diff options
8 files changed, 20 insertions, 25 deletions
diff --git a/openecomp-bdd/features/Example_ToscaTranslationFlow.feature b/openecomp-bdd/features/Example_ToscaTranslationFlow.feature index 4b20cd3404..5ec35f9a45 100644 --- a/openecomp-bdd/features/Example_ToscaTranslationFlow.feature +++ b/openecomp-bdd/features/Example_ToscaTranslationFlow.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Example Tosca Validation Flow Background: Init Given I want to create a VLM diff --git a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature b/openecomp-bdd/features/TOSCA/CapabilityDataType.feature index 71483339ae..ef240e33a3 100644 --- a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature +++ b/openecomp-bdd/features/TOSCA/CapabilityDataType.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Tosca Capability Refactor Flow Background: Init Given I want to create a VLM @@ -17,9 +17,4 @@ Feature: Tosca Validation Flow Then I want to get the package for this Item to path "resources/downloads/VSPPackage.zip" And I want to compare the content of the entry "Definitions/Nested_FSB1ServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" with file "resources/yaml/Nested_FSB1ServiceTemplate.yaml" - Then I want to create a VF for this Item - - #And I want to load the yaml content of the entry "Definitions/Nested_FSB1ServiceTemplate - # .yaml" in the zip "resources/downloads/VSPPackage.zip" to context - #And I want to check property "topology_template.node_templates.FSB1_FSB1_OAM.capabilities" - # for value { port_mirroring: { properties: { connection_point: [Object] } } }
\ No newline at end of file + Then I want to create a VF for this Item
\ No newline at end of file diff --git a/openecomp-bdd/features/TOSCA/HeatValidation.feature b/openecomp-bdd/features/TOSCA/HeatValidation.feature index ce6a8e72f5..dba54ff9ff 100644 --- a/openecomp-bdd/features/TOSCA/HeatValidation.feature +++ b/openecomp-bdd/features/TOSCA/HeatValidation.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Heat Validation Flow Background: Init Given I want to create a VLM diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature index 7dd9c95327..280ec8b791 100644 --- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature +++ b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidation-positive.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Tosca VMI Positive Flow Background: Init Given I want to create a VLM diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature index 803e40873a..b0e5b4494a 100644 --- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature +++ b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationGuideline3violations.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Tosca VMI Flow Background: Init Given I want to create a VLM diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature index 4c0ad29f2e..3cf52f6527 100644 --- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature +++ b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMissingProperties.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Tosca VMI Flow Background: Init Given I want to create a VLM diff --git a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature index 9dd91a7e2d..0b9e092875 100644 --- a/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature +++ b/openecomp-bdd/features/TOSCA/VirtualMachineInterfaceValidationHeatResourceMultipleParents.feature @@ -1,4 +1,4 @@ -Feature: Tosca Validation Flow +Feature: Tosca VMI Flow Background: Init Given I want to create a VLM diff --git a/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml b/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml index d88c77ea70..b41b5ea5e2 100644 --- a/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml +++ b/openecomp-bdd/resources/yaml/Nested_FSB1ServiceTemplate.yaml @@ -75,26 +75,26 @@ topology_template: FSB1_FSB1_OAM: type: org.openecomp.resource.cp.v2.extNeutronCP properties: - exCP_naming: - get_input: port_FSB1_OAM_exCP_naming - vlan_requirements: - get_input: port_FSB1_OAM_vlan_requirements ip_requirements: get_input: port_FSB1_OAM_ip_requirements - network_role_tag: - get_input: port_FSB1_OAM_network_role_tag - mac_requirements: - get_input: port_FSB1_OAM_mac_requirements - order: - get_input: port_FSB1_OAM_order network_role: get_input: port_FSB1_OAM_network_role - subnetpoolid: - get_input: port_FSB1_OAM_subnetpoolid fixed_ips: get_input: - port_FSB1_OAM_fixed_ips - index_value + subnetpoolid: + get_input: port_FSB1_OAM_subnetpoolid + mac_requirements: + get_input: port_FSB1_OAM_mac_requirements + exCP_naming: + get_input: port_FSB1_OAM_exCP_naming + vlan_requirements: + get_input: port_FSB1_OAM_vlan_requirements + network_role_tag: + get_input: port_FSB1_OAM_network_role_tag + order: + get_input: port_FSB1_OAM_order network: get_input: - port_FSB1_OAM_network |