diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-02-05 10:36:33 +0100 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-02-05 12:23:38 +0100 |
| commit | 242e25c987847aa01d4470e96500e085aacc5738 (patch) | |
| tree | a39faaa970bf310e2bb8aebfe1ca9fe3b6eadb16 | |
| parent | 575a8c98517c587dfdccfad93a6ea119ad689629 (diff) | |
Update the vnffg templates
The following tacker patch:
https://review.openstack.org/#/c/532203/
changed the syntax of the vnffgd templates
Change-Id: Ifbf788b02a95c8f45eb97230d3d2da117de158d6
Signed-off-by: Manuel Buil <mbuil@suse.com>
| -rw-r--r-- | sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens | 21 | ||||
| -rw-r--r-- | sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens | 22 |
2 files changed, 28 insertions, 15 deletions
diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens index 9df28b50..6123fb50 100644 --- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens +++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml-queens @@ -1,26 +1,33 @@ --- tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_HTTP Test +description: test-two-chains_HTTP Test topology_template: - description: topology-template-test2 + description: topology-template-test-two-chains inputs: net_src_port_id: type: string node_templates: Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker + type: tosca.nodes.nfv.FP.TackerV2 description: creates path properties: id: 1 policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_port_id} - destination_port_range: 22-80 - ip_proto: 6 - path: + - name: get_ssh + classifier: + network_src_port_id: {get_input: net_src_port_id} + destination_port_range: 22-22 + ip_proto: 6 + - name: get_http + classifier: + network_src_port_id: {get_input: net_src_port_id} + destination_port_range: 80-80 + ip_proto: 6 + path: - forwarder: test-vnfd1 capability: CP1 diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens index ef24ffa0..4d0763aa 100644 --- a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens +++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml-queens @@ -1,27 +1,33 @@ --- tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_SSH Test +description: test-two-chains_SSH Test topology_template: - description: topology-template-test2 + description: topology-template-test-two-chains inputs: net_src_port_id: type: string - node_templates: Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker + type: tosca.nodes.nfv.FP.TackerV2 description: creates path properties: id: 2 policy: type: ACL criteria: - - network_src_port_id: {get_input: net_src_port_id} - destination_port_range: 22-80 - ip_proto: 6 - path: + - name: get_ssh + classifier: + network_src_port_id: {get_input: net_src_port_id} + destination_port_range: 22-22 + ip_proto: 6 + - name: get_http + classifier: + network_src_port_id: {get_input: net_src_port_id} + destination_port_range: 80-80 + ip_proto: 6 + path: - forwarder: test-vnfd2 capability: CP1 |