run_rally: added quotas and requests as input parameters.

adapted bench test nova and vm

Change-Id: Ibcfb2b5c30c6b5ceb23476d7ee659ec9c06848cf
JIRA:FUNCTEST-1
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>

3 files changed, 29 insertions, 29 deletions

diff --git a/testcases/VIM/OpenStack/CI/libraries/run_rally.py b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
index b3275fb13..1b720676e 100644
--- a/testcases/VIM/OpenStack/CI/libraries/run_rally.py
+++ b/testcases/VIM/OpenStack/CI/libraries/run_rally.py
@@ -11,12 +11,12 @@
 import re, json, os, urllib2, argparse, logging
 
 """ tests configuration """
-tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'tempest', 'vm', 'all']
+tests = ['authenticate', 'glance', 'cinder', 'heat', 'keystone', 'neutron', 'nova', 'quotas', 'requests', 'tempest', 'vm', 'all']
 parser = argparse.ArgumentParser()
 parser.add_argument("test_name", help="The name of the test you want to perform with rally. "
                                       "Possible values are : "
                                       "[ {d[0]} | {d[1]} | {d[2]} | {d[3]} | {d[4]} | {d[5]} | {d[6]} "
-                                      "| {d[7]} | {d[8]} | {d[9]} ]. The 'all' value performs all the tests scenarios "
+                                      "| {d[7]} | {d[8]} | {d[9]} | {d[10]} | {d[11]} ]. The 'all' value performs all the tests scenarios "
                                       "except 'tempest'".format(d=tests))
 
 parser.add_argument("-d", "--debug", help="Debug mode",  action="store_true")
@@ -83,7 +83,7 @@ def run_task(test_name):
     """ get the date """
     cmd = os.popen("date '+%d%m%Y_%H%M'")
     test_date = cmd.read().rstrip()
- 
+
     """ check directory for scenarios test files or retrieve from git otherwise"""
     proceed_test = True
     tests_path = "./scenarios"
@@ -91,7 +91,7 @@ def run_task(test_name):
     if not os.path.exists(test_file_name):
         logger.debug('{} does not exists'.format(test_file_name))
         proceed_test = retrieve_test_cases_file(test_name, tests_path)
- 
+
     """ we do the test only if we have a scenario test file """
     if proceed_test:
         logger.debug('successfully downloaded to : {}'.format(test_file_name))
@@ -100,11 +100,11 @@ def run_task(test_name):
         cmd = os.popen(cmd_line)
         task_id = get_task_id(cmd.read())
         logger.debug('task_id : {}'.format(task_id))
- 
+
         if task_id is None:
             logger.error("failed to retrieve task_id")
             exit(-1)
- 
+
         """ check for result directory and create it otherwise """
         report_path = "./results"
         if not os.path.exists(report_path):
@@ -126,7 +126,7 @@ def run_task(test_name):
             logger.debug('saving json file')
             f.write(json_results)
             logger.debug('saving json file2')
- 
+
         """ parse JSON operation result """
         if task_succeed(json_results):
             print '{} OK'.format(test_date)
@@ -134,14 +134,14 @@ def run_task(test_name):
             print '{} KO'.format(test_date)
     else:
         logger.error('{} test failed, unable to download a scenario test file'.format(test_name))
- 
- 
+
+
 def retrieve_test_cases_file(test_name, tests_path):
     """
     Retrieve from github the sample test files
     :return: Boolean that indicates the retrieval status
     """
- 
+
     """ do not add the "/" at the end """
     url_base = "https://git.opnfv.org/cgit/functest/plain/testcases/VIM/OpenStack/CI/suites"
 
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json b/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
index 74ea15f3b..2c56777dc 100644
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
+++ b/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
@@ -6,7 +6,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "force_delete": false
             },
@@ -30,7 +30,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 }
             },
             "runner": {
@@ -56,7 +56,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "security_group_count": 10,
                 "rules_per_security_group": 10
@@ -84,7 +84,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "detailed": true
             },
@@ -108,7 +108,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "block_migration": false
             },
@@ -132,7 +132,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 }
             },
             "runner": {
@@ -155,7 +155,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "force_delete": false,
                 "actions": [
@@ -185,7 +185,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "volume_size": 10,
                 "force_delete": false
@@ -210,7 +210,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "volume_size": 10
             },
@@ -234,7 +234,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 }
             },
             "runner": {
@@ -256,7 +256,7 @@
                 "size": 10,
                 "block_migration": false,
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "flavor": {
                     "name": "m1.small"
@@ -282,7 +282,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "block_migration": false,
                 "volume_size": 10,
@@ -308,7 +308,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "force_delete": false
             },
@@ -413,7 +413,7 @@
                         "name": "m1.small"
                     },
                     "image": {
-                        "name": "^Ubuntu*"
+                        "name": "^TestVM*"
                     },
                     "servers_per_tenant": 2
                 }
@@ -427,7 +427,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "to_flavor": {
                     "name": "m1.small"
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json b/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
index 1524d5bf6..f197ef6ba 100644
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
+++ b/testcases/VIM/OpenStack/CI/suites/opnfv-vm.json
@@ -6,13 +6,13 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "floating_network": "public",
                 "force_delete": false,
                 "script": "samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
-                "username": "ubuntu"
+                "username": "cirros"
             },
             "runner": {
                 "type": "constant",
@@ -36,7 +36,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^Ubuntu*"
+                    "name": "^TestVM*"
                 },
                 "volume_args": {
                     "size": 2
@@ -47,7 +47,7 @@
                 "force_delete": false,
                 "script": "samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
-                "username": "ubuntu"
+                "username": "cirros"
             },
             "runner": {
                 "type": "constant",