From b2db57c2bfb058e5dcadfb31549dd4ed8b477aad Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Fri, 22 Sep 2017 19:44:39 +0200 Subject: Remove SFs from security groups Having the SFs port in security groups delays packets artifically in the tests Besides, the netvirt guys suggested not to do it because it might be confusing for ODL in some situations and it is not a 'suitable construct' Tests without security groups show indeed a better behaviour Change-Id: I33281215cd2e80804c8f09ca201c046f590249ab Signed-off-by: Manuel Buil --- sfc/tests/functest/sfc_one_chain_two_service_functions.py | 2 -- sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py | 2 -- sfc/tests/functest/vnfd-templates/test-vnfd1.yaml | 1 - sfc/tests/functest/vnfd-templates/test-vnfd2.yaml | 1 - sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml | 1 - sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml | 1 - 6 files changed, 8 deletions(-) diff --git a/sfc/tests/functest/sfc_one_chain_two_service_functions.py b/sfc/tests/functest/sfc_one_chain_two_service_functions.py index 2125f3e1..60190a6d 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -178,10 +178,8 @@ def main(): sys.exit(1) vnf1_instance_id = test_utils.get_nova_id(tacker_client, 'VDU1', vnf1_id) - os_utils.add_secgroup_to_instance(nova_client, vnf1_instance_id, sg_id) vnf2_instance_id = test_utils.get_nova_id(tacker_client, 'VDU1', vnf2_id) - os_utils.add_secgroup_to_instance(nova_client, vnf2_instance_id, sg_id) tosca_file = os.path.join(COMMON_CONFIG.sfc_test_dir, COMMON_CONFIG.vnffgd_dir, 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 031fc005..dc41ac2e 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -172,10 +172,8 @@ def main(): sys.exit(1) vnf1_instance_id = test_utils.get_nova_id(tacker_client, 'VDU1', vnf1_id) - os_utils.add_secgroup_to_instance(nova_client, vnf1_instance_id, sg_id) vnf2_instance_id = test_utils.get_nova_id(tacker_client, 'VDU1', vnf2_id) - os_utils.add_secgroup_to_instance(nova_client, vnf2_instance_id, sg_id) tosca_file = os.path.join(COMMON_CONFIG.sfc_test_dir, COMMON_CONFIG.vnffgd_dir, diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml index 3fbc22ae..b2a4900b 100644 --- a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml @@ -42,7 +42,6 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: true requirements: - virtualLink: node: VL1 diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml index 8f442a90..353afae7 100644 --- a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml @@ -43,7 +43,6 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: true requirements: - virtualLink: node: VL1 diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml index aad1e672..d01bf934 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml @@ -42,7 +42,6 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: true requirements: - virtualLink: node: VL1 diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml index b5502f12..9a7da6e3 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml @@ -42,7 +42,6 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: true requirements: - virtualLink: node: VL1 -- cgit 1.2.3-korg