diff options
Diffstat (limited to 'vnfapi')
| -rw-r--r-- | vnfapi/features/features-vnfapi/pom.xml | 4 | ||||
| -rw-r--r-- | vnfapi/features/pom.xml | 4 | ||||
| -rw-r--r-- | vnfapi/features/sdnc-vnfapi/pom.xml | 4 | ||||
| -rwxr-xr-x | vnfapi/installer/pom.xml | 4 | ||||
| -rw-r--r-- | vnfapi/model/pom.xml | 14 | ||||
| -rw-r--r-- | vnfapi/pom.xml | 4 | ||||
| -rw-r--r-- | vnfapi/provider/pom.xml | 5 | ||||
| -rw-r--r-- | vnfapi/provider/src/main/resources/OSGI-INF/blueprint/vnfapi-blueprint.xml | 34 |
8 files changed, 53 insertions, 20 deletions
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 |