diff options
Diffstat (limited to 'sfc/tests/functest')
4 files changed, 23 insertions, 11 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 0f4d6aa9..2125f3e1 100644 --- a/sfc/tests/functest/sfc_one_chain_two_service_functions.py +++ b/sfc/tests/functest/sfc_one_chain_two_service_functions.py @@ -191,9 +191,11 @@ def main(): tosca_file=tosca_file, vnffgd_name='red') - os_tacker.create_vnffg(tacker_client, - vnffgd_name='red', - vnffg_name='red_http') + neutron_port = test_utils.get_client_port_id(client_instance) + test_utils.create_vnffg_with_param_file(tacker_client, 'red', + 'red_http', + default_param_file, + neutron_port) # Start measuring the time it takes to implement the classification rules t1 = threading.Thread(target=test_utils.wait_for_classification_rules, 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 22249c25..031fc005 100644 --- a/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py +++ b/sfc/tests/functest/sfc_two_chains_SSH_and_HTTP.py @@ -185,9 +185,11 @@ def main(): tosca_file=tosca_file, vnffgd_name='red') - os_tacker.create_vnffg(tacker_client, - vnffgd_name='red', - vnffg_name='red_http_works') + neutron_port = test_utils.get_client_port_id(client_instance) + test_utils.create_vnffg_with_param_file(tacker_client, 'red', + 'red_http', + default_param_file, + neutron_port) # Start measuring the time it takes to implement the classification rules t1 = threading.Thread(target=test_utils.wait_for_classification_rules, @@ -270,9 +272,10 @@ def main(): tosca_file=tosca_file, vnffgd_name='blue') - os_tacker.create_vnffg(tacker_client, - vnffgd_name='blue', - vnffg_name='blue_ssh_works') + test_utils.create_vnffg_with_param_file(tacker_client, 'blue', + 'blue_ssh', + default_param_file, + neutron_port) # Start measuring the time it takes to implement the classification rules t2 = threading.Thread(target=test_utils.wait_for_classification_rules, diff --git a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml b/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml index 24a32db4..f0615e4e 100644 --- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml +++ b/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml @@ -4,6 +4,9 @@ description: test-case2_HTTP Test topology_template: description: topology-template-test2 + inputs: + net_src_port_id: + type: string node_templates: Forwarding_path1: @@ -14,7 +17,7 @@ topology_template: policy: type: ACL criteria: - - source_port_range: 0-0 + - network_src_port_id: {get_input: net_src_port_id} - destination_port_range: 22-80 - ip_proto: 6 path: diff --git a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml b/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml index 401a4272..ec18c9d6 100644 --- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml +++ b/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml @@ -4,6 +4,10 @@ description: test-case2_SSH Test topology_template: description: topology-template-test2 + inputs: + net_src_port_id: + type: string + node_templates: Forwarding_path1: @@ -14,7 +18,7 @@ topology_template: policy: type: ACL criteria: - - source_port_range: 0-0 + - network_src_port_id: {get_input: net_src_port_id} - destination_port_range: 22-80 - ip_proto: 6 path: |