Merge branch 'add_1_0' of https://github.com/Mirantis/tcp-qa into add_1_0
diff --git a/tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml b/tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml
index 9be7e06..eec4b60 100644
--- a/tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml
+++ b/tcp_tests/templates/openstack/virtual-mcp10-ovs-openstack.yaml
@@ -90,6 +90,14 @@
retry: {count: 1, delay: 5}
skip_fail: false
+- description: Install neutron on gtw node
+ cmd: salt --hard-crash --state-output=mixed --state-verbose=False
+ -C 'I@neutron:gateway' state.sls neutron
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 5}
+ skip_fail: false
+
+
- description: Check neutron agent-list
cmd: salt --hard-crash --state-output=mixed --state-verbose=False
-C 'I@keystone:server' cmd.run '. /root/keystonerc; neutron agent-list'
diff --git a/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
index 68beb02..3892e59 100644
--- a/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
+++ b/tcp_tests/templates/salt/virtual-mcp10-ovs-salt.yaml
@@ -299,3 +299,21 @@
retry: {count: 1, delay: 10}
skip_fail: false
+- description: Hack gtw node
+ cmd: salt 'gtw*' cmd.run "ip addr del 172.16.10.110/24 dev ens4; ip addr flush dev ens4";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+- description: Hack cmp01 node
+ cmd: salt 'cmp01*' cmd.run "ip addr del 172.16.10.105/24 dev ens4; ip addr flush dev ens4";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
+- description: Hack cmp02 node
+ cmd: salt 'cmp02*' cmd.run "ip addr del 172.16.10.106/24 dev ens4; ip addr flush dev ens4";
+ node_name: {{ HOSTNAME_CFG01 }}
+ retry: {count: 1, delay: 10}
+ skip_fail: false
+
diff --git a/tcp_tests/tests/system/test_mcp10_ovs_vxlan_install.py b/tcp_tests/tests/system/test_mcp10_ovs_vxlan_install.py
index 54f6d61..0d23742 100644
--- a/tcp_tests/tests/system/test_mcp10_ovs_vxlan_install.py
+++ b/tcp_tests/tests/system/test_mcp10_ovs_vxlan_install.py
@@ -47,56 +47,27 @@
"""
LOG.info("*************** DONE **************")
- #
- # def test_mcp10_ovs_vxlan_install_run_rally(self, underlay,
- # openstack_deployed,
- # show_step, rally):
- # """Test for deploying an mcp environment and check it
- #
- # Scenario:
- # 1. Prepare salt on hosts
- # 2. Setup controller nodes
- # 3. Setup compute nodes
- # 4. Run rally
- #
- # """
- # # prepare rally
- # rally.prepare()
- # rally.pull_image()
- # rally.run()
- # # run tempest
- # rally.run_tempest()
- #
- # res = rally.get_results()
- #
- # fail_msg = 'Tempest verification fails {}'.format(res)
- # assert res['failures'] == 0, fail_msg
- #
- # # @pytest.mark.snapshot_needed
- # # @pytest.mark.fail_snapshot
- # def test_mcp10_vxlan_install_with_scripts(self, config, underlay,
- # salt_deployed,
- # show_step, rally):
- # """Test for deploying an mcp environment with scripts and check it
- #
- # Scenario:
- # 1. Prepare salt on hosts
- # 2. Setup controller nodes
- # 3. Setup compute nodes
- #
- # """
- #
- # cmd = 'cd /srv/salt/reclass/scripts/; ./bootstrap_all.sh'
- # underlay.check_call(cmd, host=config.salt.salt_master_host, verbose=True)
- #
- # # prepare rally
- # rally.prepare()
- # rally.pull_image()
- # rally.run()
- # # run tempest
- # rally.run_tempest()
- #
- # res = rally.get_results()
- #
- # fail_msg = 'Tempest verification fails {}'.format(res)
- # assert res['failures'] == 0, fail_msg
+
+ def test_mcp10_ovs_vxlan_install_run_rally(self, underlay,
+ openstack_deployed,
+ show_step, rally):
+ """Test for deploying an mcp environment and check it
+
+ Scenario:
+ 1. Prepare salt on hosts
+ 2. Setup controller nodes
+ 3. Setup compute nodes
+ 4. Run rally
+
+ """
+ # prepare rally
+ rally.prepare()
+ rally.pull_image()
+ rally.run()
+ # run tempest
+ rally.run_tempest()
+
+ res = rally.get_results()
+
+ fail_msg = 'Tempest verification fails {}'.format(res)
+ assert res['failures'] == 0, fail_msg