Remove BindingAwareBroker

This is legacy API and not used in the implementation for any real
purpose. Remove references to it.

Change-Id: I4648c35cdd2a8aedd84c79f517b078fd29cffd23
Signed-off-by: Robert Varga <rovarga@cisco.com>

diff --git a/mappingservice/southbound/src/main/config/default-config.xml b/mappingservice/southbound/src/main/config/default-config.xml
index 7ea378efb17b4aabed4d9bbf4afbc7c99efd2df3..df6e25e0e98510afed59f168dc13fbd45739c62f 100644 (file)
--- a/mappingservice/southbound/src/main/config/default-config.xml
+++ b/mappingservice/southbound/src/main/config/default-config.xml
@@ -21,13 +21,6 @@
             <name>binding-rpc-broker</name>
           </rpc-registry>
 
-          <broker>
-            <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
-              binding:binding-broker-osgi-registry
-            </type>
-            <name>binding-osgi-broker</name>
-          </broker>
-
           <notification-publish-service>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl">
               binding:binding-new-notification-publish-service

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/controller/config/yang/config/lisp_sb/impl/LfmMappingServiceSbModule.java b/mappingservice/southbound/src/main/java/org/opendaylight/controller/config/yang/config/lisp_sb/impl/LfmMappingServiceSbModule.java
index 41cc57a72385de191acaf99fc6712e8075c5c479..228c68974ea9bfc70affb66b5bf898ea3a2a907e 100644 (file)
--- a/mappingservice/southbound/src/main/java/org/opendaylight/controller/config/yang/config/lisp_sb/impl/LfmMappingServiceSbModule.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/controller/config/yang/config/lisp_sb/impl/LfmMappingServiceSbModule.java
@@ -36,7 +36,6 @@ public class LfmMappingServiceSbModule extends org.opendaylight.controller.confi
         sbPlugin = new LispSouthboundPlugin();
         sbPlugin.setNotificationPublishService(getNotificationPublishServiceDependency());
         sbPlugin.setRpcRegistryDependency(getRpcRegistryDependency());
-        sbPlugin.setBindingAwareBroker(getBrokerDependency());
         sbPlugin.init();
 
         return sbPlugin;

diff --git a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
index bdf4e5371ce79a51b52cc80067e8ee17adfde097..4a260f2201f2f8871974f1180b1e7c3a3b4964d6 100644 (file)
--- a/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
+++ b/mappingservice/southbound/src/main/java/org/opendaylight/lispflowmapping/southbound/LispSouthboundPlugin.java
@@ -25,9 +25,7 @@ import java.net.InetSocketAddress;
 import java.nio.ByteBuffer;
 import java.util.concurrent.ThreadFactory;
 import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
 import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
 import org.opendaylight.lispflowmapping.lisp.type.LispMessage;
 import org.opendaylight.lispflowmapping.southbound.lisp.LispSouthboundHandler;
@@ -41,7 +39,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.common.net.InetAddresses;
 
-public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCloseable, BindingAwareProvider {
+public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCloseable {
     protected static final Logger LOG = LoggerFactory.getLogger(LispSouthboundPlugin.class);
 
     private static Object startLock = new Object();
@@ -49,12 +47,11 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl
     private LispXtrSouthboundHandler lispXtrSouthboundHandler;
     private NotificationPublishService notificationPublishService;
     private RpcProviderRegistry rpcRegistry;
-    private BindingAwareBroker broker;
     private NioDatagramChannel channel;
     private volatile String bindingAddress = "0.0.0.0";
     private volatile int xtrPort = LispMessage.XTR_PORT_NUM;
     private volatile boolean listenOnXtrPort = false;
-    private BindingAwareBroker.RpcRegistration<OdlLispSbService> sbRpcRegistration;
+    private RpcRegistration<OdlLispSbService> sbRpcRegistration;
     private NioDatagramChannel xtrChannel;
     private LispSouthboundStats statistics = new LispSouthboundStats();
     private ThreadFactory threadFactory = new DefaultThreadFactory("lisp-sb");
@@ -66,7 +63,6 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl
         final LispSouthboundRPC sbRpcHandler = new LispSouthboundRPC(this);
 
         sbRpcRegistration = rpcRegistry.addRpcImplementation(OdlLispSbService.class, sbRpcHandler);
-        broker.registerProvider(this);
 
         synchronized (startLock) {
             lispSouthboundHandler = new LispSouthboundHandler(this);
@@ -147,10 +143,6 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl
         this.rpcRegistry = rpcRegistry;
     }
 
-    public void setBindingAwareBroker(BindingAwareBroker broker) {
-        this.broker = broker;
-    }
-
     private void unloadActions() {
         lispSouthboundHandler = null;
         lispXtrSouthboundHandler = null;
@@ -235,9 +227,4 @@ public class LispSouthboundPlugin implements IConfigLispSouthboundPlugin, AutoCl
         eventLoopGroup.shutdownGracefully();
         sbRpcRegistration.close();
     }
-
-    @Override
-    public void onSessionInitiated(ProviderContext session) {
-        LOG.debug("LispSouthboundPlugin Provider Session Initiated");
-    }
 }

diff --git a/mappingservice/southbound/src/main/yang/odl-lisp-sb-impl.yang b/mappingservice/southbound/src/main/yang/odl-lisp-sb-impl.yang
index 830d19cb8789a91f71b2fdc095cbb9cf96386964..8274ef668572061116bff99f745719af5cf72af4 100644 (file)
--- a/mappingservice/southbound/src/main/yang/odl-lisp-sb-impl.yang
+++ b/mappingservice/southbound/src/main/yang/odl-lisp-sb-impl.yang
@@ -31,15 +31,6 @@ module odl-lisp-sb-impl {
     case lisp-sb-impl {
       when "/config:modules/config:module/config:type = 'lisp-sb-impl'";
 
-      container broker {
-          uses config:service-ref {
-              refine type {
-                  mandatory true;
-                  config:required-identity mdsal:binding-broker-osgi-registry;
-              }
-          }
-      }
-
       container notification-publish-service {
           uses config:service-ref {
               refine type {