X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-remoterpc-connector%2Fimplementation%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fconfig%2Fyang%2Fmd%2Fsal%2Fremote%2Frpc%2FZeroMQServerModule.java;h=11179864293ca663776d6e04e8b44b7b448d25cc;hb=753d57447509d09db441412500a68e6efed4be72;hp=606f282bd7f10d6ebf04e168ed5bb99e3b37b9e6;hpb=03abf047ba966c53f4901d36ae5198156d66dc05;p=controller.git 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 606f282bd7..1117986429 100644 --- 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,10 +9,7 @@ */ package org.opendaylight.controller.config.yang.md.sal.remote.rpc; -import org.opendaylight.controller.sal.connector.remoterpc.Client; -import org.opendaylight.controller.sal.connector.remoterpc.RemoteRpcProvider; -import org.opendaylight.controller.sal.connector.remoterpc.RoutingTableProvider; -import org.opendaylight.controller.sal.connector.remoterpc.ServerImpl; +import org.opendaylight.controller.sal.connector.remoterpc.*; import org.opendaylight.controller.sal.core.api.Broker; import org.osgi.framework.BundleContext; @@ -44,14 +41,18 @@ public final class ZeroMQServerModule extends org.opendaylight.controller.config public java.lang.AutoCloseable createInstance() { Broker broker = getDomBrokerDependency(); - RoutingTableProvider provider = new RoutingTableProvider(bundleContext); - + + final int port = getPort() != null ? getPort() : ZEROMQ_ROUTER_PORT; ServerImpl serverImpl = new ServerImpl(port); - Client clientImpl = new Client(); + ClientImpl clientImpl = new ClientImpl(); + + RoutingTableProvider provider = new RoutingTableProvider(bundleContext,serverImpl); + + RemoteRpcProvider facade = new RemoteRpcProvider(serverImpl, clientImpl); facade.setRoutingTableProvider(provider );