diff options
41 files changed, 210 insertions, 100 deletions
diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 42eeb71f..b9f354ba 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -4,7 +4,7 @@ <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>sli-northbound-artifacts</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: sli-northbound-artifacts</name> @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <properties> diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml index be3dee2b..7210cc27 100644 --- a/asdcApi/features/ccsdk-asdcApi/pom.xml +++ b/asdcApi/features/ccsdk-asdcApi/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.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-asdcApi</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/features/features-asdcApi/pom.xml b/asdcApi/features/features-asdcApi/pom.xml index 2917abd7..3a09e3ef 100644 --- a/asdcApi/features/features-asdcApi/pom.xml +++ b/asdcApi/features/features-asdcApi/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.ccsdk.sli.northbound</groupId> <artifactId>features-asdcApi</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/features/pom.xml b/asdcApi/features/pom.xml index 6f6ac13f..7a03ab51 100755 --- a/asdcApi/features/pom.xml +++ b/asdcApi/features/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.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/installer/pom.xml b/asdcApi/installer/pom.xml index 33af1bd5..b2d77b6e 100755 --- a/asdcApi/installer/pom.xml +++ b/asdcApi/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.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/model/pom.xml b/asdcApi/model/pom.xml index a5bb371c..d5e83561 100755 --- a/asdcApi/model/pom.xml +++ b/asdcApi/model/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.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> @@ -23,13 +23,11 @@ <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> diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml index d00afcb4..0fcc1537 100755 --- a/asdcApi/pom.xml +++ b/asdcApi/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.ccsdk.sli.northbound</groupId> <artifactId>asdcApi</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi</name> diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml index 34f65285..071af8d8 100755 --- a/asdcApi/provider/pom.xml +++ b/asdcApi/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.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/provider/src/main/resources/OSGI-INF/blueprint/asdc-blueprint.xml b/asdcApi/provider/src/main/resources/OSGI-INF/blueprint/asdc-blueprint.xml new file mode 100644 index 00000000..9ad08d3d --- /dev/null +++ b/asdcApi/provider/src/main/resources/OSGI-INF/blueprint/asdc-blueprint.xml @@ -0,0 +1,32 @@ +<?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.ccsdk.sli.northbound.asdcapi.AsdcApiSliClient"> + <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.ccsdk.sli.northbound.asdcapi.AsdcApiProvider"> + <argument ref="dataBroker" /> + <argument ref="notificationService" /> + <argument ref="rpcRegistry" /> + <argument ref="client" /> + </bean> + +</blueprint>
\ No newline at end of file diff --git a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml b/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml index d54eb208..98b6de9f 100644 --- a/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/daexim-offsite-backup/features/ccsdk-daexim-offsite-backup/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.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-daexim-offsite-backup</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml b/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml index 632cad58..604d9173 100644 --- a/daexim-offsite-backup/features/features-daexim-offsite-backup/pom.xml +++ b/daexim-offsite-backup/features/features-daexim-offsite-backup/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.ccsdk.sli.northbound</groupId> <artifactId>features-daexim-offsite-backup</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/daexim-offsite-backup/features/pom.xml b/daexim-offsite-backup/features/pom.xml index d23a039c..86c49397 100755 --- a/daexim-offsite-backup/features/pom.xml +++ b/daexim-offsite-backup/features/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.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> diff --git a/daexim-offsite-backup/installer/pom.xml b/daexim-offsite-backup/installer/pom.xml index d58467bb..a3abfcf1 100755 --- a/daexim-offsite-backup/installer/pom.xml +++ b/daexim-offsite-backup/installer/pom.xml @@ -4,14 +4,14 @@ <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> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <properties> <application.name>ccsdk-daexim-offsite-backup</application.name> diff --git a/daexim-offsite-backup/model/pom.xml b/daexim-offsite-backup/model/pom.xml index e0702fee..58097f9a 100755 --- a/daexim-offsite-backup/model/pom.xml +++ b/daexim-offsite-backup/model/pom.xml @@ -4,24 +4,22 @@ <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> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <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/daexim-offsite-backup/pom.xml b/daexim-offsite-backup/pom.xml index 34e4e195..40601e60 100755 --- a/daexim-offsite-backup/pom.xml +++ b/daexim-offsite-backup/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.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: daexim-offsite-backup</name> diff --git a/daexim-offsite-backup/provider/pom.xml b/daexim-offsite-backup/provider/pom.xml index 49bd6e7e..4cedda69 100755 --- a/daexim-offsite-backup/provider/pom.xml +++ b/daexim-offsite-backup/provider/pom.xml @@ -4,14 +4,14 @@ <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> <name>ccsdk-sli-northbound :: daexim-offsite-backup :: ${project.artifactId}</name> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <build> diff --git a/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml b/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml new file mode 100755 index 00000000..8e2101ad --- /dev/null +++ b/daexim-offsite-backup/provider/src/main/resources/OSGI-INF/blueprint/DaeximOffsiteBackup.xml @@ -0,0 +1,20 @@ +<?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="dataBroker" + interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" + odl:type="default" /> + + <reference id="rpcRegistry" + interface="org.opendaylight.controller.sal.binding.api.RpcProviderRegistry" + odl:type="default" /> + + <bean id="provider" class="org.onap.ccsdk.sli.northbound.daeximoffsitebackup.DaeximOffsiteBackupProvider"> + <argument ref="dataBroker" /> + <argument ref="rpcRegistry" /> + </bean> + + <odl:rpc-implementation ref="provider"/> +</blueprint> diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml index 635cbe5f..8f9e1b64 100644 --- a/dataChange/features/ccsdk-dataChange/pom.xml +++ b/dataChange/features/ccsdk-dataChange/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.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-dataChange</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/features/features-dataChange/pom.xml b/dataChange/features/features-dataChange/pom.xml index 5a50ef10..4d36c4a3 100644 --- a/dataChange/features/features-dataChange/pom.xml +++ b/dataChange/features/features-dataChange/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.ccsdk.sli.northbound</groupId> <artifactId>features-dataChange</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/features/pom.xml b/dataChange/features/pom.xml index d4fab812..be06b991 100755 --- a/dataChange/features/pom.xml +++ b/dataChange/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.ccsdk.sli.northbound</groupId> <artifactId>dataChange-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/installer/pom.xml b/dataChange/installer/pom.xml index d3e7cb2b..25511b3d 100755 --- a/dataChange/installer/pom.xml +++ b/dataChange/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.ccsdk.sli.northbound</groupId> <artifactId>dataChange-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/model/pom.xml b/dataChange/model/pom.xml index 57a8a877..5586e4ad 100755 --- a/dataChange/model/pom.xml +++ b/dataChange/model/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.ccsdk.sli.northbound</groupId> <artifactId>dataChange-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> @@ -22,13 +22,11 @@ <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> diff --git a/dataChange/pom.xml b/dataChange/pom.xml index 1419661b..6a3d3ea0 100755 --- a/dataChange/pom.xml +++ b/dataChange/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.ccsdk.sli.northbound</groupId> <artifactId>dataChange</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange</name> diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml index 204e9158..12132838 100755 --- a/dataChange/provider/pom.xml +++ b/dataChange/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.ccsdk.sli.northbound</groupId> <artifactId>dataChange-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/provider/src/main/resources/OSGI-INF/blueprint/datachange-blueprint.xml b/dataChange/provider/src/main/resources/OSGI-INF/blueprint/datachange-blueprint.xml new file mode 100644 index 00000000..5a38c81f --- /dev/null +++ b/dataChange/provider/src/main/resources/OSGI-INF/blueprint/datachange-blueprint.xml @@ -0,0 +1,32 @@ +<?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.ccsdk.sli.northbound.DataChangeClient"> + <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.ccsdk.sli.northbound.DataChangeProvider"> + <argument ref="dataBroker" /> + <argument ref="notificationService" /> + <argument ref="rpcRegistry" /> + <argument ref="client" /> + </bean> + +</blueprint>
\ No newline at end of file diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index d07f8111..d010de56 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dmaap-listener</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: dmaap-listener</name> @@ -24,7 +24,7 @@ <build.number>${maven.build.timestamp}</build.number> <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> - <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> + <ccsdk.sli.core.version>0.5.1-SNAPSHOT</ccsdk.sli.core.version> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> diff --git a/features/ccsdk-sli-northbound-all/pom.xml b/features/ccsdk-sli-northbound-all/pom.xml index c5c1b914..1df64842 100644 --- a/features/ccsdk-sli-northbound-all/pom.xml +++ b/features/ccsdk-sli-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.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-sli-northbound-all</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/features/features-sli-northbound/pom.xml b/features/features-sli-northbound/pom.xml index fce265bb..c98c303d 100644 --- a/features/features-sli-northbound/pom.xml +++ b/features/features-sli-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.ccsdk.sli.northbound</groupId> <artifactId>features-sli-northbound</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/features/installer/pom.xml b/features/installer/pom.xml index 46bdfdf3..796eadd7 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.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-features-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 486ff093..01d54329 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.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features</name> diff --git a/lcm/features/ccsdk-lcm/pom.xml b/lcm/features/ccsdk-lcm/pom.xml index cd80fb34..0528e6e5 100644 --- a/lcm/features/ccsdk-lcm/pom.xml +++ b/lcm/features/ccsdk-lcm/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.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-lcm</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/features/features-lcm/pom.xml b/lcm/features/features-lcm/pom.xml index cb712618..68e2150e 100644 --- a/lcm/features/features-lcm/pom.xml +++ b/lcm/features/features-lcm/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.ccsdk.sli.northbound</groupId> <artifactId>features-lcm</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>feature</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/features/pom.xml b/lcm/features/pom.xml index b59d2b92..f5b49230 100755 --- a/lcm/features/pom.xml +++ b/lcm/features/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.ccsdk.sli.northbound</groupId> <artifactId>lcm-features</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/installer/pom.xml b/lcm/installer/pom.xml index 3966c9d2..fb3123df 100755 --- a/lcm/installer/pom.xml +++ b/lcm/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.ccsdk.sli.northbound</groupId> <artifactId>lcm-installer</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/model/pom.xml b/lcm/model/pom.xml index 6f41820c..e2787508 100755 --- a/lcm/model/pom.xml +++ b/lcm/model/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.ccsdk.sli.northbound</groupId> <artifactId>lcm-model</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> @@ -23,13 +23,11 @@ <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> diff --git a/lcm/pom.xml b/lcm/pom.xml index 455beb89..d2299d15 100755 --- a/lcm/pom.xml +++ b/lcm/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.ccsdk.sli.northbound</groupId> <artifactId>lcm</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm</name> diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml index def00a9b..7eba7c9b 100755 --- a/lcm/provider/pom.xml +++ b/lcm/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.ccsdk.sli.northbound</groupId> <artifactId>lcm-provider</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/provider/src/main/resources/OSGI-INF/blueprint/lcm-blueprint.xml b/lcm/provider/src/main/resources/OSGI-INF/blueprint/lcm-blueprint.xml new file mode 100644 index 00000000..5597d080 --- /dev/null +++ b/lcm/provider/src/main/resources/OSGI-INF/blueprint/lcm-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.ccsdk.sli.northbound.LcmSliClient"> + <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.ccsdk.sli.northbound.LcmProvider"> + <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 @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -104,7 +104,7 @@ <organization> <name>ONAP</name> </organization> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> </project> diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml index 63b849ec..d0cc9651 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>1.3.3-SNAPSHOT</version> + <version>1.4.0-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ueb-listener</artifactId> - <version>0.5.2-SNAPSHOT</version> + <version>0.6.0-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: ueb-listener</name> @@ -22,7 +22,7 @@ <maven.build.timestamp.format>yyyyMMdd'T'HHmmss'Z'</maven.build.timestamp.format> <build.number>${maven.build.timestamp}</build.number> <SWM_VERSION>${project.version}-${build.number}</SWM_VERSION> - <ccsdk.sli.core.version>${project.version}</ccsdk.sli.core.version> + <ccsdk.sli.core.version>0.5.1-SNAPSHOT</ccsdk.sli.core.version> <ccsdk.sli.northbound.version>${project.version}</ccsdk.sli.northbound.version> </properties> diff --git a/version.properties b/version.properties index 74fd9991..54c44bc2 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=0 -sprint_number=5 -feature_revision=2 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} |