X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fshaker%2Fshaker.py;h=1ee669ce3c0cdd048e416ad24a71cf5187064757;hb=5853dd1ef3c522a975f9685250b1b3e85588f738;hp=70eb8a75bf311ac9bb67a81a53bfe67a08b55b2b;hpb=192cdecb5d7ed16641d1c5520450be38e9e0f166;p=functest.git

diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index 70eb8a75b..1ee669ce3 100644
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -22,6 +22,7 @@ import os
 import scp
 
 from functest.core import singlevm
+from functest.utils import env
 
 
 class Shaker(singlevm.SingleVm2):
@@ -36,6 +37,19 @@ class Shaker(singlevm.SingleVm2):
     flavor_disk = 3
     username = 'ubuntu'
     port = 9000
+    ssh_connect_loops = 12
+    create_server_timeout = 300
+    shaker_timeout = '3600'
+
+    def __init__(self, **kwargs):
+        super(Shaker, self).__init__(**kwargs)
+        self.role = None
+
+    def check_requirements(self):
+        if len(self.orig_cloud.list_hypervisors()) < 2:
+            self.__logger.warning("Shaker requires at least 2 hypervisors")
+            self.is_skipped = True
+            self.project.clean()
 
     def prepare(self):
         super(Shaker, self).prepare()
@@ -50,42 +64,57 @@ class Shaker(singlevm.SingleVm2):
             - 1 on operation error
         """
         assert self.ssh
-        keystone_id = self.orig_cloud.search_services('keystone')[0].id
-        self.__logger.debug("keystone id: %s", keystone_id)
-        endpoint = self.orig_cloud.search_endpoints(
-            filters={'interface': os.environ.get('OS_INTERFACE', 'public'),
-                     'service_id': keystone_id})[0].url
+        endpoint = self.get_public_auth_url(self.orig_cloud)
         self.__logger.debug("keystone endpoint: %s", endpoint)
+        if self.orig_cloud.get_role("admin"):
+            role_name = "admin"
+        elif self.orig_cloud.get_role("Admin"):
+            role_name = "Admin"
+        else:
+            raise Exception("Cannot detect neither admin nor Admin")
         self.orig_cloud.grant_role(
-            "admin", user=self.project.user.id,
+            role_name, user=self.project.user.id,
             project=self.project.project.id,
             domain=self.project.domain.id)
+        if not self.orig_cloud.get_role("heat_stack_owner"):
+            self.role = self.orig_cloud.create_role("heat_stack_owner")
         self.orig_cloud.grant_role(
             "heat_stack_owner", user=self.project.user.id,
             project=self.project.project.id,
             domain=self.project.domain.id)
         scpc = scp.SCPClient(self.ssh.get_transport())
         scpc.put('/home/opnfv/functest/conf/env_file', remote_path='~/')
+        if os.environ.get('OS_CACERT'):
+            scpc.put(os.environ.get('OS_CACERT'), remote_path='~/os_cacert')
         (_, stdout, stderr) = self.ssh.exec_command(
             'source ~/env_file && '
             'export OS_INTERFACE=public && '
             'export OS_AUTH_URL={} && '
             'export OS_USERNAME={} && '
             'export OS_PROJECT_NAME={} && '
+            'export OS_PROJECT_ID={} && '
+            'unset OS_TENANT_NAME && '
+            'unset OS_TENANT_ID && '
+            'unset OS_ENDPOINT_TYPE && '
             'export OS_PASSWORD={} && '
+            '{}'
             'env && '
-            'shaker --image-name {} --flavor-name {} '
-            '--server-endpoint {}:9000 --scenario '
-            'openstack/full_l2,'
+            'timeout {} shaker --image-name {} --flavor-name {} '
+            '--server-endpoint {}:9000 --external-net {} --dns-nameservers {} '
+            '--scenario openstack/full_l2,'
             'openstack/full_l3_east_west,'
             'openstack/full_l3_north_south,'
             'openstack/perf_l3_north_south '
             '--report report.html --output report.json'.format(
                 endpoint, self.project.user.name, self.project.project.name,
-                self.project.password, self.image.name, self.flavor.name,
-                self.fip.floating_ip_address))
-        self.__logger.info("output:\n%s", stdout.read())
-        self.__logger.info("error:\n%s", stderr.read())
+                self.project.project.id, self.project.password,
+                'export OS_CACERT=~/os_cacert && ' if os.environ.get(
+                    'OS_CACERT') else '',
+                self.shaker_timeout, self.image.name, self.flavor.name,
+                self.fip.floating_ip_address, self.ext_net.id,
+                env.get('NAMESERVER')))
+        self.__logger.info("output:\n%s", stdout.read().decode("utf-8"))
+        self.__logger.info("error:\n%s", stderr.read().decode("utf-8"))
         if not os.path.exists(self.res_dir):
             os.makedirs(self.res_dir)
         try:
@@ -95,3 +124,8 @@ class Shaker(singlevm.SingleVm2):
             self.__logger.exception("cannot get report files")
             return 1
         return stdout.channel.recv_exit_status()
+
+    def clean(self):
+        super(Shaker, self).clean()
+        if self.role:
+            self.orig_cloud.delete_role(self.role.id)