diff options
| author |   Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-08-16 10:10:33 -0400 |
|---|---|---|
| committer | Timoney, Dan (dt5972) <dtimoney@att.com> | 2019-08-19 16:23:33 -0400 |
| commit | 58b88df91a91393b1bb2200a82093ed5601cc46a (patch) | |
| tree | c247442df741c18a9c74da2d795bd56ccf4c9c78 | |
| parent | 8740b37cea9abce5f2984fe1c728b0c82ed0a84e (diff) | |
Code changes for Neon
Code changes for Neon port
Change-Id: I4dea521cabdf79e5dcefc7fa079516e2215337a4
Issue-ID: SDNC-850
Signed-off-by: Timoney, Dan (dt5972) <dtimoney@att.com>
31 files changed, 146 insertions, 69 deletions
diff --git a/features/features-sdnc-northbound/pom.xml b/features/features-sdnc-northbound/pom.xml index e25b0bb2..3d0dacab 100644 --- a/features/features-sdnc-northbound/pom.xml +++ b/features/features-sdnc-northbound/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-sdnc-northbound</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index c19b316d..e524308d 100755 --- a/features/installer/pom.xml +++ b/features/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>sdnc-northbound-features-installer</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 0908f46f..55e44779 100755 --- a/features/pom.xml +++ b/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>sdnc-northbound-feature-aggregator</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: features</name> diff --git a/features/sdnc-northbound-all/pom.xml b/features/sdnc-northbound-all/pom.xml index db8a60b1..4d37f4bc 100644 --- a/features/sdnc-northbound-all/pom.xml +++ b/features/sdnc-northbound-all/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-northbound-all</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: features :: ${project.artifactId}</name> 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()); } @@ -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>sdnc-northbound</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound</name> diff --git a/version.properties b/version.properties index 6d9189d0..ab6936a8 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=1 -sprint_number=6 -feature_revision=2 +sprint_number=7 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} diff --git a/vnfapi/features/features-vnfapi/pom.xml b/vnfapi/features/features-vnfapi/pom.xml index e8a8a5c3..8c00092c 100644 --- a/vnfapi/features/features-vnfapi/pom.xml +++ b/vnfapi/features/features-vnfapi/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-vnfapi</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> diff --git a/vnfapi/features/pom.xml b/vnfapi/features/pom.xml index 48c8bf05..67153bbe 100644 --- a/vnfapi/features/pom.xml +++ b/vnfapi/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>vnfapi-features</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> diff --git a/vnfapi/features/sdnc-vnfapi/pom.xml b/vnfapi/features/sdnc-vnfapi/pom.xml index 23c3d019..b7c180ae 100644 --- a/vnfapi/features/sdnc-vnfapi/pom.xml +++ b/vnfapi/features/sdnc-vnfapi/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-vnfapi</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> diff --git a/vnfapi/installer/pom.xml b/vnfapi/installer/pom.xml index 1f4b9788..90906ad2 100755 --- a/vnfapi/installer/pom.xml +++ b/vnfapi/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>vnfapi-installer</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> diff --git a/vnfapi/model/pom.xml b/vnfapi/model/pom.xml index 874ff7f7..687839fc 100644 --- a/vnfapi/model/pom.xml +++ b/vnfapi/model/pom.xml @@ -5,25 +5,23 @@ <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>vnfapi-model</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: vnfapi :: ${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> </project> diff --git a/vnfapi/pom.xml b/vnfapi/pom.xml index 422d75fd..ad9dd063 100644 --- a/vnfapi/pom.xml +++ b/vnfapi/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>vnfapi</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnfapi</name> diff --git a/vnfapi/provider/pom.xml b/vnfapi/provider/pom.xml index 0c69ea4f..726f2983 100644 --- a/vnfapi/provider/pom.xml +++ b/vnfapi/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>vnfapi-provider</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: vnfapi :: ${project.artifactId}</name> @@ -77,6 +77,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>1.10.19</version> <scope>test</scope> </dependency> <dependency> diff --git a/vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml b/vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml new file mode 100644 index 00000000..1afd1a65 --- /dev/null +++ b/vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-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.vnfapi.VNFSDNSvcLogicServiceClient"> + <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.vnfapi.VnfApiProvider"> + <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/vnftools/features/features-vnftools/pom.xml b/vnftools/features/features-vnftools/pom.xml index 90d9c142..27070036 100644 --- a/vnftools/features/features-vnftools/pom.xml +++ b/vnftools/features/features-vnftools/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-vnftools</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> diff --git a/vnftools/features/pom.xml b/vnftools/features/pom.xml index 911d5310..5c64f8c6 100644 --- a/vnftools/features/pom.xml +++ b/vnftools/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>vnftools-features</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> diff --git a/vnftools/features/sdnc-vnftools/pom.xml b/vnftools/features/sdnc-vnftools/pom.xml index 791661ce..f06fa9e1 100644 --- a/vnftools/features/sdnc-vnftools/pom.xml +++ b/vnftools/features/sdnc-vnftools/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-vnftools</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>feature</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> diff --git a/vnftools/installer/pom.xml b/vnftools/installer/pom.xml index 21847bc8..e2456a4d 100755 --- a/vnftools/installer/pom.xml +++ b/vnftools/installer/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools-installer</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> diff --git a/vnftools/pom.xml b/vnftools/pom.xml index 99f1903d..269c6aeb 100644 --- a/vnftools/pom.xml +++ b/vnftools/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.northbound</groupId> <artifactId>vnftools</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>pom</packaging> <name>VNF Tools Plugin</name> diff --git a/vnftools/provider/pom.xml b/vnftools/provider/pom.xml index 6bd110e3..918303ab 100644 --- a/vnftools/provider/pom.xml +++ b/vnftools/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>vnftools-provider</artifactId> - <version>1.6.2-SNAPSHOT</version> + <version>1.7.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>sdnc-northbound :: vnftools :: ${project.artifactId}</name> diff --git a/vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml b/vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml new file mode 100644 index 00000000..d784db71 --- /dev/null +++ b/vnftools/provider/src/main/resources/OSGI-INF/blueprint/vnftools-blueprint.xml @@ -0,0 +1,10 @@ +<?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"> + + + <bean id="vnftools" class="org.onap.sdnc.vnftools.VnfTools" /> + <service ref="vnftools" interface="org.onap.sdnc.vnftools.VnfTools" /> + +</blueprint>
\ No newline at end of file |