diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-01-10 12:42:59 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-01-10 12:42:59 +0000 |
| commit | 659874df80409170e57b6dd6197eb3a81eb3468e (patch) | |
| tree | 08e79fd57aa0ed299586fd88f69f87a5a2f5ded1 /vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm | |
| parent | 143784a849ece4fc35cc290e33f829b72bf1fc79 (diff) | |
| parent | 6ad41e3ccd398a2721f41ad61c80b7bb03f7d127 (diff) | |
Merge "Merge from ECOMP's repository"
Diffstat (limited to 'vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm')
| -rwxr-xr-x | vid-app-common/src/main/webapp/app/vid/scripts/view-models/instantiate.htm | 40 |
1 files changed, 37 insertions, 3 deletions
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 64f71325..d9a29e03 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>
|