Merge "Enabling Remote RPC Router module in ODL distribution."

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / implementation / src / main / java / org / opendaylight / controller / config / yang / md / sal / remote / rpc / ZeroMQServerModule.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModule.java b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModule.java
index 95bb62f93b331257413f2273bcba32ce22fdc7e9..f55566acc37ca9c4eac03ab87642c77db28a1f69 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModule.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/implementation/src/main/java/org/opendaylight/controller/config/yang/md/sal/remote/rpc/ZeroMQServerModule.java
@@ -9,54 +9,58 @@ package org.opendaylight.controller.config.yang.md.sal.remote.rpc;
 
 import org.opendaylight.controller.sal.connector.remoterpc.*;
 import org.opendaylight.controller.sal.core.api.Broker;
+import org.opendaylight.controller.sal.core.api.RpcProvisionRegistry;
 import org.osgi.framework.BundleContext;
 
 /**
-*
-*/
-public final class ZeroMQServerModule extends org.opendaylight.controller.config.yang.md.sal.remote.rpc.AbstractZeroMQServerModule
- {
+ *
+ */
+public final class ZeroMQServerModule
+    extends org.opendaylight.controller.config.yang.md.sal.remote.rpc.AbstractZeroMQServerModule {
+
+  private static final Integer ZEROMQ_ROUTER_PORT = 5554;
+  private BundleContext bundleContext;
+
+  public ZeroMQServerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                            org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+    super(identifier, dependencyResolver);
+  }
+
+  public ZeroMQServerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier,
+                            org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
+                            ZeroMQServerModule oldModule, java.lang.AutoCloseable oldInstance) {
 
-    private static final Integer ZEROMQ_ROUTER_PORT = 5554;
-    private BundleContext bundleContext;
+    super(identifier, dependencyResolver, oldModule, oldInstance);
+  }
 
-    public ZeroMQServerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
-        super(identifier, dependencyResolver);
-    }
+  @Override
+  protected void customValidation() {
+    // Add custom validation for module attributes here.
+  }
 
-    public ZeroMQServerModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver,
-            ZeroMQServerModule oldModule, java.lang.AutoCloseable oldInstance) {
+  @Override
+  public java.lang.AutoCloseable createInstance() {
 
-        super(identifier, dependencyResolver, oldModule, oldInstance);
-    }
+    Broker broker = getDomBrokerDependency();
 
-    @Override
-    protected void customValidation(){
-        // Add custom validation for module attributes here.
-    }
+    final int port = getPort() != null ? getPort() : ZEROMQ_ROUTER_PORT;
 
-    @Override
-    public java.lang.AutoCloseable createInstance() {
-        
-        Broker broker = getDomBrokerDependency();
+    ServerImpl serverImpl = new ServerImpl(port);
 
-        final int port = getPort() != null ? getPort() : ZEROMQ_ROUTER_PORT;
+    ClientImpl clientImpl = new ClientImpl();
 
-        ServerImpl serverImpl = new ServerImpl(port);
-        
-        ClientImpl clientImpl = new ClientImpl();
+    RoutingTableProvider provider = new RoutingTableProvider(bundleContext);//,serverImpl);
 
-        RoutingTableProvider provider = new RoutingTableProvider(bundleContext,serverImpl);
+    RemoteRpcProvider facade = new RemoteRpcProvider(serverImpl, clientImpl);
+    facade.setRoutingTableProvider(provider);
+    facade.setContext(bundleContext);
+    facade.setRpcProvisionRegistry((RpcProvisionRegistry) broker);
 
-        RemoteRpcProvider facade = new RemoteRpcProvider(serverImpl, clientImpl);
-        
-        facade.setRoutingTableProvider(provider );
-        
-        broker.registerProvider(facade, bundleContext);
-        return facade;
-    }
+    broker.registerProvider(facade, bundleContext);
+    return facade;
+  }
 
-    public void setBundleContext(BundleContext bundleContext) {
-        this.bundleContext = bundleContext;
-    }
+  public void setBundleContext(BundleContext bundleContext) {
+    this.bundleContext = bundleContext;
+  }
 }