Teach sal-remoterpc-connector to route actions

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

diff --git a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcListenerTest.java b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java
similarity index 60%
rename from opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcListenerTest.java
rename to opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java
index 7ae8a0a57fdf9fc963522beb03d34a6ad482cd6a..d5cfcc009f969dd98b4f8e979619e07aabba62e3 100644 (file)
--- a/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/RpcListenerTest.java
+++ b/opendaylight/md-sal/sal-remoterpc-connector/src/test/java/org/opendaylight/controller/remote/rpc/OpsListenerTest.java
@@ -5,7 +5,6 @@
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */
  * terms of the Eclipse Public License v1.0 which accompanies this distribution,
  * and is available at http://www.eclipse.org/legal/epl-v10.html
  */

-

 package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.ActorRef;
 package org.opendaylight.controller.remote.rpc;
 
 import akka.actor.ActorRef;


@@ -16,19 +15,24 @@ import java.util.Collections;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;

+import org.opendaylight.controller.remote.rpc.registry.ActionRegistry;

 import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;
 import org.opendaylight.controller.remote.rpc.registry.RpcRegistry;

+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
+import org.opendaylight.mdsal.dom.api.DOMActionInstance;

 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 
 import org.opendaylight.mdsal.dom.api.DOMRpcIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
 import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier;
 import org.opendaylight.yangtools.yang.model.api.SchemaPath;
 

-public class RpcListenerTest {
+public class OpsListenerTest {

 
     private static final QName TEST_QNAME = QName.create("test", "2015-06-12", "test");
     private static final SchemaPath RPC_TYPE = SchemaPath.create(true, TEST_QNAME);
     private static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier
             .create(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME));
     private static final DOMRpcIdentifier RPC_ID = DOMRpcIdentifier.create(RPC_TYPE, TEST_PATH);
 
     private static final QName TEST_QNAME = QName.create("test", "2015-06-12", "test");
     private static final SchemaPath RPC_TYPE = SchemaPath.create(true, TEST_QNAME);
     private static final YangInstanceIdentifier TEST_PATH = YangInstanceIdentifier
             .create(new YangInstanceIdentifier.NodeIdentifier(TEST_QNAME));
     private static final DOMRpcIdentifier RPC_ID = DOMRpcIdentifier.create(RPC_TYPE, TEST_PATH);

+    private static final DOMActionInstance ACTION_INSTANCE = DOMActionInstance.of(RPC_TYPE,
+            LogicalDatastoreType.OPERATIONAL, TEST_PATH);

 
     private static ActorSystem SYSTEM;
 
 
     private static ActorSystem SYSTEM;
 


@@ -49,19 +53,40 @@ public class RpcListenerTest {
         final TestKit probeReg = new TestKit(SYSTEM);
         final ActorRef rpcRegistry = probeReg.getRef();
 
         final TestKit probeReg = new TestKit(SYSTEM);
         final ActorRef rpcRegistry = probeReg.getRef();
 

-        final RpcListener rpcListener = new RpcListener(rpcRegistry);
-        rpcListener.onRpcAvailable(Collections.singleton(RPC_ID));
+        final OpsListener opsListener = new OpsListener(rpcRegistry, rpcRegistry);
+        opsListener.onRpcAvailable(Collections.singleton(RPC_ID));

         probeReg.expectMsgClass(RpcRegistry.Messages.AddOrUpdateRoutes.class);
     }
 
         probeReg.expectMsgClass(RpcRegistry.Messages.AddOrUpdateRoutes.class);
     }
 

+    @Test
+    public void testActionRouteAdd() {
+        // Test announcements
+        final TestKit probeReg = new TestKit(SYSTEM);
+        final ActorRef actionRegistry = probeReg.getRef();
+
+        final OpsListener opsListener = new OpsListener(actionRegistry, actionRegistry);
+        opsListener.onActionsChanged(Collections.emptySet(),Collections.singleton(ACTION_INSTANCE));
+        probeReg.expectMsgClass(ActionRegistry.Messages.UpdateActions.class);
+    }
+

     @Test
     public void testRouteRemove() {
         // Test announcements
         final TestKit probeReg = new TestKit(SYSTEM);
         final ActorRef rpcRegistry = probeReg.getRef();
 
     @Test
     public void testRouteRemove() {
         // Test announcements
         final TestKit probeReg = new TestKit(SYSTEM);
         final ActorRef rpcRegistry = probeReg.getRef();
 

-        final RpcListener rpcListener = new RpcListener(rpcRegistry);
-        rpcListener.onRpcUnavailable(Collections.singleton(RPC_ID));
+        final OpsListener opsListener = new OpsListener(rpcRegistry, rpcRegistry);
+        opsListener.onRpcUnavailable(Collections.singleton(RPC_ID));

         probeReg.expectMsgClass(RpcRegistry.Messages.RemoveRoutes.class);
     }
         probeReg.expectMsgClass(RpcRegistry.Messages.RemoveRoutes.class);
     }

+
+//    @Test
+//    public void testAcceptsImplementation() {
+//
+//        final TestKit probeReg = new TestKit(SYSTEM);
+//        final ActorRef opsRegistry = probeReg.getRef();
+//
+//        final OpsListener opsListener = new OpsListener(opsRegistry, opsRegistry);
+//        opsListener.acceptsImplementation()
+//    }

 }
 }