diff options
5 files changed, 26 insertions, 26 deletions
diff --git a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature b/openecomp-bdd/features/TOSCA/CapabilityDataType.feature index 64a0377db5..71483339ae 100644 --- a/openecomp-bdd/features/TOSCA/CapabilityDataType.feature +++ b/openecomp-bdd/features/TOSCA/CapabilityDataType.feature @@ -2,6 +2,7 @@ Feature: Tosca Validation Flow Background: Init Given I want to create a VLM + Given I want to set all Togglz to be "true" Scenario: Test Capability type in service template When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature index 6915e7b374..db5ac80923 100644 --- a/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature +++ b/openecomp-bdd/features/TOSCA/HeatToToscaTranslation.feature @@ -2,6 +2,7 @@ Feature: Tosca Validation Flow Background: Init Given I want to create a VLM + Given I want to set all Togglz to be "true" Scenario: Full - Create and submit VSP Network Package and Create VF When I want to create a VSP with onboarding type "NetworkPackage" @@ -19,7 +20,8 @@ Feature: Tosca Validation Flow Then I want to create a VF for this Item - Scenario: Full - Input parameter annotation validation. + Scenario: Validate Input parameter - annotation was added + When I want to create a VSP with onboarding type "NetworkPackage" Then I want to upload a NetworkPackage for this VSP from path "resources/uploads/inputsForNestedHeat.zip" @@ -51,6 +53,22 @@ Feature: Tosca Validation Flow Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.vf_module_label[0]" for value "main-heat2" Then I want to check property "topology_template.inputs.dummy_net_netmask_1.annotations.source.properties.param_name" for value "dummy_net_netmask_1" + Then I want to create a VF for this Item + + Scenario: Validate Input parameter - annotation was not added + + When I want to create a VSP with onboarding type "NetworkPackage" + + Then I want to upload a NetworkPackage for this VSP from path "resources/uploads/inputsForNestedHeat.zip" + And I want to process the NetworkPackage file for this VSP + + Then I want to commit this Item + And I want to submit this VSP + And I want to package this VSP + + Then I want to get the package for this Item to path "resources/downloads/VSPPackage.zip" + + When I want to load the yaml content of the entry "Definitions/MainServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" to context Then I want to check property "topology_template.inputs.OS::stack_name" exists Then I want to check property "topology_template.inputs.OS::stack_name.annotations" does not exist @@ -58,6 +76,7 @@ Feature: Tosca Validation Flow Then I want to check property "topology_template.inputs.port_pcm_port_0_network_role.annotations" does not exist Then I want to check property "topology_template.inputs.availabilityzone_name.annotations" does not exist Then I want to check property "topology_template.inputs.pcm_server_name.annotations" does not exist + Then I want to check property "topology_template.inputs.sm_server_names.annotations" does not exist When I want to load the yaml content of the entry "Definitions/nested-pcm_v0.2ServiceTemplate.yaml" in the zip "resources/downloads/VSPPackage.zip" to context Then I want to check property "topology_template.inputs.port_pcm_port_13_mac_requirements.annotations" does not exist diff --git a/openecomp-bdd/features/TOSCA/HeatValidation.feature b/openecomp-bdd/features/TOSCA/HeatValidation.feature index 69d6093776..ce6a8e72f5 100644 --- a/openecomp-bdd/features/TOSCA/HeatValidation.feature +++ b/openecomp-bdd/features/TOSCA/HeatValidation.feature @@ -2,6 +2,7 @@ Feature: Tosca Validation Flow Background: Init Given I want to create a VLM + Given I want to set all Togglz to be "true" Scenario: Test Validation Error When I want to create a VSP with onboarding type "NetworkPackage" diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java index 8126d2967c..19f4d59514 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseFullTranslationTest.java @@ -64,23 +64,13 @@ public class BaseFullTranslationTest { @BeforeClass public static void enableToggleableFeatures(){ manager = new TestFeatureManager(ToggleableFeature.class); - if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) { - manager.enable(ToggleableFeature.FORWARDER_CAPABILITY); - } - if (!ToggleableFeature.ANNOTATIONS.isActive()) { - manager.enable(ToggleableFeature.ANNOTATIONS); - } - if(!ToggleableFeature.VLAN_TAGGING.isActive()) { - manager.enable(ToggleableFeature.VLAN_TAGGING); - } + manager.enableAll(); } @AfterClass public static void disableToggleableFeatures() { - manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); - manager.disable(ToggleableFeature.ANNOTATIONS); - manager.disable(ToggleableFeature.VLAN_TAGGING); + manager.disableAll(); manager = null; TestFeatureManagerProvider.setFeatureManager(null); } diff --git a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java index 4dc1612893..e784f94df9 100644 --- a/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java +++ b/openecomp-be/lib/openecomp-sdc-translator-lib/openecomp-sdc-translator-core/src/test/java/org/openecomp/sdc/translator/services/heattotosca/impl/resourcetranslation/BaseResourceTranslationTest.java @@ -98,23 +98,12 @@ public class BaseResourceTranslationTest { @BeforeClass public static void enableToggleableFeatures(){ manager = new TestFeatureManager(ToggleableFeature.class); - if (!ToggleableFeature.FORWARDER_CAPABILITY.isActive()) { - manager.enable(ToggleableFeature.FORWARDER_CAPABILITY); - } - if(!ToggleableFeature.ANNOTATIONS.isActive()) { - manager.enable(ToggleableFeature.ANNOTATIONS); - } - if(!ToggleableFeature.VLAN_TAGGING.isActive()){ - manager.enable(ToggleableFeature.VLAN_TAGGING); - } - + manager.enableAll(); } @AfterClass public static void disableToggleableFeatures() { - manager.disable(ToggleableFeature.FORWARDER_CAPABILITY); - manager.disable(ToggleableFeature.ANNOTATIONS); - manager.disable(ToggleableFeature.VLAN_TAGGING); + manager.disableAll(); manager = null; TestFeatureManagerProvider.setFeatureManager(null); } |