Teach sal-remoterpc-connector to route actions

[controller.git] / opendaylight / md-sal / sal-remoterpc-connector / src / main / java / org / opendaylight / controller / remote / rpc / RemoteOpsProviderConfig.java

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteOpsProviderConfig.java
similarity index 78%
rename from opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java
rename to opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteOpsProviderConfig.java
index 1d663877c50f3e07150ba350370c5a8f014bfc0b..4fe130158f358e020ae7ca0229e02e005b45237b 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteRpcProviderConfig.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/main/java/org/opendaylight/controller/remote/rpc/RemoteOpsProviderConfig.java
@@ -14,25 +14,28 @@ import java.util.concurrent.TimeUnit;
 import org.opendaylight.controller.cluster.common.actor.CommonConfig;
 import scala.concurrent.duration.FiniteDuration;
 
 import org.opendaylight.controller.cluster.common.actor.CommonConfig;
 import scala.concurrent.duration.FiniteDuration;
 

-public class RemoteRpcProviderConfig extends CommonConfig {
+public class RemoteOpsProviderConfig extends CommonConfig {

 
     protected static final String TAG_RPC_BROKER_NAME = "rpc-broker-name";
     protected static final String TAG_RPC_REGISTRAR_NAME = "rpc-registrar-name";
     protected static final String TAG_RPC_REGISTRY_NAME = "registry-name";
 
     protected static final String TAG_RPC_BROKER_NAME = "rpc-broker-name";
     protected static final String TAG_RPC_REGISTRAR_NAME = "rpc-registrar-name";
     protected static final String TAG_RPC_REGISTRY_NAME = "registry-name";

+    protected static final String TAG_ACTION_REGISTRY_NAME = "action-registry-name";

     protected static final String TAG_RPC_MGR_NAME = "rpc-manager-name";
     protected static final String TAG_RPC_BROKER_PATH = "rpc-broker-path";
     protected static final String TAG_RPC_REGISTRY_PATH = "rpc-registry-path";
     protected static final String TAG_RPC_MGR_NAME = "rpc-manager-name";
     protected static final String TAG_RPC_BROKER_PATH = "rpc-broker-path";
     protected static final String TAG_RPC_REGISTRY_PATH = "rpc-registry-path";

+    protected static final String TAG_ACTION_REGISTRY_PATH = "action-registry-path";

     protected static final String TAG_RPC_MGR_PATH = "rpc-manager-path";
     protected static final String TAG_ASK_DURATION = "ask-duration";
 
     private static final String TAG_GOSSIP_TICK_INTERVAL = "gossip-tick-interval";
     private static final String TAG_RPC_REGISTRY_PERSISTENCE_ID = "rpc-registry-persistence-id";
     protected static final String TAG_RPC_MGR_PATH = "rpc-manager-path";
     protected static final String TAG_ASK_DURATION = "ask-duration";
 
     private static final String TAG_GOSSIP_TICK_INTERVAL = "gossip-tick-interval";
     private static final String TAG_RPC_REGISTRY_PERSISTENCE_ID = "rpc-registry-persistence-id";

+    private static final String TAG_ACTION_REGISTRY_PERSISTENCE_ID = "action-registry-persistence-id";

 
     //locally cached values
     private Timeout cachedAskDuration;
     private FiniteDuration cachedGossipTickInterval;
 
 
     //locally cached values
     private Timeout cachedAskDuration;
     private FiniteDuration cachedGossipTickInterval;
 

-    public RemoteRpcProviderConfig(final Config config) {
+    public RemoteOpsProviderConfig(final Config config) {

         super(config);
     }
 
         super(config);
     }
 


@@ -48,6 +51,10 @@ public class RemoteRpcProviderConfig extends CommonConfig {
         return get().getString(TAG_RPC_REGISTRY_NAME);
     }
 
         return get().getString(TAG_RPC_REGISTRY_NAME);
     }
 

+    public String getActionRegistryName() {
+        return get().getString(TAG_ACTION_REGISTRY_NAME);
+    }
+

     public String getRpcManagerName() {
         return get().getString(TAG_RPC_MGR_NAME);
     }
     public String getRpcManagerName() {
         return get().getString(TAG_RPC_MGR_NAME);
     }


@@ -64,6 +71,14 @@ public class RemoteRpcProviderConfig extends CommonConfig {
         return get().getString(TAG_RPC_REGISTRY_PERSISTENCE_ID);
     }
 
         return get().getString(TAG_RPC_REGISTRY_PERSISTENCE_ID);
     }
 

+    public String getActionRegistryPath() {
+        return get().getString(TAG_ACTION_REGISTRY_PATH);
+    }
+
+    public String getActionRegistryPersistenceId() {
+        return get().getString(TAG_ACTION_REGISTRY_PERSISTENCE_ID);
+    }
+

     public String getRpcManagerPath() {
         return get().getString(TAG_RPC_MGR_PATH);
     }
     public String getRpcManagerPath() {
         return get().getString(TAG_RPC_MGR_PATH);
     }


@@ -95,10 +110,10 @@ public class RemoteRpcProviderConfig extends CommonConfig {
      */
     @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE",
             justification = "Findbugs flags this as an unconfirmed cast of return value but the build method clearly "
      */
     @SuppressFBWarnings(value = "BC_UNCONFIRMED_CAST_OF_RETURN_VALUE",
             justification = "Findbugs flags this as an unconfirmed cast of return value but the build method clearly "

-                + "returns RemoteRpcProviderConfig. Perhaps it's confused b/c the build method is overloaded and "
+                + "returns RemoteOpsProviderConfig. Perhaps it's confused b/c the build method is overloaded and "

                 + "and differs in return type from the base class.")
                 + "and differs in return type from the base class.")

-    public static RemoteRpcProviderConfig newInstance(final String actorSystemName, final boolean metricCaptureEnabled,
-            final int mailboxCapacity) {
+    public static RemoteOpsProviderConfig newInstance(final String actorSystemName, final boolean metricCaptureEnabled,
+                                                      final int mailboxCapacity) {

         return new Builder(actorSystemName).metricCaptureEnabled(metricCaptureEnabled)
                 .mailboxCapacity(mailboxCapacity).build();
     }
         return new Builder(actorSystemName).metricCaptureEnabled(metricCaptureEnabled)
                 .mailboxCapacity(mailboxCapacity).build();
     }


@@ -112,11 +127,13 @@ public class RemoteRpcProviderConfig extends CommonConfig {
             configHolder.put(TAG_RPC_BROKER_NAME, "broker");
             configHolder.put(TAG_RPC_REGISTRAR_NAME, "registrar");
             configHolder.put(TAG_RPC_REGISTRY_NAME, "registry");
             configHolder.put(TAG_RPC_BROKER_NAME, "broker");
             configHolder.put(TAG_RPC_REGISTRAR_NAME, "registrar");
             configHolder.put(TAG_RPC_REGISTRY_NAME, "registry");

+            configHolder.put(TAG_ACTION_REGISTRY_NAME, "action-registry");

             configHolder.put(TAG_RPC_MGR_NAME, "rpc");
 
             //Actor paths
             configHolder.put(TAG_RPC_BROKER_PATH, "/user/rpc/broker");
             configHolder.put(TAG_RPC_REGISTRY_PATH, "/user/rpc/registry");
             configHolder.put(TAG_RPC_MGR_NAME, "rpc");
 
             //Actor paths
             configHolder.put(TAG_RPC_BROKER_PATH, "/user/rpc/broker");
             configHolder.put(TAG_RPC_REGISTRY_PATH, "/user/rpc/registry");

+            configHolder.put(TAG_ACTION_REGISTRY_PATH, "/user/action/registry");

             configHolder.put(TAG_RPC_MGR_PATH, "/user/rpc");
 
             //durations
             configHolder.put(TAG_RPC_MGR_PATH, "/user/rpc");
 
             //durations


@@ -125,6 +142,7 @@ public class RemoteRpcProviderConfig extends CommonConfig {
 
             // persistence
             configHolder.put(TAG_RPC_REGISTRY_PERSISTENCE_ID, "remote-rpc-registry");
 
             // persistence
             configHolder.put(TAG_RPC_REGISTRY_PERSISTENCE_ID, "remote-rpc-registry");

+            configHolder.put(TAG_ACTION_REGISTRY_PERSISTENCE_ID, "remote-action-registry");

         }
 
         public Builder gossipTickInterval(final String interval) {
         }
 
         public Builder gossipTickInterval(final String interval) {


@@ -133,8 +151,8 @@ public class RemoteRpcProviderConfig extends CommonConfig {
         }
 
         @Override
         }
 
         @Override

-        public RemoteRpcProviderConfig build() {
-            return new RemoteRpcProviderConfig(merge());
+        public RemoteOpsProviderConfig build() {
+            return new RemoteOpsProviderConfig(merge());

         }
     }
 }
         }
     }
 }