Removed the line break before and after options over UI,

Added a 'version' field validation over the E2E test.

Issue-ID: VID-691
Signed-off-by: Amir Skalka <amir.skalka@intl.att.com>
Change-Id: I52205e819a373458c47b8a48239c4bdb309a0bae

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
index d3cb239..1e06df2 100644 (file)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/modals/new-change-management/new-change-management.html
@@ -132,9 +132,7 @@
                                 class="vnf-versions-select-as-text"
                                 id="{{vnfName['invariant-id']}}-target-version-select">
                             <option value="" disabled="" selected="selected">Select Target VNF Model Version</option>
-                            <option ng-repeat="version in vnfName.availableVersions">
-                                {{version.modelInfo.modelVersion}}
-                            </option>
+                            <option ng-repeat="version in vnfName.availableVersions">{{version.modelInfo.modelVersion}}</option>
                         </select>
                     </td>
                     <td class="col-md-1 vnf-versions-file">

diff --git a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
index ef13fce..351e5b0 100644 (file)
--- a/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
+++ b/vid-automation/src/main/java/vid/automation/test/test/ChangeManagementTest.java
@@ -640,7 +640,8 @@ public class ChangeManagementTest extends VidBaseTestCase {
                         "widgetData", ImmutableMap.builder()
                                 .put("vnfNames", ImmutableList.of(ImmutableMap.of(
                                         "id", vnfInstanceId,
-                                        "invariant-id", modelInvariantId
+                                        "invariant-id", modelInvariantId,
+                                        "version", "5.0"
                                 )))
                                 .put("workflowParameters", emptyMap())
                                 .put("subscriberId", "a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb")