summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-12-02 16:11:28 +0000
committerGerrit Code Review <review@openstack.org>2016-12-02 16:11:28 +0000
commitcab3213efe4cdfd5f6d860e69ea6c39ae52bec3a (patch)
tree9e37ffbe0e043d9cca660b41cce0ca66297a5baf
parent534c12eb75c26bfb58a1d11315c5fd979de456d3 (diff)
parentb54dbdc3aa10ceaafdeff6027cacd80536fa6b49 (diff)
Merge "Disable netchecker deployment in Calico tests"
-rw-r--r--fuel_ccp_tests/settings.py2
-rw-r--r--fuel_ccp_tests/tests/system/test_calico.py4
-rw-r--r--fuel_ccp_tests/tests/system/test_netchecker.py4
3 files changed, 10 insertions, 0 deletions
diff --git a/fuel_ccp_tests/settings.py b/fuel_ccp_tests/settings.py
index 60fb6f9..a51c636 100644
--- a/fuel_ccp_tests/settings.py
+++ b/fuel_ccp_tests/settings.py
@@ -111,6 +111,8 @@ CALICO = {
111 None), 111 None),
112 "enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY', 112 "enable_network_policy": get_var_as_bool('ENABLE_NETWORK_POLICY',
113 None), 113 None),
114 "deploy_netchecker": get_var_as_bool('DEPLOY_NETCHECKER',
115 None),
114} 116}
115 117
116for key, val in CALICO.items(): 118for key, val in CALICO.items():
diff --git a/fuel_ccp_tests/tests/system/test_calico.py b/fuel_ccp_tests/tests/system/test_calico.py
index e76f3b4..03c19bf 100644
--- a/fuel_ccp_tests/tests/system/test_calico.py
+++ b/fuel_ccp_tests/tests/system/test_calico.py
@@ -16,6 +16,7 @@ import pytest
16 16
17import base_test 17import base_test
18from fuel_ccp_tests import logger 18from fuel_ccp_tests import logger
19from fuel_ccp_tests import settings
19from fuel_ccp_tests.helpers import netchecker 20from fuel_ccp_tests.helpers import netchecker
20 21
21LOG = logger.logger 22LOG = logger.logger
@@ -25,6 +26,9 @@ LOG = logger.logger
25class TestFuelCCPCalico(base_test.SystemBaseTest): 26class TestFuelCCPCalico(base_test.SystemBaseTest):
26 """Test class for Calico network plugin in k8s""" 27 """Test class for Calico network plugin in k8s"""
27 28
29 kube_settings = settings.DEFAULT_CUSTOM_YAML
30 kube_settings['deploy_netchecker'] = False
31
28 @pytest.mark.fail_snapshot 32 @pytest.mark.fail_snapshot
29 @pytest.mark.snapshot_needed 33 @pytest.mark.snapshot_needed
30 def test_k8s_netchecker_calico(self, underlay, k8scluster, config, 34 def test_k8s_netchecker_calico(self, underlay, k8scluster, config,
diff --git a/fuel_ccp_tests/tests/system/test_netchecker.py b/fuel_ccp_tests/tests/system/test_netchecker.py
index b302ba2..28a947a 100644
--- a/fuel_ccp_tests/tests/system/test_netchecker.py
+++ b/fuel_ccp_tests/tests/system/test_netchecker.py
@@ -26,6 +26,10 @@ LOG = logger.logger
26 26
27 27
28class TestFuelCCPNetCheckerMixin: 28class TestFuelCCPNetCheckerMixin:
29
30 kube_settings = settings.DEFAULT_CUSTOM_YAML
31 kube_settings['deploy_netchecker'] = False
32
29 pod_yaml_file = os.path.join( 33 pod_yaml_file = os.path.join(
30 settings.NETCHECKER_SERVER_DIR, 34 settings.NETCHECKER_SERVER_DIR,
31 'k8s_resources/netchecker-server_pod.yaml') 35 'k8s_resources/netchecker-server_pod.yaml')