When ports are added to a container, construct its topology immediately based on...

[controller.git] / opendaylight / protocol_plugins / openflow / src / main / java / org / opendaylight / controller / protocol_plugin / openflow / internal / TopologyServices.java

diff --git a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
index 57a7b03dd91d1d74866350e476b390e8a2f3fa43..68572fb65086ef4c7901dc4179caf03e57c12233 100644 (file)
--- a/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
+++ b/opendaylight/protocol_plugins/openflow/src/main/java/org/opendaylight/controller/protocol_plugin/openflow/internal/TopologyServices.java
@@ -1,4 +1,3 @@
-
 /*
  * Copyright (c) 2013 Cisco Systems, Inc. and others.  All rights reserved.
  *
@@ -10,8 +9,7 @@
 package org.opendaylight.controller.protocol_plugin.openflow.internal;
 
 import java.util.Dictionary;
-import java.util.Set;
-
+import java.util.List;
 import org.apache.felix.dm.Component;
 import org.opendaylight.controller.protocol_plugin.openflow.IRefreshInternalProvider;
 import org.opendaylight.controller.protocol_plugin.openflow.ITopologyServiceShimListener;
@@ -19,10 +17,9 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import org.opendaylight.controller.sal.core.Edge;
-import org.opendaylight.controller.sal.core.Property;
-import org.opendaylight.controller.sal.core.UpdateType;
 import org.opendaylight.controller.sal.topology.IPluginInTopologyService;
 import org.opendaylight.controller.sal.topology.IPluginOutTopologyService;
+import org.opendaylight.controller.sal.topology.TopoEdgeUpdate;
 
 public class TopologyServices implements ITopologyServiceShimListener,
         IPluginInTopologyService {
@@ -39,62 +36,63 @@ public class TopologyServices implements ITopologyServiceShimListener,
      */
     @SuppressWarnings("unchecked")
     void init(Component c) {
-        logger.debug("INIT called!");
+        logger.trace("INIT called!");
         Dictionary<Object, Object> props = c.getServiceProperties();
         containerName = (props != null) ? (String) props.get("containerName")
                 : null;
     }
 
     /**
-     * Function called by the dependency manager when at least one
-     * dependency become unsatisfied or when the component is shutting
-     * down because for example bundle is being stopped.
+     * Function called by the dependency manager when at least one dependency
+     * become unsatisfied or when the component is shutting down because for
+     * example bundle is being stopped.
      *
      */
     void destroy() {
-        logger.debug("DESTROY called!");
+        logger.trace("DESTROY called!");
     }
 
     /**
-     * Function called by dependency manager after "init ()" is called
-     * and after the services provided by the class are registered in
-     * the service registry
+     * Function called by dependency manager after "init ()" is called and after
+     * the services provided by the class are registered in the service registry
      *
      */
     void start() {
-        logger.debug("START called!");
+        logger.trace("START called!");
     }
 
     /**
-     * Function called by the dependency manager before the services
-     * exported by the component are unregistered, this will be
-     * followed by a "destroy ()" calls
+     * Function called by the dependency manager before the services exported by
+     * the component are unregistered, this will be followed by a "destroy ()"
+     * calls
      *
      */
     void stop() {
-        logger.debug("STOP called!");
+        logger.trace("STOP called!");
     }
 
     /**
      * Retrieve SAL service IPluginOutTopologyService
      *
-     * @param s Called by Dependency Manager as soon as the SAL
-     * service is available
+     * @param s
+     *            Called by Dependency Manager as soon as the SAL service is
+     *            available
      */
     public void setPluginOutTopologyService(IPluginOutTopologyService s) {
-        logger.debug("Setting IPluginOutTopologyService to:" + s);
+        logger.trace("Setting IPluginOutTopologyService to: {}", s);
         this.salTopoService = s;
     }
 
     /**
      * called when SAL service IPluginOutTopologyService is no longer available
      *
-     * @param s Called by Dependency Manager as soon as the SAL
-     * service is unavailable
+     * @param s
+     *            Called by Dependency Manager as soon as the SAL service is
+     *            unavailable
      */
     public void unsetPluginOutTopologyService(IPluginOutTopologyService s) {
         if (this.salTopoService == s) {
-            logger.debug("UNSetting IPluginOutTopologyService from:" + s);
+            logger.trace("UNSetting IPluginOutTopologyService from: {}", s);
             this.salTopoService = null;
         }
     }
@@ -102,32 +100,34 @@ public class TopologyServices implements ITopologyServiceShimListener,
     /**
      * Retrieve OF protocol_plugin service IRefreshInternalProvider
      *
-     * @param s Called by Dependency Manager as soon as the SAL
-     * service is available
+     * @param s
+     *            Called by Dependency Manager as soon as the SAL service is
+     *            available
      */
     public void setRefreshInternalProvider(IRefreshInternalProvider s) {
-        logger.debug("Setting IRefreshInternalProvider to:" + s);
+        logger.trace("Setting IRefreshInternalProvider to: {}", s);
         this.topoRefreshService = s;
     }
 
     /**
-     * called when OF protocol_plugin service IRefreshInternalProvider
-     * is no longer available
+     * called when OF protocol_plugin service IRefreshInternalProvider is no
+     * longer available
      *
-     * @param s Called by Dependency Manager as soon as the SAL
-     * service is unavailable
+     * @param s
+     *            Called by Dependency Manager as soon as the SAL service is
+     *            unavailable
      */
     public void unsetRefreshInternalProvider(IRefreshInternalProvider s) {
         if (this.topoRefreshService == s) {
-            logger.debug("UNSetting IRefreshInternalProvider from:" + s);
+            logger.trace("UNSetting IRefreshInternalProvider from: {}", s);
             this.topoRefreshService = null;
         }
     }
 
     @Override
-    public void edgeUpdate(Edge edge, UpdateType type, Set<Property> props) {
+    public void edgeUpdate(List<TopoEdgeUpdate> topoedgeupdateList) {
         if (this.salTopoService != null) {
-            this.salTopoService.edgeUpdate(edge, type, props);
+            this.salTopoService.edgeUpdate(topoedgeupdateList);
         }
     }