diff options
41 files changed, 402 insertions, 73 deletions
diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 244dba19a..ff7bc3f7b 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.4.1-SNAPSHOT</version> + <version>0.4.2-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.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <properties> diff --git a/asdcApi/features/ccsdk-asdcApi/pom.xml b/asdcApi/features/ccsdk-asdcApi/pom.xml index 0691fc211..d7ad2b799 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-asdcApi</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 292cac23d..a3c92f6e1 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>features-asdcApi</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 2c81542bc..95e71af76 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-features</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 860563f8c..d078f5aa9 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-installer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 3952fea74..384c03130 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-model</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> diff --git a/asdcApi/pom.xml b/asdcApi/pom.xml index 3e8f12877..aade65265 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: asdcApi</name> diff --git a/asdcApi/provider/pom.xml b/asdcApi/provider/pom.xml index 6df4ba2f2..97c39dc65 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>asdcApi-provider</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: asdcApi :: ${project.artifactId}</name> 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 d5fa7b420..820054eff 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-daexim-offsite-backup</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 07b4a039b..a8eec8ece 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>features-daexim-offsite-backup</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 318ebad38..78187ef04 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup-features</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 23ac81f5e..6d2d4c9a6 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.2.1</version> + <version>1.2.2-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.4.1-SNAPSHOT</version> + <version>0.4.2-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 0805a60c8..5490df9f1 100755 --- a/daexim-offsite-backup/model/pom.xml +++ b/daexim-offsite-backup/model/pom.xml @@ -4,14 +4,14 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>1.2.1</version> + <version>1.2.2-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.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <dependencies> diff --git a/daexim-offsite-backup/pom.xml b/daexim-offsite-backup/pom.xml index 4c73bdae3..135ab35b9 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>daexim-offsite-backup</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 087f014f1..ed8eb4fac 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.2.1</version> + <version>1.2.2-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.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <build> diff --git a/dataChange/features/ccsdk-dataChange/pom.xml b/dataChange/features/ccsdk-dataChange/pom.xml index ad1c29e5b..dae1a3510 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-dataChange</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 be8fabdc7..79affc6f6 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>features-dataChange</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 55f0c1428..454eaa914 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-features</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 0828da596..1bf4fe3ca 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-installer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 26b6b9cd0..195ff6bf3 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-model</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dataChange/pom.xml b/dataChange/pom.xml index cfeee532b..211f9d997 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: dataChange</name> diff --git a/dataChange/provider/pom.xml b/dataChange/provider/pom.xml index 62d134ccc..a4b892518 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dataChange-provider</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: dataChange :: ${project.artifactId}</name> diff --git a/dmaap-listener/pom.xml b/dmaap-listener/pom.xml index 87f97bc21..cfdf0fa7f 100755 --- a/dmaap-listener/pom.xml +++ b/dmaap-listener/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>dmaap-listener</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: dmaap-listener</name> diff --git a/features/ccsdk-sli-northbound-all/pom.xml b/features/ccsdk-sli-northbound-all/pom.xml index 471cadeb0..13d12b467 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-sli-northbound-all</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 6b76770e7..7e55dbf0d 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>features-sli-northbound</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 731b7a93c..90df894f5 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-features-installer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: features :: ${project.artifactId}</name> diff --git a/features/pom.xml b/features/pom.xml index 957e07826..d3aac65b5 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>slinorthbound-feature-aggregator</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 fa2f73a94..086996eea 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ccsdk-lcm</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 7f216cb0c..700b1f82c 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>features-lcm</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 0c5404744..0b04daff8 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-features</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 df5214f65..fd36b7a33 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-installer</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-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 a8f8a0c98..b8e5c1879 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-model</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> diff --git a/lcm/pom.xml b/lcm/pom.xml index 42b9002b9..1e5f0c6a2 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>pom</packaging> <name>ccsdk-sli-northbound :: lcm</name> diff --git a/lcm/provider/pom.xml b/lcm/provider/pom.xml index 49d8c7d51..addb1d5c4 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.2.1</version> + <version>1.2.2-SNAPSHOT</version> <relativePath/> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>lcm-provider</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>bundle</packaging> <name>ccsdk-sli-northbound :: lcm :: ${project.artifactId}</name> @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <modelVersion>4.0.0</modelVersion> @@ -104,7 +104,7 @@ <organization> <name>ONAP</name> </organization> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> </project> diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml index 39ba7efff..1894f8f30 100755 --- a/ueb-listener/pom.xml +++ b/ueb-listener/pom.xml @@ -5,12 +5,12 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>1.2.1</version> + <version>1.2.2-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> <artifactId>ueb-listener</artifactId> - <version>0.4.1-SNAPSHOT</version> + <version>0.4.2-SNAPSHOT</version> <packaging>jar</packaging> <name>ccsdk-sli-northbound :: ueb-listener</name> diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java index 37b100ca4..4824d9f2d 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java @@ -31,6 +31,7 @@ import java.util.Map; import javax.sql.rowset.CachedRowSet; +import org.onap.sdc.tosca.parser.api.IEntityDetails; import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; import org.onap.sdc.toscaparser.api.CapabilityAssignment; @@ -70,6 +71,7 @@ public class SdncBaseModel { protected static DBResourceManager jdbcDataSource = null; protected static SdncUebConfiguration config = null; protected NodeTemplate nodeTemplate = null; + protected IEntityDetails entityDetails = null; public SdncBaseModel(DBResourceManager jdbcDataSource) { this.jdbcDataSource = jdbcDataSource; @@ -89,6 +91,14 @@ public class SdncBaseModel { this.jdbcDataSource = jdbcDataSource; this.config = config; } + + public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, IEntityDetails entityDetails, DBResourceManager jdbcDataSource, SdncUebConfiguration config) throws IOException { + this (sdcCsarHelper, entityDetails); + this.sdcCsarHelper = sdcCsarHelper; + this.entityDetails = entityDetails; + this.jdbcDataSource = jdbcDataSource; + this.config = config; + } public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, Metadata metadata) { @@ -128,6 +138,23 @@ public class SdncBaseModel { } + public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, IEntityDetails entityDetails) { + + params = new HashMap<String, String>(); + attributeValueParams = new HashMap<String, String>(); + this.sdcCsarHelper = sdcCsarHelper; + this.entityDetails = entityDetails; + + // extract common nodeTemplate metadata + Metadata metadata = entityDetails.getMetadata(); + customizationUUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID); + invariantUUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_INVARIANTUUID); + addParameter(PARAM_INVARIANT_UUID_KEY, invariantUUID); + UUID = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_UUID); + addParameter(PARAM_UUID_KEY, UUID); + addParameter(PARAM_VERSION_KEY, extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_VERSION)); + } + public SdncBaseModel(ISdcCsarHelper sdcCsarHelper, Group group, SdncUebConfiguration config, DBResourceManager jdbcDataSource) throws IOException { this (sdcCsarHelper, group); this.sdcCsarHelper = sdcCsarHelper; @@ -662,6 +689,22 @@ public class SdncBaseModel { } } + protected String extractValue (IEntityDetails entityDetails, String name) { + String value = null; + if (entityDetails.getProperties().containsKey(name)) { + Property property = entityDetails.getProperties().get(name); + if (property != null && property.getValue() != null) { + value = property.getValue().toString(); + } + } + + if (value != null) { + return value; + } else { + return ""; + } + } + protected String extractGetInputValue (Group group, NodeTemplate nodeTemplate, String name) { String value = sdcCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, extractGetInputName (group, name)); @@ -761,6 +804,22 @@ public class SdncBaseModel { } } + protected String extractBooleanValue (IEntityDetails entityDetails, String name) { + String value = null; + if (entityDetails.getProperties().containsKey(name)) { + Property property = entityDetails.getProperties().get(name); + if (property != null && property.getValue() != null) { + value = property.getValue().toString(); + } + } + + if (value != null && !value.isEmpty()) { + return value.contains("true") ? "Y" : "N"; + } else { + return ""; + } + } + public static String extractBooleanValue (ISdcCsarHelper sdcCsarHelper, NodeTemplate nodeTemplate, String name) { String value = sdcCsarHelper.getNodeTemplatePropertyLeafValue(nodeTemplate, name); if (value != null && !value.isEmpty()) { diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncPNFModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncPNFModel.java new file mode 100644 index 000000000..296b13819 --- /dev/null +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncPNFModel.java @@ -0,0 +1,142 @@ +/*- + * ============LICENSE_START======================================================= + * openECOMP : SDN-C + * ================================================================================ + * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights + * reserved. + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ============LICENSE_END========================================================= + */ + +package org.onap.ccsdk.sli.northbound.uebclient; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; +import org.onap.sdc.tosca.parser.api.IEntityDetails; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.ccsdk.sli.core.dblib.DBResourceManager; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class SdncPNFModel extends SdncBaseModel { + + private static final Logger LOG = LoggerFactory + .getLogger(SdncVFModel.class); + + private String vendor = null; + private String vendorModelDescription = null; + private String nfNamingCode = null; + private String serviceUUID = null; + private String serviceInvariantUUID = null; + + public SdncPNFModel(ISdcCsarHelper sdcCsarHelper, IEntityDetails entityDetails, DBResourceManager jdbcDataSource, SdncUebConfiguration config) throws IOException { + + super(sdcCsarHelper, entityDetails, jdbcDataSource, config); + + // extract metadata + Metadata metadata = entityDetails.getMetadata(); + addParameter("name", extractValue(metadata, SdcPropertyNames.PROPERTY_NAME_NAME)); + vendor = extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDOR); + addParameter("vendor", vendor); + vendorModelDescription = extractValue (metadata, "description"); + addParameter("vendor_version", extractValue (metadata, SdcPropertyNames.PROPERTY_NAME_RESOURCEVENDORRELEASE)); + + // extract properties + addParameter("ecomp_generated_naming", extractBooleanValue(entityDetails, "nf_naming#ecomp_generated_naming")); + addParameter("naming_policy", extractValue(entityDetails, "nf_naming#naming_policy")); + addParameter("nf_type", extractValue(entityDetails, SdcPropertyNames.PROPERTY_NAME_NFTYPE)); + addParameter("nf_role", extractValue(entityDetails, SdcPropertyNames.PROPERTY_NAME_NFROLE)); + nfNamingCode = extractValue(entityDetails, "nf_naming_code"); + addParameter("nf_code", nfNamingCode); + addParameter("nf_function", extractValue(entityDetails, SdcPropertyNames.PROPERTY_NAME_NFFUNCTION)); + addIntParameter("avail_zone_max_count", extractValue(entityDetails, SdcPropertyNames.PROPERTY_NAME_AVAILABILITYZONEMAXCOUNT)); + addParameter("sdnc_model_name", extractValue(entityDetails, "sdnc_model_name")); + addParameter("sdnc_model_version", extractValue(entityDetails, "sdnc_model_version")); + addParameter("sdnc_artifact_name", extractValue(entityDetails, "sdnc_artifact_name")); + + } + + public void insertData() throws IOException { + + insertPNFModelData(); + } + + private void insertPNFModelData () throws IOException { + + try { + cleanUpExistingToscaData("VF_MODEL", "customization_uuid", getCustomizationUUID()) ; + cleanUpExistingToscaData("SERVICE_MODEL_TO_VF_MODEL_MAPPING", "service_uuid", serviceUUID, "vf_customization_uuid", getCustomizationUUID()); + + // insert into VF_MODEL/ATTRIBUTE_VALUE_PAIR and SERVICE_MODEL_TO_VF_MODEL_MAPPING + LOG.info("Call insertToscaData for VF_MODEL where customization_uuid = " + getCustomizationUUID()); + insertToscaData(buildSql("VF_MODEL", model_yaml), null); + //insertRelevantAttributeData(); + + Map<String, String> mappingParams = new HashMap<String, String>(); + addParameter("service_invariant_uuid", serviceInvariantUUID, mappingParams); + addParameter("vf_uuid", getUUID(), mappingParams); + addParameter("vf_customization_uuid", getCustomizationUUIDNoQuotes(), mappingParams); + insertToscaData(buildSql("SERVICE_MODEL_TO_VF_MODEL_MAPPING", "service_uuid", serviceUUID, model_yaml, mappingParams), null); + + } catch (IOException e) { + LOG.error("Could not insert Tosca CSAR data into the VF_MODEL table"); + throw new IOException (e); + } + + } + + public String getVendor() { + return vendor; + } + + public void setVendor(String vendor) { + this.vendor = vendor; + } + + public String getVendorModelDescription() { + return vendorModelDescription; + } + + public void setVendorModelDescription(String vendorModelDescription) { + this.vendorModelDescription = vendorModelDescription; + } + + public String getNfNamingCode() { + return nfNamingCode; + } + + public void setNfNamingCode(String nfNamingCode) { + this.nfNamingCode = nfNamingCode; + } + + public String getServiceUUID() { + return serviceUUID; + } + public void setServiceUUID(String serviceUUID) { + this.serviceUUID = serviceUUID; + } + + public String getServiceInvariantUUID() { + return serviceInvariantUUID; + } + + public void setServiceInvariantUUID(String serviceInvariantUUID) { + this.serviceInvariantUUID = serviceInvariantUUID; + } + +} diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java index ba644f302..4d9dbda96 100644 --- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java +++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java @@ -70,7 +70,11 @@ import org.onap.sdc.api.notification.INotificationData; import org.onap.sdc.api.notification.IResourceInstance; import org.onap.sdc.api.results.IDistributionClientDownloadResult; import org.onap.sdc.api.results.IDistributionClientResult; +import org.onap.sdc.tosca.parser.api.IEntityDetails; import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.tosca.parser.elements.queries.EntityQuery; +import org.onap.sdc.tosca.parser.elements.queries.TopologyTemplateQuery; +import org.onap.sdc.tosca.parser.enums.SdcTypes; import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException; import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory; import org.onap.sdc.toscaparser.api.NodeTemplate; @@ -751,6 +755,28 @@ public class SdncUebCallback implements INotificationCallback { } // VF loop + + // Ingest Network (PNF) Data - Dublin/1906 + EntityQuery entityQuery = EntityQuery.newBuilder(SdcTypes.PNF).build(); + TopologyTemplateQuery topologyTemplateQuery = TopologyTemplateQuery.newBuilder(SdcTypes.SERVICE).build(); + + List<IEntityDetails> pnfs = sdcCsarHelper.getEntity(entityQuery, topologyTemplateQuery, false); + if (!pnfs.isEmpty()) { + + for (IEntityDetails pnf : pnfs) { + + try { + SdncPNFModel pnfModel = new SdncPNFModel(sdcCsarHelper, pnf, jdbcDataSource, config); + pnfModel.setServiceUUID(serviceModel.getServiceUUID()); + pnfModel.setServiceInvariantUUID(serviceModel.getServiceInvariantUUID()); + pnfModel.insertData(); + + } catch (IOException e) { + deployStatus = DistributionStatusEnum.DEPLOY_ERROR; + } + } // PNF loop + } + DistributionStatusEnum complexToscaDeployStatus = customProcessComplexTosca(sdcCsarHelper, config, jdbcDataSource, serviceModel, data, svcName, resourceName, artifact, archiveDir); if (complexToscaDeployStatus == DistributionStatusEnum.DEPLOY_ERROR) { diff --git a/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncPNFModelTest.java b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncPNFModelTest.java new file mode 100644 index 000000000..d4c06b049 --- /dev/null +++ b/ueb-listener/src/test/java/org/onap/ccsdk/sli/northbound/uebclient/SdncPNFModelTest.java @@ -0,0 +1,102 @@ +package org.onap.ccsdk.sli.northbound.uebclient; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +import java.io.IOException; +import java.util.HashMap; +import java.util.Map; + +import org.junit.Before; +import org.junit.Test; +import org.onap.sdc.tosca.parser.api.IEntityDetails; +import org.onap.sdc.tosca.parser.api.ISdcCsarHelper; +import org.onap.sdc.toscaparser.api.elements.Metadata; +import org.onap.sdc.toscaparser.api.Property; + +import org.onap.ccsdk.sli.core.dblib.DBResourceManager; + + public class SdncPNFModelTest { + + SdncPNFModel testSdncPNFModel = null; + + @Before + public void setUp() throws Exception { + ISdcCsarHelper mockCsarHelper = mock(ISdcCsarHelper.class); + IEntityDetails mockEntityDetails = mock(IEntityDetails.class); + Metadata mockMetadata = mock(Metadata.class); + Property mockProperty = mock(Property.class); + Map<String, Property> mockProperties = new HashMap<String, Property>(); + DBResourceManager mockDBResourceManager = mock(DBResourceManager.class); + SdncUebConfiguration mockSdncUebConfiguration = mock(SdncUebConfiguration.class); + + when(mockEntityDetails.getMetadata()).thenReturn(mockMetadata); + when(mockCsarHelper.getMetadataPropertyValue(mockMetadata, "customizationUUID")).thenReturn("aaaa-bbbb-cccc-dddd"); + mockProperty.setValue("test-nf-naming-code"); + when(mockProperties.get("nf_naming_code")).thenReturn(mockProperty); + + try { + testSdncPNFModel = new SdncPNFModel(mockCsarHelper,mockEntityDetails,mockDBResourceManager,mockSdncUebConfiguration); + testSdncPNFModel.setServiceUUID("bbbb-cccc-dddd-eeee"); + testSdncPNFModel.setServiceInvariantUUID("cccc-dddd-eeee-ffff"); + testSdncPNFModel.setVendor("Cisco"); + testSdncPNFModel.setVendorModelDescription("Cisco Equipment Model"); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + + assertNotNull(testSdncPNFModel); + } + + @Test + public void testSetGetVendor() { + String newVendorModel = "new-vendor-model"; + testSdncPNFModel.setVendor(newVendorModel); + String result = testSdncPNFModel.getVendor(); + assertEquals(result, newVendorModel); + } + + @Test + public void testSetGetVendorModelDescription() { + String newVendorModelDescription = "new-vendor-model-description"; + testSdncPNFModel.setVendorModelDescription(newVendorModelDescription); + String result = testSdncPNFModel.getVendorModelDescription(); + assertEquals(result, newVendorModelDescription); + } + + @Test + public void testSetGetNfNamingCode() { + String newNfNamingCode = "new-nf-naming-code"; + testSdncPNFModel.setNfNamingCode(newNfNamingCode); + String result = testSdncPNFModel.getNfNamingCode(); + assertEquals(result, newNfNamingCode); + } + + @Test + public void testSetGetServiceUUID() { + String newServiceUuid = "cccc-dddd-eeee-ffff"; + testSdncPNFModel.setServiceUUID(newServiceUuid); + String result = testSdncPNFModel.getServiceUUID(); + assertEquals(newServiceUuid, result); + } + + @Test + public void testSetGetServiceInvariantUUID() { + String newServiceInvariantUuid = "dddd-eeee-ffff-eeee"; + testSdncPNFModel.setServiceInvariantUUID(newServiceInvariantUuid); + String result = testSdncPNFModel.getServiceInvariantUUID(); + assertEquals(result, newServiceInvariantUuid); + } + + @Test + public void testInsertData() { + try { + testSdncPNFModel.insertData(); + } catch (IOException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + } diff --git a/version.properties b/version.properties index 2a56aedac..e40820109 100644 --- a/version.properties +++ b/version.properties @@ -5,7 +5,7 @@ release_name=0 sprint_number=4 -feature_revision=1 +feature_revision=2 base_version=${release_name}.${sprint_number}.${feature_revision} |