Use rallyforge/rally:0.9.1 for rally_manager.py as default
diff --git a/README.md b/README.md
index 5cba9db..e4fc4ba 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@
```
Run deploy test for virtual-mcp11-dvr
---------------------------------
+-------------------------------------
Note: This lab is not finished yet. TBD: configure vsrx node
```
export ENV_NAME=virtual-mcp11-dvr # You can set any env name
@@ -47,7 +47,7 @@
Run deploy test for virtual-mcp11-ovs
---------------------------------
+-------------------------------------
Note: This lab is not finished yet. TBD: configure vsrx node
```
export ENV_NAME=virtual-mcp11-ovs # You can set any env name
@@ -56,6 +56,16 @@
LC_ALL=en_US.UTF-8 py.test -vvv -s -k test_tcp_install_default
+Run deploy test and rally verify (tempest) for virtual-mcp11-ovs
+----------------------------------------------------------------
+Note: This lab is not finished yet. TBD: configure vsrx node
+```
+export ENV_NAME=virtual-mcp11-ovs # You can set any env name
+export LAB_CONFIG_NAME=virtual-mcp11-ovs # Name of set of templates
+
+LC_ALL=en_US.UTF-8 py.test -vvv -s -k test_tcp_install_run_rally
+
+
Run deploy test for mk22-qa-lab01
---------------------------------
Note: This lab is not finished yet. TBD: configure vsrx node
diff --git a/tcp_tests/managers/rallymanager.py b/tcp_tests/managers/rallymanager.py
index 17cebcb..9e5e4c9 100644
--- a/tcp_tests/managers/rallymanager.py
+++ b/tcp_tests/managers/rallymanager.py
@@ -27,7 +27,7 @@
"""docstring for RallyManager"""
image_name = 'rallyforge/rally'
- image_version = '0.7.0'
+ image_version = '0.9.1'
def __init__(self, underlay, admin_host):
super(RallyManager, self).__init__()
@@ -40,9 +40,10 @@
source /home/rally/openrc
rally-manage db recreate
rally deployment create --fromenv --name=tempest
-rally verify install
-rally verify genconfig
-rally verify showconfig"""
+rally verify create-verifier --type tempest --name tempest-verifier
+rally verify configure-verifier
+rally verify configure-verifier --show
+"""
cmd = "cat > {path} << EOF\n{content}\nEOF".format(
path='/root/rally/install_tempest.sh', content=content)
cmd1 = "chmod +x /root/rally/install_tempest.sh"
@@ -71,7 +72,8 @@
with self._underlay.remote(host=self._admin_host) as remote:
LOG.info("Getting image id")
- cmd = "docker images | grep 0.7.0| awk '{print $3}'"
+ cmd = "docker images | grep {0}| awk '{print $3}'".format(
+ self.image_version)
res = remote.check_call(cmd)
self.image_id = res['stdout'][0].strip()
LOG.info("Image ID is {}".format(self.image_id))
@@ -101,10 +103,10 @@
"rally verify start {test}".format(test=test),
docker_id=self.docker_id),
docker_exec.format(
- cmd="rally verify results --json --output-file result.json",
+ cmd="rally verify report --type json --to result.json",
docker_id=self.docker_id),
docker_exec.format(
- cmd="rally verify results --html --output-file result.html",
+ cmd="rally verify report --type html --to result.html",
docker_id=self.docker_id),
]
with self._underlay.remote(host=self._admin_host) as remote: