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

Fixing too long names + typos

Browse Source
This commit is contained in:
Quentin De Coninck 2017-06-12 09:53:30 +02:00
parent 55cdfa7cce
commit 5c1b9cfe23
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/mpMultiInterfaceCongConfig.py
View File

@ -1,5 +1,5 @@
from mpConfig import MpConfig
from mpMultiInterfaceTopo import MpMultiInterfaceTopo
from mpMultiInterfaceCongTopo import MpMultiInterfaceCongTopo
from mpParamTopo import MpParamTopo
from mpTopo import MpTopo
@ -176,7 +176,7 @@ class MpMultiInterfaceCongConfig(MpConfig):
return MpTopo.clientName + "-eth" + str(interfaceID)
def getCongClientInterface(self, interfaceID):
return "CongClient-" + str(interfaceID) + "-eth0"
return MpMultiInterfaceCongTopo.congClientName + "-" + str(interfaceID) + "-eth0"
def getRouterInterfaceSwitch(self, interfaceID):
return MpTopo.routerName + "-eth" + str(interfaceID)
@ -185,7 +185,7 @@ class MpMultiInterfaceCongConfig(MpConfig):
return MpTopo.serverName + "-eth0"
def getCongServerInterface(self, interfaceID):
return "CongServer-" + str(interfaceID) + "-eth0"
return MpMultiInterfaceCongTopo.congServerName + "-" + str(interfaceID) + "-eth0"
def getMidLeftName(self, id):
return MpTopo.switchNamePrefix + str(id)

7
src/mpMultiInterfaceCongTopo.py
View File

@ -1,6 +1,9 @@
from mpTopo import MpTopo
class MpMultiInterfaceCongTopo(MpTopo):
congClientName = "CCli"
congServerName = "CSer"
def __init__(self, topoBuilder, parameterFile):
MpTopo.__init__(self,topoBuilder, parameterFile)
print("Hello from topo multi if")
@ -13,12 +16,12 @@ class MpMultiInterfaceCongTopo(MpTopo):
for l in self.topoParam.linkCharacteristics:
self.switch.append(self.addOneSwitchPerLink(l))
self.addLink(self.client,self.switch[-1])
self.cong_clients.append(self.addHost("CongClient-" + 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.switch[-1],self.router, **l.asDict())
self.addLink(self.router, self.server)
for i in range(len(self.cong_clients)):
self.cong_servers.append(self.addHost("CongServer-" + 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])
def getCongClients(self):