Merge from ECOMP's repository

[vid.git] / vid-app-common / src / main / webapp / app / vid / scripts / view-models / instantiate.htm

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 64f7132..d9a29e0 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
@@ -34,7 +34,7 @@
                        <label>Status:</label><span class="status">{{status}}</span>\r
                </div>\r
 \r
-        <div ng-if="errorMsg != null" style="white-space: pre-line"><font color='red'>{{errorMsg}}\r
+        <div class="error-msg" ng-if="errorMsg != null" style="white-space: pre-line"><font color='red'>{{errorMsg}}\r
             <pre>{{errorDetails | json}}</pre>\r
         </font></div>\r
 \r
@@ -181,12 +181,17 @@
                                style="margin-right: 8px;">\r
                                 Deactivate\r
                             </a>\r
-                            <a data-tests-id="activateButton" ng-disabled="!isActivateDeactivateEnabled('activate')"\r
+                            <a ng-if="!isActivateFabricConfiguration()" data-tests-id="activateButton" ng-disabled="!isActivateDeactivateEnabled('activate')"\r
                                class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="activateMSOInstance()"\r
                                style="margin-right: 8px;">\r
                                 Activate\r
                             </a>\r
-                            <a data-tests-id="showAssignmentsButton" ng-disabled="!isShowAssignmentsEnabled()"\r
+                            <a ng-if="isActivateFabricConfiguration()" data-tests-id="activateFabricConfigurationButton" ng-disabled="!allConfigurationsAssigned"\r
+                               class="pull-right btn btn-primary btn-xs" data-nodrag ng-click="activateFabricConfigurationMSO()"\r
+                               style="margin-right: 8px;">\r
+                                Activate Fabric Configuration\r
+                            </a>\r
+                            <a data-tests-id="showAssignmentsButton" ng-if="isShowAssignmentsEnabled()"\r
                                class="pull-right btn btn-primary btn-xs" data-nodrag style="margin-right: 8px;"\r
                                target="_blank" ng-href="{{showAssignmentsSDNC()}}">\r
                                 Show Assignments\r
@@ -377,6 +382,25 @@
                                         </div>\r
                                     </li>\r
                                 </ol>\r
+\r
+                                <ol ui-tree-nodes="" ng-model="vnf.networks"\r
+                                    ng-class="{hidden: collapsed}">\r
+                                    <li ng-repeat="network in vnf.networks" ui-tree-node>\r
+                                        <div ui-tree-handle class="tree-node tree-node-content">\r
+                                            NETWORK: {{network.name}} | TYPE: {{network.nodeType}} | ORCH\r
+                                            STATUS: {{network.nodeStatus}}\r
+                                        </div>\r
+                                        <ol ui-tree-nodes="" ng-model="network.vlans" ng-class="{hidden: collapsed}">\r
+                                            <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
+                                                </div>\r
+\r
+                                            </li>\r
+                                        </ol>\r
+                                    </li>\r
+                                </ol>\r
                             </li>\r
                         </ol>\r
 \r
@@ -400,6 +424,16 @@
                                         <span class="glyphicon glyphicon-info-sign network-info"></span>\r
                                     </a>\r
                                 </div>\r
+\r
+                                <ol ui-tree-nodes="" ng-model="network.vlans" ng-class="{hidden: collapsed}">\r
+                                    <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
+                                        </div>\r
+\r
+                                    </li>\r
+                                </ol>\r
                             </li>\r
                         </ol>\r
 \r