diff options
author | ahothan <ahothan@cisco.com> | 2018-01-16 12:46:21 -0800 |
---|---|---|
committer | ahothan <ahothan@cisco.com> | 2018-01-16 12:46:21 -0800 |
commit | 02c8ed97e27b6e417945d27d4d3c2ab8e7dbfa7e (patch) | |
tree | c6335c42266f70c77b7fa2560d5b932040e66d9a /nfvbench/chain_managers.py | |
parent | b481ad4a6c6b98cac760b12e4190f9540869e673 (diff) |
[NFVBENCH-62] Add support for non-openstack environments
Add Unit test to validate non-openstack with dummy traffic gen
Change-Id: I359ddb7d43169f706d8262842af975d5b4675a3a
Signed-off-by: ahothan <ahothan@cisco.com>
Diffstat (limited to 'nfvbench/chain_managers.py')
-rw-r--r-- | nfvbench/chain_managers.py | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/nfvbench/chain_managers.py b/nfvbench/chain_managers.py index 8b605aa..087c751 100644 --- a/nfvbench/chain_managers.py +++ b/nfvbench/chain_managers.py @@ -96,11 +96,12 @@ class StatsManager(object): raise exc def _get_data(self): - return self.worker.get_data() + return self.worker.get_data() if self.worker else {} def _get_network(self, traffic_port, index=None, reverse=False): interfaces = [self.clients['traffic'].get_interface(traffic_port)] - interfaces.extend(self.worker.get_network_interfaces(index)) + if self.worker: + interfaces.extend(self.worker.get_network_interfaces(index)) return Network(interfaces, reverse) def _config_interfaces(self): @@ -127,13 +128,14 @@ class StatsManager(object): return self.interval_collector.get() if self.interval_collector else [] def get_version(self): - return self.worker.get_version() + return self.worker.get_version() if self.worker else {} def run(self): """ Run analysis in both direction and return the analysis """ - self.worker.run() + if self.worker: + self.worker.run() stats = self._generate_traffic() result = { @@ -157,7 +159,7 @@ class StatsManager(object): return result def get_compute_nodes_bios(self): - return self.worker.get_compute_nodes_bios() + return self.worker.get_compute_nodes_bios() if self.worker else {} @staticmethod def get_analysis(nets): @@ -176,7 +178,8 @@ class StatsManager(object): return packet_analyzer.get_analysis() def close(self): - self.worker.close() + if self.worker: + self.worker.close() class PVPStatsManager(StatsManager): @@ -229,10 +232,13 @@ class EXTStatsManager(StatsManager): StatsManager.__init__(self, config, clients, specs, factory, vlans, notifier) def _setup(self): - WORKER_CLASS = self.factory.get_chain_worker(self.specs.openstack.encaps, - self.config.service_chain) - self.worker = WORKER_CLASS(self.config, self.clients, self.specs) - self.worker.set_vlans(self.vlans) + if self.specs.openstack: + WORKER_CLASS = self.factory.get_chain_worker(self.specs.openstack.encaps, + self.config.service_chain) + self.worker = WORKER_CLASS(self.config, self.clients, self.specs) + self.worker.set_vlans(self.vlans) - if not self.config.no_int_config: - self._config_interfaces() + if not self.config.no_int_config: + self._config_interfaces() + else: + self.worker = None |