From 514939ff19a8838e45934f90af039fbeea12fd40 Mon Sep 17 00:00:00 2001
From: Daniel Malachovsky <daniel.malachovsky@pantheon.sk>
Date: Tue, 9 Feb 2016 20:16:14 +0100
Subject: Design changes p. 1

- fixed some design flaws
- added tunnel table into inventory detail
- added filter to remove vxlan_tunnel from interfaces list in bd mnager

Change-Id: Ia9f0ca737d062ed2ed57734561dbece34d20b7c3
Signed-off-by: Daniel Malachovsky <daniel.malachovsky@pantheon.sk>
---
 .../vpp/controllers/inventory.controller.js        | 43 ++++++++++++----------
 1 file changed, 23 insertions(+), 20 deletions(-)

(limited to 'vbd/gui/module/src/main/resources/vpp/controllers/inventory.controller.js')

diff --git a/vbd/gui/module/src/main/resources/vpp/controllers/inventory.controller.js b/vbd/gui/module/src/main/resources/vpp/controllers/inventory.controller.js
index 7f2a4ec0c..b1797534a 100644
--- a/vbd/gui/module/src/main/resources/vpp/controllers/inventory.controller.js
+++ b/vbd/gui/module/src/main/resources/vpp/controllers/inventory.controller.js
@@ -20,7 +20,7 @@ define(['app/vpp/vpp.module'], function(vpp) {
                         $scope.vppList = data;
                         $scope.displayVppList = [].concat($scope.vppList);
                         dataService.vpps = $scope.vppList;
-
+console.log($scope.vppList);
                         $scope.$broadcast('RELOAD_VPP_TABLE');
 
                         //for vppList access in BDM
@@ -222,28 +222,31 @@ define(['app/vpp/vpp.module'], function(vpp) {
                 $scope.app.container(document.getElementById('next-vpp-topo'));
                 $scope.topo.attach($scope.app);
 
-                $scope.$watch('selectedVpp', function() {
-                    vm.vpp = vpp;
-                    vm.vpp.type = 'vpp';
-                    vm.vpp.label = vm.vpp.name;
-
-                    var nodes = [].concat(vm.vpp);
-                    var links = [];
-
-                    _.forEach(vm.vpp.interfaces, function(interf, index){
-                        interf.label = interf.name;
-                        interf.scale = 0.5;
-                        nodes.push(interf);
-                        links.push({source: 0, target: index + 1});
-                    });
-
-                    $scope.topo.data({
-                        nodes: nodes,
-                        links: links
-                    });
+            };
+
+            $scope.fillTopologyData = function(vpp) {
+                var nodes = [].concat(vpp);
+                var links = [];
+                vpp.type  = 'vpp';
+                vpp.label = vpp.name;
+
+                _.forEach(vpp.interfaces, function(interf, index){
+                    interf.label = interf.name;
+                    interf.scale = 0.5;
+                    nodes.push(interf);
+                    links.push({source: 0, target: index + 1});
+                });
+
+                $scope.topo.data({
+                    nodes: nodes,
+                    links: links
                 });
             };
 
+            $scope.$watch('selectedVpp', function() {
+                $scope.fillTopologyData($scope.selectedVpp);
+            });
+
             $scope.viewTopology($scope.selectedVpp);
 
         }]);
-- 
cgit 1.2.3-korg