Bug 3810 - Topology cannot zoom or show different switch groups

Revert to the Helium topology graph.

Change-Id: Iff971df695b6bc32841e77001b9decced909e340
Signed-off-by: Maxime Millette-Coulombe <mmcoulombe@inocybe.com>
(cherry picked from commit a89b9e8b0cb8c7f779d43a2fd656b29450539aa3)

diff --git a/modules/loader-resources/src/main/resources/main.js b/modules/loader-resources/src/main/resources/main.js
index 75db715fc3700c256ab0638bc51530518dd4b2b9..0ba9c55e93bb654722a691ee2d44005f2dabb3d8 100644 (file)
--- a/modules/loader-resources/src/main/resources/main.js
+++ b/modules/loader-resources/src/main/resources/main.js
@@ -43,6 +43,9 @@ require.config({
     'pixi' : {
         exports: 'PIXI'
     },
+    'vis' : {
+        exports: 'vis'
+    },
     'graphRenderer' : ['pixi'],
     'jquery' : {
       exports : '$'

diff --git a/modules/loader-resources/src/main/resources/test-main.js b/modules/loader-resources/src/main/resources/test-main.js
index 7ea1e49ac38f3446fbff6057ac9b9dfa74354c77..0018ed27d0e44df99723c56e20f42d7e6134c5c2 100644 (file)
--- a/modules/loader-resources/src/main/resources/test-main.js
+++ b/modules/loader-resources/src/main/resources/test-main.js
@@ -68,6 +68,9 @@ var test = require.config({
     'pixi' : {
         exports: 'PIXI'
     },
+    'vis' : {
+        exports: 'vis'
+    },
     'graphRenderer' : ['pixi'],
     'jquery' : {
       exports : '$'

diff --git a/modules/topology-resources/src/main/resources/topology/topology.controller.js b/modules/topology-resources/src/main/resources/topology/topology.controller.js
index 9ab75eacff3056e1d4dca3fa372f8a9c32f4fed9..3d66d5addeb4d08a84f672403357009f3a5dd7b3 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.controller.js
+++ b/modules/topology-resources/src/main/resources/topology/topology.controller.js
@@ -1,5 +1,4 @@
-define(['app/topology/topology.module','app/topology/topology.services', 'graphRenderer', 'pixi'], function(topology, service, GraphRenderer, PIXI) {
-  window.PIXI = PIXI; // attach pixijs to global scope
+define(['app/topology/topology.module','app/topology/topology.services', 'app/topology/topology.directives'], function(topology, service) {
 
   topology.register.controller('TopologyCtrl', ['$scope', '$rootScope', 'NetworkTopologySvc' ,  function ($scope, $rootScope, NetworkTopologySvc) {
     $rootScope['section_logo'] = 'assets/images/logo_topology.gif';
@@ -12,16 +11,7 @@ define(['app/topology/topology.module','app/topology/topology.services', 'graphR
           var step = 30;
           data.nodes.push({id: 1001, x: x, y: y + step, label: 'Switch', group: 'switch',value:20});
           data.nodes.push({id: 1003, x: x, y: y + 3 * step, label: 'Host', group: 'host',value:20});*/
-
-          var inNodes = data.nodes;
-          var inEdges = data.links;
-          if (!graphRenderer) {
-            graphRenderer = new GraphRenderer();
-            graphRenderer.loadGraph(inNodes, inEdges);
-            graphRenderer.start('topology_simple');
-          } else {
-            graphRenderer.refresh(inNodes, inEdges);
-          }
+          $scope.topologyData = data;
       });
     };
 

diff --git a/modules/topology-resources/src/main/resources/topology/topology.directives.js b/modules/topology-resources/src/main/resources/topology/topology.directives.js
index 12a84c9d888c374bec70153944cc6408f43154fe..3d223e4cf50b9e0b4eb08eaeb5665e0b70401d93 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.directives.js
+++ b/modules/topology-resources/src/main/resources/topology/topology.directives.js
@@ -1,10 +1,9 @@
-define(['app/topology/topology.module', 'd3', 'vis'], function(topology) {
+define(['app/topology/topology.module', 'vis'], function(topology, vis) {
 
   topology.register.directive('topologySimple', function() {
     // constants
     var width = 800,
-        height = 800,
-        fill = d3.scale.category20();
+      height = 800;
 
     return {
       restrict: 'E',

diff --git a/modules/topology-resources/src/main/resources/topology/topology.tpl.html b/modules/topology-resources/src/main/resources/topology/topology.tpl.html
index 138acc2dc73dd38b326b6b0ea04f8bafa65bab9f..faa185cba251f1226c968b13210f44d80452bfdf 100644 (file)
--- a/modules/topology-resources/src/main/resources/topology/topology.tpl.html
+++ b/modules/topology-resources/src/main/resources/topology/topology.tpl.html
@@ -12,6 +12,6 @@
       <h3>Controls</h3>
       <button class="btn btn-primary" ng-click="createTopology()">Reload</button>
     </div>
-    <div class="col-md-10 col-lg-offset-1" id="topology_simple"></div>
+    <topology-simple class="col-md-10 col-lg-offset-1" topology-data="topologyData"></topology-simple>
   </div>
 </div>