Replace neutron floating ip creation with shade.

Function create_floating_ip now uses shade client instead of neutron
client.

JIRA: YARDSTICK-890

Change-Id: I3defd691dad998cebf98442b52f0555b176f1af4
Signed-off-by: Shobhi Jain <shobhi.jain@intel.com>

1 files changed, 16 insertions, 17 deletions

diff --git a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py
index a7286f5da..894cc1c2a 100644
--- a/yardstick/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py
+++ b/yardstick/tests/unit/benchmark/scenarios/lib/test_create_floating_ip.py
@@ -11,48 +11,47 @@ import unittest
 import mock
 
 from yardstick.benchmark.scenarios.lib import create_floating_ip
-import yardstick.common.openstack_utils as op_utils
+from yardstick.common import openstack_utils
+from yardstick.common import exceptions
 
 
 class CreateFloatingIpTestCase(unittest.TestCase):
 
     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')
+            openstack_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')
+            openstack_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.args = {'options': {'network_name_or_id': 'yardstick_net'}}
+        self.result = {}
 
-        self._fip_obj = create_floating_ip.CreateFloatingIp(mock.ANY, mock.ANY)
-        self._fip_obj.scenario_cfg = {'output': 'key1\nkey2'}
+        self.fip_obj = create_floating_ip.CreateFloatingIp(self.args, mock.ANY)
+        self.fip_obj.scenario_cfg = {'output': 'key1\nkey2'}
 
         self.addCleanup(self._stop_mock)
 
     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)
+        output = self.fip_obj.run(self.result)
+        self.assertEqual({'floating_ip_create': 1}, self.result)
+        self.assertEqual({'key1': 'value1', 'key2': 'value2'}, output)
+        self.mock_log.info.asset_called_once_with(
+            'Creating floating ip successful!')
 
     def test_run_no_fip(self):
         self.mock_create_floating_ip.return_value = None
-        output = self._fip_obj.run(mock.ANY)
-        self.assertIsNone(output)
+        with self.assertRaises(exceptions.ScenarioCreateFloatingIPError):
+            self.fip_obj.run(self.result)
+        self.assertEqual({'floating_ip_create': 0}, self.result)
         self.mock_log.error.assert_called_once_with(
             'Creating floating ip failed!')