Resolving some tests in CreatePortMirroringConfigurationTest by merging instantiate...

Issue-ID: VID-546
Signed-off-by: RachelF <rachel.fishbein@intl.att.com>
Change-Id: Icf4ffd6c2eb26cb5cf5842f9d6bfb153431d136b

diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
index ceccb0a..f80f924 100755 (executable)
--- a/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm
@@ -20,19 +20,19 @@
 \r
 <div>\r
 \r
-       <div popup-window class="popupContents" ngx-show="{{popup.isVisible}}"\r
-                ng-cloak>\r
-               <div ng-include="'app/vid/scripts/view-models/creationDialog.htm'"></div>\r
-               <div ng-include="'app/vid/scripts/view-models/deleteResumeDialog.htm'"></div>\r
-               <div ng-include="'app/vid/scripts/view-models/detailsDialog.htm'"></div>\r
-               <div ng-include="'app/vid/scripts/view-models/statusDialog.htm'"></div>\r
-           <div ng-include="'app/vid/scripts/view-models/iframeDialog.htm'"></div>\r
-       </div>\r
-       <div ng-controller="aaiSubscriberController" ng-init="getComponentList() ">\r
-               <div class="statusLine" ng-class="{true:'aaiVisible', false:'aaiHidden'}[isSpinnerVisible]">\r
-                       <img src="app/vid/images/spinner.gif"></img>\r
-                       <label>Status:</label><span class="status">{{status}}</span>\r
-               </div>\r
+    <div popup-window class="popupContents" ngx-show="{{popup.isVisible}}"\r
+         ng-cloak>\r
+        <div ng-include="'app/vid/scripts/view-models/creationDialog.htm'"></div>\r
+        <div ng-include="'app/vid/scripts/view-models/deleteResumeDialog.htm'"></div>\r
+        <div ng-include="'app/vid/scripts/view-models/detailsDialog.htm'"></div>\r
+        <div ng-include="'app/vid/scripts/view-models/statusDialog.htm'"></div>\r
+        <div ng-include="'app/vid/scripts/view-models/iframeDialog.htm'"></div>\r
+    </div>\r
+    <div ng-controller="aaiSubscriberController" ng-init="getComponentList() ">\r
+        <div class="statusLine" ng-class="{true:'aaiVisible', false:'aaiHidden'}[isSpinnerVisible]">\r
+            <img src="app/vid/images/spinner.gif"></img>\r
+            <label>Status:</label><span class="status">{{status}}</span>\r
+        </div>\r
 \r
         <div class="error-msg" ng-if="errorMsg != null" style="white-space: pre-line"><font color='red'>{{errorMsg}}\r
             <pre>{{errorDetails | json}}</pre>\r
@@ -394,7 +394,7 @@
                                             <li ng-repeat="vlan in network.vlans" ui-tree-node>\r
                                                 <div ui-tree-handle class="tree-node tree-node-content"\r
                                                      ng-class="'vlansTreeNode'">\r
-                                                    VLAN: {{vlan.vlanIdInner}} | TYPE: VLAN\r
+                                                    VLAN: {{vlan.vlanIdOuter}} | TYPE: VLAN\r
                                                 </div>\r
 \r
                                             </li>\r
@@ -429,7 +429,7 @@
                                     <li ng-repeat="vlan in network.vlans" ui-tree-node>\r
                                         <div ui-tree-handle class="tree-node tree-node-content"\r
                                              ng-class="'vlansTreeNode'">\r
-                                            VLAN: {{vlan.vlanIdInner}} | TYPE: VLAN\r
+                                            VLAN: {{vlan.vlanIdOuter}} | TYPE: VLAN\r
                                         </div>\r
 \r
                                     </li>\r
@@ -452,7 +452,7 @@
                                     <a class="pull-right btn btn-danger btn-xs"\r
                                        ng-if="!isMacro() && isPermitted && configuration.nodeStatus !== STATUS_CONSTANTS.AAI_ACTIVE"\r
                                        ng-disabled="!isConfigurationDataAvailiable(configuration)"\r
-                                       data-tests-id="deleteConfigurationButton"\r
+                                       data-tests-id="deleteConfigurationButton-{{configuration.name}}"\r
                                        data-nodrag\r
                                        ng-click="deleteConfiguration(aService, configuration)">\r
                                         <span class="glyphicon glyphicon-remove"></span>\r
@@ -461,9 +461,9 @@
 \r
                                     <a class="pull-right btn btn-primary btn-xs" data-nodrag\r
                                        ng-click="toggleConfigurationStatus(aService, configuration)"\r
-                                       ng-if="isPermitted && allowConfigurationActions"\r
+                                       ng-if="isPermitted && allowConfigurationActions(configuration)"\r
                                        ng-disabled="!isConfigurationDataAvailiable(configuration)"\r
-                                       data-tests-id="activateDeactivateButton">\r
+                                       data-tests-id="activateDeactivateButton-{{configuration.name}}">\r
                                         {{configuration.nodeStatus === STATUS_CONSTANTS.AAI_ACTIVE ? "Deactivate" :\r
                                         "Activate"}}\r
                                     </a>\r
@@ -473,7 +473,7 @@
                                         <div ui-tree-handle class="tree-node tree-node-content">\r
                                             PORT: {{port.portName}} | ORCH STATUS: {{port.portStatus}}\r
 \r
-                                            <button type="button" data-tests-id="enableDisableButton"\r
+                                            <button type="button" data-tests-id="enableDisableButton-{{configuration.name}}-{{port.portName}}"\r
                                                     class="pull-right btn btn-primary btn-xs"\r
                                                     ng-if="configuration.nodeStatus == STATUS_CONSTANTS.AAI_ACTIVE"\r
                                                     ng-disabled="!isConfigurationDataAvailiable(configuration)"\r