diff --git a/taf/testlib/afscross.py b/taf/testlib/afscross.py index f2e72d9..e13d534 100644 --- a/taf/testlib/afscross.py +++ b/taf/testlib/afscross.py @@ -44,7 +44,7 @@ def __init__(self, config, opts, env): @type env: Environment """ self.class_logger.debug("Create AFS object.") - self.opts = opts + super().__init__(config, opts) # Correcting AFS port map if "mapcorrector" in config: diff --git a/taf/testlib/dev_basecross.py b/taf/testlib/dev_basecross.py index 3bed88b..5015a6c 100644 --- a/taf/testlib/dev_basecross.py +++ b/taf/testlib/dev_basecross.py @@ -87,9 +87,7 @@ def __init__(self, config, opts): """ @brief Initialize ZeroCross class """ - self.id = config['id'] - self.type = config['instance_type'] - self.opts = opts + super().__init__(config, opts) self.autoconnect = True def xconnect(self, connection=None): diff --git a/taf/testlib/dev_onsswcross.py b/taf/testlib/dev_onsswcross.py index 454887b..1b170e5 100644 --- a/taf/testlib/dev_onsswcross.py +++ b/taf/testlib/dev_onsswcross.py @@ -48,12 +48,9 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ + super().__init__(config, opts) self.class_logger.info("Init ONS Switch Cross object.") - self.id = config['id'] - self.type = config['instance_type'] self.name = config['name'] if "name" in config else "noname" - self.config = config - self.opts = opts # Connections info: self.connections = [] # Do xconnect on create? diff --git a/taf/testlib/dev_ovscontroller.py b/taf/testlib/dev_ovscontroller.py index 6c47f74..497bd8b 100644 --- a/taf/testlib/dev_ovscontroller.py +++ b/taf/testlib/dev_ovscontroller.py @@ -50,12 +50,13 @@ class OvsControllerGeneralMixin(entry_template.GenericEntry): """ class_logger = loggers.ClassLogger() - def __init__(self, config): + def __init__(self, config, opts): """ @brief Initialize OvsControllerGeneralMixin class @param config: Configuration information. @type config: dict """ + super().__init__(config, opts) self.val = config['related_id'][0] self.sw_type = config['related_conf'][self.val]['instance_type'] if 'ip_host' in list(config.keys()): @@ -460,10 +461,9 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ - super(NoxControllerLocal, self).__init__(config) + super(NoxControllerLocal, self).__init__(config, opts) self.popen = None self.pid = None - self.opts = opts self.cmdproxy = JsonCommand(self.json_ipaddr, self.port) self.waiton_err_message = "OVS controller is started but does not respond." @@ -600,7 +600,7 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ - super(FloodlightControllerLocal, self).__init__(config) + super(FloodlightControllerLocal, self).__init__(config, opts) self.popen = None self.pid = None self.opts = opts @@ -744,7 +744,7 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ - super(OFtestControllerLocal, self).__init__(config) + super(OFtestControllerLocal, self).__init__(config, opts) self.popen = None self.pid = None self.opts = opts @@ -874,7 +874,7 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ - super(OvsControllerRemote, self).__init__(config) + super(OvsControllerRemote, self).__init__(config, opts) self.popen = None self.pid = None self.opts = opts diff --git a/taf/testlib/dev_staticcross_ons.py b/taf/testlib/dev_staticcross_ons.py index 77f4733..5a03fd4 100644 --- a/taf/testlib/dev_staticcross_ons.py +++ b/taf/testlib/dev_staticcross_ons.py @@ -39,9 +39,7 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ - self.id = config['id'] - self.type = config['instance_type'] - self.opts = opts + super().__init__(config, opts) self.autoconnect = config['autoconnect'] if "autoconnect" in config else True # Store configuration of related devices diff --git a/taf/testlib/dev_vethcross.py b/taf/testlib/dev_vethcross.py index afbedc5..02ea08c 100644 --- a/taf/testlib/dev_vethcross.py +++ b/taf/testlib/dev_vethcross.py @@ -44,10 +44,8 @@ def __init__(self, config, opts): @param opts: py.test config.option object which contains all py.test cli options. @type opts: OptionParser """ + super().__init__(config, opts) self.class_logger.info("VethCross is selected.") - self.id = config['id'] - self.type = config['instance_type'] - self.opts = opts # Connections info: self.connections = [] # Do xconnect on create? diff --git a/taf/testlib/dev_vlabcross.py b/taf/testlib/dev_vlabcross.py index 94df22f..fefe2da 100644 --- a/taf/testlib/dev_vlabcross.py +++ b/taf/testlib/dev_vlabcross.py @@ -50,12 +50,10 @@ def __init__(self, config, opts): @type opts: OptionParser @raise CrossException: error in vlab path """ - self.id = config['id'] - self.type = config['instance_type'] + super().__init__(config, opts) self.ipaddr = config['ip_host'] self.port = config['ip_port'] if "ip_port" in config else "8050" self.ifaces = config['ports'] - self.opts = opts # Do xconnect on create? self.autoconnect = config['autoconnect'] if "autoconnect" in config else True