From 1b6ef8fb3a3bec72414cac2e6fdf66270abacdc4 Mon Sep 17 00:00:00 2001
From: Shobhi Jain <shobhi.jain@intel.com>
Date: Mon, 29 Jan 2018 11:49:02 +0000
Subject: Replace neutron get network id with shade.

Function get_network_id now uses shade client instead of shade client.
Removed redundant function: get_port_id.

JIRA: YARDSTICK-890

Change-Id: I6081477fee39fa78131187e65daf3d7d3a9e439f
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>
---
 .../scenarios/lib/test_create_floating_ip.py       | 56 +++++++++++++++-------
 1 file changed, 40 insertions(+), 16 deletions(-)

(limited to 'tests/unit')

diff --git a/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py b/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py
index 72dbcd7cd..a7286f5da 100644
--- a/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py
+++ b/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py
@@ -6,29 +6,53 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
+
 import unittest
 import mock
 
-from yardstick.benchmark.scenarios.lib.create_floating_ip import CreateFloatingIp
+from yardstick.benchmark.scenarios.lib import create_floating_ip
+import yardstick.common.openstack_utils as op_utils
 
 
 class CreateFloatingIpTestCase(unittest.TestCase):
 
-    @mock.patch('yardstick.common.openstack_utils.create_floating_ip')
-    @mock.patch('yardstick.common.openstack_utils.get_network_id')
-    @mock.patch('yardstick.common.openstack_utils.get_neutron_client')
-    def test_create_floating_ip(self, mock_create_floating_ip, mock_get_network_id, mock_get_neutron_client):
-        options = {}
-        args = {"options": options}
-        obj = CreateFloatingIp(args, {})
-        obj.run({})
-        self.assertTrue(mock_create_floating_ip.called)
-        self.assertTrue(mock_get_network_id.called)
-        self.assertTrue(mock_get_neutron_client.called)
+    def setUp(self):
+        self._mock_get_network_id = mock.patch.object(
+            op_utils, 'get_network_id')
+        self.mock_get_network_id = self._mock_get_network_id.start()
+        self._mock_create_floating_ip = mock.patch.object(
+            op_utils, 'create_floating_ip')
+        self.mock_create_floating_ip = self._mock_create_floating_ip.start()
+        self._mock_get_neutron_client = mock.patch.object(
+            op_utils, 'get_neutron_client')
+        self.mock_get_neutron_client = self._mock_get_neutron_client.start()
+        self._mock_get_shade_client = mock.patch.object(
+            op_utils, 'get_shade_client')
+        self.mock_get_shade_client = self._mock_get_shade_client.start()
+        self._mock_log = mock.patch.object(create_floating_ip, 'LOG')
+        self.mock_log = self._mock_log.start()
+
+        self._fip_obj = create_floating_ip.CreateFloatingIp(mock.ANY, mock.ANY)
+        self._fip_obj.scenario_cfg = {'output': 'key1\nkey2'}
+
+        self.addCleanup(self._stop_mock)
 
-def main():
-    unittest.main()
+    def _stop_mock(self):
+        self._mock_get_network_id.stop()
+        self._mock_create_floating_ip.stop()
+        self._mock_get_neutron_client.stop()
+        self._mock_get_shade_client.stop()
+        self._mock_log.stop()
 
+    def test_run(self):
+        self.mock_create_floating_ip.return_value = {'fip_id': 'value1',
+                                                     'fip_addr': 'value2'}
+        output = self._fip_obj.run(mock.ANY)
+        self.assertDictEqual({'key1': 'value1', 'key2': 'value2'}, output)
 
-if __name__ == '__main__':
-    main()
+    def test_run_no_fip(self):
+        self.mock_create_floating_ip.return_value = None
+        output = self._fip_obj.run(mock.ANY)
+        self.assertIsNone(output)
+        self.mock_log.error.assert_called_once_with(
+            'Creating floating ip failed!')
-- 
cgit 1.2.3-korg