X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Feos-dom-akka%2Fsrc%2Ftest%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Feos%2Fakka%2Fowner%2Fsupervisor%2FOwnerSupervisorTest.java;h=4bf68a7ef1a46c0749ad618ba0a21054cc58f03e;hb=refs%2Fchanges%2F66%2F98466%2F2;hp=61747622d1c8343e13762e48f6aa0bb47e61a194;hpb=e1e6d8e34fd4c5c5c07c7a8063ffa94a8dbe2062;p=controller.git

diff --git a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/owner/supervisor/OwnerSupervisorTest.java b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/owner/supervisor/OwnerSupervisorTest.java
index 61747622d1..4bf68a7ef1 100644
--- a/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/owner/supervisor/OwnerSupervisorTest.java
+++ b/opendaylight/md-sal/eos-dom-akka/src/test/java/org/opendaylight/controller/eos/akka/owner/supervisor/OwnerSupervisorTest.java
@@ -43,29 +43,29 @@ public class OwnerSupervisorTest extends AbstractNativeEosTest {
 
         final ClusterNode node = startup(2550, Collections.singletonList("member-1"));
         try {
-            reachableMember(node, "member-2");
-            reachableMember(node, "member-3");
+            reachableMember(node, "member-2", DEFAULT_DATACENTER);
+            reachableMember(node, "member-3", DEFAULT_DATACENTER);
             registerCandidates(node, ENTITY_1, "member-1", "member-2", "member-3");
 
             final MockEntityOwnershipListener listener = registerListener(node, ENTITY_1);
             verifyListenerState(listener, ENTITY_1,true, true, false);
 
-            unreachableMember(node, "member-1");
+            unreachableMember(node, "member-1", DEFAULT_DATACENTER);
             verifyListenerState(listener, ENTITY_1, true, false, true);
 
-            unreachableMember(node, "member-2");
+            unreachableMember(node, "member-2", DEFAULT_DATACENTER);
             verifyListenerState(listener, ENTITY_1, true, false, false);
 
-            unreachableMember(node, "member-3");
+            unreachableMember(node, "member-3", DEFAULT_DATACENTER);
             verifyListenerState(listener, ENTITY_1, false, false, false);
 
-            reachableMember(node, "member-2");
+            reachableMember(node, "member-2", DEFAULT_DATACENTER);
             verifyListenerState(listener, ENTITY_1, true, false, false);
 
             // no notification here as member-2 is already the owner
-            reachableMember(node, "member-1");
+            reachableMember(node, "member-1", DEFAULT_DATACENTER);
 
-            unreachableMember(node, "member-2");
+            unreachableMember(node, "member-2", DEFAULT_DATACENTER);
             verifyListenerState(listener, ENTITY_1,true, true, false);
         } finally {
             ActorTestKit.shutdown(node.getActorSystem());
@@ -96,7 +96,7 @@ public class OwnerSupervisorTest extends AbstractNativeEosTest {
             // this one could not be assigned during init as we dont have member-2 thats reachable
             verifyListenerState(listener2, ENTITY_2, false, false, false);
 
-            reachableMember(node, "member-2");
+            reachableMember(node, "member-2", DEFAULT_DATACENTER);
             verifyListenerState(listener2, ENTITY_2, true, false, false);
         } finally {
             ActorTestKit.shutdown(node.getActorSystem());
@@ -117,8 +117,8 @@ public class OwnerSupervisorTest extends AbstractNativeEosTest {
         private final Map<DOMEntity, String> currentOwners;
 
         private MockSyncer(final ActorContext<OwnerSupervisorCommand> context,
-                          final Map<DOMEntity, Set<String>> currentCandidates,
-                          final Map<DOMEntity, String> currentOwners) {
+                           final Map<DOMEntity, Set<String>> currentCandidates,
+                           final Map<DOMEntity, String> currentOwners) {
             super(context);
             this.currentCandidates = currentCandidates;
             this.currentOwners = currentOwners;
@@ -139,7 +139,7 @@ public class OwnerSupervisorTest extends AbstractNativeEosTest {
         }
 
         private Behavior<OwnerSupervisorCommand> switchToSupervisor(final InitialCandidateSync message) {
-            return OwnerSupervisor.create(currentCandidates, currentOwners);
+            return OwnerSupervisor.create(currentCandidates, currentOwners, CODEC_CONTEXT.getInstanceIdentifierCodec());
         }
     }
 
@@ -163,12 +163,14 @@ public class OwnerSupervisorTest extends AbstractNativeEosTest {
 
             listenerRegistry = context.spawn(EntityTypeListenerRegistry.create(role), "ListenerRegistry");
             candidateRegistry = context.spawn(CandidateRegistry.create(), "CandidateRegistry");
-            ownerStateChecker = context.spawn(OwnerStateChecker.create(role), "OwnerStateChecker");
 
             final ClusterSingleton clusterSingleton = ClusterSingleton.get(context.getSystem());
             // start the initial sync behavior that switches to the regular one after syncing
             ownerSupervisor = clusterSingleton.init(SingletonActor.of(
                     MockSyncer.create(currentCandidates, currentOwners), "OwnerSupervisor"));
+
+            ownerStateChecker = context.spawn(OwnerStateChecker.create(role, ownerSupervisor, null),
+                    "OwnerStateChecker");
         }
 
         public static Behavior<BootstrapCommand> create(final Map<DOMEntity, Set<String>> currentCandidates,