diff options
| author |   Dan Timoney <dtimoney@att.com> | 2022-03-01 11:10:58 -0500 |
|---|---|---|
| committer | Dan Timoney <dtimoney@att.com> | 2022-03-22 18:04:32 +0000 |
| commit | 7c0ec3e4540c1a10a03efcfbae06c4a7915977a6 (patch) | |
| tree | ca6c6fd9616f24efb786ee8620ad499cb258a4d9 | |
| parent | b64e61b3631a022f6f166e6fc15026537ff46c63 (diff) | |
Migrate SLI to OpenDaylight Phosphorus
Updated ccsdk/sli to use Phosphorus SR1 version of parent poms and
updated Java Reflection code to handle changes in Phosphorus:
- use Uint8/Uint16/Uint32/Uint64 classes in place of
char/Short/Long/BigInteger, respectively
- add code for toMap method to handle change in representation
of yang list from java List to java Map
- Add new YangUtils class to replace removed ODL yangtools SchemaUtils class
- Update restconf-client due to changes in yangtools
Issue-ID: CCSDK-3567
Signed-off-by: Dan Timoney <dtimoney@att.com>
Change-Id: Iea581c7f39b1038ce95cc0ca6728fe56dd023f3e
174 files changed, 1096 insertions, 388 deletions
diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 3305d5f42..15fa49b06 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index d2e84ee05..a42b6cd60 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index b92a8fba9..1ae16055c 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml index 991ab2055..cd94a7930 100644 --- a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml +++ b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml index 36083942e..3c5b7669e 100644 --- a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml +++ b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ansible-adaptor/pom.xml b/adaptors/ansible-adaptor/pom.xml index 70bfbb208..26d0fb233 100644 --- a/adaptors/ansible-adaptor/pom.xml +++ b/adaptors/ansible-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index 93b4081cc..0d0c5fc19 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index 3928d6e26..d306ab711 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index 08a13d76a..73b2aefa2 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 4b28ccf5d..ce68cf868 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 06ecd64cd..b854acf69 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml index 718bd61ea..abda05f2b 100644 --- a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml +++ b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml index 24ebc0159..c77f2051a 100644 --- a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml +++ b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/chef-adaptor/pom.xml b/adaptors/chef-adaptor/pom.xml index 8f0475bb2..9a70e6bdf 100644 --- a/adaptors/chef-adaptor/pom.xml +++ b/adaptors/chef-adaptor/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 03b20d921..272895a49 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-ansible-adaptor/pom.xml b/adaptors/features/ccsdk-ansible-adaptor/pom.xml index f39f62b64..25e35d063 100644 --- a/adaptors/features/ccsdk-ansible-adaptor/pom.xml +++ b/adaptors/features/ccsdk-ansible-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 5940f577b..fb67e48f5 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-chef-adaptor/pom.xml b/adaptors/features/ccsdk-chef-adaptor/pom.xml index cff36c573..77a4c267e 100644 --- a/adaptors/features/ccsdk-chef-adaptor/pom.xml +++ b/adaptors/features/ccsdk-chef-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-iaas-adaptor/pom.xml b/adaptors/features/ccsdk-iaas-adaptor/pom.xml index 1ecd32c0f..ab8b8da79 100644 --- a/adaptors/features/ccsdk-iaas-adaptor/pom.xml +++ b/adaptors/features/ccsdk-iaas-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index 4f1734d24..46666aba6 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 1af4142e5..f229ce41e 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index 125f26077..626503d5c 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index d68cc5f7f..1755893bf 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-netconf-adaptor/pom.xml b/adaptors/features/ccsdk-netconf-adaptor/pom.xml index 5d28e055c..2e43713b0 100644 --- a/adaptors/features/ccsdk-netconf-adaptor/pom.xml +++ b/adaptors/features/ccsdk-netconf-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index dd03baab8..a8904e852 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-rest-adaptor/pom.xml b/adaptors/features/ccsdk-rest-adaptor/pom.xml index 37ae276d1..c60142da6 100644 --- a/adaptors/features/ccsdk-rest-adaptor/pom.xml +++ b/adaptors/features/ccsdk-rest-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml index a02df5689..984a9e80d 100644 --- a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index b000b224c..0cdee64c9 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index c4ce962e9..b7f2e5bd0 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-ssh-adaptor/pom.xml b/adaptors/features/ccsdk-ssh-adaptor/pom.xml index 5997eca04..78d5973e2 100644 --- a/adaptors/features/ccsdk-ssh-adaptor/pom.xml +++ b/adaptors/features/ccsdk-ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml index c2f2f205f..4f7db8025 100644 --- a/adaptors/features/features-sli-adaptors/pom.xml +++ b/adaptors/features/features-sli-adaptors/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index 4270641ce..64168b36b 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index a57f522f4..4158ee447 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml index f64e28744..99d91a5bd 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml +++ b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml index 24954cb56..8c1c88017 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml +++ b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/iaas-adaptor/pom.xml b/adaptors/iaas-adaptor/pom.xml index b52a0dde3..bc6a2d52f 100644 --- a/adaptors/iaas-adaptor/pom.xml +++ b/adaptors/iaas-adaptor/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index e41ffb5d3..c587a217e 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index ee7983951..ce858a2bd 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 90af4559f..da8ef21e2 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index d2d8628f3..77482183d 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index 4c40b49a2..5bd4d480a 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index 12122b50a..d8035edd0 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index e5c86b304..9890444ee 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml index fec84f5bc..956e02217 100644 --- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml +++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml index 83ba40f1a..3f846a896 100644 --- a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml +++ b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netconf-adaptor/pom.xml b/adaptors/netconf-adaptor/pom.xml index c3cb3d1af..e081f307f 100644 --- a/adaptors/netconf-adaptor/pom.xml +++ b/adaptors/netconf-adaptor/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/pom.xml b/adaptors/pom.xml index d2d886ee9..0fb9f1759 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index f58b508fd..ce4b1317d 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index df11995b8..1f0228a8a 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index fbb6f59fb..2dd29e3bf 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/rest-adaptor/pom.xml b/adaptors/rest-adaptor/pom.xml index 827bc32d4..ecb8f661d 100644 --- a/adaptors/rest-adaptor/pom.xml +++ b/adaptors/rest-adaptor/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml index 9d9ee09aa..58ffe7aa7 100644 --- a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml +++ b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml index 5f55a3bc4..d9e1347e4 100644 --- a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml +++ b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/saltstack-adaptor/pom.xml b/adaptors/saltstack-adaptor/pom.xml index dea786905..14a7fdaa9 100644 --- a/adaptors/saltstack-adaptor/pom.xml +++ b/adaptors/saltstack-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml index 93261319a..890acbed7 100644 --- a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml +++ b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml index 642f69cac..78db55583 100644 --- a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml +++ b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index 144ce053d..18a5bae13 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index 723cf6ce4..17e8dedf0 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index f169e3a35..1b9d077c2 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ssh-adaptor/pom.xml b/adaptors/ssh-adaptor/pom.xml index b167c322f..9d9cf0006 100644 --- a/adaptors/ssh-adaptor/pom.xml +++ b/adaptors/ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml index e7ef69738..ef166a0b0 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index a756c0ce6..af4bfe769 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 1bea19fb4..4e6283125 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index 1197c6355..1ec425601 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 00e0cc7dd..a67d49df9 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index c7a872a96..519288d0d 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 51492a052..e71580557 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 474783562..d4d946a4f 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index c2bc88cc2..7fdf43ec7 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index 46a6564ba..148296466 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 4184797bf..eb7e3e914 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index a760460fd..4f07a6240 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index b563e846c..f51b99f25 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index cb06f365e..2fccfa027 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/pom.xml b/core/features/pom.xml index f69502858..0943cda02 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index fb9a27b83..c6359f6d8 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 76898e9bb..a58a1dede 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 9163d544f..0e899ad5b 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/pom.xml b/core/pom.xml index 67a3dc96f..4714363f1 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index 2a4874e25..1a6b5a76e 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index dd4c04325..8d0e5932f 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index 350b63aff..1e39e6b1b 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/model/src/main/yang/test-model@2019-07-23.yang b/core/sli/model/src/main/yang/test-model@2019-07-23.yang index fc8e8b007..87419f838 100755 --- a/core/sli/model/src/main/yang/test-model@2019-07-23.yang +++ b/core/sli/model/src/main/yang/test-model@2019-07-23.yang @@ -18,43 +18,43 @@ module test-model { revision "2019-07-23" { description - "First release of the test model"; + "First release of the test model"; } identity sample-identity { - description - "Base identity"; + description + "Base identity"; } - typedef percentage { - type uint8 { - range "0 .. 100"; - } - description "represents a percentage"; - } + typedef percentage { + type uint8 { + range "0 .. 100"; + } + description "represents a percentage"; + } grouping builtin { leaf sample-binary { type binary; } leaf sample-bits { - type bits{ - bit fan-running { - position 0; - } - bit hd-led { - position 1; - } - bit power-led { - position 2; - } + type bits { + bit fan-running { + position 0; + } + bit hd-led { + position 1; + } + bit power-led { + position 2; + } } } leaf sample-boolean { type boolean; } leaf sample-decimal64 { - type decimal64{ + type decimal64 { fraction-digits 1; } } @@ -62,7 +62,7 @@ module test-model { type empty; } leaf sample-enumeration { - type enumeration{ + type enumeration { enum "shelf.slot.port"; enum "not available"; enum "CURRENTLY_AVAILABLE"; @@ -71,9 +71,9 @@ module test-model { } } leaf sample-identityref { - type identityref { - base "sample-identity"; - } + type identityref { + base "sample-identity"; + } } leaf sample-int8 { type int8; @@ -88,9 +88,9 @@ module test-model { type int64; } leaf sample-leafref { - type leafref { - path "../sample-boolean"; - } + type leafref { + path "../sample-boolean"; + } } leaf sample-string { type string; @@ -108,103 +108,121 @@ module test-model { type uint64; } leaf sample-union { - type union { - type int32; - type enumeration { - enum "unbounded"; - } - } - } - leaf percent-completed { - type percentage; - } + type union { + type int32; + type enumeration { + enum "unbounded"; + } + } + } + leaf percent-completed { + type percentage; + } } grouping inet-types-grouping { leaf ip-version { - type inet:ip-version; + type inet:ip-version; } leaf dscp { - type inet:dscp; + type inet:dscp; } leaf port-number { - type inet:port-number; + type inet:port-number; } leaf ipv6-flow-label { - type inet:ipv6-flow-label; + type inet:ipv6-flow-label; } leaf as-number { - type inet:as-number; + type inet:as-number; } leaf ip-address { - type inet:ip-address; + type inet:ip-address; } leaf ipv4-address { - type inet:ipv4-address; + type inet:ipv4-address; } leaf ipv6-address { - type inet:ipv6-address; + type inet:ipv6-address; } leaf ip-address-no-zone { - type inet:ip-address-no-zone; + type inet:ip-address-no-zone; } leaf ipv4-address-no-zone { - type inet:ipv4-address-no-zone; + type inet:ipv4-address-no-zone; } leaf ipv6-address-no-zone { - type inet:ipv6-address-no-zone; + type inet:ipv6-address-no-zone; } leaf ip-prefix { - type inet:ip-prefix; + type inet:ip-prefix; } leaf ipv4-prefix { - type inet:ipv4-prefix; + type inet:ipv4-prefix; } leaf ipv6-prefix { - type inet:ipv6-prefix; + type inet:ipv6-prefix; } leaf domain-name { - type inet:domain-name; + type inet:domain-name; } leaf host { - type inet:host; + type inet:host; } leaf uri { - type inet:uri; + type inet:uri; } - anyxml data; + anyxml data; } container sample-container { - leaf customer-name { - type string; - } - - leaf-list customer-nicknames { - type string; - } - - container login { - leaf message { - type string; - description - "Message given at start of login session"; - } - - list customer-addresses { - key "address-name"; - leaf address-name { - type string; - } - leaf street-address { - type string; - } - leaf state { - type string; - } - } - } - uses builtin; - uses inet-types-grouping; - } + leaf customer-name { + type string; + } + + leaf-list customer-nicknames { + type string; + } + + container login { + leaf message { + type string; + description + "Message given at start of login session"; + } + + list customer-addresses { + key "address-name"; + leaf address-name { + type string; + } + leaf street-address { + type string; + } + leaf state { + type string; + } + } + } + list ip-address-list { + key "ip-addr"; + leaf ip-addr { + type inet:ip-address; + } + } + leaf-list ip-address-leaf-list { + type inet:ip-address; + } + list ip-address-names { + key "ip-addr"; + leaf ip-addr { + type inet:ip-address; + } + leaf fqdn { + type string; + } + } + uses builtin; + uses inet-types-grouping; + } } diff --git a/core/sli/pom.xml b/core/sli/pom.xml index ca79c3ae7..e0f9caa74 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index 5d4142839..ccd0c71b9 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index e4dd45692..6b67441be 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java index d13122f91..37a6a5b24 100755 --- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java +++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java @@ -32,20 +32,9 @@ import java.lang.reflect.Method; import java.lang.reflect.Modifier; import java.lang.reflect.ParameterizedType; import java.lang.reflect.Type; -import java.util.ArrayList; -import java.util.Enumeration; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefix; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; +import java.util.*; + +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.*; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RouteDistinguisher; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.bgp.types.rev200120.RouteDistinguisherBuilder; import org.opendaylight.yangtools.yang.binding.Identifier; @@ -176,8 +165,16 @@ public class MdsalHelper { toProperties(props, pfx + "[" + i + "]", fromList.get(i), fromClass, useLegacyEnumerationMapping); } setProperty(props, pfx + "_length", Integer.toString(fromList.size())); - } else if (fromClass.isEnum()) - { + } else if (fromObj instanceof Map) { + Map fromMap = (Map) fromObj; + Iterator<Object> mapIter = fromMap.values().iterator(); + int idx = 0; + while (mapIter.hasNext()) { + toProperties(props, pfx + "[" + idx + "]", mapIter.next(), fromClass, useLegacyEnumerationMapping); + idx++; + } + setProperty(props, pfx + "_length", Integer.toString(idx)); + } else if (fromClass.isEnum()) { try { if (useLegacyEnumerationMapping) { Method m = fromClass.getMethod(getStringValueMethod(simpleTypeName), null); @@ -581,6 +578,86 @@ public class MdsalHelper { } + public static Map toMap(Properties props, String pfx, Map toObj, Class elemType) { + + int maxIdx = -1; + boolean foundValue = false; + + if (props.containsKey(pfx + "_length")) { + try { + int listLength = Integer.parseInt(props.getProperty(pfx + "_length")); + + if (listLength > 0) { + maxIdx = listLength - 1; + } + } catch (NumberFormatException e) { + LOG.info("Invalid input for length ", e); + } + } + + String arrayKey = pfx + "["; + int arrayKeyLength = arrayKey.length(); + if (maxIdx == -1) { + // Figure out array size + for (Object pNameObj : props.keySet()) { + String key = (String) pNameObj; + + if (key.startsWith(arrayKey)) { + String idxStr = key.substring(arrayKeyLength); + int endloc = idxStr.indexOf("]"); + if (endloc != -1) { + idxStr = idxStr.substring(0, endloc); + } + try { + int curIdx = Integer.parseInt(idxStr); + if (curIdx > maxIdx) { + maxIdx = curIdx; + } + } catch (Exception e) { + LOG.error("Illegal subscript in property {}", key, e); + } + + } + } + } + + for (int i = 0; i <= maxIdx; i++) { + + String curBase = pfx + "[" + i + "]"; + + // Maps are used to represent yang lists. + // Each entry in the Map is an yang-generated object, + // to be constructed by a builder. + String builderName = elemType.getName() + "Builder"; + try { + Class elemClass = Class.forName(elemType.getName()); + Class builderClass = Class.forName(builderName); + Object builderObj = builderClass.newInstance(); + Method buildMethod = builderClass.getMethod("build"); + builderObj = toBuilder(props, curBase, builderObj, true); + if (builderObj != null) { + Object builtObj = buildMethod.invoke(builderObj); + Method keyMethod = builtObj.getClass().getMethod("key"); + keyMethod.setAccessible(true); + Object builtObjKey = keyMethod.invoke(builtObj); + toObj.put(builtObjKey, builtObj); + foundValue = true; + } + + } catch (ClassNotFoundException e) { + LOG.warn("Could not find builder class {}", builderName, e); + } catch (Exception e) { + LOG.error("Caught exception trying to populate list from {}", pfx, e); + } + } + + if (foundValue) { + return (toObj); + } else { + return (null); + } + } + public static Object toBuilder(Properties props, String pfx, Object toObj) { return (toBuilder(props, pfx, toObj, false)); } @@ -679,6 +756,7 @@ public class MdsalHelper { String simpleName = paramClass.getSimpleName(); + if (IPV4_ADDRESS.equals(simpleName) || IPV6_ADDRESS.equals(simpleName) || IP_ADDRESS.equals(simpleName)) { @@ -762,9 +840,21 @@ public class MdsalHelper { LOG.error("Caught exception calling " + toClass.getName() + "." + m.getName() + "(" + paramValue + ")", e); } + + } + } else if ("Host".equals(simpleName)) { + if ((paramValue != null) && (paramValue.length() > 0)) { + try { + Host host = HostBuilder.getDefaultInstance(paramValue); + m.invoke(toObj, host); + foundValue = true; + } catch (Exception e) { + LOG.error("Caught exception calling " + toClass.getName() + "." + m.getName() + + "(" + paramValue + ")", e); + } + } - } - else { + } else { // setter expects a yang-generated class. Need // to // create a builder to set it. @@ -828,6 +918,56 @@ public class MdsalHelper { } } + if (constObj == null) { + // Is there a Uint64 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint64.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint64.valueOf(paramValue)); + } + } + } + + } + + if (constObj == null) { + // Is there a Uint32 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint32.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint32.valueOf(paramValue)); + } + } + } + + } + if (constObj == null) { + // Is there a Uint16 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint16.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint16.valueOf(paramValue)); + } + } + } + + } + + if (constObj == null) { + // Is there a Uint8 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint8.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint8.valueOf(paramValue)); + } + } + } + + } if (constObj == null) { @@ -919,9 +1059,36 @@ public class MdsalHelper { } else { // Setter's argument is not a yang-generated class. See - // if it is a List. + // if it is a Map or a List + if (Map.class.isAssignableFrom(paramClass)) { + Type paramType = m.getGenericParameterTypes()[0]; + Type elementType = ((ParameterizedType) paramType).getActualTypeArguments()[1]; + Object paramObj = new LinkedHashMap(); + try { + paramObj = toMap(props, propName, (Map) paramObj, (Class)elementType); + } catch (Exception e) { + LOG.error("Caught exception trying to create map expected as argument to {}.{}", + toClass.getName(), m.getName(), e); + } + if (paramObj != null) { + try { + boolean isAccessible = m.isAccessible(); + if (!isAccessible) { + m.setAccessible(true); + } + m.invoke(toObj, paramObj); + if (!isAccessible) { + m.setAccessible(isAccessible); + } + foundValue = true; - if (List.class.isAssignableFrom(paramClass)) { + } catch (Exception e) { + LOG.error("Caught exception trying to convert List returned by" + toClass.getName() + + "." + m.getName() + "() to Properties entry", e); + } + } + } + else if (List.class.isAssignableFrom(paramClass)) { // Figure out what type of args are in List and pass // that to toList(). @@ -960,59 +1127,124 @@ public class MdsalHelper { Object constObj = null; - try { - // See if I can find a constructor I can use - Constructor[] constructors = paramClass.getConstructors(); - // Is there a String constructor? - for (Constructor c : constructors) { - Class[] cParms = c.getParameterTypes(); - if ((cParms != null) && (cParms.length == 1)) { - if (String.class.isAssignableFrom(cParms[0])) { - constObj = c.newInstance(paramValue); - } - } - } + // Handle Uint classes as special case + if (Uint64.class.isAssignableFrom(paramClass)) { + constObj = Uint64.valueOf(paramValue); + } else if (Uint32.class.isAssignableFrom(paramClass)) { + constObj = Uint32.valueOf(paramValue); + } else if (Uint16.class.isAssignableFrom(paramClass)) { + constObj = Uint16.valueOf(paramValue); + } else if (Uint8.class.isAssignableFrom(paramClass)) { + constObj = Uint8.valueOf(paramValue); + } - if (constObj == null) { - // Is there a Long constructor? + if (constObj != null) { + try { + m.invoke(toObj, constObj); + foundValue = true; + } catch (Exception e2) { + LOG.error("Caught exception trying to call " + m.getName(), e2); + } + } else { + try { + // See if I can find a constructor I can use + Constructor[] constructors = paramClass.getConstructors(); + // Is there a String constructor? for (Constructor c : constructors) { Class[] cParms = c.getParameterTypes(); if ((cParms != null) && (cParms.length == 1)) { - if (Long.class.isAssignableFrom(cParms[0])) { - constObj = c.newInstance(Long.parseLong(paramValue)); + if (String.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(paramValue); } } } - } + if (constObj == null) { + // Is there a Long constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Long.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Long.parseLong(paramValue)); + } + } + } + } - if (constObj != null) { - try { - m.invoke(toObj, constObj); - foundValue = true; - } catch (Exception e2) { - LOG.error("Caught exception trying to call " + m.getName(), e2); + if (constObj == null) { + // Is there a Uint64 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint64.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint64.valueOf(paramValue)); + } + } + } } - } else { - try { - boolean isAccessible = m.isAccessible(); - if (!isAccessible) { - m.setAccessible(true); + if (constObj == null) { + // Is there a Uint32 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint32.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint32.valueOf(paramValue)); + } + } } - m.invoke(toObj, paramValue); - if (!isAccessible) { - m.setAccessible(isAccessible); + } + if (constObj == null) { + // Is there a Uint16 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint16.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint16.valueOf(paramValue)); + } + } } - foundValue = true; + } + if (constObj == null) { + // Is there a Uint8 constructor? + for (Constructor c : constructors) { + Class[] cParms = c.getParameterTypes(); + if ((cParms != null) && (cParms.length == 1)) { + if (Uint8.class.isAssignableFrom(cParms[0])) { + constObj = c.newInstance(Uint8.valueOf(paramValue)); + } + } + } + } + + + if (constObj != null) { + try { + m.invoke(toObj, constObj); + foundValue = true; + } catch (Exception e2) { + LOG.error("Caught exception trying to call " + m.getName(), e2); + } + } else { + try { + boolean isAccessible = m.isAccessible(); + if (!isAccessible) { + m.setAccessible(true); + } + m.invoke(toObj, paramValue); + if (!isAccessible) { + m.setAccessible(isAccessible); + } + foundValue = true; - } catch (Exception e) { - LOG.error("Caught exception trying to convert value returned by" - + toClass.getName() + "." + m.getName() + "() to Properties entry", - e); + } catch (Exception e) { + LOG.error("Caught exception trying to convert value returned by" + + toClass.getName() + "." + m.getName() + "() to Properties entry", + e); + } } + } catch (Exception e1) { + LOG.warn("Could not find a suitable constructor for " + paramClass.getName(), e1); } - } catch (Exception e1) { - LOG.warn("Could not find a suitable constructor for " + paramClass.getName(), e1); } } diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java new file mode 100644 index 000000000..573444bf2 --- /dev/null +++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java @@ -0,0 +1,410 @@ +package org.onap.ccsdk.sli.core.sli.provider; + +import static com.google.common.base.Preconditions.checkState; +import com.google.common.collect.Collections2; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableSet; +import java.util.ArrayList; +import java.util.Collection; +import java.util.HashMap; +import java.util.HashSet; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.Set; +import org.eclipse.jdt.annotation.Nullable; +import org.opendaylight.yangtools.yang.common.QName; +import org.opendaylight.yangtools.yang.common.Revision; +import org.opendaylight.yangtools.yang.model.api.Module; +import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.AugmentationIdentifier; +import org.opendaylight.yangtools.yang.model.api.ActionNodeContainer; +import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; +import org.opendaylight.yangtools.yang.model.api.AugmentationTarget; +import org.opendaylight.yangtools.yang.model.api.CaseSchemaNode; +import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; +import org.opendaylight.yangtools.yang.model.api.DataNodeContainer; +import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; +import org.opendaylight.yangtools.yang.model.api.NotificationNodeContainer; +import org.opendaylight.yangtools.yang.model.api.OperationDefinition; +import org.opendaylight.yangtools.yang.model.api.SchemaContext; +import org.opendaylight.yangtools.yang.model.api.SchemaNode; + +public final class YangUtils { + + private YangUtils() { + } + /** + * Find the first schema with specified QName. + * + * @param qname schema node to find + * @param dataSchemaNode Iterable of schemaNodes to look through + * @return schema node with newest revision or absent if no schema node with matching qname is found + */ + public static Optional<DataSchemaNode> findFirstSchema(final QName qname, + final Iterable<? extends DataSchemaNode> dataSchemaNode) { + DataSchemaNode schema = null; + if (dataSchemaNode != null && qname != null) { + for (final DataSchemaNode dsn : dataSchemaNode) { + if (qname.isEqualWithoutRevision(dsn.getQName())) { + if (schema == null || Revision.compare(schema.getQName().getRevision(), + dsn.getQName().getRevision()) < 0) { + schema = dsn; + } + } else if (dsn instanceof ChoiceSchemaNode) { + for (final CaseSchemaNode choiceCase : ((ChoiceSchemaNode) dsn).getCases()) { + final Optional<DataSchemaNode> dataChildByName = choiceCase.findDataChildByName(qname); + if (dataChildByName.isPresent()) { + return dataChildByName; + } + final Optional<DataSchemaNode> foundDsn = findFirstSchema(qname, choiceCase.getChildNodes()); + if (foundDsn.isPresent()) { + return foundDsn; + } + } + } + } + } + return Optional.ofNullable(schema); + } + /** + * Find child schema node identified by its QName within a provided schema node. + * + * @param schema schema for parent node - search root + * @param qname qname(with or without a revision) of a child node to be found in the parent schema + * @return found schema node + * @throws java.lang.IllegalStateException if the child was not found in parent schema node + */ + public static DataSchemaNode findSchemaForChild(final DataNodeContainer schema, final QName qname) { + // Try to find child schema node directly, but use a fallback that compares QNames without revisions + // and auto-expands choices + final Optional<DataSchemaNode> dataChildByName = schema.findDataChildByName(qname); + return dataChildByName.isPresent() ? dataChildByName.get() + : findSchemaForChild(schema, qname, schema.getChildNodes()); + } + public static @Nullable DataSchemaNode findSchemaForChild(final DataNodeContainer schema, final QName qname, + final boolean strictMode) { + if (strictMode) { + return findSchemaForChild(schema, qname); + } + final Optional<DataSchemaNode> childSchemaOptional = findFirstSchema(qname, schema.getChildNodes()); + if (!childSchemaOptional.isPresent()) { + return null; + } + return childSchemaOptional.get(); + } + public static DataSchemaNode findSchemaForChild(final DataNodeContainer schema, final QName qname, + final Iterable<? extends DataSchemaNode> childNodes) { + final Optional<DataSchemaNode> childSchema = findFirstSchema(qname, childNodes); + checkState(childSchema.isPresent(), "Unknown child(ren) node(s) detected, identified by: %s, in: %s", qname, + schema); + return childSchema.get(); + } + public static DataSchemaNode findSchemaForChild(final ChoiceSchemaNode schema, final QName childPartialQName) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases()) { + final Optional<DataSchemaNode> childSchema = findFirstSchema(childPartialQName, + choiceCaseNode.getChildNodes()); + if (childSchema.isPresent()) { + return childSchema.get(); + } + } + throw new IllegalStateException(String.format("Unknown child(ren) node(s) detected, identified by: %s, in: %s", + childPartialQName, schema)); + } + public static AugmentationSchemaNode findSchemaForAugment(final AugmentationTarget schema, + final Set<QName> qnames) { + final Optional<AugmentationSchemaNode> schemaForAugment = findAugment(schema, qnames); + checkState(schemaForAugment.isPresent(), "Unknown augmentation node detected, identified by: %s, in: %s", + qnames, schema); + return schemaForAugment.get(); + } + public static AugmentationSchemaNode findSchemaForAugment(final ChoiceSchemaNode schema, final Set<QName> qnames) { + for (final CaseSchemaNode choiceCaseNode : schema.getCases()) { + final Optional<AugmentationSchemaNode> schemaForAugment = findAugment(choiceCaseNode, qnames); + if (schemaForAugment.isPresent()) { + return schemaForAugment.get(); + } + } + throw new IllegalStateException(String.format("Unknown augmentation node detected, identified by: %s, in: %s", + qnames, schema)); + } + private static Optional<AugmentationSchemaNode> findAugment(final AugmentationTarget schema, + final Set<QName> qnames) { + for (final AugmentationSchemaNode augment : schema.getAvailableAugmentations()) { + final Set<QName> qNamesFromAugment = ImmutableSet.copyOf(Collections2.transform(augment.getChildNodes(), + DataSchemaNode::getQName)); + if (qnames.equals(qNamesFromAugment)) { + return Optional.of(augment); + } + } + return Optional.empty(); + } + /** + * Recursively find all child nodes that come from choices. + * + * @param schema schema + * @return Map with all child nodes, to their most top augmentation + */ + public static Map<QName, ChoiceSchemaNode> mapChildElementsFromChoices(final DataNodeContainer schema) { + return mapChildElementsFromChoices(schema, schema.getChildNodes()); + } + private static Map<QName, ChoiceSchemaNode> mapChildElementsFromChoices(final DataNodeContainer schema, + final Iterable<? extends DataSchemaNode> childNodes) { + final Map<QName, ChoiceSchemaNode> mappedChoices = new LinkedHashMap<>(); + for (final DataSchemaNode childSchema : childNodes) { + if (childSchema instanceof ChoiceSchemaNode) { + if (isFromAugment(schema, childSchema)) { + continue; + } + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases()) { + for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { + mappedChoices.put(qname, (ChoiceSchemaNode) childSchema); + } + } + } + } + return mappedChoices; + } + private static boolean isFromAugment(final DataNodeContainer schema, final DataSchemaNode childSchema) { + if (!(schema instanceof AugmentationTarget)) { + return false; + } + for (final AugmentationSchemaNode augmentation : ((AugmentationTarget) schema).getAvailableAugmentations()) { + if (augmentation.findDataChildByName(childSchema.getQName()).isPresent()) { + return true; + } + } + return false; + } + /** + * Recursively find all child nodes that come from augmentations. + * + * @param schema schema + * @return Map with all child nodes, to their most top augmentation + */ + public static Map<QName, AugmentationSchemaNode> mapChildElementsFromAugments(final AugmentationTarget schema) { + final Map<QName, AugmentationSchemaNode> childNodesToAugmentation = new LinkedHashMap<>(); + // Find QNames of augmented child nodes + final Map<QName, AugmentationSchemaNode> augments = new HashMap<>(); + for (final AugmentationSchemaNode augmentationSchema : schema.getAvailableAugmentations()) { + for (final DataSchemaNode dataSchemaNode : augmentationSchema.getChildNodes()) { + augments.put(dataSchemaNode.getQName(), augmentationSchema); + } + } + // Augmented nodes have to be looked up directly in augmentationTarget + // because nodes from augment do not contain nodes from other augmentations + if (schema instanceof DataNodeContainer) { + for (final DataSchemaNode child : ((DataNodeContainer) schema).getChildNodes()) { + // If is not augmented child, continue + if (!augments.containsKey(child.getQName())) { + continue; + } + final AugmentationSchemaNode mostTopAugmentation = augments.get(child.getQName()); + // recursively add all child nodes in case of augment, case and choice + if (child instanceof AugmentationSchemaNode || child instanceof CaseSchemaNode) { + for (final QName qname : getChildNodesRecursive((DataNodeContainer) child)) { + childNodesToAugmentation.put(qname, mostTopAugmentation); + } + } else if (child instanceof ChoiceSchemaNode) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) child).getCases()) { + for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { + childNodesToAugmentation.put(qname, mostTopAugmentation); + } + } + } else { + childNodesToAugmentation.put(child.getQName(), mostTopAugmentation); + } + } + } + // Choice Node has to map child nodes from all its cases + if (schema instanceof ChoiceSchemaNode) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) schema).getCases()) { + if (!augments.containsKey(choiceCaseNode.getQName())) { + continue; + } + for (final QName qname : getChildNodesRecursive(choiceCaseNode)) { + childNodesToAugmentation.put(qname, augments.get(choiceCaseNode.getQName())); + } + } + } + return childNodesToAugmentation; + } + /** + * Recursively list all child nodes. In case of choice, augment and cases, step in. + * + * @param nodeContainer node container + * @return set of QNames + */ + public static Set<QName> getChildNodesRecursive(final DataNodeContainer nodeContainer) { + final Set<QName> allChildNodes = new HashSet<>(); + for (final DataSchemaNode childSchema : nodeContainer.getChildNodes()) { + if (childSchema instanceof ChoiceSchemaNode) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) childSchema).getCases()) { + allChildNodes.addAll(getChildNodesRecursive(choiceCaseNode)); + } + } else if (childSchema instanceof AugmentationSchemaNode || childSchema instanceof CaseSchemaNode) { + allChildNodes.addAll(getChildNodesRecursive((DataNodeContainer) childSchema)); + } else { + allChildNodes.add(childSchema.getQName()); + } + } + return allChildNodes; + } + /** + * Retrieves real schemas for augmented child node. + * + * <p> + * Schema of the same child node from augment, and directly from target is not the same. + * Schema of child node from augment is incomplete, therefore its useless for XML/NormalizedNode translation. + * + * @param targetSchema target schema + * @param augmentSchema augment schema + * @return set of nodes + */ + public static Set<DataSchemaNode> getRealSchemasForAugment(final AugmentationTarget targetSchema, + final AugmentationSchemaNode augmentSchema) { + if (!targetSchema.getAvailableAugmentations().contains(augmentSchema)) { + return ImmutableSet.of(); + } + if (targetSchema instanceof DataNodeContainer) { + return getRealSchemasForAugment((DataNodeContainer)targetSchema, augmentSchema); + } + final Set<DataSchemaNode> realChildNodes = new HashSet<>(); + if (targetSchema instanceof ChoiceSchemaNode) { + for (final DataSchemaNode dataSchemaNode : augmentSchema.getChildNodes()) { + for (final CaseSchemaNode choiceCaseNode : ((ChoiceSchemaNode) targetSchema).getCases()) { + if (getChildNodesRecursive(choiceCaseNode).contains(dataSchemaNode.getQName())) { + realChildNodes.add(choiceCaseNode.getDataChildByName(dataSchemaNode.getQName())); + } + } + } + } + return realChildNodes; + } + public static Set<DataSchemaNode> getRealSchemasForAugment(final DataNodeContainer targetSchema, + final AugmentationSchemaNode augmentSchema) { + final Set<DataSchemaNode> realChildNodes = new HashSet<>(); + for (final DataSchemaNode dataSchemaNode : augmentSchema.getChildNodes()) { + final DataSchemaNode realChild = targetSchema.getDataChildByName(dataSchemaNode.getQName()); + realChildNodes.add(realChild); + } + return realChildNodes; + } + + public static boolean belongsToCaseAugment(final CaseSchemaNode caseNode, + final AugmentationIdentifier childToProcess) { + for (final AugmentationSchemaNode augmentationSchema : caseNode.getAvailableAugmentations()) { + final Set<QName> currentAugmentChildNodes = new HashSet<>(); + for (final DataSchemaNode dataSchemaNode : augmentationSchema.getChildNodes()) { + currentAugmentChildNodes.add(dataSchemaNode.getQName()); + } + if (childToProcess.getPossibleChildNames().equals(currentAugmentChildNodes)) { + return true; + } + } + return false; + } + /** + * Tries to find in {@code parent} which is dealed as augmentation target node with QName as {@code child}. If such + * node is found then it is returned, else null. + * + * @param parent parent node + * @param child child node + * @return augmentation schema + */ + public static AugmentationSchemaNode findCorrespondingAugment(final DataSchemaNode parent, + final DataSchemaNode child) { + if (!(parent instanceof AugmentationTarget) || parent instanceof ChoiceSchemaNode) { + return null; + } + for (final AugmentationSchemaNode augmentation : ((AugmentationTarget) parent).getAvailableAugmentations()) { + final Optional<DataSchemaNode> childInAugmentation = augmentation.findDataChildByName(child.getQName()); + if (childInAugmentation.isPresent()) { + return augmentation; + } + } + return null; + } + /** + * Find child data schema node identified by its QName within a provided schema node. This method performs lookup + * in the namespace of all leafs, leaf-lists, lists, containers, choices, rpcs, actions, notifications, anydatas + * and anyxmls according to RFC6050/RFC7950 section 6.2.1. + * + * @param node + * schema node + * @param qname + * QName + * @return data child schema node + * @throws IllegalArgumentException + * if the schema node does not allow children + */ + public static @Nullable SchemaNode findDataChildSchemaByQName(final SchemaNode node, final QName qname) { + if (node instanceof DataNodeContainer) { + SchemaNode child = ((DataNodeContainer) node).dataChildByName(qname); + if (child == null && node instanceof SchemaContext) { + child = tryFind(((SchemaContext) node).getOperations(), qname).orElse(null); + } + if (child == null && node instanceof NotificationNodeContainer) { + child = tryFind(((NotificationNodeContainer) node).getNotifications(), qname).orElse(null); + } + if (child == null && node instanceof ActionNodeContainer) { + child = tryFind(((ActionNodeContainer) node).getActions(), qname).orElse(null); + } + return child; + } + if (node instanceof ChoiceSchemaNode) { + return ((ChoiceSchemaNode) node).findCase(qname).orElse(null); + } + if (node instanceof OperationDefinition) { + switch (qname.getLocalName()) { + case "input": + return ((OperationDefinition) node).getInput(); + case "output": + return ((OperationDefinition) node).getOutput(); + default: + return null; + } + } + throw new IllegalArgumentException(String.format("Schema node %s does not allow children.", node)); + } + /** + * Find child schema node identified by its QName within a provided schema node. This method performs lookup in both + * the namespace of groupings and the namespace of all leafs, leaf-lists, lists, containers, choices, rpcs, + * actions, notifications, anydatas and anyxmls according to RFC6050/RFC7950 section 6.2.1. + * + * <p> + * This method returns collection of SchemaNodes, because name conflicts can occur between the namespace + * of groupings and namespace of data nodes. This method finds and collects all schema nodes with supplied QName + * and returns them all as collection of schema nodes. + * + * @param node + * schema node + * @param qname + * QName + * @return collection of child schema nodes + * @throws IllegalArgumentException + * if the schema node does not allow children + */ + public static Collection<SchemaNode> findChildSchemaNodesByQName(final SchemaNode node, final QName qname) { + final List<SchemaNode> childNodes = new ArrayList<>(); + final SchemaNode dataNode = findDataChildSchemaByQName(node, qname); + if (dataNode != null) { + childNodes.add(dataNode); + } + if (node instanceof DataNodeContainer) { + tryFind(((DataNodeContainer) node).getGroupings(), qname).ifPresent(childNodes::add); + } + return childNodes.isEmpty() ? ImmutableList.of() : ImmutableList.copyOf(childNodes); + } + private static <T extends SchemaNode> Optional<T> tryFind(final Collection<T> nodes, final QName qname) { + return nodes.stream().filter(node -> qname.equals(node.getQName())).findFirst(); + } + + public static Module findParentModule(final SchemaContext context, final SchemaNode schemaNode) { + final QName qname = schemaNode.getPath().getLastComponent(); + checkState(qname != null, "Schema Path contains invalid state of path parts. " + + "The Schema Path MUST contain at least ONE QName which defines namespace and Local name of path."); + return context.findModule(qname.getModule()).orElse(null); + } + +} diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java index 21ba4cdd0..0c06923e2 100755 --- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java +++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java @@ -24,24 +24,23 @@ package org.onap.ccsdk.sli.core.sli.provider; import java.math.BigDecimal; import java.math.BigInteger; import java.net.Inet6Address; -import java.util.ArrayList; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import java.util.*; + import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.Builtin.SampleBits; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.Builtin.SampleEnumeration; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.Builtin.SampleUnion; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.Percentage; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.SampleContainer; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.SampleContainerBuilder; -import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.sample.container.LoginBuilder; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.sample.container.*; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.sample.container.login.CustomerAddresses; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.sample.container.login.CustomerAddressesBuilder; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.sample.container.login.CustomerAddressesKey; import org.opendaylight.yang.gen.v1.test.IpFragmentFlagEnumType; import org.opendaylight.yang.gen.v1.test.TestObjectBuilder; import org.opendaylight.yang.gen.v1.test.WrapperObj; @@ -64,7 +63,7 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Prefix; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.PortNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri; -import org.opendaylight.yangtools.yang.common.Empty; +import org.opendaylight.yangtools.yang.common.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import junit.framework.TestCase; @@ -92,45 +91,53 @@ public class MdsalHelperTest extends TestCase { ExecuteGraphInputBuilder execBuilder = new ExecuteGraphInputBuilder(); SliParameterBuilder parmBuilder = new SliParameterBuilder(); - List<SliParameter> params = new LinkedList<SliParameter>(); + Map<SliParameterKey, SliParameter> params = new HashMap<>(); parmBuilder.setParameterName("boolean-parm"); parmBuilder.setBooleanValue(Boolean.TRUE); - params.add(parmBuilder.build()); + SliParameter newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("int-parm"); parmBuilder.setBooleanValue(null); parmBuilder.setIntValue(1); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("str-parm"); parmBuilder.setIntValue(null); parmBuilder.setStringValue("hello"); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipaddress4-parm"); parmBuilder.setStringValue(null); parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipaddress6-parm"); parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("ef::1")); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipprefix-parm"); parmBuilder.setIpaddressValue(null); parmBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("10.0.0.0/24")); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("portnumber-parm"); parmBuilder.setIpprefixValue(null); parmBuilder.setPortNumber(PortNumber.getDefaultInstance("8080")); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); parmBuilder.setParameterName("dcsp-parm"); parmBuilder.setPortNumber(null); parmBuilder.setDscp(Dscp.getDefaultInstance("57")); - params.add(parmBuilder.build()); + newParm = parmBuilder.build(); + params.put(newParm.key(), newParm); execBuilder.setMode(Mode.Sync); execBuilder.setModuleName("my-module"); @@ -574,7 +581,8 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithuInt8() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - Short myShort = new Short("255"); + + Uint8 myShort = Uint8.valueOf("255"); sampleBuilder.setSampleUint8(myShort); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -583,7 +591,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithuInt16() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - Integer myInt = new Integer("65535"); + Uint16 myInt = Uint16.valueOf("65535"); sampleBuilder.setSampleUint16(myInt); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -592,7 +600,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithuInt32() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - Long myLong = new Long("4294967295"); + Uint32 myLong = Uint32.valueOf("4294967295"); sampleBuilder.setSampleUint32(myLong); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -601,7 +609,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithuInt64() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - BigInteger myBigInt = new BigInteger("2432902008176640000"); + Uint64 myBigInt = Uint64.valueOf("2432902008176640000"); sampleBuilder.setSampleUint64(myBigInt); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -628,7 +636,7 @@ public class MdsalHelperTest extends TestCase { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); Properties props = new Properties(); - Short myShort = new Short("99"); + Uint8 myShort = Uint8.valueOf("99"); Percentage myPercent = new Percentage(myShort); sampleBuilder.setPercentCompleted(myPercent); MdsalHelper.toProperties(props, sampleBuilder); @@ -661,21 +669,21 @@ public class MdsalHelperTest extends TestCase { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); LoginBuilder lb = new LoginBuilder(); lb.setMessage("WELCOME!"); - List<CustomerAddresses> addresses = new ArrayList<CustomerAddresses>(); + Map<CustomerAddressesKey, CustomerAddresses> addresses = new LinkedHashMap<>(); CustomerAddressesBuilder cab = new CustomerAddressesBuilder(); cab.setAddressName("home"); cab.setState("NJ"); cab.setStreetAddress("yellowbrick road"); CustomerAddresses addressOne = cab.build(); - addresses.add(addressOne); + addresses.put(addressOne.key(), addressOne); cab.setAddressName("vacation house"); cab.setState("FL"); cab.setStreetAddress("ocean ave"); CustomerAddresses addressTwo = cab.build(); - addresses.add(addressTwo); + addresses.put(addressTwo.key(), addressTwo); lb.setCustomerAddresses(addresses); sampleBuilder.setLogin(lb.build()); @@ -766,6 +774,13 @@ public class MdsalHelperTest extends TestCase { props.put("sample-container.ipv6-prefix", "2001:db8:aaaa:1111::100/64"); props.put("sample-container.ipv6-prefix.value", "2001:db8:aaaa:1111::100/64"); props.put("sample-container.port-number", "2"); + props.put("sample-container.ip-address-list[0].ip-addr", "127.0.0.1"); + props.put("sample-container.ip-address-list[1].ip-addr", "10.20.0.1"); + props.put("sample-container.ip-address-list_length", 2); + props.put("sample-container.ip-address-leaf-list[0]", "127.0.0.1"); + props.put("sample-container.ip-address-names[0].ip-addr", "127.0.0.1"); + props.put("sample-container.ip-address-names[0].fqdn", "localhost"); + props.put("sample-container.uri", "http://wiki.onap.org:8080"); props.put("sample-container.uri.value", "http://wiki.onap.org:8080"); SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); @@ -790,6 +805,23 @@ public class MdsalHelperTest extends TestCase { assertEquals(Ipv6Prefix.getDefaultInstance("2001:db8:aaaa:1111::100/64"), result.getIpv6Prefix()); assertEquals(PortNumber.getDefaultInstance("2"), result.getPortNumber()); assertEquals(Uri.getDefaultInstance("http://wiki.onap.org:8080"), result.getUri()); + Map<IpAddressListKey, IpAddressList> ipAddrList = result.getIpAddressList(); + + Iterator<IpAddressList> ipAddrIter = ipAddrList.values().iterator(); + assertEquals(true, ipAddrIter.hasNext()); + assertEquals("127.0.0.1", ipAddrIter.next().getIpAddr().stringValue()); + assertEquals(true, ipAddrIter.hasNext()); + assertEquals("10.20.0.1", ipAddrIter.next().getIpAddr().stringValue()); + assertEquals(1, result.getIpAddressLeafList().size()); + assertEquals("127.0.0.1", result.getIpAddressLeafList().get(0).stringValue()); + Map<IpAddressNamesKey, IpAddressNames> ipNamesMap = result.getIpAddressNames(); + Iterator<IpAddressNames> ipNamesIter = ipNamesMap.values().iterator(); + assertEquals(true, ipNamesIter.hasNext()); + IpAddressNames ipNames = ipNamesIter.next(); + assertEquals("127.0.0.1", ipNames.getIpAddr().stringValue()); + assertEquals("localhost", ipNames.getFqdn()); + + } public void testToLowerHyphen() throws Exception { diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java index 10bbbd91a..ada933d88 100644 --- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java +++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java @@ -23,17 +23,21 @@ package org.onap.ccsdk.sli.core.sli.provider; import java.util.Enumeration; +import java.util.HashMap; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Properties; import org.junit.Test; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResultsBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultBuilder; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultKey; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder; import org.slf4j.Logger; @@ -57,38 +61,38 @@ public class PrintYangToPropTest { egBuilder.setModuleName("my-module"); egBuilder.setRpcName("my-rpc"); - List<SliParameter> pList = new LinkedList<>(); + Map<SliParameterKey, SliParameter> pMap = new HashMap<>(); SliParameterBuilder pBuilder = new SliParameterBuilder(); pBuilder.setParameterName("string-param"); pBuilder.setStringValue("hi"); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("int-param"); pBuilder.setIntValue(1); pBuilder.setStringValue(null); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("bool-param"); pBuilder.setIntValue(null); pBuilder.setBooleanValue(true); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipaddress-value1"); pBuilder.setBooleanValue(null); pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipaddress-value2"); pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("::1")); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipprefix-value1"); pBuilder.setIpaddressValue(null); pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("192.168.0.0/16")); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipprefix-value2"); pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("2001:db8:3c4d::/48")); - pList.add(pBuilder.build()); + pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); - egBuilder.setSliParameter(pList); + egBuilder.setSliParameter(pMap); // Generate properties @@ -113,12 +117,12 @@ public class PrintYangToPropTest { TestResultBuilder resultBuilder = new TestResultBuilder(); // Set builder with values - List<TestResult> resultList = new LinkedList<>(); + Map<TestResultKey, TestResult> resultList = new HashMap<>(); resultBuilder.setTestIdentifier("test1"); List<String> results = new LinkedList<>(); results.add("pass"); resultBuilder.setResults(results); - resultList.add(resultBuilder.build()); + resultList.put(new TestResultKey(resultBuilder.getTestIdentifier()), resultBuilder.build()); resultsBuilder.setTestResult(resultList); // Generate properties diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index 7f66197b7..c5571ee0b 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 1968d88a0..dea15a631 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index a2383860a..99ab72818 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index ca5c89a95..018f4eca8 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index 77a090086..f09441ba4 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index c90a3361f..8e5e9537e 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index 255d00ae2..b53b6aea2 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index c7cb55506..93cf051ff 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 6e852ed0d..bda7226e0 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java b/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java index a00131efb..015ef5e57 100644 --- a/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java +++ b/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java @@ -258,7 +258,7 @@ public class SliapiProvider implements AutoCloseable, SLIAPIService { String propValue = ""; - Boolean boolval = sliParm.isBooleanValue(); + Boolean boolval = sliParm.getBooleanValue(); if (boolval != null) { propValue = boolval.toString(); diff --git a/core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java b/core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java index cd7dd2058..73c613aa7 100644 --- a/core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java +++ b/core/sliapi/provider/src/test/java/org/onap/ccsdk/sli/core/sliapi/TestSliapiProvider.java @@ -27,11 +27,7 @@ import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; import java.io.InputStream; import java.net.URL; -import java.util.HashMap; -import java.util.LinkedList; -import java.util.List; -import java.util.Map; -import java.util.Properties; +import java.util.*; import java.util.concurrent.Future; import org.junit.After; import org.junit.Before; @@ -72,6 +68,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.Hea import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.SLIAPIService; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.VlbcheckInput; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder; import org.opendaylight.yangtools.concepts.ObjectRegistration; @@ -173,20 +170,23 @@ public class TestSliapiProvider { inputBuilder.setMode(ExecuteGraphInput.Mode.Sync); inputBuilder.setModuleName("sli"); inputBuilder.setRpcName("healthcheck"); - List<SliParameter> pList = new LinkedList<>(); + Map<SliParameterKey, SliParameter> pMap = new LinkedHashMap<>(); SliParameterBuilder pBuilder = new SliParameterBuilder(); pBuilder.setParameterName("int-parameter"); pBuilder.setIntValue(1); - pList.add(pBuilder.build()); + SliParameter sliParm = pBuilder.build(); + pMap.put(sliParm.key(), sliParm); pBuilder.setParameterName("bool-parameter"); pBuilder.setIntValue(null); pBuilder.setBooleanValue(true); - pList.add(pBuilder.build()); + sliParm = pBuilder.build(); + pMap.put(sliParm.key(), sliParm); pBuilder.setParameterName("str-parameter"); pBuilder.setBooleanValue(null); pBuilder.setStringValue("value"); - pList.add(pBuilder.build()); - inputBuilder.setSliParameter(pList); + sliParm = pBuilder.build(); + pMap.put(sliParm.key(), sliParm); + inputBuilder.setSliParameter(pMap); provider.executeGraph(inputBuilder.build()); @@ -194,20 +194,23 @@ public class TestSliapiProvider { inputBuilder.setMode(ExecuteGraphInput.Mode.Sync); inputBuilder.setModuleName("sli"); inputBuilder.setRpcName("no-such-graph"); - pList = new LinkedList<>(); + pMap = new LinkedHashMap<>(); pBuilder = new SliParameterBuilder(); pBuilder.setParameterName("int-parameter"); pBuilder.setIntValue(1); - pList.add(pBuilder.build()); + sliParm = pBuilder.build(); + pMap.put(sliParm.key(), sliParm); pBuilder.setParameterName("bool-parameter"); pBuilder.setIntValue(null); pBuilder.setBooleanValue(true); - pList.add(pBuilder.build()); + sliParm = pBuilder.build(); + pMap.put(sliParm.key(), sliParm); pBuilder.setParameterName("str-parameter"); pBuilder.setBooleanValue(null); pBuilder.setStringValue("value"); - pList.add(pBuilder.build()); - inputBuilder.setSliParameter(pList); + sliParm = pBuilder.build(); + pMap.put(sliParm.key(), sliParm); + inputBuilder.setSliParameter(pMap); provider.executeGraph(inputBuilder.build()); assertTrue(provider.vlbcheck(mock(VlbcheckInput.class)) instanceof Future<?>); diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index b9c0b7175..a7a7417b1 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 8a52c1467..0da7ce110 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 6e99c7756..35cadb918 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 340328ba1..eaa13b386 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index 613fe6902..1ece725cd 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index 7d32d9490..e6048f075 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 557c7dca1..c33700b93 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index 344836fd6..bcdbc4136 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index ac6db8470..5aea17ddc 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 044b359bb..b9776844c 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 1320a2a52..a99e04848 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 1ec930e8f..f130aaa9e 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 24c33a2ef..2bc3a4f76 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 46b87ab1d..d8a9408f6 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index ca5b9f4db..26c7719aa 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index 2864f40df..034414aec 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index 3295588de..ed8dc1a89 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 3acf8b681..8823eea1c 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 2e2b07731..0854a15b7 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index a62e56b46..d5433998c 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index 62368f95f..20b798de9 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index d99abf41d..2fa26cbd7 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 7fd013056..cde57f400 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index 584ddb21d..189919b03 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 80979084a..36deb6338 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index e099e25a2..123662b8e 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index 8867dd4e4..0197895af 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 220f37d88..7b2b860ae 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 6be45b230..0eac73f7e 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java b/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java index 4dd46d597..0178b40dc 100644 --- a/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java +++ b/northbound/lcm/provider/src/main/java/org/onap/ccsdk/sli/northbound/LcmProvider.java @@ -38,6 +38,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.northbound.lcm.rev180329. import org.opendaylight.yangtools.concepts.ObjectRegistration; import org.opendaylight.yangtools.yang.common.RpcResult; import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.Uint16; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -1038,7 +1039,7 @@ public class LcmProvider implements AutoCloseable, LCMService { if (input == null) { LOG.debug("Rejecting " +rpcName+ " because of invalid input"); - statusBuilder.setCode(LcmResponseCode.REJECT_INVALID_INPUT.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.REJECT_INVALID_INPUT.getValue())); statusBuilder.setMessage("REJECT - INVALID INPUT. Missing input"); CommonHeaderBuilder hBuilder = new CommonHeaderBuilder(); hBuilder.setApiVer("1"); @@ -1069,14 +1070,14 @@ public class LcmProvider implements AutoCloseable, LCMService { catch (Exception e) { LOG.error("Caught exception executing service logic for "+ rpcName, e); - statusBuilder.setCode(LcmResponseCode.FAILURE_DG_FAILURE.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.FAILURE_DG_FAILURE.getValue())); statusBuilder.setMessage("FAILURE - DG FAILURE ("+e.getMessage()+")"); throw new LcmRpcInvocationException(statusBuilder.build(), hBuilder.build()); } } else { LOG.error("No service logic active for LCM: '" + rpcName + "'"); - statusBuilder.setCode(LcmResponseCode.REJECT_DG_NOT_FOUND.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.REJECT_DG_NOT_FOUND.getValue())); statusBuilder.setMessage("FAILURE - DG not found for action "+rpcName); throw new LcmRpcInvocationException(statusBuilder.build(), hBuilder.build()); } @@ -1085,7 +1086,7 @@ public class LcmProvider implements AutoCloseable, LCMService { { LOG.error("Caught exception looking for service logic", e); - statusBuilder.setCode(LcmResponseCode.FAILURE_DG_FAILURE.getValue()); + statusBuilder.setCode(Uint16.valueOf(LcmResponseCode.FAILURE_DG_FAILURE.getValue())); statusBuilder.setMessage("FAILURE - Unexpected error looking for DG ("+e.getMessage()+")"); throw new LcmRpcInvocationException(statusBuilder.build(), hBuilder.build()); } @@ -1101,6 +1102,7 @@ public class LcmProvider implements AutoCloseable, LCMService { payload = new Payload(payloadValue); } + String statusCode = sBuilder.getCode().toString(); if (!"400".equals(statusCode)) { diff --git a/northbound/pom.xml b/northbound/pom.xml index c6defa585..9856b33e2 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index c0a06f323..b47181d03 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index e78e37afa..a7af5c21a 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index 926004a38..fcb6aa2da 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index 19e742c8c..5b814a9a5 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index 0b25869c9..833f03dc7 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index e686c8a00..6c37718b6 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 6b1aed529..9eb9f2459 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 61326265e..ba175ee10 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index 40eaae0b7..f75fb40db 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index 0098e5a1c..47fbb2d6b 100644 --- a/plugins/features/features-sli-plugins/pom.xml +++ b/plugins/features/features-sli-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index 6af48deb0..058e2b7c3 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index 9f187b11b..0c979b8ee 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index f09c7c0af..044ef570d 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index 1d3c680b5..94af1268a 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 10f4204df..67dfa18ff 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index b770cd6d4..a1e7d357b 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/pom.xml b/plugins/pom.xml index 2aa88174d..dd811d872 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index ae8427d74..e60514f7f 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 2e0f26d8a..08221d5dd 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index 4aafd492e..b0319f4c2 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 55d829ecb..d0df99657 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index 9f9ed138f..472786bc9 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 9e240b047..0d1dd3886 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 82448519a..8c594aae1 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index 9005c84ad..a884bd507 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index e82690afb..0e40a4958 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -60,7 +60,13 @@ </dependency> <dependency> <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-common</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.opendaylight.yangtools</groupId> <artifactId>yang-data-impl</artifactId> + <scope>provided</scope> </dependency> <dependency> <groupId>com.fasterxml.jackson.core</groupId> diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java index b5a9df706..4a2e18198 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java @@ -84,6 +84,7 @@ import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.Namespace; import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.PropertiesNodeSerializer; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; import org.opendaylight.restconf.nb.rfc8040.utils.parser.ParserIdentifier; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; @@ -479,7 +480,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { * @throws SvcLogicException when XML parsing fails */ private String getXmlReqForPutOp(String req, String nodeName, - URI modNs) throws SvcLogicException { + XMLNamespace modNs) throws SvcLogicException { req = getUpdatedXmlReq(req, nodeName, modNs.toString()); Document oldDoc; try { diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java index 0134a5a47..ab554dd45 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DfSerializerUtil.java @@ -45,6 +45,7 @@ import org.dom4j.Element; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.Namespace; import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.PropertiesNode; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaContext; import org.opendaylight.yangtools.yang.model.api.TypeDefinition; @@ -190,13 +191,8 @@ public final class DfSerializerUtil { if (mName != null) { it = ctx.findModules(mName).iterator(); } else { - URI modUri = null; - try { - modUri = new URI(mUri); - } catch (URISyntaxException e) { - throw new SvcLogicException(URI_ERR, e); - } - it = ctx.findModules(modUri).iterator(); + + it = ctx.findModules(XMLNamespace.of(mUri)).iterator(); } if (!it.hasNext()) { diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java index 1fd0d2dee..08edacc8a 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/MdsalSerializerHelper.java @@ -52,8 +52,8 @@ import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.M import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.MULTI_INSTANCE_NODE; import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.SINGLE_INSTANCE_LEAF_NODE; import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.SINGLE_INSTANCE_NODE; -import static org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils.findDataChildSchemaByQName; -import static org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils.findSchemaForChild; +import static org.onap.ccsdk.sli.core.sli.provider.YangUtils.findDataChildSchemaByQName; +import static org.onap.ccsdk.sli.core.sli.provider.YangUtils.findSchemaForChild; import static org.opendaylight.yangtools.yang.data.util.ParserStreamUtils.findSchemaNodeByNameAndNamespace; /** diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java index f098195e4..09734b6b6 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/PropertiesNodeXmlListener.java @@ -30,6 +30,7 @@ import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.Namespace; import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.PropertiesNode; import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.PropertiesNodeListener; import org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.RootNode; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import java.io.Writer; import java.net.URI; @@ -211,7 +212,7 @@ public class PropertiesNodeXmlListener implements PropertiesNodeListener { */ private void setValueWithNs(Element element, LeafNode node) { Namespace valNs = node.valueNs(); - URI modNs = (valNs == null) ? null : valNs.moduleNs(); + XMLNamespace modNs = (valNs == null) ? null : valNs.moduleNs(); String val = node.value(); if (modNs != null) { element.addNamespace(XML_PREFIX, modNs.toString()); diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java index 1cf99b2d4..a7a2b3735 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/InnerNode.java @@ -35,7 +35,7 @@ import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.MdsalPrope import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.MdsalPropertiesNodeUtils.resolveName; import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.MULTI_INSTANCE_HOLDER_NODE; import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.MULTI_INSTANCE_LEAF_HOLDER_NODE; -import static org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils.findCorrespondingAugment; +import static org.onap.ccsdk.sli.core.sli.provider.YangUtils.findCorrespondingAugment; /** * Abstraction of an entity that represents an inner node to properties data diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java index 8fd7a12bc..063e030ac 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeSerializer.java @@ -40,7 +40,9 @@ import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.S import java.util.HashMap; import java.util.Map; import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.provider.YangUtils; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.Module; import org.opendaylight.yangtools.yang.model.api.SchemaNode; @@ -143,7 +145,7 @@ public class MdsalPropertiesNodeSerializer extends PropertiesNodeSerializer<Sche } private RootNode createRootNode(String lastNodeName, String rootUri) { - Module m = SchemaContextUtil.findParentModule(schemaCtx(), curSchema); + Module m = YangUtils.findParentModule(schemaCtx(), curSchema); Namespace ns = new Namespace(m.getName(), m.getNamespace(), getRevision(m.getRevision())); return new RootNode(lastNodeName, ns, schemaNode(), rootUri); diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java index 331f01cb7..9b0a31d09 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java @@ -28,23 +28,20 @@ import java.util.Collection; import java.util.Deque; import java.util.Iterator; import java.util.Optional; + +import com.sun.xml.txw2.annotation.XmlNamespace; import org.onap.ccsdk.sli.core.sli.SvcLogicException; +import org.onap.ccsdk.sli.core.sli.provider.YangUtils; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; import org.opendaylight.restconf.common.errors.RestconfDocumentedException; import org.opendaylight.yangtools.yang.common.QName; import org.opendaylight.yangtools.yang.common.Revision; -import org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils; +import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.data.util.ParserStreamUtils; import org.opendaylight.yangtools.yang.data.util.codec.IdentityCodecUtil; -import org.opendaylight.yangtools.yang.model.api.AnyxmlSchemaNode; -import org.opendaylight.yangtools.yang.model.api.AugmentationSchemaNode; -import org.opendaylight.yangtools.yang.model.api.ChoiceSchemaNode; -import org.opendaylight.yangtools.yang.model.api.DataSchemaNode; -import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.api.IdentitySchemaNode; +import org.opendaylight.yangtools.yang.model.api.*; import org.opendaylight.yangtools.yang.model.api.Module; -import org.opendaylight.yangtools.yang.model.api.SchemaContext; -import org.opendaylight.yangtools.yang.model.api.SchemaNode; +import org.opendaylight.yangtools.yang.model.util.SchemaInferenceStack; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -447,14 +444,15 @@ public final class MdsalPropertiesNodeUtils { return null; } - QName qname = QName.create(namespace.moduleNs(), + + QName qname = QName.create(XMLNamespace.of(namespace.moduleNs().toString()), Revision.of(namespace.revision()), name); // YANG RPC will not be instance of DataSchemaNode if (curSchema instanceof DataSchemaNode) { Deque<DataSchemaNode> schemaNodeDeque = ParserStreamUtils. findSchemaNodeByNameAndNamespace(((DataSchemaNode) - curSchema), name, namespace.moduleNs()); + curSchema), name, XMLNamespace.of(namespace.moduleNs().toString())); if (schemaNodeDeque.isEmpty()) { // could not find schema node return null; @@ -467,10 +465,12 @@ public final class MdsalPropertiesNodeUtils { } // node is child of Choice/case - return SchemaUtils.findSchemaForChild(((ChoiceSchemaNode) schemaNode), + + + return YangUtils.findSchemaForChild(((ChoiceSchemaNode) schemaNode), qname); } else { - return SchemaUtils.findDataChildSchemaByQName(curSchema, qname); + return YangUtils.findDataChildSchemaByQName(curSchema, qname); } } diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java index 4f27ee1e7..9bb71b5ba 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/Namespace.java @@ -20,14 +20,15 @@ package org.onap.ccsdk.sli.plugins.yangserializers.pnserializer; -import java.net.URI; + +import org.opendaylight.yangtools.yang.common.XMLNamespace; /** * Representation of YANG namespace. */ public class Namespace { private String moduleName; - private URI moduleNs; + private XMLNamespace moduleNs; private String revision; /** @@ -38,7 +39,7 @@ public class Namespace { * @param moduleNs module namespace * @param revision revision */ - public Namespace(String modulename, URI moduleNs, String revision) { + public Namespace(String modulename, XMLNamespace moduleNs, String revision) { this.moduleName = modulename; this.moduleNs = moduleNs; this.revision = revision; @@ -67,7 +68,7 @@ public class Namespace { * * @return module namespace */ - public URI moduleNs() { + public XMLNamespace moduleNs() { return moduleNs; } @@ -76,7 +77,7 @@ public class Namespace { * * @param moduleNs module namespace */ - public void moduleNs(URI moduleNs) { + public void moduleNs(XMLNamespace moduleNs) { this.moduleNs = moduleNs; } diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java index c7f7340fd..d7ca885da 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/RootNode.java @@ -35,7 +35,7 @@ import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.MdsalPrope import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.MdsalPropertiesNodeUtils.resolveName; import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.MULTI_INSTANCE_HOLDER_NODE; import static org.onap.ccsdk.sli.plugins.yangserializers.pnserializer.NodeType.MULTI_INSTANCE_LEAF_HOLDER_NODE; -import static org.opendaylight.yangtools.yang.data.impl.schema.SchemaUtils.findCorrespondingAugment; +import static org.onap.ccsdk.sli.core.sli.provider.YangUtils.findCorrespondingAugment; /** * Abstraction of node representing properties data tree. diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index cde32749c..36c6cc90a 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index 0de677052..7af13c554 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 7df3a3e60..2680d1085 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index 8a2452dfa..c216bda11 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index a790d5fb4..85d0142bf 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index c6c2e9d86..eb2da63ad 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.2</version> + <version>2.3.3-SNAPSHOT</version> <relativePath/> </parent> |