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 --- .../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 -------------------- 10 files changed, 277 insertions(+), 277 deletions(-) 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 (limited to 'sfc/tests/functest/vnfd-templates') 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 -- cgit 1.2.3-korg