aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorManuel Buil <mbuil@suse.com>2017-03-21 21:25:53 +0100
committerManuel Buil <mbuil@suse.com>2017-03-21 20:43:46 +0000
commita32584d817e775a58957773faee6f0037d12107d (patch)
tree6a1432f4430337b62ec5173d7cd6cef631b8d484
parent80732036d12ddaad25edb6ff00aa60c84910a887 (diff)
Bug fix in CI: security groups not working
CI tests create a lot of security groups with the name default. Our SFs are assigned to a default security group but there are so many that the result is not predictable and most likely wrong. We add it now to example-sg sec. group Change-Id: I64984aa7b6114747c5bab5fb2e4b8d8d32865bb0 Signed-off-by: Manuel Buil <mbuil@suse.com> (cherry picked from commit 3c6e0efc2f4575ec2cf2e1304bdc1b66cdc08b06)
-rw-r--r--sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py2
-rw-r--r--sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py5
2 files changed, 6 insertions, 1 deletions
diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
index 97ff0011..079bc0b8 100644
--- a/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
+++ b/sfc/tests/functest/sfc_one_chain_two_service_functions_different_computes.py
@@ -154,7 +154,7 @@ def main():
instances = os_utils.get_instances(nova_client)
for instance in instances:
- if 'client' or 'server' not in instance.name:
+ if ('client' not in instance.name) and ('server' not in instance.name):
os_utils.add_secgroup_to_instance(nova_client, instance.id, sg_id)
os_tacker.create_sfc(tacker_client, 'red',
diff --git a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
index 68ac1e24..021e8df1 100644
--- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
+++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py
@@ -159,6 +159,11 @@ def main():
logger.error('ERROR while booting vnfs')
sys.exit(1)
+ instances = os_utils.get_instances(nova_client)
+ for instance in instances:
+ if ('client' not in instance.name) and ('server' not in instance.name):
+ os_utils.add_secgroup_to_instance(nova_client, instance.id, sg_id)
+
os_tacker.create_sfc(tacker_client, 'red', chain_vnf_names=['testVNF1'])
os_tacker.create_sfc(tacker_client, 'blue', chain_vnf_names=['testVNF2'])