Increase Shaker timeout before init message in console

[functest.git] / functest / opnfv_tests / openstack / shaker / shaker.py

diff --git a/functest/opnfv_tests/openstack/shaker/shaker.py b/functest/opnfv_tests/openstack/shaker/shaker.py
index efe3a15..57e033e 100644 (file)
--- a/functest/opnfv_tests/openstack/shaker/shaker.py
+++ b/functest/opnfv_tests/openstack/shaker/shaker.py
@@ -19,9 +19,11 @@ and list of tests to execute.
 import logging
 import os
 
+import json
 import scp
 
 from functest.core import singlevm
+from functest.utils import env
 
 
 class Shaker(singlevm.SingleVm2):
@@ -30,18 +32,29 @@ class Shaker(singlevm.SingleVm2):
 
     __logger = logging.getLogger(__name__)
 
-    filename = '/home/opnfv/functest/images/shaker-image.qcow2'
+    filename = '/home/opnfv/functest/images/shaker-image-1.3.0+stretch.qcow2'
     flavor_ram = 512
     flavor_vcpus = 1
     flavor_disk = 3
-    username = 'ubuntu'
+    username = 'debian'
     port = 9000
     ssh_connect_loops = 12
+    create_server_timeout = 300
+    shaker_timeout = '3600'
+    quota_instances = -1
+    quota_cores = -1
+    check_console_loop = 12
 
     def __init__(self, **kwargs):
         super(Shaker, self).__init__(**kwargs)
         self.role = None
 
+    def check_requirements(self):
+        if self.count_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()
         self.cloud.create_security_group_rule(
@@ -73,6 +86,10 @@ class Shaker(singlevm.SingleVm2):
             "heat_stack_owner", user=self.project.user.id,
             project=self.project.project.id,
             domain=self.project.domain.id)
+        self.orig_cloud.set_compute_quotas(
+            self.project.project.name,
+            instances=self.quota_instances,
+            cores=self.quota_cores)
         scpc = scp.SCPClient(self.ssh.get_transport())
         scpc.put('/home/opnfv/functest/conf/env_file', remote_path='~/')
         if os.environ.get('OS_CACERT'):
@@ -86,12 +103,13 @@ class Shaker(singlevm.SingleVm2):
             'export OS_PROJECT_ID={} && '
             'unset OS_TENANT_NAME && '
             'unset OS_TENANT_ID && '
-            'export OS_PASSWORD={} && '
+            'unset OS_ENDPOINT_TYPE && '
+            'export OS_PASSWORD="{}" && '
             '{}'
             'env && '
-            'shaker --image-name {} --flavor-name {} '
-            '--server-endpoint {}:9000 --scenario '
-            'openstack/full_l2,'
+            'timeout {} shaker --debug --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 '
@@ -100,10 +118,11 @@ class Shaker(singlevm.SingleVm2):
                 self.project.project.id, self.project.password,
                 'export OS_CACERT=~/os_cacert && ' if os.environ.get(
                     'OS_CACERT') else '',
-                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.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:
@@ -112,6 +131,13 @@ class Shaker(singlevm.SingleVm2):
         except scp.SCPException:
             self.__logger.exception("cannot get report files")
             return 1
+        with open(os.path.join(self.res_dir, 'report.json')) as json_file:
+            data = json.load(json_file)
+            for value in data["records"].values():
+                if value["status"] != "ok":
+                    self.__logger.error(
+                        "%s failed\n%s", value["scenario"], value["stderr"])
+                    return 1
         return stdout.channel.recv_exit_status()
 
     def clean(self):