Merge "Add TLS support in the Opendaylight Controller: - TLS configuration is specifi...

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
index 2ee1583af7ebebe7f089f2992220f69e25338ade..3cd696854c3c9d89a6f6d5543b3ce276f751dfbc 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
+++ b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/Activator.java
@@ -84,7 +84,7 @@ public class Activator extends ComponentActivatorAbstractBase {
             // provider of service exists
             c.add(createContainerServiceDependency(containerName).setService(
                     IListenRoutingUpdates.class).setCallbacks(
-                    "setLIstenRoutingUpdates", "unsetLIstenRoutingUpdates")
+                    "setListenRoutingUpdates", "unsetListenRoutingUpdates")
                     .setRequired(false));
 
             c.add(createContainerServiceDependency(containerName).setService(

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
index 6f1dc3f9d707bd49016a67005ef88799349bd64f..05ec5d40530919941dd69f67a197111c7a565687 100644 (file)
--- a/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
+++ b/opendaylight/routing/dijkstra_implementation/src/main/java/org/opendaylight/controller/routing/dijkstra_implementation/internal/DijkstraImplementation.java
@@ -71,7 +71,7 @@ public class DijkstraImplementation implements IRouting, ITopologyManagerAware {
         }
     }
 
-    public void unsetRoutingUpdates(IListenRoutingUpdates i) {
+    public void unsetListenRoutingUpdates(IListenRoutingUpdates i) {
         if (this.routingAware == null) {
             return;
         }

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component-factory.xml b/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component-factory.xml
deleted file mode 100644 (file)
index d71bef8..0000000
--- a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component-factory.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
- activate="factoryStartUp" deactivate="factoryShutDown"
- factory="routing.dijkstra_implementation.factory" name="routing.dijkstra_implementation.ComponentFactory">
-   <implementation class="org.opendaylight.controller.routing.dijkstra_implementation.internal.DijkstraImplementation"/>
-   <service>
-      <provide interface="org.osgi.service.component.ComponentFactory"/>
-   </service>
-</scr:component>

diff --git a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml b/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml
deleted file mode 100644 (file)
index 4f9cdc8..0000000
--- a/opendaylight/routing/dijkstra_implementation/src/main/resources/OSGI-INF/component.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<scr:component xmlns:scr="http://www.osgi.org/xmlns/scr/v1.1.0"
-               activate="startUp"
-               deactivate="shutDown"
-               name="routing.dijkstra_implementation.Component">
-  <implementation class="org.opendaylight.controller.routing.dijkstra_implementation.internal.DijkstraImplementation"/>
-
-  <service>
-    <provide interface="org.opendaylight.controller.sal.routing.IRouting"/>
-    <provide interface="org.opendaylight.controller.topologymanager.ITopologyManagerAware"/>
-  </service>
-  <reference name="IListenRoutingUpdates"
-             bind="setListenRoutingUpdates"
-             unbind="unsetRoutingUpdates"
-             cardinality="0..n"
-             policy="dynamic"
-             interface="org.opendaylight.controller.sal.routing.IListenRoutingUpdates"/>
-</scr:component>

diff --git a/opendaylight/web/root/src/main/resources/js/one-topology.js b/opendaylight/web/root/src/main/resources/js/one-topology.js
index fc06a8c9882ec2e20aec2c75563a10ceda3422e4..27aabca6fd7c9ffc35c2127ab0a6bd0ea4be156b 100644 (file)
--- a/opendaylight/web/root/src/main/resources/js/one-topology.js
+++ b/opendaylight/web/root/src/main/resources/js/one-topology.js
@@ -108,10 +108,14 @@ one.topology.init = function(json) {
                        enable: true,
                        type: 'Native',
                        onMouseEnter: function(node, eventInfo, e) {
-                               if (node.id != undefined) // if node
+                               // if node
+                               if (node.id != undefined) {
                                        one.topology.graph.canvas.getElement().style.cursor = 'move';
-                               else if (eventInfo.edge != undefined && eventInfo.edge.nodeTo.data["$type"] == "swtch" && eventInfo.edge.nodeFrom.data["$type"] == "swtch")
+                               } else if (eventInfo.edge != undefined && 
+                                               eventInfo.edge.nodeTo.data["$type"] == "swtch" && 
+                                               eventInfo.edge.nodeFrom.data["$type"] == "swtch") {
                                        one.topology.graph.canvas.getElement().style.cursor = 'pointer';
+                               }
                        },
                        onMouseLeave: function(node, eventInfo, e) {
                                one.topology.graph.canvas.getElement().style.cursor = '';
@@ -137,7 +141,11 @@ one.topology.init = function(json) {
                                $.post('/controller/web/topology/node/' + did, data);
                        },
                        onClick: function(node, eventInfo, e) {
-                               return false;
+                               if(one.f.topology === undefined) {
+                                       return false;
+                               } else {
+                                       one.f.topology.Events.onClick(node, eventInfo);
+                               }
                        }
                },
                iterations: 200,
@@ -177,6 +185,7 @@ one.topology.init = function(json) {
                        style.textAlign = "center";
                }
        });
+
        one.topology.graph.loadJSON(json);
        // compute positions incrementally and animate.
        one.topology.graph.computeIncremental({
@@ -194,7 +203,7 @@ one.topology.init = function(json) {
                                        node.setPos(new $jit.Complex(x, y), "end");
                                }
                        }
-                       console.log('done');
+                        console.log('done');
                        one.topology.graph.animate({
                                modes: ['linear'],
                                transition: $jit.Trans.Elastic.easeOut,
@@ -215,4 +224,4 @@ one.topology.update = function() {
 /** INIT */
 $.getJSON(one.global.remoteAddress+"controller/web/topology/visual.json", function(data) {
        one.topology.init(data);
-});
\ No newline at end of file
+});