From 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 Mon Sep 17 00:00:00 2001
From: Ittay Stern <ittay.stern@att.com>
Date: Mon, 31 Dec 2018 17:21:27 +0200
Subject: Merge from ECOMP's repository

Main Features
--------------

-  Async-Instantiation jobs mechanism major update; still WIP (package
   `org.onap.vid.job`)

-  New features in View/Edit: Activate fabric configuration; show
   related networks; soft delete

-  Support AAI service-tree traversal (`AAIServiceTree`)

-  In-memory cache for SDC models and certain A&AI queries
   (`CacheProviderWithLoadingCache`)

-  Upgrade TOSCA Parser and add parsing options; fix malformed TOSCA
   models

-  Resolve Cloud-Owner values for MSO

-  Pass X-ONAP headers to MSO

Infrastructure
--------------
-  Remove codehaus' jackson mapper; use soley fasterxml 2.9.7
-  Surefire invokes both TestNG and JUnit tests
-  Support Kotlin source files
-  AaiController2 which handles errors in a "Spring manner"
-  Inline generated-sources and remove jsonschema2pojo

Quality
--------
-  Cumulative bug fixes (A&AI API, UI timeouts, and many more)
-  Many Sonar issues cleaned-up
-  Some unused classes removed
-  Minor changes in vid-automation project, allowing some API
   verification to run

Hard Merges
------------
-  HTTP Clients (MSO, A&AI, WebConfig, OutgoingRequestHeadersTest)
-  Moved `package org.onap.vid.controllers` to `controller`, without
   plural -- just to keep semantic sync with ECOMP.

Reference commit in ECOMP: 3d1141625

Issue-ID: VID-378
Change-Id: I9c8d1e74caa41815891d441fc0760bb5f29c5788
Signed-off-by: Ittay Stern <ittay.stern@att.com>
---
 .../app/vid/scripts/view-models/instantiate.htm    | 40 ++++++++++++++++++++--
 1 file changed, 37 insertions(+), 3 deletions(-)

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