diff options
author | Shobhi Jain <shobhi.jain@intel.com> | 2018-02-01 16:31:55 +0000 |
---|---|---|
committer | Rodolfo Alonso Hernandez <rodolfo.alonso.hernandez@intel.com> | 2018-02-19 11:35:44 +0000 |
commit | 90d19cadf08f2aeb7f3bb938f60bb517d4ab677d (patch) | |
tree | 30b0958a730b6c42ca15f6ab6e94e145cd344351 /yardstick/benchmark/scenarios/lib/delete_network.py | |
parent | 4e5893873d684069e57b2ef91a75b446bb319d56 (diff) |
Replace neutron network deletion with shade.
Function delete_neutron_net now uses shade client instead of neutron
client.
JIRA: YARDSTICK-890
Change-Id: I99b6f3ecd37d6e3b783f7eb3da9f971398fc3bdd
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
Diffstat (limited to 'yardstick/benchmark/scenarios/lib/delete_network.py')
-rw-r--r-- | yardstick/benchmark/scenarios/lib/delete_network.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/yardstick/benchmark/scenarios/lib/delete_network.py b/yardstick/benchmark/scenarios/lib/delete_network.py index e8796bf82..2e8b595f9 100644 --- a/yardstick/benchmark/scenarios/lib/delete_network.py +++ b/yardstick/benchmark/scenarios/lib/delete_network.py @@ -7,14 +7,12 @@ # http://www.apache.org/licenses/LICENSE-2.0 ############################################################################## -from __future__ import print_function -from __future__ import absolute_import - import logging from yardstick.benchmark.scenarios import base import yardstick.common.openstack_utils as op_utils + LOG = logging.getLogger(__name__) @@ -30,7 +28,7 @@ class DeleteNetwork(base.Scenario): self.network_id = self.options.get("network_id", None) - self.neutron_client = op_utils.get_neutron_client() + self.shade_client = op_utils.get_shade_client() self.setup_done = False @@ -45,7 +43,7 @@ class DeleteNetwork(base.Scenario): if not self.setup_done: self.setup() - status = op_utils.delete_neutron_net(self.neutron_client, + status = op_utils.delete_neutron_net(self.shade_client, network_id=self.network_id) if status: result.update({"delete_network": 1}) @@ -53,3 +51,4 @@ class DeleteNetwork(base.Scenario): else: result.update({"delete_network": 0}) LOG.error("Delete network failed!") + return status |