diff --git a/core/experience.py b/core/experience.py index 795cccb..cd4e343 100644 --- a/core/experience.py +++ b/core/experience.py @@ -1,7 +1,7 @@ from .parameter import ExperienceParameter from mpMultiInterfaceTopo import MpMultiInterfaceTopo -class Experience: +class Experience(object): PING = "ping" NCPV = "ncpv" NC = "nc" diff --git a/core/parameter.py b/core/parameter.py index 36721a8..58d4654 100644 --- a/core/parameter.py +++ b/core/parameter.py @@ -1,5 +1,5 @@ -class Parameter: +class Parameter(object): def __init__(self, paramFile): self.paramDic = {} print("Create the param Object") @@ -208,10 +208,10 @@ class ExperienceParameter(Parameter): defaultValue[BACKUPPATH1] = "0" def __init__(self, paramFile): - super().__init__(paramFile) + super(ExperienceParameter, self).__init__(paramFile) def getParam(self, key): - val = super().getParam(key) + val = super(ExperienceParameter, self).getParam(key) if val is None: if key in ExperienceParameter.defaultValue: return ExperienceParameter.defaultValue[key] diff --git a/core/topo.py b/core/topo.py index 44fbb41..46934ea 100644 --- a/core/topo.py +++ b/core/topo.py @@ -89,7 +89,7 @@ class TopoParameter(Parameter): s = s + self.linkCharacteristics[-1].__str__() return s -class Topo: +class Topo(object): mininetBuilder = "mininet" multiIfTopo = "MultiIf" ECMPLikeTopo = "ECMPLike" @@ -149,7 +149,7 @@ class Topo: self.topoBuilder.stopNetwork() -class TopoConfig: +class TopoConfig(object): PING_OUTPUT = "ping.log" diff --git a/mpECMPSingleInterfaceConfig.py b/mpECMPSingleInterfaceConfig.py index 54e9cd5..dbb4860 100644 --- a/mpECMPSingleInterfaceConfig.py +++ b/mpECMPSingleInterfaceConfig.py @@ -4,7 +4,7 @@ from struct import * class MpECMPSingleInterfaceConfig(TopoConfig): def __init__(self, topo, param): - super().__init__(topo, param) + super(MpECMPSingleInterfaceConfig, self).__init__(topo, param) def configureRoute(self): i = 0 diff --git a/mpECMPSingleInterfaceTopo.py b/mpECMPSingleInterfaceTopo.py index 8da7df8..7b7b33f 100644 --- a/mpECMPSingleInterfaceTopo.py +++ b/mpECMPSingleInterfaceTopo.py @@ -2,7 +2,7 @@ from core.topo import Topo class MpECMPSingleInterfaceTopo(Topo): def __init__(self, topoBuilder, parameterFile): - super().__init__(topoBuilder, parameterFile) + super(MpECMPSingleInterfaceTopo, self).__init__(topoBuilder, parameterFile) print("Hello ECMP topo") diff --git a/mpMultiInterfaceConfig.py b/mpMultiInterfaceConfig.py index 101c277..e0d04f9 100644 --- a/mpMultiInterfaceConfig.py +++ b/mpMultiInterfaceConfig.py @@ -3,7 +3,7 @@ from mpMultiInterfaceTopo import MpMultiInterfaceTopo class MpMultiInterfaceConfig(TopoConfig): def __init__(self, topo, param): - super().__init__(topo, param) + super(MpMultiInterfaceConfig, self).__init__(topo, param) def configureRoute(self): i = 0 diff --git a/mpMultiInterfaceCongConfig.py b/mpMultiInterfaceCongConfig.py index e29cbad..925afd3 100644 --- a/mpMultiInterfaceCongConfig.py +++ b/mpMultiInterfaceCongConfig.py @@ -3,7 +3,7 @@ from core.topo import TopoConfig, Topo, TopoParameter class MpMultiInterfaceCongConfig(TopoConfig): def __init__(self, topo, param): - super().__init__(topo, param) + super(MpMultiInterfaceCongConfig, self).__init__(topo, param) def configureRoute(self): i = 0 diff --git a/mpMultiInterfaceCongTopo.py b/mpMultiInterfaceCongTopo.py index 3aa8992..aa45ef5 100644 --- a/mpMultiInterfaceCongTopo.py +++ b/mpMultiInterfaceCongTopo.py @@ -5,7 +5,7 @@ class MpMultiInterfaceCongTopo(Topo): congServerName = "CSer" def __init__(self, topoBuilder, parameterFile): - super().__init__(topoBuilder, parameterFile) + super(MpMultiInterfaceCongTopo, self).__init__(topoBuilder, parameterFile) print("Hello from topo multi if") self.client = self.addHost(Topo.clientName) self.server = self.addHost(Topo.serverName) diff --git a/mpMultiInterfaceTopo.py b/mpMultiInterfaceTopo.py index 9f8735d..152d818 100644 --- a/mpMultiInterfaceTopo.py +++ b/mpMultiInterfaceTopo.py @@ -2,7 +2,7 @@ from core.topo import Topo class MpMultiInterfaceTopo(Topo): def __init__(self, topoBuilder, parameterFile): - super().__init__(topoBuilder, parameterFile) + super(MpMultiInterfaceTopo, self).__init__(topoBuilder, parameterFile) print("Hello from topo multi if") self.client = self.addHost(Topo.clientName) self.server = self.addHost(Topo.serverName) diff --git a/mpTwoInterfaceCongestionConfig.py b/mpTwoInterfaceCongestionConfig.py index 5863938..3bdc59b 100644 --- a/mpTwoInterfaceCongestionConfig.py +++ b/mpTwoInterfaceCongestionConfig.py @@ -3,7 +3,7 @@ from mpTwoInterfaceCongestionTopo import MpTwoInterfaceCongestionTopo class MpTwoInterfaceCongestionConfig(TopoConfig): def __init__(self, topo, param): - super().__init__(topo, param) + super(MpTwoInterfaceCongestionConfig, self).__init__(topo, param) def configureRoute(self): # Client - Router diff --git a/mpTwoInterfaceCongestionTopo.py b/mpTwoInterfaceCongestionTopo.py index 988bf36..53778ce 100644 --- a/mpTwoInterfaceCongestionTopo.py +++ b/mpTwoInterfaceCongestionTopo.py @@ -2,7 +2,7 @@ from core.topo import Topo class MpTwoInterfaceCongestionTopo(Topo): def __init__(self, topoBuilder, parameterFile): - super().__init__(topoBuilder, parameterFile) + super(MpTwoInterfaceCongestionTopo, self).__init__(topoBuilder, parameterFile) print("Hello from topo two ifs cong") print("Expected topo:")