From 7f559a258f1b58cfad14a24ad927d3679ed1166d Mon Sep 17 00:00:00 2001 From: asledzinskiy Date: Mon, 28 Nov 2016 18:32:31 +0200 Subject: [PATCH] Fix parameters passed to deploy-test-vms.sh - Neutron fixed network creation was moved to k8s jobs thus this part was deleted from deploy-test-vms.sh and there is no need to pass it to script Change-Id: I347de611e505859b0b9223fb87f96af35c67043b --- fuel_ccp_tests/tests/system/test_deploy.py | 5 ++-- fuel_ccp_tests/tests/system/test_few_os.py | 30 +++++++++------------- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/fuel_ccp_tests/tests/system/test_deploy.py b/fuel_ccp_tests/tests/system/test_deploy.py index 7c9f8db..ec6b023 100644 --- a/fuel_ccp_tests/tests/system/test_deploy.py +++ b/fuel_ccp_tests/tests/system/test_deploy.py @@ -65,9 +65,8 @@ class TestDeployOpenstack(base_test.SystemBaseTest): host=config.k8s.kube_host) remote.check_call( "source openrc-{0}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600) @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed) diff --git a/fuel_ccp_tests/tests/system/test_few_os.py b/fuel_ccp_tests/tests/system/test_few_os.py index 91cd637..7c86578 100644 --- a/fuel_ccp_tests/tests/system/test_few_os.py +++ b/fuel_ccp_tests/tests/system/test_few_os.py @@ -68,9 +68,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest): post_os_deploy_checks.check_pods_status(k8s_actions.api) remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600) topology_path = \ @@ -92,9 +91,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest): namespace="ccp-second") remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600) @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed) @@ -139,9 +137,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest): post_os_deploy_checks.check_pods_status(k8s_actions.api) remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600) topology_path = \ @@ -163,9 +160,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest): namespace="ccp-second") remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600) @pytest.mark.revert_snapshot(ext.SNAPSHOT.ccp_deployed) @@ -271,9 +267,8 @@ class TestDeployTwoOS(base_test.SystemBaseTest): namespace=settings.CCP_CONF["kubernetes"]["namespace"]) remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600) @pytest.mark.revert_snapshot(name="two_os") @@ -296,7 +291,6 @@ class TestDeployTwoOS(base_test.SystemBaseTest): namespace=settings.CCP_CONF["kubernetes"]["namespace"]) remote.check_call( "source openrc-{}; bash fuel-ccp/tools/deploy-test-vms.sh -a" - " create -i {1}".format( - settings.CCP_CONF["kubernetes"]["namespace"], - settings.IFACES['public']), + " create".format( + settings.CCP_CONF["kubernetes"]["namespace"]), timeout=600)