From e2cfbd1fa3f3eb61b2ef348fb0440d0767bdf465 Mon Sep 17 00:00:00 2001 From: Quentin De Coninck Date: Mon, 12 Jun 2017 10:06:27 +0200 Subject: [PATCH] Removing dashes in names of congestion clients (mininet does not like it) --- src/mpMultiInterfaceCongConfig.py | 4 ++-- src/mpMultiInterfaceCongTopo.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mpMultiInterfaceCongConfig.py b/src/mpMultiInterfaceCongConfig.py index ec59632..26c6c52 100644 --- a/src/mpMultiInterfaceCongConfig.py +++ b/src/mpMultiInterfaceCongConfig.py @@ -184,7 +184,7 @@ class MpMultiInterfaceCongConfig(MpConfig): return MpTopo.clientName + "-eth" + str(interfaceID) def getCongClientInterface(self, interfaceID): - return MpMultiInterfaceCongTopo.congClientName + "-" + str(interfaceID) + "-eth0" + return MpMultiInterfaceCongTopo.congClientName + str(interfaceID) + "-eth0" def getRouterInterfaceSwitch(self, interfaceID): return MpTopo.routerName + "-eth" + str(interfaceID) @@ -193,7 +193,7 @@ class MpMultiInterfaceCongConfig(MpConfig): return MpTopo.serverName + "-eth0" def getCongServerInterface(self, interfaceID): - return MpMultiInterfaceCongTopo.congServerName + "-" + str(interfaceID) + "-eth0" + return MpMultiInterfaceCongTopo.congServerName + str(interfaceID) + "-eth0" def getMidLeftName(self, id): return MpTopo.switchNamePrefix + str(id) diff --git a/src/mpMultiInterfaceCongTopo.py b/src/mpMultiInterfaceCongTopo.py index ccd5853..dd7812f 100644 --- a/src/mpMultiInterfaceCongTopo.py +++ b/src/mpMultiInterfaceCongTopo.py @@ -16,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(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.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(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]) def getCongClients(self):