lab/mininet-sample
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Removing dashes in names of congestion clients (mininet does not like it)

Browse Source
This commit is contained in:
Quentin De Coninck 2017-06-12 10:06:27 +02:00
parent 1252d24aa2
commit e2cfbd1fa3
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mpMultiInterfaceCongConfig.py
View File

@ -184,7 +184,7 @@ class MpMultiInterfaceCongConfig(MpConfig):
return MpTopo.clientName + "-eth" + str(interfaceID) return MpTopo.clientName + "-eth" + str(interfaceID)
def getCongClientInterface(self, interfaceID): def getCongClientInterface(self, interfaceID):
return MpMultiInterfaceCongTopo.congClientName + "-" + str(interfaceID) + "-eth0" return MpMultiInterfaceCongTopo.congClientName + str(interfaceID) + "-eth0"
def getRouterInterfaceSwitch(self, interfaceID): def getRouterInterfaceSwitch(self, interfaceID):
return MpTopo.routerName + "-eth" + str(interfaceID) return MpTopo.routerName + "-eth" + str(interfaceID)
@ -193,7 +193,7 @@ class MpMultiInterfaceCongConfig(MpConfig):
return MpTopo.serverName + "-eth0" return MpTopo.serverName + "-eth0"
def getCongServerInterface(self, interfaceID): def getCongServerInterface(self, interfaceID):
return MpMultiInterfaceCongTopo.congServerName + "-" + str(interfaceID) + "-eth0" return MpMultiInterfaceCongTopo.congServerName + str(interfaceID) + "-eth0"
def getMidLeftName(self, id): def getMidLeftName(self, id):
return MpTopo.switchNamePrefix + str(id) return MpTopo.switchNamePrefix + str(id)

4
src/mpMultiInterfaceCongTopo.py
View File

@ -16,12 +16,12 @@ class MpMultiInterfaceCongTopo(MpTopo):
for l in self.topoParam.linkCharacteristics: for l in self.topoParam.linkCharacteristics:
self.switch.append(self.addOneSwitchPerLink(l)) self.switch.append(self.addOneSwitchPerLink(l))
self.addLink(self.client,self.switch[-1]) self.addLink(self.client,self.switch[-1])
self.cong_clients.append(self.addHost(MpMultiInterfaceCongTopo.congClientName + "-" + str(len(self.cong_clients)))) self.cong_clients.append(self.addHost(MpMultiInterfaceCongTopo.congClientName + str(len(self.cong_clients))))
self.addLink(self.cong_clients[-1], self.switch[-1]) self.addLink(self.cong_clients[-1], self.switch[-1])
self.addLink(self.switch[-1],self.router, **l.asDict()) self.addLink(self.switch[-1],self.router, **l.asDict())
self.addLink(self.router, self.server) self.addLink(self.router, self.server)
for i in range(len(self.cong_clients)): for i in range(len(self.cong_clients)):
self.cong_servers.append(self.addHost(MpMultiInterfaceCongTopo.congServerName + "-" + str(len(self.cong_servers)))) self.cong_servers.append(self.addHost(MpMultiInterfaceCongTopo.congServerName + str(len(self.cong_servers))))
self.addLink(self.router, self.cong_servers[-1]) self.addLink(self.router, self.cong_servers[-1])
def getCongClients(self): def getCongClients(self):