From 56fb19b663557ce07be6d4e5c07fd4a5b9276ed2 Mon Sep 17 00:00:00 2001 From: Dimitrios Markou Date: Fri, 1 Sep 2017 14:26:45 +0300 Subject: Adapt functionality to the new Tacker API Change-Id: I078e9f26d3040cf04120abd425f03cb4f2e8daef Signed-off-by: Dimitrios Markou --- sfc/tests/functest/config.yaml | 3 +++ sfc/tests/functest/register-vim.json | 18 ++++++++++++++++++ .../vnfd-templates/test-vnfd-default-params.json | 3 +++ .../vnfd-templates/test-vnfd-default-params.yaml | 5 ----- sfc/tests/functest/vnfd-templates/test-vnfd1.yaml | 2 +- sfc/tests/functest/vnfd-templates/test-vnfd2.yaml | 2 +- sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml | 2 +- sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml | 2 +- sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml | 2 +- .../functest/vnffgd-templates/test-vnffgd.yaml | 14 ++++---------- .../functest/vnffgd-templates/test2-vnffgd1.yaml | 22 +++++++--------------- .../functest/vnffgd-templates/test2-vnffgd2.yaml | 22 +++++++--------------- 12 files changed, 47 insertions(+), 50 deletions(-) create mode 100644 sfc/tests/functest/register-vim.json create mode 100644 sfc/tests/functest/vnfd-templates/test-vnfd-default-params.json delete mode 100644 sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml (limited to 'sfc/tests/functest') diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index fdb94caf..a37642d3 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -36,6 +36,8 @@ testcases: secgroup_descr: "Example Security group" test_vnfd_red: "test-vnfd1.yaml" test_vnfd_blue: "test-vnfd2.yaml" + test_vnffgd_red: "test2-vnffgd1.yaml" + test_vnffgd_blue: "test2-vnffgd2.yaml" sfc_one_chain_two_service_functions: enabled: true @@ -49,6 +51,7 @@ testcases: secgroup_descr: "Example Security group" test_vnfd_red: "test2-vnfd1.yaml" test_vnfd_blue: "test2-vnfd2.yaml" + test_vnffgd_red: "test-vnffgd.yaml" sfc_symmetric_chain: enabled: false diff --git a/sfc/tests/functest/register-vim.json b/sfc/tests/functest/register-vim.json new file mode 100644 index 00000000..00719449 --- /dev/null +++ b/sfc/tests/functest/register-vim.json @@ -0,0 +1,18 @@ +{ + "vim": { + "vim_project": { + "project_domain_name": "Default", + "id": "", + "name": "admin" + }, + "auth_cred": { + "username": "admin", + "user_domain_name": "Default", + "password": "", + "user_id": "" + }, + "auth_url": "", + "type": "openstack", + "name": "test-vim" + } +} diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.json b/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.json new file mode 100644 index 00000000..4715461b --- /dev/null +++ b/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.json @@ -0,0 +1,3 @@ +{ +zone: 'nova' +} diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml deleted file mode 100644 index d87e6e68..00000000 --- a/sfc/tests/functest/vnfd-templates/test-vnfd-default-params.yaml +++ /dev/null @@ -1,5 +0,0 @@ ---- -vdus: - vdu1: - param: - zone: nova diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml index 277c1880..3fbc22ae 100644 --- a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml @@ -42,7 +42,7 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: false + 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 337e9412..8f442a90 100644 --- a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml @@ -43,7 +43,7 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: false + 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 cc5fed6f..aad1e672 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml @@ -42,7 +42,7 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: false + 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 f8150f25..b5502f12 100644 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml +++ b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml @@ -42,7 +42,7 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: false + anti_spoofing_protection: true requirements: - virtualLink: node: VL1 diff --git a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml index 26491b5e..7f8f1787 100644 --- a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml +++ b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml @@ -39,7 +39,7 @@ topology_template: properties: management: true order: 0 - anti_spoofing_protection: false + anti_spoofing_protection: true requirements: - virtualLink: node: VL1 diff --git a/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml index 9c696d2e..b1fd574c 100644 --- a/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml +++ b/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml @@ -4,11 +4,6 @@ description: test-case1 topology_template: description: topology-template-test1 - inputs: - net_src_id: - type: string - ip_dst: - type: string node_templates: Forwarding_path1: @@ -19,14 +14,13 @@ topology_template: policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_id} + - source_port_range: 0-0 - destination_port_range: 80-80 - ip_proto: 6 - - ip_dst_prefix: {get_input: ip_dst} path: - - forwarder: VNFD1 + - forwarder: test-vnfd1 capability: CP1 - - forwarder: VNFD2 + - forwarder: test-vnfd2 capability: CP1 groups: @@ -39,5 +33,5 @@ topology_template: number_of_endpoints: 2 dependent_virtual_link: [VL1, VL1] connection_point: [CP1, CP1] - constituent_vnfs: [VNFD1, VNFD2] + constituent_vnfs: [test-vnfd1, test-vnfd2] members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml b/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml index a15e94cc..24a32db4 100644 --- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml +++ b/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml @@ -4,11 +4,6 @@ description: test-case2_HTTP Test topology_template: description: topology-template-test2 - inputs: - net_src_id: - type: string - ip_dst: - type: string node_templates: Forwarding_path1: @@ -19,14 +14,11 @@ topology_template: policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_id} - - destination_port_range: 80-80 + - source_port_range: 0-0 + - destination_port_range: 22-80 - ip_proto: 6 - - ip_dst_prefix: {get_input: ip_dst} path: - - forwarder: VNFD1 - capability: CP1 - - forwarder: VNFD2 + - forwarder: test-vnfd1 capability: CP1 groups: @@ -36,8 +28,8 @@ topology_template: properties: vendor: tacker version: 1.0 - number_of_endpoints: 2 - dependent_virtual_link: [VL1, VL1] - connection_point: [CP1, CP1] - constituent_vnfs: [VNFD1, VNFD2] + number_of_endpoints: 1 + dependent_virtual_link: [VL1] + connection_point: [CP1] + constituent_vnfs: [test-vnfd1] members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml b/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml index 80a41edd..401a4272 100644 --- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml +++ b/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml @@ -4,11 +4,6 @@ description: test-case2_SSH Test topology_template: description: topology-template-test2 - inputs: - net_src_id: - type: string - ip_dst: - type: string node_templates: Forwarding_path1: @@ -19,14 +14,11 @@ topology_template: policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_id} - - destination_port_range: 22-22 + - source_port_range: 0-0 + - destination_port_range: 22-80 - ip_proto: 6 - - ip_dst_prefix: {get_input: ip_dst} path: - - forwarder: VNFD1 - capability: CP1 - - forwarder: VNFD2 + - forwarder: test-vnfd2 capability: CP1 groups: @@ -36,8 +28,8 @@ topology_template: properties: vendor: tacker version: 1.0 - number_of_endpoints: 2 - dependent_virtual_link: [VL1, VL1] - connection_point: [CP1, CP1] - constituent_vnfs: [VNFD1, VNFD2] + number_of_endpoints: 1 + dependent_virtual_link: [VL1] + connection_point: [CP1] + constituent_vnfs: [test-vnfd2] members: [Forwarding_path1] -- cgit 1.2.3-korg