diff options
Diffstat (limited to 'generic-resource-api')
10 files changed, 59 insertions, 25 deletions
diff --git a/generic-resource-api/client/pom.xml b/generic-resource-api/client/pom.xml index 09e6d245..d19e229c 100644 --- a/generic-resource-api/client/pom.xml +++ b/generic-resource-api/client/pom.xml @@ -6,7 +6,7 @@ <packaging>jar</packaging> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-client</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <name>sdnc-northbound :: generic-resource-api:: ${project.artifactId}</name> <url>http://wiki.onap.org</url> @@ -15,7 +15,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>client-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <dependencies> @@ -38,7 +38,7 @@ <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-dependency-plugin</artifactId> <configuration> - <includeGroupIds>org.opendaylight.mdsal.model, org.onap.sdnc.northbound</includeGroupIds> + <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.sdnc.northbound</includeGroupIds> </configuration> </plugin> <plugin> diff --git a/generic-resource-api/features/features-generic-resource-api/pom.xml b/generic-resource-api/features/features-generic-resource-api/pom.xml index d3752234..dc578548 100644 --- a/generic-resource-api/features/features-generic-resource-api/pom.xml +++ b/generic-resource-api/features/features-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>features-generic-resource-api</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml index 23965789..961670d4 100644 --- a/generic-resource-api/features/pom.xml +++ b/generic-resource-api/features/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-features</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> diff --git a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml index 5a4eea97..d47e06db 100644 --- a/generic-resource-api/features/sdnc-generic-resource-api/pom.xml +++ b/generic-resource-api/features/sdnc-generic-resource-api/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>sdnc-generic-resource-api</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml index a7c8b369..e8825334 100755 --- a/generic-resource-api/installer/pom.xml +++ b/generic-resource-api/installer/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-installer</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml index 789c20b3..85710c20 100644 --- a/generic-resource-api/model/pom.xml +++ b/generic-resource-api/model/pom.xml @@ -5,26 +5,24 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-model</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> <dependencies> <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>ietf-inet-types-2013-07-15</artifactId> - </dependency> - <dependency> - <groupId>org.opendaylight.mdsal.model</groupId> - <artifactId>ietf-yang-types-20130715</artifactId> + <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId> + <artifactId>rfc6991</artifactId> </dependency> + + </dependencies> <build> diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml index deff8241..3b2ce9a2 100644 --- a/generic-resource-api/pom.xml +++ b/generic-resource-api/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: generic-resource-api</name> diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml index 2a6d50e4..9283f506 100644 --- a/generic-resource-api/provider/pom.xml +++ b/generic-resource-api/provider/pom.xml @@ -5,13 +5,13 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>generic-resource-api-provider</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: generic-resource-api :: ${project.artifactId}</name> @@ -82,6 +82,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> </dependencies> diff --git a/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml b/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml new file mode 100644 index 00000000..80d35574 --- /dev/null +++ b/generic-resource-api/provider/src/main/resources/OSGI-INF/blueprint/generic-resource-api-blueprint.xml @@ -0,0 +1,34 @@ +<?xml version="1.0" encoding="UTF-8"?> +<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0" + xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0" + odl:use-default-for-reference-types="true"> + + <reference id="svcLogicService" + interface="org.onap.ccsdk.sli.core.sli.provider.SvcLogicService" /> + + <bean id="client" class="org.onap.sdnc.northbound.GenericResourceApiSvcLogicServiceClient"> + <argument ref="svcLogicService" /> + </bean> + + <reference id="dataBroker" + interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" + odl:type="default" /> + + <reference id="notificationService" + interface="org.opendaylight.controller.md.sal.binding.api.NotificationPublishService" + odl:type="default" /> + + <reference id="rpcRegistry" + interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" + odl:type="default" /> + + <bean id="provider" class="org.onap.sdnc.northbound.GenericResourceApiProvider"> + <argument ref="dataBroker" /> + <argument ref="notificationService" /> + <argument ref="rpcRegistry" /> + <argument ref="client" /> + </bean> + + <odl:rpc-implementation ref="provider"/> + +</blueprint>
\ No newline at end of file diff --git a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java index bbd0afdf..cce03cc2 100644 --- a/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java +++ b/generic-resource-api/provider/src/test/java/org/onap/sdnc/northbound/ServiceTopologyOperationRPCTest.java @@ -146,6 +146,7 @@ public class ServiceTopologyOperationRPCTest extends GenericResourceApiProviderT @Test public void should_fail_when_client_execution_failed() throws Exception { + svcClient.mockHasGraph(true); svcClient.mockExecute(new RuntimeException("test exception")); @@ -157,7 +158,7 @@ public class ServiceTopologyOperationRPCTest extends GenericResourceApiProviderT , input , RpcResult::getResult ); - + assertEquals("500", output.getResponseCode()); assertEquals("test exception", output.getResponseMessage()); assertEquals("Y", output.getAckFinalIndicator()); @@ -202,7 +203,7 @@ public class ServiceTopologyOperationRPCTest extends GenericResourceApiProviderT , RpcResult::getResult ); - assertEquals("500", output.getResponseCode()); + assertEquals("200", output.getResponseCode()); assertEquals("Y", output.getAckFinalIndicator()); } |