aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature2
-rw-r--r--openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature2
-rw-r--r--openecomp-bdd/features/AbortFunctionality/TestProperties.feature5
-rw-r--r--openecomp-bdd/features/AbortFunctionality/TestRollback.feature2
-rw-r--r--openecomp-bdd/features/AbortFunctionality/TestSubmit.feature2
-rw-r--r--openecomp-bdd/features/Example_HEAT.feature33
-rw-r--r--openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zipbin0 -> 3889 bytes
7 files changed, 26 insertions, 20 deletions
diff --git a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature b/openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature
index cdfea4f456..1c501d6599 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature
+++ b/openecomp-bdd/features/AbortFunctionality/TestAbort_ForInvalidHeatFile.feature
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Feature: Abort Flow
+Feature: Abort Flow - Test validation data
Background: Init
Given I want to create a VLM
diff --git a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature b/openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature
index 3eb0463b86..c3ee8a5e6c 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature
+++ b/openecomp-bdd/features/AbortFunctionality/TestAbort_ForValidHeatFile.feature
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Feature: Abort Flow
+Feature: Abort Flow - Test for valid heat
Background: Init
Given I want to create a VLM
diff --git a/openecomp-bdd/features/AbortFunctionality/TestProperties.feature b/openecomp-bdd/features/AbortFunctionality/TestProperties.feature
index d268c64ac4..e9e9acdbe1 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestProperties.feature
+++ b/openecomp-bdd/features/AbortFunctionality/TestProperties.feature
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Feature: Abort Flow
+Feature: Abort Flow - Test Properties
Background: Init
Given I want to create a VLM
@@ -29,5 +29,4 @@ Feature: Abort Flow
Then I want to get path "/vendor-software-products/{item.id}/versions/{item.versionId}"
Then I want to check property "candidateOnboardingOrigin" exists
Then I want to check property "candidateOnboardingOrigin" for value "zip"
- Then I want to check property "onboardingOrigin" does not exist
- # Then I want to print the context data \ No newline at end of file
+ Then I want to check property "onboardingOrigin" does not exist \ No newline at end of file
diff --git a/openecomp-bdd/features/AbortFunctionality/TestRollback.feature b/openecomp-bdd/features/AbortFunctionality/TestRollback.feature
index 50f16e66a9..d61a1cc773 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestRollback.feature
+++ b/openecomp-bdd/features/AbortFunctionality/TestRollback.feature
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Feature: Abort Flow
+Feature: Abort Flow - Test rollback
Background: Init
Given I want to create a VLM
diff --git a/openecomp-bdd/features/AbortFunctionality/TestSubmit.feature b/openecomp-bdd/features/AbortFunctionality/TestSubmit.feature
index f39b95d7f0..3153022396 100644
--- a/openecomp-bdd/features/AbortFunctionality/TestSubmit.feature
+++ b/openecomp-bdd/features/AbortFunctionality/TestSubmit.feature
@@ -12,7 +12,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-Feature: Abort Flow
+Feature: Abort Flow - Test Submit
Background: Init
Given I want to create a VLM
diff --git a/openecomp-bdd/features/Example_HEAT.feature b/openecomp-bdd/features/Example_HEAT.feature
index b46ff52ac7..778fd96616 100644
--- a/openecomp-bdd/features/Example_HEAT.feature
+++ b/openecomp-bdd/features/Example_HEAT.feature
@@ -1,7 +1,19 @@
+# Copyright © 2016-2018 European Support Limited
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
Feature: Heat Example File
Scenario: Test with update for heat file and check for validation warning
- # Use ONLY during development. Example for running a test with an existing item in order to not create an item each test.
- # Given Item "c99b775cc0764746b15a32b728c10402" and version Id "f044f9e265ac46c2882cb14c4b1732a5"
Given I want to create a VLM
When I want to create a VSP with onboarding type "NetworkPackage"
@@ -10,14 +22,9 @@ Feature: Heat Example File
When I want to upload a NetworkPackage for this VSP from path "resources/uploads/BASE_MUX.zip"
And I want to process the NetworkPackage file for this VSP
-# See in tests for abort - part of new functionality
-# When I want to download the NetworkPackage for this VSP to path "resources/downloads/base_mux.zip"
-# Then I want to check property "data[0].file" for value "CB_BASE.yaml"
-#
-# Then I want to set the input data to:
-# """
-# {"modules":[{"name":"module_1","isBase":false,"yaml":"CB_BASE.yaml"}],"unassigned":[],"artifacts":["MUX_Parameters.env","CB_MUX.yaml"],"nested":[]}
-# """
-# Then I want to update for path "/vendor-software-products/{item.id}/versions/{item.versionId}/orchestration-template-candidate/manifest" with the input data from the context
-# Then I want to process the NetworkPackage file for this VSP
-# Then I want to check property "errors['CB_MUX.yaml'][0].level" for value "WARNING" \ No newline at end of file
+ When I want to download the NetworkPackage for this VSP to path "resources/downloads/base_mux.zip"
+ Then I want to check property "data[0].file" for value "CB_BASE.yaml"
+
+ When I want to upload a NetworkPackage for this VSP from path "resources/uploads/BASE_MUX_with_no_base.zip"
+ Then I want to process the NetworkPackage file for this VSP
+ Then I want to check property "errors['CB_MUX.yaml'][0].level" for value "WARNING" \ No newline at end of file
diff --git a/openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zip b/openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zip
new file mode 100644
index 0000000000..8698ef7e4c
--- /dev/null
+++ b/openecomp-bdd/resources/uploads/BASE_MUX_with_no_base.zip
Binary files differ