Replace neutron get network id with shade.

[yardstick.git] / yardstick / benchmark / scenarios / lib / create_floating_ip.py

diff --git a/yardstick/benchmark/scenarios/lib/create_floating_ip.py b/yardstick/benchmark/scenarios/lib/create_floating_ip.py
index 328566d..7108722 100644 (file)
--- a/yardstick/benchmark/scenarios/lib/create_floating_ip.py
+++ b/yardstick/benchmark/scenarios/lib/create_floating_ip.py
@@ -7,15 +7,13 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-from __future__ import print_function
-from __future__ import absolute_import
-
 import logging
 import os
 
 from yardstick.benchmark.scenarios import base
 import yardstick.common.openstack_utils as op_utils
 
+
 LOG = logging.getLogger(__name__)
 
 
@@ -30,6 +28,7 @@ class CreateFloatingIp(base.Scenario):
         self.ext_net_id = os.getenv("EXTERNAL_NETWORK", "external")
 
         self.neutron_client = op_utils.get_neutron_client()
+        self.shade_client = op_utils.get_shade_client()
         self.setup_done = False
 
     def setup(self):
@@ -37,24 +36,21 @@ class CreateFloatingIp(base.Scenario):
 
         self.setup_done = True
 
-    def run(self, result):
+    def run(self, *args):
         """execute the test"""
 
         if not self.setup_done:
             self.setup()
 
-        net_id = op_utils.get_network_id(self.neutron_client, self.ext_net_id)
+        net_id = op_utils.get_network_id(self.shade_client, self.ext_net_id)
         floating_info = op_utils.create_floating_ip(self.neutron_client,
                                                     extnet_id=net_id)
-        if floating_info:
-            LOG.info("Creating floating ip successful!")
-        else:
+
+        if not floating_info:
             LOG.error("Creating floating ip failed!")
+            return
 
-        try:
-            keys = self.scenario_cfg.get('output', '').split()
-        except KeyError:
-            pass
-        else:
-            values = [floating_info["fip_id"], floating_info["fip_addr"]]
-            return self._push_to_outputs(keys, values)
+        LOG.info("Creating floating ip successful!")
+        keys = self.scenario_cfg.get('output', '').split()
+        values = [floating_info["fip_id"], floating_info["fip_addr"]]
+        return self._push_to_outputs(keys, values)