Added subscriber S/C tags
diff --git a/views/ngXosViews/diagnostic/src/js/logicTopology.js b/views/ngXosViews/diagnostic/src/js/logicTopology.js
index a3501dd..5ca0b30 100644
--- a/views/ngXosViews/diagnostic/src/js/logicTopology.js
+++ b/views/ngXosViews/diagnostic/src/js/logicTopology.js
@@ -11,7 +11,7 @@
bindToController: true,
controllerAs: 'vm',
templateUrl: 'templates/logicTopology.tpl.html',
- controller: function($element, $log, $scope, $rootScope, $timeout, d3, LogicTopologyHelper, Node, Tenant, Ceilometer){
+ controller: function($element, $log, $scope, $rootScope, $timeout, d3, LogicTopologyHelper, Node, Tenant, Ceilometer, serviceTopologyConfig){
$log.info('Logic Plane');
var svg;
@@ -29,8 +29,6 @@
$scope.$watch(() => this.subscribers, (subscribers) => {
if(subscribers){
- // LogicTopologyHelper.addSubscribers(angular.copy(subscribers));
-
Node.queryWithInstances().$promise
.then((computeNodes) => {
LogicTopologyHelper.addComputeNodes(computeNodes);
@@ -43,6 +41,17 @@
$scope.$watch(() => this.selected, (selected) => {
if(selected){
$log.info(`Update logic layer for subscriber ${selected.humanReadableName}`);
+
+ // append the device with to config settings
+ serviceTopologyConfig.elWidths.push(160);
+
+ LogicTopologyHelper.addSubscriber(angular.copy(selected));
+
+ Tenant.getSubscriberTag({subscriber_root: selected.id}).$promise
+ .then((tags) => {
+ LogicTopologyHelper.addSubscriberTag(tags);
+ LogicTopologyHelper.updateTree(svg);
+ })
}
});
@@ -57,6 +66,10 @@
$rootScope.$on('instance.detail', (evt, service) => {
+ // NOTE consider if subscriber is selected or not,
+ // if not select instances
+ // else select containers (and follow subscriber chain to find the correct instance)
+
let param = {
'service_vsg': {kind: 'vCPE'},
'service_vbng': {kind: 'vBNG'},
@@ -69,6 +82,7 @@
return Ceilometer.getInstancesStats(instances);
})
.then((instances) => {
+ console.log(instances);
this.hideInstanceStats = false;
// HACK if array is empty wait for animation
if(instances.length === 0){
@@ -97,7 +111,6 @@
$scope.$apply();
};
-
// listen for subscriber modal event
$rootScope.$on('subscriber.modal.open', () => {
this.openSubscriberModal();