Remove cmd to OpenStack, use python client

JIRA: FUNCTEST-503

Change-Id: Ie92051ec128ad4857862e6125628dac24ce99a2a
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 5295ff3..6aa39ea 100644 (file)
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -15,6 +15,7 @@ import shutil
 import opnfv.utils.constants as releng_constants
 
 import functest.utils.functest_utils as ft_utils
+import functest.utils.openstack_utils as os_utils
 from functest.utils.constants import CONST
 
 IMAGE_ID_ALT = None
@@ -129,9 +130,11 @@ def configure_tempest_multisite(logger, deployment_dir):
     config.read(tempest_conf_file)
 
     config.set('service_available', 'kingbird', 'true')
-    cmd = ("openstack endpoint show kingbird | grep publicurl |"
-           "awk '{print $4}' | awk -F '/' '{print $4}'")
-    kingbird_api_version = os.popen(cmd).read()
+    # cmd = ("openstack endpoint show kingbird | grep publicurl |"
+    #       "awk '{print $4}' | awk -F '/' '{print $4}'")
+    # kingbird_api_version = os.popen(cmd).read()
+    kingbird_api_version = os_utils.get_endpoint(service_type='kingbird')
+
     if CI_INSTALLER_TYPE == 'fuel':
         # For MOS based setup, the service is accessible
         # via bind host
@@ -172,9 +175,10 @@ def configure_tempest_multisite(logger, deployment_dir):
                                bind_details)[0]
         kingbird_endpoint_url = "http://%s:%s/" % (bind_host, bind_port)
     else:
-        cmd = "openstack endpoint show kingbird | grep publicurl |\
-               awk '{print $4}' | awk -F '/' '{print $3}'"
-        kingbird_endpoint_url = os.popen(cmd).read()
+        # cmd = "openstack endpoint show kingbird | grep publicurl |\
+        #       awk '{print $4}' | awk -F '/' '{print $3}'"
+        # kingbird_endpoint_url = os.popen(cmd).read()
+        kingbird_endpoint_url = os_utils.get_endpoint(service_type='kingbird')
 
     try:
         config.add_section("kingbird")

diff --git a/functest/opnfv_tests/sdn/onos/teston/onos.py b/functest/opnfv_tests/sdn/onos/teston/onos.py
index 300f56d..213bdb7 100755 (executable)
--- a/functest/opnfv_tests/sdn/onos/teston/onos.py
+++ b/functest/opnfv_tests/sdn/onos/teston/onos.py
@@ -18,14 +18,15 @@ import datetime
 import os
 import re
 import time
+import urlparse
 
 import argparse
 from neutronclient.v2_0 import client as neutronclient
 
+import functest.utils.functest_constants as ft_constants
 import functest.utils.functest_logger as ft_logger
 import functest.utils.functest_utils as ft_utils
 import functest.utils.openstack_utils as openstack_utils
-import functest.utils.functest_constants as ft_constants
 
 
 parser = argparse.ArgumentParser()
@@ -135,9 +136,9 @@ def GetResult():
 
 
 def SetOnosIp():
-    cmd = "openstack catalog show network | grep publicURL"
-    cmd_output = os.popen(cmd).read()
-    OC1 = re.search(r"\d+\.\d+\.\d+\.\d+", cmd_output).group()
+    # cmd = "openstack catalog show network | grep publicURL"
+    neutron_url = openstack_utils.get_endpoint(service_type='network')
+    OC1 = urlparse.urlparse(neutron_url).hostname
     os.environ['OC1'] = OC1
     time.sleep(2)
     logger.debug("ONOS IP is " + OC1)
@@ -180,10 +181,9 @@ def SfcTest():
 
 
 def GetIp(type):
-    cmd = "openstack catalog show " + type + " | grep publicURL"
-    cmd_output = os.popen(cmd).read()
-    ip = re.search(r"\d+\.\d+\.\d+\.\d+", cmd_output).group()
-    return ip
+    # cmd = "openstack catalog show " + type + " | grep publicURL"
+    url = openstack_utils.get_endpoint(service_type=type)
+    return urlparse.urlparse(url).hostname
 
 
 def Replace(before, after):