From e2bf4ed6d951fe9d65b6bf8af8f8dca60ed173c9 Mon Sep 17 00:00:00 2001 From: ahothan Date: Sat, 16 Sep 2017 00:17:22 -0700 Subject: StatsManager must clean up self when there is an exception in __init__ ALso remove unused connection.py Change-Id: I1bf688ade511f2054e9d67edf8938df1988e4cb2 Signed-off-by: ahothan --- nfvbench/chain_managers.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'nfvbench/chain_managers.py') diff --git a/nfvbench/chain_managers.py b/nfvbench/chain_managers.py index fe3a2d4..033eb7a 100644 --- a/nfvbench/chain_managers.py +++ b/nfvbench/chain_managers.py @@ -85,8 +85,14 @@ class StatsManager(object): 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) - self._config_interfaces() + try: + self.worker.set_vlans(self.vlans) + self._config_interfaces() + except Exception as exc: + # since the wrorker is up and running, we need to close it + # in case of exception + self.close() + raise exc def _get_data(self): return self.worker.get_data() -- cgit 1.2.3-korg