From 759e0751465747acfb9cf840aaad7761ba1327dd Mon Sep 17 00:00:00 2001 From: Manuel Buil Date: Mon, 18 Dec 2017 13:03:07 +0100 Subject: Documentation update and some clean up Change-Id: I1fca51b9b6afff5a596ceee2e1401127fe23231d Signed-off-by: Manuel Buil --- sfc/tests/functest/README.sfc-test-2 | 11 ----- sfc/tests/functest/README.sfc-test-3 | 24 ---------- sfc/tests/functest/README.tests | 48 +++++++++++++++++++ sfc/tests/functest/config.yaml | 16 +++---- sfc/tests/functest/sfc_tacker_test2.bash | 29 ----------- .../vnfd-templates/test-one-chain-vnfd1.yaml | 56 ++++++++++++++++++++++ .../vnfd-templates/test-one-chain-vnfd2.yaml | 56 ++++++++++++++++++++++ .../vnfd-templates/test-symmetric-vnfd.yaml | 53 ++++++++++++++++++++ .../vnfd-templates/test-two-chains-vnfd1.yaml | 56 ++++++++++++++++++++++ .../vnfd-templates/test-two-chains-vnfd2.yaml | 56 ++++++++++++++++++++++ sfc/tests/functest/vnfd-templates/test-vnfd1.yaml | 56 ---------------------- sfc/tests/functest/vnfd-templates/test-vnfd2.yaml | 56 ---------------------- sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml | 56 ---------------------- sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml | 56 ---------------------- sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml | 53 -------------------- .../vnffgd-templates/test-one-chain-vnffgd.yaml | 40 ++++++++++++++++ .../vnffgd-templates/test-two-chains-vnffgd1.yaml | 38 +++++++++++++++ .../vnffgd-templates/test-two-chains-vnffgd2.yaml | 39 +++++++++++++++ .../functest/vnffgd-templates/test-vnffgd.yaml | 40 ---------------- .../functest/vnffgd-templates/test2-vnffgd1.yaml | 38 --------------- .../functest/vnffgd-templates/test2-vnffgd2.yaml | 39 --------------- 21 files changed, 450 insertions(+), 466 deletions(-) delete mode 100644 sfc/tests/functest/README.sfc-test-2 delete mode 100644 sfc/tests/functest/README.sfc-test-3 create mode 100644 sfc/tests/functest/README.tests delete mode 100644 sfc/tests/functest/sfc_tacker_test2.bash create mode 100644 sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml create mode 100644 sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml create mode 100644 sfc/tests/functest/vnfd-templates/test-symmetric-vnfd.yaml create mode 100644 sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml create mode 100644 sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml delete mode 100644 sfc/tests/functest/vnfd-templates/test-vnfd1.yaml delete mode 100644 sfc/tests/functest/vnfd-templates/test-vnfd2.yaml delete mode 100644 sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml delete mode 100644 sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml delete mode 100644 sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml create mode 100644 sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml create mode 100644 sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml create mode 100644 sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml delete mode 100644 sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml delete mode 100644 sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml delete mode 100644 sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml (limited to 'sfc') diff --git a/sfc/tests/functest/README.sfc-test-2 b/sfc/tests/functest/README.sfc-test-2 deleted file mode 100644 index 5a9f2ebe..00000000 --- a/sfc/tests/functest/README.sfc-test-2 +++ /dev/null @@ -1,11 +0,0 @@ -### ODL-SFC TEST2 DESCRIPTION ### - -This is a simple description of the test case - -We create one client and one server using nova. Then, 2 SFs are created using -tacker. The SFs are deployed in two different compute nodes. A chain is created -where both SFs are included. - -vxlan_tool is started in both SFs and HTTP traffic is sent from the client to -the server. If it works, the vxlan_tool is modified to block HTTP traffic. -It is tried again and it should fail because packets are dropped diff --git a/sfc/tests/functest/README.sfc-test-3 b/sfc/tests/functest/README.sfc-test-3 deleted file mode 100644 index 1583f24e..00000000 --- a/sfc/tests/functest/README.sfc-test-3 +++ /dev/null @@ -1,24 +0,0 @@ -### ODL-SFC TEST3 DESCRIPTION ### - -*** This test is not working yet - see JIRA SFC-86 *** - -One client and one server are created using nova. The server will be running -a web server on port 80. - -Then one Service Function (SF) is created using Tacker. This service function -will be running a firewall that blocks the traffic in a specific port (e.g. -33333). A symmetric service chain routing the traffic throught this SF will be -created as well. - -1st check: The client is able to reach the server using a source port different -from the one that the firewall blocks (e.g 22222), and the response gets back -to the client. - -2nd check: The client is able to reach the server using the source port that -the firewall blocks, but responses back from the server are blocked, as the -symmetric service chain makes them go through the firewall that blocks on the -destination port initially used as source port by the client (e.g. 33333). - -If the client is able to receive the response, it would be a symptom of the -symmetric chain not working, as traffic would be flowing from server to client -directly without traversing the SF. diff --git a/sfc/tests/functest/README.tests b/sfc/tests/functest/README.tests new file mode 100644 index 00000000..d4e3df3e --- /dev/null +++ b/sfc/tests/functest/README.tests @@ -0,0 +1,48 @@ +## These are the current available test cases ## + +## TEST ONE CHAIN - sfc_one_chain_two_service_functions ## + +We create one client and one server using nova. Then, 2 SFs are created using +tacker. A chain is created where both SFs are included. + +vxlan_tool is started in both SFs and HTTP traffic is sent from the client to +the server. If it works, the vxlan_tool is modified to block HTTP traffic. +It is tried again and it should fail because packets are dropped. Then, that +SF stops blocking and the other SF starts blocking HTTP and the connection is +tried again. + + +## TEST TWO CHAINS - sfc_two_chains_SSH_and_HTTP ## + +We create one client and one server using nova. Then, 2 SFs are created using +tacker. Two chains are created, having one SF each. + +vxlan_tool is started in both SFs, one SF blocks SSH traffic and the other SF +block HTTP traffic. First, the client traffic is classified to chain1, where +HTTP should work but SSH sould not. This is tested and after that the +classification is changed to classified to chain2, where HTTP should not work +but SSH should work. This is tested again. + + +## TEST SYMMETRIC - sfc_symmetric_chain ## + +One client and one server are created using nova. The server will be running +a web server on port 80. + +Then one Service Function (SF) is created using Tacker. This service function +will be running a firewall that blocks the traffic in a specific port (e.g. +33333). A symmetric service chain routing the traffic throught this SF will be +created as well. + +1st check: The client is able to reach the server using a source port different +from the one that the firewall blocks (e.g 22222), and the response gets back +to the client. + +2nd check: The client is able to reach the server using the source port that +the firewall blocks, but responses back from the server are blocked, as the +symmetric service chain makes them go through the firewall that blocks on the +destination port initially used as source port by the client (e.g. 33333). + +If the client is able to receive the response, it would be a symptom of the +symmetric chain not working, as traffic would be flowing from server to client +directly without traversing the SF. diff --git a/sfc/tests/functest/config.yaml b/sfc/tests/functest/config.yaml index 4a4a806e..294ba7c7 100644 --- a/sfc/tests/functest/config.yaml +++ b/sfc/tests/functest/config.yaml @@ -35,9 +35,9 @@ testcases: subnet_cidr: "11.0.0.0/24" secgroup_name: "example-sg" secgroup_descr: "Example Security group" - test_vnfd_red: "test-vnfd1.yaml" - test_vnfd_blue: "test-vnfd2.yaml" - test_vnffgd_red: "test-vnffgd.yaml" + test_vnfd_red: "test-one-chain-vnfd1.yaml" + test_vnfd_blue: "test-one-chain-vnfd2.yaml" + test_vnffgd_red: "test-one-chain-vnffgd.yaml" sfc_two_chains_SSH_and_HTTP: enabled: false @@ -49,10 +49,10 @@ testcases: subnet_cidr: "11.0.0.0/24" secgroup_name: "example-sg" secgroup_descr: "Example Security group" - test_vnfd_red: "test2-vnfd1.yaml" - test_vnfd_blue: "test2-vnfd2.yaml" - test_vnffgd_red: "test2-vnffgd1.yaml" - test_vnffgd_blue: "test2-vnffgd2.yaml" + test_vnfd_red: "test-two-chains-vnfd1.yaml" + test_vnfd_blue: "test-two-chains-vnfd2.yaml" + test_vnffgd_red: "test-two-chains-vnffgd1.yaml" + test_vnffgd_blue: "test-two-chains-vnffgd2.yaml" sfc_symmetric_chain: enabled: false @@ -64,6 +64,6 @@ testcases: subnet_cidr: "11.0.0.0/24" secgroup_name: "example-sg" secgroup_descr: "Example Security group" - test_vnfd: "test3-vnfd1.yaml" + test_vnfd: "test-symmetric-vnfd.yaml" allowed_source_port: 22222 blocked_source_port: 33333 diff --git a/sfc/tests/functest/sfc_tacker_test2.bash b/sfc/tests/functest/sfc_tacker_test2.bash deleted file mode 100644 index 156b19cb..00000000 --- a/sfc/tests/functest/sfc_tacker_test2.bash +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -BASEDIR=`dirname $0` - -#import VNF descriptor -tacker vnfd-create --vnfd-file ${BASEDIR}/vnfd-templates/test2-vnfd1.yaml -tacker vnfd-create --vnfd-file ${BASEDIR}/vnfd-templates/test2-vnfd2.yaml - -#create instances of the imported VNF -tacker vnf-create --name testVNF1 --vnfd-name test-vnfd1 -tacker vnf-create --name testVNF2 --vnfd-name test-vnfd2 - -key=true -while $key;do - sleep 3 - active=`tacker vnf-list | grep -E 'PENDING|ERROR'` - echo -e "checking if SFs are up: $active" - if [ -z "$active" ]; then - key=false - fi -done - -#create service chain -tacker sfc-create --name red --chain testVNF1,testVNF2 - -#create classifier -tacker sfc-classifier-create --name red_http --chain red --match source_port=0,dest_port=80,protocol=6 - -tacker sfc-list -tacker sfc-classifier-list diff --git a/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml new file mode 100644 index 00000000..4042222c --- /dev/null +++ b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd1.yaml @@ -0,0 +1,56 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: firewall1-example +metadata: + template_name: test-vnfd1 + +topology_template: + inputs: + zone: + type: string + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 2 GB + disk_size: 10 GB + properties: + image: sfc_nsh_euphrates + availability_zone: {get_input: zone} + mgmt_driver: noop + config: | + param0: key1 + param1: key2 + service_type: firewall + monitoring_policy: + name: ping + parameters: + monitoring_delay: 10 + count: 3 + interval: 2 + timeout: 2 + action: + failure: respawn + retry: 5 + port: 22 + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + order: 0 + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: example-net + vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml new file mode 100644 index 00000000..42308c6c --- /dev/null +++ b/sfc/tests/functest/vnfd-templates/test-one-chain-vnfd2.yaml @@ -0,0 +1,56 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: firewall2-example +metadata: + template_name: test-vnfd2 + +topology_template: + inputs: + zone: + type: string + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 2 GB + disk_size: 10 GB + properties: + image: sfc_nsh_euphrates + availability_zone: {get_input: zone} + mgmt_driver: noop + config: | + param0: key0 + param1: key1 + service_type: firewall + monitoring_policy: + name: ping + parameters: + monitoring_delay: 10 + count: 3 + interval: 2 + timeout: 2 + action: + failure: respawn + retry: 5 + port: 22 + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + order: 0 + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: example-net + vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test-symmetric-vnfd.yaml b/sfc/tests/functest/vnfd-templates/test-symmetric-vnfd.yaml new file mode 100644 index 00000000..1f4c11f6 --- /dev/null +++ b/sfc/tests/functest/vnfd-templates/test-symmetric-vnfd.yaml @@ -0,0 +1,53 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: firewall3-example +metadata: + template_name: test-vnfd1 + +topology_template: + inputs: + zone: + type: string + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 2 GB + disk_size: 10 GB + properties: + image: sfc_nsh_euphrates + availability_zone: {get_input: zone} + mgmt_driver: noop + service_type: firewall + monitoring_policy: + name: ping + parameters: + monitoring_delay: 10 + count: 3 + interval: 2 + timeout: 2 + action: + failure: respawn + retry: 5 + port: 22 + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + order: 0 + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: example-net + vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml new file mode 100644 index 00000000..4042222c --- /dev/null +++ b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd1.yaml @@ -0,0 +1,56 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: firewall1-example +metadata: + template_name: test-vnfd1 + +topology_template: + inputs: + zone: + type: string + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 2 GB + disk_size: 10 GB + properties: + image: sfc_nsh_euphrates + availability_zone: {get_input: zone} + mgmt_driver: noop + config: | + param0: key1 + param1: key2 + service_type: firewall + monitoring_policy: + name: ping + parameters: + monitoring_delay: 10 + count: 3 + interval: 2 + timeout: 2 + action: + failure: respawn + retry: 5 + port: 22 + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + order: 0 + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: example-net + vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml new file mode 100644 index 00000000..ac4f223d --- /dev/null +++ b/sfc/tests/functest/vnfd-templates/test-two-chains-vnfd2.yaml @@ -0,0 +1,56 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: firewall2-example +metadata: + template_name: test-vnfd2 + +topology_template: + inputs: + zone: + type: string + node_templates: + VDU1: + type: tosca.nodes.nfv.VDU.Tacker + capabilities: + nfv_compute: + properties: + num_cpus: 1 + mem_size: 2 GB + disk_size: 10 GB + properties: + image: sfc_nsh_euphrates + availability_zone: {get_input: zone} + mgmt_driver: noop + config: | + param0: key1 + param1: key2 + service_type: firewall + monitoring_policy: + name: ping + parameters: + monitoring_delay: 10 + count: 3 + interval: 2 + timeout: 2 + action: + failure: respawn + retry: 5 + port: 22 + + CP1: + type: tosca.nodes.nfv.CP.Tacker + properties: + management: true + order: 0 + anti_spoofing_protection: false + requirements: + - virtualLink: + node: VL1 + - virtualBinding: + node: VDU1 + + VL1: + type: tosca.nodes.nfv.VL + properties: + network_name: example-net + vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml deleted file mode 100644 index 4042222c..00000000 --- a/sfc/tests/functest/vnfd-templates/test-vnfd1.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: firewall1-example -metadata: - template_name: test-vnfd1 - -topology_template: - inputs: - zone: - type: string - node_templates: - VDU1: - type: tosca.nodes.nfv.VDU.Tacker - capabilities: - nfv_compute: - properties: - num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB - properties: - image: sfc_nsh_euphrates - availability_zone: {get_input: zone} - mgmt_driver: noop - config: | - param0: key1 - param1: key2 - service_type: firewall - monitoring_policy: - name: ping - parameters: - monitoring_delay: 10 - count: 3 - interval: 2 - timeout: 2 - action: - failure: respawn - retry: 5 - port: 22 - - CP1: - type: tosca.nodes.nfv.CP.Tacker - properties: - management: true - order: 0 - anti_spoofing_protection: false - requirements: - - virtualLink: - node: VL1 - - virtualBinding: - node: VDU1 - - VL1: - type: tosca.nodes.nfv.VL - properties: - network_name: example-net - vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml deleted file mode 100644 index 42308c6c..00000000 --- a/sfc/tests/functest/vnfd-templates/test-vnfd2.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: firewall2-example -metadata: - template_name: test-vnfd2 - -topology_template: - inputs: - zone: - type: string - node_templates: - VDU1: - type: tosca.nodes.nfv.VDU.Tacker - capabilities: - nfv_compute: - properties: - num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB - properties: - image: sfc_nsh_euphrates - availability_zone: {get_input: zone} - mgmt_driver: noop - config: | - param0: key0 - param1: key1 - service_type: firewall - monitoring_policy: - name: ping - parameters: - monitoring_delay: 10 - count: 3 - interval: 2 - timeout: 2 - action: - failure: respawn - retry: 5 - port: 22 - - CP1: - type: tosca.nodes.nfv.CP.Tacker - properties: - management: true - order: 0 - anti_spoofing_protection: false - requirements: - - virtualLink: - node: VL1 - - virtualBinding: - node: VDU1 - - VL1: - type: tosca.nodes.nfv.VL - properties: - network_name: example-net - vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml deleted file mode 100644 index 4042222c..00000000 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd1.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: firewall1-example -metadata: - template_name: test-vnfd1 - -topology_template: - inputs: - zone: - type: string - node_templates: - VDU1: - type: tosca.nodes.nfv.VDU.Tacker - capabilities: - nfv_compute: - properties: - num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB - properties: - image: sfc_nsh_euphrates - availability_zone: {get_input: zone} - mgmt_driver: noop - config: | - param0: key1 - param1: key2 - service_type: firewall - monitoring_policy: - name: ping - parameters: - monitoring_delay: 10 - count: 3 - interval: 2 - timeout: 2 - action: - failure: respawn - retry: 5 - port: 22 - - CP1: - type: tosca.nodes.nfv.CP.Tacker - properties: - management: true - order: 0 - anti_spoofing_protection: false - requirements: - - virtualLink: - node: VL1 - - virtualBinding: - node: VDU1 - - VL1: - type: tosca.nodes.nfv.VL - properties: - network_name: example-net - vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml b/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml deleted file mode 100644 index ac4f223d..00000000 --- a/sfc/tests/functest/vnfd-templates/test2-vnfd2.yaml +++ /dev/null @@ -1,56 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: firewall2-example -metadata: - template_name: test-vnfd2 - -topology_template: - inputs: - zone: - type: string - node_templates: - VDU1: - type: tosca.nodes.nfv.VDU.Tacker - capabilities: - nfv_compute: - properties: - num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB - properties: - image: sfc_nsh_euphrates - availability_zone: {get_input: zone} - mgmt_driver: noop - config: | - param0: key1 - param1: key2 - service_type: firewall - monitoring_policy: - name: ping - parameters: - monitoring_delay: 10 - count: 3 - interval: 2 - timeout: 2 - action: - failure: respawn - retry: 5 - port: 22 - - CP1: - type: tosca.nodes.nfv.CP.Tacker - properties: - management: true - order: 0 - anti_spoofing_protection: false - requirements: - - virtualLink: - node: VL1 - - virtualBinding: - node: VDU1 - - VL1: - type: tosca.nodes.nfv.VL - properties: - network_name: example-net - vendor: Tacker diff --git a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml b/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml deleted file mode 100644 index 1f4c11f6..00000000 --- a/sfc/tests/functest/vnfd-templates/test3-vnfd1.yaml +++ /dev/null @@ -1,53 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: firewall3-example -metadata: - template_name: test-vnfd1 - -topology_template: - inputs: - zone: - type: string - node_templates: - VDU1: - type: tosca.nodes.nfv.VDU.Tacker - capabilities: - nfv_compute: - properties: - num_cpus: 1 - mem_size: 2 GB - disk_size: 10 GB - properties: - image: sfc_nsh_euphrates - availability_zone: {get_input: zone} - mgmt_driver: noop - service_type: firewall - monitoring_policy: - name: ping - parameters: - monitoring_delay: 10 - count: 3 - interval: 2 - timeout: 2 - action: - failure: respawn - retry: 5 - port: 22 - - CP1: - type: tosca.nodes.nfv.CP.Tacker - properties: - management: true - order: 0 - anti_spoofing_protection: false - requirements: - - virtualLink: - node: VL1 - - virtualBinding: - node: VDU1 - - VL1: - type: tosca.nodes.nfv.VL - properties: - network_name: example-net - vendor: Tacker diff --git a/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml new file mode 100644 index 00000000..27c7d545 --- /dev/null +++ b/sfc/tests/functest/vnffgd-templates/test-one-chain-vnffgd.yaml @@ -0,0 +1,40 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: test-case1 + +topology_template: + description: topology-template-test1 + inputs: + net_src_port_id: + type: string + + node_templates: + Forwarding_path1: + type: tosca.nodes.nfv.FP.Tacker + description: creates path + properties: + id: 1 + policy: + type: ACL + criteria: + - network_src_port_id: {get_input: net_src_port_id} + - destination_port_range: 80-80 + - ip_proto: 6 + path: + - forwarder: test-vnfd1 + capability: CP1 + - forwarder: test-vnfd2 + capability: CP1 + + groups: + VNFFG1: + type: tosca.groups.nfv.VNFFG + description: creates chain + properties: + vendor: tacker + version: 1.0 + number_of_endpoints: 2 + dependent_virtual_link: [VL1, VL1] + connection_point: [CP1, CP1] + constituent_vnfs: [test-vnfd1, test-vnfd2] + members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml new file mode 100644 index 00000000..f0615e4e --- /dev/null +++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd1.yaml @@ -0,0 +1,38 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: test-case2_HTTP Test + +topology_template: + description: topology-template-test2 + inputs: + net_src_port_id: + type: string + + node_templates: + Forwarding_path1: + type: tosca.nodes.nfv.FP.Tacker + 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: + - forwarder: test-vnfd1 + capability: CP1 + + groups: + VNFFG1: + type: tosca.groups.nfv.VNFFG + description: creates chain + properties: + vendor: tacker + version: 1.0 + 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/test-two-chains-vnffgd2.yaml b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml new file mode 100644 index 00000000..ec18c9d6 --- /dev/null +++ b/sfc/tests/functest/vnffgd-templates/test-two-chains-vnffgd2.yaml @@ -0,0 +1,39 @@ +--- +tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 +description: test-case2_SSH Test + +topology_template: + description: topology-template-test2 + inputs: + net_src_port_id: + type: string + + + node_templates: + Forwarding_path1: + type: tosca.nodes.nfv.FP.Tacker + 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: + - forwarder: test-vnfd2 + capability: CP1 + + groups: + VNFFG1: + type: tosca.groups.nfv.VNFFG + description: creates chain + properties: + vendor: tacker + version: 1.0 + number_of_endpoints: 1 + dependent_virtual_link: [VL1] + connection_point: [CP1] + constituent_vnfs: [test-vnfd2] + members: [Forwarding_path1] diff --git a/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml b/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml deleted file mode 100644 index 27c7d545..00000000 --- a/sfc/tests/functest/vnffgd-templates/test-vnffgd.yaml +++ /dev/null @@ -1,40 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case1 - -topology_template: - description: topology-template-test1 - inputs: - net_src_port_id: - type: string - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - description: creates path - properties: - id: 1 - policy: - type: ACL - criteria: - - network_src_port_id: {get_input: net_src_port_id} - - destination_port_range: 80-80 - - ip_proto: 6 - path: - - forwarder: test-vnfd1 - capability: CP1 - - forwarder: test-vnfd2 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 2 - dependent_virtual_link: [VL1, VL1] - connection_point: [CP1, CP1] - 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 deleted file mode 100644 index f0615e4e..00000000 --- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd1.yaml +++ /dev/null @@ -1,38 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_HTTP Test - -topology_template: - description: topology-template-test2 - inputs: - net_src_port_id: - type: string - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - 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: - - forwarder: test-vnfd1 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - 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 deleted file mode 100644 index ec18c9d6..00000000 --- a/sfc/tests/functest/vnffgd-templates/test2-vnffgd2.yaml +++ /dev/null @@ -1,39 +0,0 @@ ---- -tosca_definitions_version: tosca_simple_profile_for_nfv_1_0_0 -description: test-case2_SSH Test - -topology_template: - description: topology-template-test2 - inputs: - net_src_port_id: - type: string - - - node_templates: - Forwarding_path1: - type: tosca.nodes.nfv.FP.Tacker - 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: - - forwarder: test-vnfd2 - capability: CP1 - - groups: - VNFFG1: - type: tosca.groups.nfv.VNFFG - description: creates chain - properties: - vendor: tacker - version: 1.0 - number_of_endpoints: 1 - dependent_virtual_link: [VL1] - connection_point: [CP1] - constituent_vnfs: [test-vnfd2] - members: [Forwarding_path1] -- cgit 1.2.3-korg