Replace neutron create security group full with shade.

Function create_security_group_full now uses shade client.

Remove openstack util's private 'get_security_groups',
'get_security_group_id' & 'create_security_group' functions as
'create_security_group_full' now uses 'get_security_group' &
'create_security_group' function defined in shade client library.

JIRA: YARDSTICK-890

Change-Id: Ibd5b9ca9b7ce99b3e40c5dcc545f2af672ce2203
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
(cherry picked from commit c00e2c606806b46111b108818235d236ba409515)

2 files changed, 104 insertions, 19 deletions

diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_sec_group.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_sec_group.py
index 21158ab17..0477a49d4 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_sec_group.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_sec_group.py
@@ -6,25 +6,54 @@
 # 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_sec_group import CreateSecgroup
-
-
-class CreateSecGroupTestCase(unittest.TestCase):
-
-    @mock.patch('yardstick.common.openstack_utils.get_neutron_client')
-    @mock.patch('yardstick.common.openstack_utils.create_security_group_full')
-    def test_create_sec_group(self, mock_get_neutron_client, mock_create_security_group_full):
-        options = {
-            'openstack_paras': {
-                'sg_name': 'yardstick_sec_group',
-                'description': 'security group for yardstick manual VM'
-            }
-        }
-        args = {"options": options}
-        obj = CreateSecgroup(args, {})
-        obj.run({})
-        mock_get_neutron_client.assert_called_once()
-        mock_create_security_group_full.assert_called_once()
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
+from yardstick.benchmark.scenarios.lib import create_sec_group
+
+
+class CreateSecurityGroupTestCase(unittest.TestCase):
+
+    def setUp(self):
+
+        self._mock_create_security_group_full = mock.patch.object(
+            openstack_utils, 'create_security_group_full')
+        self.mock_create_security_group_full = (
+            self._mock_create_security_group_full.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_sec_group, 'LOG')
+        self.mock_log = self._mock_log.start()
+        self.args = {'options': {'sg_name': 'yardstick_sg'}}
+        self.result = {}
+
+        self.csecgp_obj = create_sec_group.CreateSecgroup(self.args, mock.ANY)
+        self.addCleanup(self._stop_mock)
+
+    def _stop_mock(self):
+        self._mock_create_security_group_full.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
+
+    def test_run(self):
+        _uuid = uuidutils.generate_uuid()
+        self.csecgp_obj.scenario_cfg = {'output': 'id'}
+        self.mock_create_security_group_full.return_value = _uuid
+        output = self.csecgp_obj.run(self.result)
+        self.assertEqual({'sg_create': 1}, self.result)
+        self.assertEqual({'id': _uuid}, output)
+        self.mock_log.info.asset_called_once_with(
+            'Create security group successful!')
+
+    def test_run_fail(self):
+        self.mock_create_security_group_full.return_value = None
+        with self.assertRaises(exceptions.ScenarioCreateSecurityGroupError):
+            self.csecgp_obj.run(self.result)
+        self.assertEqual({'sg_create': 0}, self.result)
+        self.mock_log.error.assert_called_once_with(
+            'Create security group failed!')
diff --git a/yardstick/tests/unit/common/test_openstack_utils.py b/yardstick/tests/unit/common/test_openstack_utils.py
index 5c7e5bfab..3abd39668 100644
--- a/yardstick/tests/unit/common/test_openstack_utils.py
+++ b/yardstick/tests/unit/common/test_openstack_utils.py
@@ -282,3 +282,59 @@ class ListImageTestCase(unittest.TestCase):
         images = openstack_utils.list_images(mock_shade_client)
         mock_logger.error.assert_called_once()
         self.assertFalse(images)
+
+
+class SecurityGroupTestCase(unittest.TestCase):
+
+    def setUp(self):
+        self.mock_shade_client = mock.Mock()
+        self.sg_name = 'sg_name'
+        self.sg_description = 'sg_description'
+        self._uuid = uuidutils.generate_uuid()
+
+    def test_create_security_group_full_existing_security_group(self):
+        self.mock_shade_client.get_security_group.return_value = (
+            {'name': 'name', 'id': self._uuid})
+        output = openstack_utils.create_security_group_full(
+            self.mock_shade_client, self.sg_name, self.sg_description)
+        self.mock_shade_client.get_security_group.assert_called_once()
+        self.assertEqual(self._uuid, output)
+
+    @mock.patch.object(openstack_utils, 'log')
+    def test_create_security_group_full_non_existing_security_group(
+            self, mock_logger):
+        self.mock_shade_client.get_security_group.return_value = None
+        self.mock_shade_client.create_security_group.side_effect = (
+            exc.OpenStackCloudException('error message'))
+        output = openstack_utils.create_security_group_full(
+            self.mock_shade_client, self.sg_name, self.sg_description)
+        mock_logger.error.assert_called_once()
+        self.assertIsNone(output)
+
+    @mock.patch.object(openstack_utils, 'create_security_group_rule')
+    @mock.patch.object(openstack_utils, 'log')
+    def test_create_security_group_full_create_rule_fail(
+            self, mock_logger, mock_create_security_group_rule):
+        self.mock_shade_client.get_security_group.return_value = None
+        self.mock_shade_client.create_security_group.return_value = (
+            {'name': 'name', 'id': self._uuid})
+        mock_create_security_group_rule.return_value = False
+        output = openstack_utils.create_security_group_full(
+            self.mock_shade_client, self.sg_name, self.sg_description)
+        mock_create_security_group_rule.assert_called()
+        self.mock_shade_client.delete_security_group(self.sg_name)
+        mock_logger.error.assert_called_once()
+        self.assertIsNone(output)
+
+    @mock.patch.object(openstack_utils, 'create_security_group_rule')
+    def test_create_security_group_full(
+            self, mock_create_security_group_rule):
+        self.mock_shade_client.get_security_group.return_value = None
+        self.mock_shade_client.create_security_group.return_value = (
+            {'name': 'name', 'id': self._uuid})
+        mock_create_security_group_rule.return_value = True
+        output = openstack_utils.create_security_group_full(
+            self.mock_shade_client, self.sg_name, self.sg_description)
+        mock_create_security_group_rule.assert_called()
+        self.mock_shade_client.delete_security_group(self.sg_name)
+        self.assertEqual(self._uuid, output)