Register global PurchaseCarProvider

routed-rpc used to create a global registration, which we lost
during migration. Fix that.

JIRA: CONTROLLER-1947
Change-Id: Ifa3a13d8bb2a6caab9d58dd97903186c7c27dfed
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java
index e958c866437de174c79abaef6cfa374e23e8e2bc..34e83698356c7d015924019972a8c16be863d118 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java
@@ -51,6 +51,9 @@ public class PeopleProvider implements PeopleService, AutoCloseable {
         this.dataProvider = requireNonNull(dataProvider);
         this.rpcProviderService = requireNonNull(rpcProviderService);
         this.rpcImplementation = requireNonNull(rpcImplementation);
         this.dataProvider = requireNonNull(dataProvider);
         this.rpcProviderService = requireNonNull(rpcProviderService);
         this.rpcImplementation = requireNonNull(rpcImplementation);

+
+        // Add global registration
+        regs.add(rpcProviderService.registerRpcImplementation(CarPurchaseService.class, rpcImplementation));

     }
 
     @Override
     }
 
     @Override

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java
index dc6b47da900e0b421b46171ee0112707f6dd5c67..055dc6ac62acbfc5d017217abff5ee2ec119409b 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java
@@ -7,6 +7,8 @@
  */
 package org.opendaylight.controller.clustering.it.provider;
 
  */
 package org.opendaylight.controller.clustering.it.provider;
 

+import static java.util.Objects.requireNonNull;
+

 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;
 import com.google.common.util.concurrent.Futures;
 import com.google.common.util.concurrent.ListenableFuture;
 import com.google.common.util.concurrent.MoreExecutors;


@@ -22,17 +24,14 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class PurchaseCarProvider implements CarPurchaseService, AutoCloseable {
 import org.slf4j.LoggerFactory;
 
 public class PurchaseCarProvider implements CarPurchaseService, AutoCloseable {

-

     private static final Logger LOG = LoggerFactory.getLogger(PurchaseCarProvider.class);
 
     private static final Logger LOG = LoggerFactory.getLogger(PurchaseCarProvider.class);
 

-    private NotificationPublishService notificationProvider;
-
+    private final NotificationPublishService notificationProvider;

 
 

-    public void setNotificationProvider(final NotificationPublishService salService) {
-        this.notificationProvider = salService;
+    public PurchaseCarProvider(final NotificationPublishService notificationProvider) {
+        this.notificationProvider = requireNonNull(notificationProvider);

     }
 
     }
 

-

     @Override
     public ListenableFuture<RpcResult<BuyCarOutput>> buyCar(final BuyCarInput input) {
         LOG.info("Routed RPC buyCar : generating notification for buying car [{}]", input);
     @Override
     public ListenableFuture<RpcResult<BuyCarOutput>> buyCar(final BuyCarInput input) {
         LOG.info("Routed RPC buyCar : generating notification for buying car [{}]", input);


@@ -47,5 +46,6 @@ public class PurchaseCarProvider implements CarPurchaseService, AutoCloseable {
 
     @Override
     public void close() {
 
     @Override
     public void close() {

+

     }
 }
     }
 }

diff --git a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/resources/OSGI-INF/blueprint/cluster-test-app.xml b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/resources/OSGI-INF/blueprint/cluster-test-app.xml
index ef8c73bbbca0f86bea96c7a5f2903da84b75c380..eccae7a7d17b892eb0a92d43fd09f090d49e380d 100644 (file)
--- a/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/resources/OSGI-INF/blueprint/cluster-test-app.xml
+++ b/opendaylight/md-sal/samples/clustering-test-app/provider/src/main/resources/OSGI-INF/blueprint/cluster-test-app.xml
@@ -22,11 +22,9 @@
 
 
   <bean id="purchaseCarProvider" class="org.opendaylight.controller.clustering.it.provider.PurchaseCarProvider" >
 
 
   <bean id="purchaseCarProvider" class="org.opendaylight.controller.clustering.it.provider.PurchaseCarProvider" >

-    <property name="notificationProvider" ref="notificationPublishService"/>
+    <argument ref="notificationPublishService"/>

   </bean>
 
   </bean>
 

-  <!-- odl:routed-rpc-implementation id="carPurchaseRpcReg" ref="purchaseCarProvider"/ -->
-

   <bean id="peopleProvider" class="org.opendaylight.controller.clustering.it.provider.PeopleProvider"
         destroy-method="close">
     <argument ref="dataBroker"/>
   <bean id="peopleProvider" class="org.opendaylight.controller.clustering.it.provider.PeopleProvider"
         destroy-method="close">
     <argument ref="dataBroker"/>