From 075e46994411d2f338d36752336d7079bd5d1928 Mon Sep 17 00:00:00 2001
From: morganrOL <morgan.richomme@orange.com>
Date: Wed, 13 May 2015 11:25:40 +0200
Subject: change default image name for bench testing

JIRA: FUNCTEST-1

Change-Id: Ib3b7dc01555d032bc0d189984ea00839983a1f6b
Signed-off-by: morganrOL <morgan.richomme@orange.com>
---
 .../VIM/OpenStack/CI/suites/opnfv-glance.json      |  2 +-
 testcases/VIM/OpenStack/CI/suites/opnfv-nova.json  | 30 +++++++++++-----------
 testcases/VIM/OpenStack/CI/suites/opnfv-vm.json    | 12 ++++-----
 3 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json b/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
index 1359fff56..e560cd7ff 100644
--- a/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
+++ b/testcases/VIM/OpenStack/CI/suites/opnfv-glance.json
@@ -46,7 +46,7 @@
                 "container_format": "bare",
                 "disk_format": "qcow2",
                 "flavor": {
-                    "name": "m1.nano"
+                    "name": "m1.small"
                 },
                 "number_instances": 2
             },
diff --git a/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json b/testcases/VIM/OpenStack/CI/suites/opnfv-nova.json
index 2c56777dc..09ca4108a 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": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "force_delete": false
             },
@@ -30,7 +30,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 }
             },
             "runner": {
@@ -56,7 +56,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "security_group_count": 10,
                 "rules_per_security_group": 10
@@ -84,7 +84,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "detailed": true
             },
@@ -108,7 +108,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "block_migration": false
             },
@@ -132,7 +132,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 }
             },
             "runner": {
@@ -155,7 +155,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "force_delete": false,
                 "actions": [
@@ -185,7 +185,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "volume_size": 10,
                 "force_delete": false
@@ -210,7 +210,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "volume_size": 10
             },
@@ -234,7 +234,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 }
             },
             "runner": {
@@ -256,7 +256,7 @@
                 "size": 10,
                 "block_migration": false,
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "flavor": {
                     "name": "m1.small"
@@ -282,7 +282,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "block_migration": false,
                 "volume_size": 10,
@@ -308,7 +308,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "force_delete": false
             },
@@ -413,7 +413,7 @@
                         "name": "m1.small"
                     },
                     "image": {
-                        "name": "^TestVM*"
+                        "name": "^functest-img*"
                     },
                     "servers_per_tenant": 2
                 }
@@ -427,7 +427,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "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 f197ef6ba..6061f9693 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": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "floating_network": "public",
                 "force_delete": false,
-                "script": "samples/tasks/support/instance_dd_test.sh",
+                "script": "../Rally_repo/samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
-                "username": "cirros"
+                "username": "admin"
             },
             "runner": {
                 "type": "constant",
@@ -36,7 +36,7 @@
                     "name": "m1.small"
                 },
                 "image": {
-                    "name": "^TestVM*"
+                    "name": "^functest-img*"
                 },
                 "volume_args": {
                     "size": 2
@@ -45,9 +45,9 @@
                 "floating_network": "public",
                 "use_floatingip": true,
                 "force_delete": false,
-                "script": "samples/tasks/support/instance_dd_test.sh",
+                "script": "../Rally_repo/samples/tasks/support/instance_dd_test.sh",
                 "interpreter": "/bin/sh",
-                "username": "cirros"
+                "username": "admin"
             },
             "runner": {
                 "type": "constant",
-- 
cgit 1.2.3-korg