diff options
13 files changed, 31 insertions, 12 deletions
diff --git a/cucumber-js-test-apis-ci/features/AbortFunctionality/TestSubmit.feature b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestSubmit.feature index 3153022396..d74c7e3f7c 100644 --- a/cucumber-js-test-apis-ci/features/AbortFunctionality/TestSubmit.feature +++ b/cucumber-js-test-apis-ci/features/AbortFunctionality/TestSubmit.feature @@ -16,6 +16,7 @@ Feature: Abort Flow - Test Submit Background: Init Given I want to create a VLM + Then I want to submit this VLM Scenario: Test submit if file is just uploaded When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Example_Collaboration.feature b/cucumber-js-test-apis-ci/features/Example_Collaboration.feature index c799efda12..71033b238f 100644 --- a/cucumber-js-test-apis-ci/features/Example_Collaboration.feature +++ b/cucumber-js-test-apis-ci/features/Example_Collaboration.feature @@ -2,6 +2,8 @@ Feature: Collaboration Example File Background: Init Given I want to create a VLM + Then I want to submit this VLM + Scenario: Testing permissions for contributors and Owners Then I want to check user "mb033001" has no permissions on this Item @@ -12,8 +14,8 @@ Feature: Collaboration Example File Then I want to check user "mb0001" has role "contributor" on this Item When I want to set the user to "aaaa" - Then I want the following to fail When I want to get the permissions for this Item + Then I want to check property "listCount" for value 2 When I want to set the user to "mb0001" Then I want the following to fail diff --git a/cucumber-js-test-apis-ci/features/Example_ToscaTranslationFlow.feature b/cucumber-js-test-apis-ci/features/Example_ToscaTranslationFlow.feature index 5ec35f9a45..b11227f52d 100644 --- a/cucumber-js-test-apis-ci/features/Example_ToscaTranslationFlow.feature +++ b/cucumber-js-test-apis-ci/features/Example_ToscaTranslationFlow.feature @@ -2,6 +2,7 @@ Feature: Example Tosca Validation Flow Background: Init Given I want to create a VLM + Then I want to submit this VLM Scenario: Full - Create and submit VSP Network Package and Create VF When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Example_VSP.feature b/cucumber-js-test-apis-ci/features/Example_VSP.feature index 5cffa585c5..ade2ef467b 100644 --- a/cucumber-js-test-apis-ci/features/Example_VSP.feature +++ b/cucumber-js-test-apis-ci/features/Example_VSP.feature @@ -2,6 +2,7 @@ Feature: VSP Example File Background: Init Given I want to create a VLM + Then I want to submit this VLM Scenario: Create and submit VSP Network Package When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVsp.feature b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVsp.feature index 2cc057469f..8e5a155861 100644 --- a/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVsp.feature +++ b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/ArchiveVsp.feature @@ -1,7 +1,8 @@ Feature: Archive and Restore VSP Background: Init - Given I want to create a VLM + Given I want to create a VLM + Then I want to submit this VLM Scenario: Archive VSP with Draft When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature index f68eece6a8..d83afce50d 100644 --- a/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature +++ b/cucumber-js-test-apis-ci/features/Onboarding/ArchiveItem/FilterArchivedVSPpackage.feature @@ -2,6 +2,7 @@ Feature: Filter Archived VSP Package Details Background: Init Given I want to create a VLM + Then I want to submit this VLM Scenario: Active VSP Package When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPCertified.feature b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPCertified.feature index 35a506a010..f4fa9d4423 100644 --- a/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPCertified.feature +++ b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPCertified.feature @@ -1,7 +1,8 @@ Feature: Delete VSP Draft Background: Init - Given I want to create a VLM + Given I want to create a VLM + Then I want to submit this VLM Scenario: Delete VSP with only draft When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPDraft.feature b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPDraft.feature index 5248131618..73cf7e263b 100644 --- a/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPDraft.feature +++ b/cucumber-js-test-apis-ci/features/Onboarding/DeleteItem/DeleteVSPDraft.feature @@ -1,7 +1,8 @@ Feature: Delete VSP Certified Background: Init - Given I want to create a VLM + Given I want to create a VLM + Then I want to submit this VLM Scenario: Delete VSP with certified - negative When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/cucumber-js-test-apis-ci/features/Onboarding/UniqueValue.feature b/cucumber-js-test-apis-ci/features/Onboarding/UniqueValue.feature index 31e41b9931..3abe1a3cb8 100644 --- a/cucumber-js-test-apis-ci/features/Onboarding/UniqueValue.feature +++ b/cucumber-js-test-apis-ci/features/Onboarding/UniqueValue.feature @@ -3,8 +3,8 @@ Feature: Unique value Scenario: List unique types When I want to get path "/unique-types" Then I want to check property "listCount" for value 2 - And I want to check property "results[0]" for value "VspName" - And I want to check property "results[1]" for value "VlmName" + And I want to check property "results[1]" for value "VspName" + And I want to check property "results[0]" for value "VlmName" Scenario: Get unique value - non existing type (negative) Given I want the following to fail with error code "UNIQUE_TYPE_NOT_FOUND" diff --git a/cucumber-js-test-apis-ci/features/TOSCA/CapabilityDataType.feature b/cucumber-js-test-apis-ci/features/TOSCA/CapabilityDataType.feature index ef240e33a3..51709caf09 100644 --- a/cucumber-js-test-apis-ci/features/TOSCA/CapabilityDataType.feature +++ b/cucumber-js-test-apis-ci/features/TOSCA/CapabilityDataType.feature @@ -2,6 +2,7 @@ Feature: Tosca Capability Refactor Flow Background: Init Given I want to create a VLM + Then I want to submit this VLM Given I want to set all Togglz to be "true" Scenario: Test Capability type in service template diff --git a/cucumber-js-test-apis-ci/features/TOSCA/HeatToToscaTranslation.feature b/cucumber-js-test-apis-ci/features/TOSCA/HeatToToscaTranslation.feature index ae0803687f..57fb1464c3 100644 --- a/cucumber-js-test-apis-ci/features/TOSCA/HeatToToscaTranslation.feature +++ b/cucumber-js-test-apis-ci/features/TOSCA/HeatToToscaTranslation.feature @@ -2,6 +2,7 @@ Feature: Tosca Validation Flow Background: Init Given I want to create a VLM + Then I want to submit this VLM Given I want to set all Togglz to be "true" Scenario: Full - Create and submit VSP Network Package and Create VF diff --git a/cucumber-js-test-apis-ci/features/TOSCA/VlanTagging.feature b/cucumber-js-test-apis-ci/features/TOSCA/VlanTagging.feature index 7adf99fae2..f529394726 100644 --- a/cucumber-js-test-apis-ci/features/TOSCA/VlanTagging.feature +++ b/cucumber-js-test-apis-ci/features/TOSCA/VlanTagging.feature @@ -2,6 +2,7 @@ Feature: Vlan Tagging - Full Flow tests Background: Init Given I want to create a VLM + Then I want to submit this VLM Given I want to set all Togglz to be "true" Scenario: Pattern 1A Full - Create and submit VSP Network Package containing one compute, one diff --git a/cucumber-js-test-apis-ci/resources/yaml/Nested_FSB1ServiceTemplate.yaml b/cucumber-js-test-apis-ci/resources/yaml/Nested_FSB1ServiceTemplate.yaml index fb301b6ab6..967dc269c1 100644 --- a/cucumber-js-test-apis-ci/resources/yaml/Nested_FSB1ServiceTemplate.yaml +++ b/cucumber-js-test-apis-ci/resources/yaml/Nested_FSB1ServiceTemplate.yaml @@ -55,6 +55,11 @@ topology_template: required: true entry_schema: type: org.openecomp.datatypes.network.VlanRequirements + port_FSB1_OAM_related_networks: + type: list + required: true + entry_schema: + type: org.openecomp.datatypes.network.RelatedNetworksAssignments port_FSB1_OAM_network_role_tag: type: string required: true @@ -75,6 +80,10 @@ topology_template: FSB1_FSB1_OAM: type: org.openecomp.resource.cp.v2.extNeutronCP properties: + mac_requirements: + get_input: port_FSB1_OAM_mac_requirements + order: + get_input: port_FSB1_OAM_order exCP_naming: get_input: port_FSB1_OAM_exCP_naming vlan_requirements: @@ -82,20 +91,18 @@ topology_template: subinterface_indicator: false ip_requirements: get_input: port_FSB1_OAM_ip_requirements + related_networks: + get_input: port_FSB1_OAM_related_networks 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 network: get_input: - port_FSB1_OAM_network |