diff options
Diffstat (limited to 'plugins/grToolkit/provider/src')
3 files changed, 49 insertions, 62 deletions
diff --git a/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java index 7a8b3deb0..5a8730bff 100755 --- a/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java +++ b/plugins/grToolkit/provider/src/main/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProvider.java @@ -21,6 +21,8 @@ package org.onap.ccsdk.sli.plugins.grtoolkit; +import com.google.common.util.concurrent.Futures; +import com.google.common.util.concurrent.ListenableFuture; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; @@ -33,18 +35,15 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Comparator; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.Properties; -import java.util.List; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import javax.annotation.Nonnull; - -import com.google.common.util.concurrent.Futures; -import com.google.common.util.concurrent.ListenableFuture; - import org.apache.commons.lang.StringUtils; - +import org.json.JSONArray; +import org.json.JSONObject; import org.onap.ccsdk.sli.core.dblib.DbLibService; import org.onap.ccsdk.sli.plugins.grtoolkit.connection.ConnectionManager; import org.onap.ccsdk.sli.plugins.grtoolkit.connection.ConnectionResponse; @@ -60,16 +59,11 @@ import org.onap.ccsdk.sli.plugins.grtoolkit.resolver.HealthResolver; import org.onap.ccsdk.sli.plugins.grtoolkit.resolver.SingleNodeHealthResolver; import org.onap.ccsdk.sli.plugins.grtoolkit.resolver.SixNodeHealthResolver; import org.onap.ccsdk.sli.plugins.grtoolkit.resolver.ThreeNodeHealthResolver; - -import org.json.JSONArray; -import org.json.JSONObject; - import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.DataTreeChangeListener; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.sal.binding.api.BindingAwareBroker; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.DataTreeChangeListener; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.AdminHealthInput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.AdminHealthOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.AdminHealthOutputBuilder; @@ -98,9 +92,9 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.SiteIdentifierOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.SiteIdentifierOutputBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.site.health.output.SitesBuilder; +import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -133,8 +127,8 @@ public class GrToolkitProvider implements AutoCloseable, GrToolkitService, DataT private final ExecutorService executor; protected DataBroker dataBroker; protected NotificationPublishService notificationService; - protected RpcProviderRegistry rpcRegistry; - protected BindingAwareBroker.RpcRegistration<GrToolkitService> rpcRegistration; + protected RpcProviderService rpcRegistry; + protected ObjectRegistration<GrToolkitService> rpcRegistration; protected DbLibService dbLib; private String member; private ClusterActor self; @@ -155,7 +149,7 @@ public class GrToolkitProvider implements AutoCloseable, GrToolkitService, DataT */ public GrToolkitProvider(DataBroker dataBroker, NotificationPublishService notificationProviderService, - RpcProviderRegistry rpcProviderRegistry, + RpcProviderService rpcProviderRegistry, DistributedDataStoreInterface configDatastore, DbLibService dbLibService) { log.info("Creating provider for {}", APP_NAME); @@ -177,7 +171,7 @@ public class GrToolkitProvider implements AutoCloseable, GrToolkitService, DataT createContainers(); setProperties(); defineMembers(); - rpcRegistration = rpcRegistry.addRpcImplementation(GrToolkitService.class, this); + rpcRegistration = rpcRegistry.registerRpcImplementation(GrToolkitService.class, this); log.info("Initialization complete for {}", APP_NAME); } diff --git a/plugins/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml b/plugins/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml index 5a4492c56..300c1cc75 100644 --- a/plugins/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml +++ b/plugins/grToolkit/provider/src/main/resources/org/opendaylight/blueprint/GrToolkit.xml @@ -4,16 +4,13 @@ odl:use-default-for-reference-types="true"> <reference id="dataBroker" - interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" - odl:type="default" /> + interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" /> <reference id="notificationService" - interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" - odl:type="default" /> + interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" /> <reference id="rpcRegistry" - interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" - odl:type="default" /> + interface="org.opendaylight.mdsal.binding.api.RpcProviderService" /> <reference id="dbLib" interface="org.onap.ccsdk.sli.core.dblib.DbLibService" /> diff --git a/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java index edd6d1b8d..6495c89cf 100644 --- a/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java +++ b/plugins/grToolkit/provider/src/test/java/org/onap/ccsdk/sli/plugins/grtoolkit/GrToolkitProviderTest.java @@ -20,25 +20,42 @@ */ package org.onap.ccsdk.sli.plugins.grtoolkit; +import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; +import static com.github.tomakehurst.wiremock.client.WireMock.get; +import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; +import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.spy; +import static org.mockito.Mockito.when; import com.github.tomakehurst.wiremock.junit.WireMockRule; - import com.google.common.util.concurrent.ListenableFuture; - +import java.io.IOException; +import java.lang.reflect.InvocationTargetException; +import java.lang.reflect.Method; +import java.nio.file.Files; +import java.nio.file.Paths; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Properties; +import java.util.concurrent.ExecutionException; +import java.util.stream.Collectors; +import java.util.stream.Stream; import org.junit.Before; import org.junit.Rule; import org.junit.Test; import org.junit.contrib.java.lang.system.EnvironmentVariables; - import org.onap.ccsdk.sli.core.dblib.DBLibConnection; import org.onap.ccsdk.sli.core.dblib.DbLibService; import org.onap.ccsdk.sli.plugins.grtoolkit.data.ClusterActor; - import org.opendaylight.controller.cluster.access.concepts.MemberName; import org.opendaylight.controller.cluster.datastore.DistributedDataStoreInterface; import org.opendaylight.controller.cluster.datastore.utils.ActorUtils; -import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService; -import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry; +import org.opendaylight.mdsal.binding.api.DataBroker; +import org.opendaylight.mdsal.binding.api.NotificationPublishService; +import org.opendaylight.mdsal.binding.api.RpcProviderService; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.AdminHealthOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.ClusterHealthOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.DatabaseHealthOutput; @@ -49,38 +66,15 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.ResumeAkkaTrafficOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.SiteHealthOutput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.SiteIdentifierOutput; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.resume.akka.traffic.input.NodeInfoBuilder; import org.opendaylight.yangtools.yang.common.RpcResult; -import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; -import java.nio.file.Files; -import java.nio.file.Paths; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Properties; -import java.util.concurrent.ExecutionException; -import java.util.stream.Collectors; -import java.util.stream.Stream; - -import static com.github.tomakehurst.wiremock.client.WireMock.aResponse; -import static com.github.tomakehurst.wiremock.client.WireMock.get; -import static com.github.tomakehurst.wiremock.client.WireMock.stubFor; -import static com.github.tomakehurst.wiremock.client.WireMock.urlEqualTo; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; - -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.spy; -import static org.mockito.Mockito.when; - public class GrToolkitProviderTest { GrToolkitProvider provider; GrToolkitProvider providerSpy; DataBroker dataBroker; NotificationPublishService notificationProviderService; - RpcProviderRegistry rpcProviderRegistry; + RpcProviderService rpcProviderRegistry; DistributedDataStoreInterface configDatastore; DbLibService dbLibService; DBLibConnection connection; @@ -96,7 +90,7 @@ public class GrToolkitProviderTest { environmentVariables.set("SDNC_CONFIG_DIR","src/test/resources"); dataBroker = mock(DataBroker.class); notificationProviderService = mock(NotificationPublishService.class); - rpcProviderRegistry = mock(RpcProviderRegistry.class); + rpcProviderRegistry = mock(RpcProviderService.class); configDatastore = mock(DistributedDataStoreInterface.class); dbLibService = mock(DbLibService.class); connection = mock(DBLibConnection.class); @@ -266,11 +260,13 @@ public class GrToolkitProviderTest { @Test public void haltTrafficTest() { HaltAkkaTrafficInputBuilder builder = new HaltAkkaTrafficInputBuilder(); - builder.setNodeInfo(new ArrayList<>()); + builder.setNodeInfo(Arrays.asList( + new org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.plugins.gr.toolkit.rev180926.halt.akka.traffic. + input.NodeInfoBuilder().build())); ListenableFuture<RpcResult<HaltAkkaTrafficOutput>> result = provider.haltAkkaTraffic(builder.build()); try { assertEquals("200", result.get().getResult().getStatus()); - } catch(InterruptedException | ExecutionException e) { + } catch (InterruptedException | ExecutionException e) { fail(); } } @@ -278,7 +274,7 @@ public class GrToolkitProviderTest { @Test public void resumeTrafficTest() { ResumeAkkaTrafficInputBuilder builder = new ResumeAkkaTrafficInputBuilder(); - builder.setNodeInfo(new ArrayList<>()); + builder.setNodeInfo(Arrays.asList(new NodeInfoBuilder().build())); ListenableFuture<RpcResult<ResumeAkkaTrafficOutput>> result = provider.resumeAkkaTraffic(builder.build()); try { assertEquals("200", result.get().getResult().getStatus()); |