diff options
| author |   Dimitrios Markou <mardim@intracom-telecom.com> | 2017-09-01 14:26:45 +0300 |
|---|---|---|
| committer | Dimitrios Markou <mardim@intracom-telecom.com> | 2017-09-07 15:53:08 +0300 |
| commit | 56fb19b663557ce07be6d4e5c07fd4a5b9276ed2 (patch) | |
| tree | 1ba1c2d0e28c537e73f20a3f701974bab3af5de0 /sfc/tests/functest/vnffgd-templates | |
| parent | b864bfbdff816dc621e5b4cd91431ec9ac4a47c0 (diff) | |
Adapt functionality to the new Tacker API
Change-Id: I078e9f26d3040cf04120abd425f03cb4f2e8daef
Signed-off-by: Dimitrios Markou <mardim@intracom-telecom.com>
Diffstat (limited to 'sfc/tests/functest/vnffgd-templates')
| -rw-r--r-- | sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml | 14 | ||||
| -rw-r--r-- | sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml | 22 | ||||
| -rw-r--r-- | sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml | 22 |
3 files changed, 18 insertions, 40 deletions
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] |