From 5bb06d8977dc1ffa18c47cd1b152f84f4a6cfa34 Mon Sep 17 00:00:00 2001
From: Shobhi Jain <shobhi.jain@intel.com>
Date: Mon, 5 Feb 2018 15:18:43 +0000
Subject: Replace neutron network creation with shade.

Function create_neutron_net now uses shade client instead of neutron
client.

JIRA: YARDSTICK-890

Change-Id: I456078e98550901c1f736640c9f9bd0d5f9c3df6
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
---
 .../benchmark/scenarios/lib/create_network.py      | 41 ++++++++--------
 yardstick/common/exceptions.py                     |  4 ++
 yardstick/common/openstack_utils.py                | 28 ++++++++---
 .../benchmark/scenarios/lib/test_create_network.py | 57 ++++++++++++++++------
 .../tests/unit/common/test_openstack_utils.py      | 25 ++++++++++
 5 files changed, 114 insertions(+), 41 deletions(-)

diff --git a/yardstick/benchmark/scenarios/lib/create_network.py b/yardstick/benchmark/scenarios/lib/create_network.py
index cffff132a..734820519 100644
--- a/yardstick/benchmark/scenarios/lib/create_network.py
+++ b/yardstick/benchmark/scenarios/lib/create_network.py
@@ -7,13 +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
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+
 
 LOG = logging.getLogger(__name__)
 
@@ -28,9 +27,14 @@ class CreateNetwork(base.Scenario):
         self.context_cfg = context_cfg
         self.options = self.scenario_cfg['options']
 
-        self.openstack = self.options.get("openstack_paras", None)
+        self.network_name = self.options["network_name"]
+        self.shared = self.options.get("shared", False)
+        self.admin_state_up = self.options.get("admin_state_up", True)
+        self.external = self.options.get("external", False)
+        self.provider = self.options.get("provider")
+        self.project_id = self.options.get("project_id")
 
-        self.neutron_client = op_utils.get_neutron_client()
+        self.shade_client = openstack_utils.get_shade_client()
 
         self.setup_done = False
 
@@ -45,20 +49,17 @@ class CreateNetwork(base.Scenario):
         if not self.setup_done:
             self.setup()
 
-        openstack_paras = {'network': self.openstack}
-        network_id = op_utils.create_neutron_net(self.neutron_client,
-                                                 openstack_paras)
-        if network_id:
-            result.update({"network_create": 1})
-            LOG.info("Create network successful!")
-        else:
+        network_id = openstack_utils.create_neutron_net(
+            self.shade_client, self.network_name, shared=self.shared,
+            admin_state_up=self.admin_state_up, external=self.external,
+            provider=self.provider, project_id=self.project_id)
+        if not network_id:
             result.update({"network_create": 0})
             LOG.error("Create network failed!")
+            raise exceptions.ScenarioCreateNetworkError
 
-        try:
-            keys = self.scenario_cfg.get('output', '').split()
-        except KeyError:
-            pass
-        else:
-            values = [network_id]
-            return self._push_to_outputs(keys, values)
+        result.update({"network_create": 1})
+        LOG.info("Create network successful!")
+        keys = self.scenario_cfg.get('output', '').split()
+        values = [network_id]
+        return self._push_to_outputs(keys, values)
diff --git a/yardstick/common/exceptions.py b/yardstick/common/exceptions.py
index 7f72887e1..ade5b53a8 100644
--- a/yardstick/common/exceptions.py
+++ b/yardstick/common/exceptions.py
@@ -100,3 +100,7 @@ class TaskReadError(YardstickException):
 
 class TaskRenderError(YardstickException):
     message = 'Failed to render template:\n%(input_task)s'
+
+
+class ScenarioCreateNetworkError(YardstickException):
+    message = 'Create Neutron Network Scenario failed'
diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py
index e3f67baa5..9da37e64b 100644
--- a/yardstick/common/openstack_utils.py
+++ b/yardstick/common/openstack_utils.py
@@ -435,13 +435,29 @@ def get_network_id(shade_client, network_name):
         return networks[0]['id']
 
 
-def create_neutron_net(neutron_client, json_body):      # pragma: no cover
+def create_neutron_net(shade_client, network_name, shared=False,
+                       admin_state_up=True, external=False, provider=None,
+                       project_id=None):
+    """Create a neutron network.
+
+    :param network_name:(string) name of the network being created.
+    :param shared:(bool) whether the network is shared.
+    :param admin_state_up:(bool) set the network administrative state.
+    :param external:(bool) whether this network is externally accessible.
+    :param provider:(dict) a dict of network provider options.
+    :param project_id:(string) specify the project ID this network
+                      will be created on (admin-only).
+    :returns:(string) the network id.
+    """
     try:
-        network = neutron_client.create_network(body=json_body)
-        return network['network']['id']
-    except Exception:  # pylint: disable=broad-except
-        log.error("Error [create_neutron_net(neutron_client)]")
-        raise Exception("operation error")
+        networks = shade_client.create_network(
+            name=network_name, shared=shared, admin_state_up=admin_state_up,
+            external=external, provider=provider, project_id=project_id)
+        return networks['id']
+    except exc.OpenStackCloudException as o_exc:
+        log.error("Error [create_neutron_net(shade_client)]."
+                  "Exception message, '%s'", o_exc.orig_message)
+        return None
 
 
 def delete_neutron_net(shade_client, network_id):
diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_network.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_network.py
index cea60c319..17a4ef2e1 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_network.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_network.py
@@ -6,25 +6,52 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+
+from oslo_utils import uuidutils
 import unittest
 import mock
 
-from yardstick.benchmark.scenarios.lib.create_network import CreateNetwork
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+from yardstick.benchmark.scenarios.lib import create_network
 
 
 class CreateNetworkTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.common.openstack_utils.get_neutron_client')
-    @mock.patch('yardstick.common.openstack_utils.create_neutron_net')
-    def test_create_network(self, mock_get_neutron_client, mock_create_neutron_net):
-        options = {
-            'openstack_paras': {
-                'name': 'yardstick_net',
-                'admin_state_up': 'True'
-            }
-        }
-        args = {"options": options}
-        obj = CreateNetwork(args, {})
-        obj.run({})
-        mock_get_neutron_client.assert_called_once()
-        mock_create_neutron_net.assert_called_once()
+    def setUp(self):
+
+        self._mock_create_neutron_net = mock.patch.object(
+            openstack_utils, 'create_neutron_net')
+        self.mock_create_neutron_net = self._mock_create_neutron_net.start()
+        self._mock_get_shade_client = mock.patch.object(
+            openstack_utils, 'get_shade_client')
+        self.mock_get_shade_client = self._mock_get_shade_client.start()
+        self._mock_log = mock.patch.object(create_network, 'LOG')
+        self.mock_log = self._mock_log.start()
+        self.args = {'options': {'network_name': 'yardstick_net'}}
+        self.result = {}
+
+        self._cnet_obj = create_network.CreateNetwork(self.args, mock.ANY)
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_create_neutron_net.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
+
+    def test_run(self):
+        _uuid = uuidutils.generate_uuid()
+        self._cnet_obj.scenario_cfg = {'output': 'id'}
+        self.mock_create_neutron_net.return_value = _uuid
+        output = self._cnet_obj.run(self.result)
+        self.assertEqual({"network_create": 1}, self.result)
+        self.assertEqual({'id': _uuid}, output)
+        self.mock_log.info.asset_called_once_with('Create network successful!')
+
+    def test_run_fail_exception(self):
+        self.mock_create_neutron_net.return_value = None
+        with self.assertRaises(exceptions.ScenarioCreateNetworkError):
+            self._cnet_obj.run(self.result)
+        self.assertEqual({"network_create": 0}, self.result)
+        self.mock_log.error.assert_called_once_with(
+            'Create network failed!')
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py
index 4863f05c0..a63661025 100644
--- a/yardstick/tests/unit/common/test_openstack_utils.py
+++ b/yardstick/tests/unit/common/test_openstack_utils.py
@@ -83,3 +83,28 @@ class DeleteNeutronNetTestCase(unittest.TestCase):
                                                     'network_id')
         self.assertFalse(output)
         mock_logger.error.assert_called_once()
+
+
+class CreateNeutronNetTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.mock_shade_client = mock.Mock()
+        self.network_name = 'name'
+        self.mock_shade_client.create_network = mock.Mock()
+
+    def test_create_neutron_net(self):
+        _uuid = uuidutils.generate_uuid()
+        self.mock_shade_client.create_network.return_value = {'id': _uuid}
+        output = openstack_utils.create_neutron_net(self.mock_shade_client,
+                                                    self.network_name)
+        self.assertEqual(_uuid, output)
+
+    @mock.patch.object(openstack_utils, 'log')
+    def test_create_neutron_net_exception(self, mock_logger):
+        self.mock_shade_client.create_network.side_effect = (
+            exc.OpenStackCloudException('error message'))
+
+        output = openstack_utils.create_neutron_net(self.mock_shade_client,
+                                                    self.network_name)
+        mock_logger.error.assert_called_once()
+        self.assertIsNone(output)
-- 
cgit 1.2.3-korg


From 9f26e65c62fd5a4a1fbf9048e3bfe857b18729c9 Mon Sep 17 00:00:00 2001
From: Shobhi Jain <shobhi.jain@intel.com>
Date: Wed, 7 Feb 2018 11:08:05 +0000
Subject: Replace neutron subnet creation with shade.

Function 'create_neutron_subnet' now uses shade client
instead of neutron client.

JIRA: YARDSTICK-890

Change-Id: I8eb5295cecd73742bfb5a7d0764af6f45ef0685e
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
---
 yardstick/benchmark/scenarios/lib/create_subnet.py | 60 +++++++++++++---------
 yardstick/common/exceptions.py                     |  4 ++
 yardstick/common/openstack_utils.py                | 54 ++++++++++++++++---
 .../benchmark/scenarios/lib/test_create_subnet.py  | 60 ++++++++++++++++------
 .../tests/unit/common/test_openstack_utils.py      | 25 +++++++++
 5 files changed, 157 insertions(+), 46 deletions(-)

diff --git a/yardstick/benchmark/scenarios/lib/create_subnet.py b/yardstick/benchmark/scenarios/lib/create_subnet.py
index c34af8a9e..e383c99de 100644
--- a/yardstick/benchmark/scenarios/lib/create_subnet.py
+++ b/yardstick/benchmark/scenarios/lib/create_subnet.py
@@ -7,13 +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
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+
 
 LOG = logging.getLogger(__name__)
 
@@ -28,9 +27,23 @@ class CreateSubnet(base.Scenario):
         self.context_cfg = context_cfg
         self.options = self.scenario_cfg['options']
 
-        self.openstack = self.options.get("openstack_paras", None)
-
-        self.neutron_client = op_utils.get_neutron_client()
+        self.network_name_or_id = self.options['network_name_or_id']
+        self.cidr = self.options.get('cidr')
+        self.ip_version = self.options.get('ip_version', 4)
+        self.enable_dhcp = self.options.get('enable_dhcp', False)
+        self.subnet_name = self.options.get('subnet_name')
+        self.tenant_id = self.options.get('tenant_id')
+        self.allocation_pools = self.options.get('allocation_pools')
+        self.gateway_ip = self.options.get('gateway_ip')
+        self.disable_gateway_ip = self.options.get('disable_gateway_ip', False)
+        self.dns_nameservers = self.options.get('dns_nameservers')
+        self.host_routes = self.options.get('host_routes')
+        self.ipv6_ra_mode = self.options.get('ipv6_ra_mode')
+        self.ipv6_address_mode = self.options.get('ipv6_address_mode')
+        self.use_default_subnetpool = self.options.get(
+            'use_default_subnetpool', False)
+
+        self.shade_client = openstack_utils.get_shade_client()
 
         self.setup_done = False
 
@@ -45,22 +58,23 @@ class CreateSubnet(base.Scenario):
         if not self.setup_done:
             self.setup()
 
-        openstack_paras = {'subnets': [self.openstack]}
-        subnet_id = op_utils.create_neutron_subnet(self.neutron_client,
-                                                   openstack_paras)
-        if subnet_id:
-            result.update({"subnet_create": 1})
-            LOG.info("Create subnet successful!")
-        else:
+        subnet_id = openstack_utils.create_neutron_subnet(
+            self.shade_client, self.network_name_or_id, cidr=self.cidr,
+            ip_version=self.ip_version, enable_dhcp=self.enable_dhcp,
+            subnet_name=self.subnet_name, tenant_id=self.tenant_id,
+            allocation_pools=self.allocation_pools, gateway_ip=self.gateway_ip,
+            disable_gateway_ip=self.disable_gateway_ip,
+            dns_nameservers=self.dns_nameservers, host_routes=self.host_routes,
+            ipv6_ra_mode=self.ipv6_ra_mode,
+            ipv6_address_mode=self.ipv6_address_mode,
+            use_default_subnetpool=self.use_default_subnetpool)
+        if not subnet_id:
             result.update({"subnet_create": 0})
             LOG.error("Create subnet failed!")
+            raise exceptions.ScenarioCreateSubnetError
 
-        check_result = subnet_id
-
-        try:
-            keys = self.scenario_cfg.get('output', '').split()
-        except KeyError:
-            pass
-        else:
-            values = [check_result]
-            return self._push_to_outputs(keys, values)
+        result.update({"subnet_create": 1})
+        LOG.info("Create subnet successful!")
+        keys = self.scenario_cfg.get('output', '').split()
+        values = [subnet_id]
+        return self._push_to_outputs(keys, values)
diff --git a/yardstick/common/exceptions.py b/yardstick/common/exceptions.py
index ade5b53a8..4245ce12f 100644
--- a/yardstick/common/exceptions.py
+++ b/yardstick/common/exceptions.py
@@ -104,3 +104,7 @@ class TaskRenderError(YardstickException):
 
 class ScenarioCreateNetworkError(YardstickException):
     message = 'Create Neutron Network Scenario failed'
+
+
+class ScenarioCreateSubnetError(YardstickException):
+    message = 'Create Neutron Subnet Scenario failed'
diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py
index 9da37e64b..0421346e6 100644
--- a/yardstick/common/openstack_utils.py
+++ b/yardstick/common/openstack_utils.py
@@ -468,13 +468,55 @@ def delete_neutron_net(shade_client, network_id):
         return False
 
 
-def create_neutron_subnet(neutron_client, json_body):      # pragma: no cover
+def create_neutron_subnet(shade_client, network_name_or_id, cidr=None,
+                          ip_version=4, enable_dhcp=False, subnet_name=None,
+                          tenant_id=None, allocation_pools=None,
+                          gateway_ip=None, disable_gateway_ip=False,
+                          dns_nameservers=None, host_routes=None,
+                          ipv6_ra_mode=None, ipv6_address_mode=None,
+                          use_default_subnetpool=False):
+    """Create a subnet on a specified network.
+
+    :param network_name_or_id:(string) the unique name or ID of the
+                              attached network. If a non-unique name is
+                              supplied, an exception is raised.
+    :param cidr:(string) the CIDR.
+    :param ip_version:(int) the IP version.
+    :param enable_dhcp:(bool) whether DHCP is enable.
+    :param subnet_name:(string) the name of the subnet.
+    :param tenant_id:(string) the ID of the tenant who owns the network.
+    :param allocation_pools: A list of dictionaries of the start and end
+                            addresses for the allocation pools.
+    :param gateway_ip:(string) the gateway IP address.
+    :param disable_gateway_ip:(bool) whether gateway IP address is enabled.
+    :param dns_nameservers: A list of DNS name servers for the subnet.
+    :param host_routes: A list of host route dictionaries for the subnet.
+    :param ipv6_ra_mode:(string) IPv6 Router Advertisement mode.
+                        Valid values are: 'dhcpv6-stateful',
+                        'dhcpv6-stateless', or 'slaac'.
+    :param ipv6_address_mode:(string) IPv6 address mode.
+                             Valid values are: 'dhcpv6-stateful',
+                             'dhcpv6-stateless', or 'slaac'.
+    :param use_default_subnetpool:(bool) use the default subnetpool for
+                                  ``ip_version`` to obtain a CIDR. It is
+                                  required to pass ``None`` to the ``cidr``
+                                  argument when enabling this option.
+    :returns:(string) the subnet id.
+    """
     try:
-        subnet = neutron_client.create_subnet(body=json_body)
-        return subnet['subnets'][0]['id']
-    except Exception:  # pylint: disable=broad-except
-        log.error("Error [create_neutron_subnet")
-        raise Exception("operation error")
+        subnet = shade_client.create_subnet(
+            network_name_or_id, cidr=cidr, ip_version=ip_version,
+            enable_dhcp=enable_dhcp, subnet_name=subnet_name,
+            tenant_id=tenant_id, allocation_pools=allocation_pools,
+            gateway_ip=gateway_ip, disable_gateway_ip=disable_gateway_ip,
+            dns_nameservers=dns_nameservers, host_routes=host_routes,
+            ipv6_ra_mode=ipv6_ra_mode, ipv6_address_mode=ipv6_address_mode,
+            use_default_subnetpool=use_default_subnetpool)
+        return subnet['id']
+    except exc.OpenStackCloudException as o_exc:
+        log.error("Error [create_neutron_subnet(shade_client)]. "
+                  "Exception message: %s", o_exc.orig_message)
+        return None
 
 
 def create_neutron_router(neutron_client, json_body):      # pragma: no cover
diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_subnet.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_subnet.py
index 554b88acc..856e985c4 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_subnet.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_subnet.py
@@ -6,27 +6,53 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+
+from oslo_utils import uuidutils
 import unittest
 import mock
 
-from yardstick.benchmark.scenarios.lib.create_subnet import CreateSubnet
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+from yardstick.benchmark.scenarios.lib import create_subnet
 
 
 class CreateSubnetTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.common.openstack_utils.get_neutron_client')
-    @mock.patch('yardstick.common.openstack_utils.create_neutron_subnet')
-    def test_create_subnet(self, mock_get_neutron_client, mock_create_neutron_subnet):
-        options = {
-            'openstack_paras': {
-                'network_id': '123-123-123',
-                'name': 'yardstick_subnet',
-                'cidr': '10.10.10.0/24',
-                'ip_version': '4'
-            }
-        }
-        args = {"options": options}
-        obj = CreateSubnet(args, {})
-        obj.run({})
-        mock_get_neutron_client.assert_called_once()
-        mock_create_neutron_subnet.assert_called_once()
+    def setUp(self):
+
+        self._mock_create_neutron_subnet = mock.patch.object(
+            openstack_utils, 'create_neutron_subnet')
+        self.mock_create_neutron_subnet = (
+            self._mock_create_neutron_subnet.start())
+        self._mock_get_shade_client = mock.patch.object(
+            openstack_utils, 'get_shade_client')
+        self.mock_get_shade_client = self._mock_get_shade_client.start()
+        self._mock_log = mock.patch.object(create_subnet, 'LOG')
+        self.mock_log = self._mock_log.start()
+        self.args = {'options': {'network_name_or_id': 'yardstick_net'}}
+        self.result = {"subnet_create": 0}
+
+        self._csubnet_obj = create_subnet.CreateSubnet(self.args, mock.ANY)
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_create_neutron_subnet.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
+
+    def test_run(self):
+        _uuid = uuidutils.generate_uuid()
+        self._csubnet_obj.scenario_cfg = {'output': 'id'}
+        self.mock_create_neutron_subnet.return_value = _uuid
+        output = self._csubnet_obj.run(self.result)
+        self.assertDictEqual({"subnet_create": 1}, self.result)
+        self.assertDictEqual({'id': _uuid}, output)
+        self.mock_log.info.asset_called_once_with('Create subnet successful!')
+
+    def test_run_fail(self):
+        self._csubnet_obj.scenario_cfg = {'output': 'id'}
+        self.mock_create_neutron_subnet.return_value = None
+        with self.assertRaises(exceptions.ScenarioCreateSubnetError):
+            self._csubnet_obj.run(self.result)
+        self.assertDictEqual({"subnet_create": 0}, self.result)
+        self.mock_log.error.assert_called_once_with('Create subnet failed!')
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py
index a63661025..cf5c206a5 100644
--- a/yardstick/tests/unit/common/test_openstack_utils.py
+++ b/yardstick/tests/unit/common/test_openstack_utils.py
@@ -108,3 +108,28 @@ class CreateNeutronNetTestCase(unittest.TestCase):
                                                     self.network_name)
         mock_logger.error.assert_called_once()
         self.assertIsNone(output)
+
+
+class CreateNeutronSubnetTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.mock_shade_client = mock.Mock()
+        self.network_name_or_id = 'name_or_id'
+        self.mock_shade_client.create_subnet = mock.Mock()
+
+    def test_create_neutron_subnet(self):
+        _uuid = uuidutils.generate_uuid()
+        self.mock_shade_client.create_subnet.return_value = {'id': _uuid}
+        output = openstack_utils.create_neutron_subnet(
+            self.mock_shade_client, self.network_name_or_id)
+        self.assertEqual(_uuid, output)
+
+    @mock.patch.object(openstack_utils, 'log')
+    def test_create_neutron_subnet_exception(self, mock_logger):
+        self.mock_shade_client.create_subnet.side_effect = (
+            exc.OpenStackCloudException('error message'))
+
+        output = openstack_utils.create_neutron_subnet(
+            self.mock_shade_client, self.network_name_or_id)
+        mock_logger.error.assert_called_once()
+        self.assertIsNone(output)
-- 
cgit 1.2.3-korg


From 5d5c7649d60901042e26d7d8400dc2d1ca2fb586 Mon Sep 17 00:00:00 2001
From: Shobhi Jain <shobhi.jain@intel.com>
Date: Mon, 19 Feb 2018 16:50:51 +0000
Subject: Replace neutron router deletion with shade.

Function delete_neutron_router now uses shade client instead of neutron
client.

JIRA: YARDSTICK-890

Change-Id: I5b557b640396f343b85b5f5eff415384decc083c
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
---
 yardstick/benchmark/scenarios/lib/delete_router.py | 24 +++++-----
 yardstick/common/exceptions.py                     |  4 ++
 yardstick/common/openstack_utils.py                | 11 +++--
 .../benchmark/scenarios/lib/test_delete_router.py  | 51 +++++++++++++++++-----
 .../tests/unit/common/test_openstack_utils.py      | 28 ++++++++++++
 5 files changed, 88 insertions(+), 30 deletions(-)

diff --git a/yardstick/benchmark/scenarios/lib/delete_router.py b/yardstick/benchmark/scenarios/lib/delete_router.py
index 358fd40cf..5e7467b2c 100644
--- a/yardstick/benchmark/scenarios/lib/delete_router.py
+++ b/yardstick/benchmark/scenarios/lib/delete_router.py
@@ -7,13 +7,12 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import logging
 
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
 from yardstick.benchmark.scenarios import base
-import yardstick.common.openstack_utils as op_utils
+
 
 LOG = logging.getLogger(__name__)
 
@@ -28,9 +27,9 @@ class DeleteRouter(base.Scenario):
         self.context_cfg = context_cfg
         self.options = self.scenario_cfg['options']
 
-        self.router_id = self.options.get("router_id", None)
+        self.router_id = self.options["router_id"]
 
-        self.neutron_client = op_utils.get_neutron_client()
+        self.shade_client = openstack_utils.get_shade_client()
 
         self.setup_done = False
 
@@ -45,11 +44,12 @@ class DeleteRouter(base.Scenario):
         if not self.setup_done:
             self.setup()
 
-        status = op_utils.delete_neutron_router(self.neutron_client,
-                                                router_id=self.router_id)
-        if status:
-            result.update({"delete_router": 1})
-            LOG.info("Delete router successful!")
-        else:
+        status = openstack_utils.delete_neutron_router(self.shade_client,
+                                                       self.router_id)
+        if not status:
             result.update({"delete_router": 0})
             LOG.error("Delete router failed!")
+            raise exceptions.ScenarioDeleteRouterError
+
+        result.update({"delete_router": 1})
+        LOG.info("Delete router successful!")
diff --git a/yardstick/common/exceptions.py b/yardstick/common/exceptions.py
index 4245ce12f..a0edd3ba9 100644
--- a/yardstick/common/exceptions.py
+++ b/yardstick/common/exceptions.py
@@ -108,3 +108,7 @@ class ScenarioCreateNetworkError(YardstickException):
 
 class ScenarioCreateSubnetError(YardstickException):
     message = 'Create Neutron Subnet Scenario failed'
+
+
+class ScenarioDeleteRouterError(YardstickException):
+    message = 'Delete Neutron Router Scenario failed'
diff --git a/yardstick/common/openstack_utils.py b/yardstick/common/openstack_utils.py
index 0421346e6..84bfbbbb1 100644
--- a/yardstick/common/openstack_utils.py
+++ b/yardstick/common/openstack_utils.py
@@ -528,13 +528,12 @@ def create_neutron_router(neutron_client, json_body):      # pragma: no cover
         raise Exception("operation error")
 
 
-def delete_neutron_router(neutron_client, router_id):      # pragma: no cover
+def delete_neutron_router(shade_client, router_id):
     try:
-        neutron_client.delete_router(router=router_id)
-        return True
-    except Exception:  # pylint: disable=broad-except
-        log.error("Error [delete_neutron_router(neutron_client, '%s')]",
-                  router_id)
+        return shade_client.delete_router(router_id)
+    except exc.OpenStackCloudException as o_exc:
+        log.error("Error [delete_neutron_router(shade_client, '%s')]. "
+                  "Exception message: %s", router_id, o_exc.orig_message)
         return False
 
 
diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_router.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_router.py
index d0751083f..b76100f19 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_router.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_delete_router.py
@@ -6,22 +6,49 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+
+from oslo_utils import uuidutils
 import unittest
 import mock
 
-from yardstick.benchmark.scenarios.lib.delete_router import DeleteRouter
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+from yardstick.benchmark.scenarios.lib import delete_router
 
 
 class DeleteRouterTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.common.openstack_utils.get_neutron_client')
-    @mock.patch('yardstick.common.openstack_utils.delete_neutron_router')
-    def test_delete_router(self, mock_get_neutron_client, mock_delete_neutron_router):
-        options = {
-            'router_id': '123-123-123'
-        }
-        args = {"options": options}
-        obj = DeleteRouter(args, {})
-        obj.run({})
-        mock_get_neutron_client.assert_called_once()
-        mock_delete_neutron_router.assert_called_once()
+    def setUp(self):
+        self._mock_delete_neutron_router = mock.patch.object(
+            openstack_utils, 'delete_neutron_router')
+        self.mock_delete_neutron_router = (
+            self._mock_delete_neutron_router.start())
+        self._mock_get_shade_client = mock.patch.object(
+            openstack_utils, 'get_shade_client')
+        self.mock_get_shade_client = self._mock_get_shade_client.start()
+        self._mock_log = mock.patch.object(delete_router, 'LOG')
+        self.mock_log = self._mock_log.start()
+        self.args = {'options': {'router_id': uuidutils.generate_uuid()}}
+        self.result = {"delete_router": 0}
+
+        self._del_obj = delete_router.DeleteRouter(self.args, mock.ANY)
+
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_delete_neutron_router.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
+
+    def test_run(self):
+        self.mock_delete_neutron_router.return_value = True
+        self.assertIsNone(self._del_obj.run(self.result))
+        self.assertEqual({"delete_router": 1}, self.result)
+        self.mock_log.info.assert_called_once_with("Delete router successful!")
+
+    def test_run_fail(self):
+        self.mock_delete_neutron_router.return_value = False
+        with self.assertRaises(exceptions.ScenarioDeleteRouterError):
+            self._del_obj.run(self.result)
+        self.assertEqual({"delete_router": 0}, self.result)
+        self.mock_log.error.assert_called_once_with("Delete router failed!")
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py
index cf5c206a5..c6b0f46b2 100644
--- a/yardstick/tests/unit/common/test_openstack_utils.py
+++ b/yardstick/tests/unit/common/test_openstack_utils.py
@@ -133,3 +133,31 @@ class CreateNeutronSubnetTestCase(unittest.TestCase):
             self.mock_shade_client, self.network_name_or_id)
         mock_logger.error.assert_called_once()
         self.assertIsNone(output)
+
+
+class DeleteNeutronRouterTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.mock_shade_client = mock.Mock()
+        self.mock_shade_client.delete_router = mock.Mock()
+
+    def test_delete_neutron_router(self):
+        self.mock_shade_client.delete_router.return_value = True
+        output = openstack_utils.delete_neutron_router(self.mock_shade_client,
+                                                       'router_id')
+        self.assertTrue(output)
+
+    def test_delete_neutron_router_fail(self):
+        self.mock_shade_client.delete_router.return_value = False
+        output = openstack_utils.delete_neutron_router(self.mock_shade_client,
+                                                       'router_id')
+        self.assertFalse(output)
+
+    @mock.patch.object(openstack_utils, 'log')
+    def test_delete_neutron_router_exception(self, mock_logger):
+        self.mock_shade_client.delete_router.side_effect = (
+            exc.OpenStackCloudException('error message'))
+        output = openstack_utils.delete_neutron_router(self.mock_shade_client,
+                                                       'router_id')
+        mock_logger.error.assert_called_once()
+        self.assertFalse(output)
-- 
cgit 1.2.3-korg