From de63cbb97a9f751f8856647dbf81eb632420cd9d Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Thu, 21 Jul 2022 08:25:58 -0400 Subject: Migrate sli to sulfur sr1 Migrate sli to OpenDaylight Sulfur release Issue-ID: CCSDK-3693 Signed-off-by: Dan Timoney Change-Id: I3ca6fb12a03038a9447747650ea2a6e6d6e71d9d --- adaptors/aai-service/installer/pom.xml | 2 +- adaptors/aai-service/pom.xml | 2 +- adaptors/aai-service/provider/pom.xml | 3 +- .../ansible-adaptor/ansible-adaptor-bundle/pom.xml | 2 +- .../ansible-adaptor-installer/pom.xml | 2 +- adaptors/ansible-adaptor/pom.xml | 2 +- adaptors/artifacts/pom.xml | 2 +- adaptors/base/http/installer/pom.xml | 2 +- adaptors/base/http/pom.xml | 2 +- adaptors/base/http/provider/pom.xml | 2 +- adaptors/base/pom.xml | 2 +- adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml | 2 +- .../chef-adaptor/chef-adaptor-installer/pom.xml | 2 +- adaptors/chef-adaptor/pom.xml | 2 +- adaptors/features/ccsdk-aai-service/pom.xml | 2 +- adaptors/features/ccsdk-ansible-adaptor/pom.xml | 2 +- adaptors/features/ccsdk-base-http/pom.xml | 2 +- adaptors/features/ccsdk-chef-adaptor/pom.xml | 2 +- adaptors/features/ccsdk-iaas-adaptor/pom.xml | 2 +- adaptors/features/ccsdk-mdsal-resource/pom.xml | 2 +- .../features/ccsdk-messagerouter-consumer/pom.xml | 2 +- .../features/ccsdk-messagerouter-publisher/pom.xml | 2 +- adaptors/features/ccsdk-netbox-client/pom.xml | 2 +- adaptors/features/ccsdk-netconf-adaptor/pom.xml | 2 +- .../features/ccsdk-resource-assignment/pom.xml | 2 +- adaptors/features/ccsdk-rest-adaptor/pom.xml | 2 +- adaptors/features/ccsdk-saltstack-adaptor/pom.xml | 2 +- adaptors/features/ccsdk-sli-adaptors-all/pom.xml | 2 +- adaptors/features/ccsdk-sql-resource/pom.xml | 2 +- adaptors/features/ccsdk-ssh-adaptor/pom.xml | 2 +- adaptors/features/features-sli-adaptors/pom.xml | 2 +- adaptors/features/installer/pom.xml | 2 +- adaptors/features/pom.xml | 2 +- adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml | 2 +- .../iaas-adaptor/iaas-adaptor-installer/pom.xml | 2 +- adaptors/iaas-adaptor/pom.xml | 2 +- adaptors/mdsal-resource/installer/pom.xml | 2 +- adaptors/mdsal-resource/pom.xml | 2 +- adaptors/mdsal-resource/provider/pom.xml | 2 +- adaptors/message-router/pom.xml | 2 +- adaptors/netbox-client/installer/pom.xml | 2 +- adaptors/netbox-client/pom.xml | 2 +- adaptors/netbox-client/provider/pom.xml | 2 +- .../netconf-adaptor/netconf-adaptor-bundle/pom.xml | 2 +- .../netconf-adaptor-installer/pom.xml | 2 +- adaptors/netconf-adaptor/pom.xml | 2 +- adaptors/pom.xml | 2 +- adaptors/resource-assignment/installer/pom.xml | 2 +- adaptors/resource-assignment/pom.xml | 2 +- adaptors/resource-assignment/provider/pom.xml | 2 +- adaptors/rest-adaptor/pom.xml | 2 +- adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml | 2 +- .../rest-adaptor/rest-adaptor-installer/pom.xml | 2 +- adaptors/saltstack-adaptor/pom.xml | 2 +- .../saltstack-adaptor-installer/pom.xml | 2 +- .../saltstack-adaptor-provider/pom.xml | 2 +- adaptors/sql-resource/installer/pom.xml | 2 +- adaptors/sql-resource/pom.xml | 2 +- adaptors/sql-resource/provider/pom.xml | 2 +- adaptors/ssh-adaptor/pom.xml | 2 +- adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml | 2 +- .../sli/adaptors/ssh/sshd/SshAdaptorTest.java | 4 +- core/artifacts/pom.xml | 2 +- core/dblib/installer/pom.xml | 2 +- core/dblib/pom.xml | 2 +- core/dblib/provider/pom.xml | 2 +- core/features/ccsdk-dblib/pom.xml | 2 +- core/features/ccsdk-filters/pom.xml | 2 +- core/features/ccsdk-sli-core-all/pom.xml | 2 +- core/features/ccsdk-sli/pom.xml | 2 +- core/features/ccsdk-sliPluginUtils/pom.xml | 2 +- core/features/ccsdk-sliapi/pom.xml | 2 +- core/features/ccsdk-slicore-utils/pom.xml | 2 +- core/features/features-sli-core/pom.xml | 2 +- core/features/installer/pom.xml | 2 +- core/features/pom.xml | 2 +- core/filters/installer/pom.xml | 2 +- core/filters/pom.xml | 2 +- core/filters/provider/pom.xml | 2 +- core/pom.xml | 2 +- core/sli/common/pom.xml | 2 +- core/sli/installer/pom.xml | 2 +- core/sli/model/pom.xml | 2 +- core/sli/pom.xml | 2 +- core/sli/provider-base/pom.xml | 2 +- core/sli/provider/pom.xml | 22 ++- .../ccsdk/sli/core/sli/provider/MdsalHelper.java | 190 ++++++++++++++++++++- .../ccsdk/sli/core/sli/provider/YangUtils.java | 3 +- .../sli/core/sli/provider/MdsalHelperTest.java | 13 +- .../sli/core/sli/provider/PrintYangToPropTest.java | 5 +- core/sliPluginUtils/installer/pom.xml | 2 +- core/sliPluginUtils/pom.xml | 2 +- core/sliPluginUtils/provider/pom.xml | 2 +- core/sliapi/installer/pom.xml | 2 +- core/sliapi/model/pom.xml | 2 +- core/sliapi/model/swagger/pom.xml | 2 +- .../sliapi/model/swagger/src/main/json/sliapi.json | 2 +- .../sliapi/model/swagger/src/main/yaml/sliapi.yaml | 2 +- core/sliapi/model/yang/pom.xml | 2 +- core/sliapi/pom.xml | 2 +- core/sliapi/provider/pom.xml | 2 +- .../onap/ccsdk/sli/core/sliapi/SliapiProvider.java | 7 +- core/utils/installer/pom.xml | 2 +- core/utils/pom.xml | 2 +- core/utils/provider/pom.xml | 2 +- northbound/artifacts/pom.xml | 2 +- northbound/asdcApi/installer/pom.xml | 2 +- northbound/asdcApi/model/pom.xml | 2 +- northbound/asdcApi/pom.xml | 2 +- northbound/asdcApi/provider/pom.xml | 2 +- northbound/daexim-offsite-backup/installer/pom.xml | 2 +- northbound/daexim-offsite-backup/model/pom.xml | 2 +- northbound/daexim-offsite-backup/pom.xml | 2 +- northbound/daexim-offsite-backup/provider/pom.xml | 2 +- northbound/dataChange/installer/pom.xml | 2 +- northbound/dataChange/model/pom.xml | 2 +- northbound/dataChange/pom.xml | 2 +- northbound/dataChange/provider/pom.xml | 2 +- northbound/dmaap-listener/pom.xml | 2 +- northbound/features/ccsdk-asdcApi/pom.xml | 2 +- .../features/ccsdk-daexim-offsite-backup/pom.xml | 2 +- northbound/features/ccsdk-dataChange/pom.xml | 2 +- northbound/features/ccsdk-lcm/pom.xml | 2 +- .../features/ccsdk-sli-northbound-all/pom.xml | 2 +- .../features/features-sli-northbound/pom.xml | 2 +- northbound/features/installer/pom.xml | 2 +- northbound/features/pom.xml | 2 +- northbound/lcm/installer/pom.xml | 2 +- northbound/lcm/model/pom.xml | 2 +- northbound/lcm/pom.xml | 2 +- northbound/lcm/provider/pom.xml | 2 +- northbound/pom.xml | 2 +- northbound/ueb-listener/pom.xml | 2 +- plugins/artifacts/pom.xml | 2 +- plugins/features/ccsdk-gr-toolkit/pom.xml | 2 +- plugins/features/ccsdk-properties-node/pom.xml | 2 +- plugins/features/ccsdk-restapi-call-node/pom.xml | 2 +- plugins/features/ccsdk-restconf-client/pom.xml | 2 +- plugins/features/ccsdk-sli-plugins-all/pom.xml | 2 +- plugins/features/ccsdk-sshapi-call-node/pom.xml | 2 +- plugins/features/ccsdk-template-node/pom.xml | 2 +- plugins/features/features-sli-plugins/pom.xml | 2 +- plugins/features/installer/pom.xml | 2 +- plugins/features/pom.xml | 2 +- plugins/grToolkit/installer/pom.xml | 2 +- plugins/grToolkit/model/pom.xml | 2 +- plugins/grToolkit/pom.xml | 2 +- plugins/grToolkit/provider/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/properties-node/installer/pom.xml | 2 +- plugins/properties-node/pom.xml | 2 +- plugins/properties-node/provider/pom.xml | 2 +- plugins/restapi-call-node/installer/pom.xml | 2 +- plugins/restapi-call-node/pom.xml | 2 +- plugins/restapi-call-node/provider/pom.xml | 2 +- plugins/restconf-client/installer/pom.xml | 2 +- plugins/restconf-client/pom.xml | 2 +- plugins/restconf-client/provider/pom.xml | 12 +- .../restconfapicall/RestconfApiCallNode.java | 11 +- .../plugins/restconfapicall/RestconfApiUtils.java | 12 +- .../pnserializer/MdsalPropertiesNodeUtils.java | 4 +- .../restconfapicall/TestRestconfApiUtils.java | 6 +- .../TestRestconfDiscoveryNode.java | 12 +- .../dfserializer/DataFormatSerializerTest.java | 8 +- .../dfserializer/IdentifierValidationTest.java | 8 +- .../pnserializer/PropertiesSerializerTest.java | 28 +-- plugins/sshapi-call-node/installer/pom.xml | 2 +- plugins/sshapi-call-node/pom.xml | 2 +- plugins/sshapi-call-node/provider/pom.xml | 2 +- plugins/template-node/installer/pom.xml | 2 +- plugins/template-node/pom.xml | 2 +- plugins/template-node/provider/pom.xml | 2 +- pom.xml | 2 +- 173 files changed, 440 insertions(+), 220 deletions(-) diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 2d05f3ab8..fd579dbbe 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index 14039a833..8547e6382 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index 1bb7505b2..118abfbcf 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT @@ -36,6 +36,7 @@ org.mockito mockito-core + 3.12.4 test diff --git a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml index bc79c58e3..b1b129a0c 100644 --- a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml +++ b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml @@ -24,7 +24,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml index ae5eb9edf..6ef7cf650 100644 --- a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml +++ b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/ansible-adaptor/pom.xml b/adaptors/ansible-adaptor/pom.xml index c6c6b2b7d..3bee1d0f3 100644 --- a/adaptors/ansible-adaptor/pom.xml +++ b/adaptors/ansible-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index 1b21f1cf4..8c2a5f492 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index 8c41718cf..efb6b4870 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index 9f3d710da..6e1bd2740 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 5b815d96c..57eb95aa2 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 94b358a34..2d032e452 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml index 4fa571e53..15169d1ab 100644 --- a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml +++ b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml @@ -27,7 +27,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml index 096003be1..2bc20e26d 100644 --- a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml +++ b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml @@ -27,7 +27,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/chef-adaptor/pom.xml b/adaptors/chef-adaptor/pom.xml index c511ab4a3..903d757d2 100644 --- a/adaptors/chef-adaptor/pom.xml +++ b/adaptors/chef-adaptor/pom.xml @@ -27,7 +27,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index c68e69c5c..42f0f36ad 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-ansible-adaptor/pom.xml b/adaptors/features/ccsdk-ansible-adaptor/pom.xml index e101575e2..8eaf3b336 100644 --- a/adaptors/features/ccsdk-ansible-adaptor/pom.xml +++ b/adaptors/features/ccsdk-ansible-adaptor/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 0910550ac..f06337a0f 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-chef-adaptor/pom.xml b/adaptors/features/ccsdk-chef-adaptor/pom.xml index f2ffc4af9..42aba476b 100644 --- a/adaptors/features/ccsdk-chef-adaptor/pom.xml +++ b/adaptors/features/ccsdk-chef-adaptor/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-iaas-adaptor/pom.xml b/adaptors/features/ccsdk-iaas-adaptor/pom.xml index cec7777e9..b721099b9 100644 --- a/adaptors/features/ccsdk-iaas-adaptor/pom.xml +++ b/adaptors/features/ccsdk-iaas-adaptor/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index 07e6caa06..3963a2dc9 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index edf903757..a1a0ea47c 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index c502b4131..c3e9f032b 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index 06461a433..9f404e718 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-netconf-adaptor/pom.xml b/adaptors/features/ccsdk-netconf-adaptor/pom.xml index 304d4bc6f..0bfc4ce4e 100644 --- a/adaptors/features/ccsdk-netconf-adaptor/pom.xml +++ b/adaptors/features/ccsdk-netconf-adaptor/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index a8ef7d0ce..fb253d9c7 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-rest-adaptor/pom.xml b/adaptors/features/ccsdk-rest-adaptor/pom.xml index 416da908c..1a8d31bf0 100644 --- a/adaptors/features/ccsdk-rest-adaptor/pom.xml +++ b/adaptors/features/ccsdk-rest-adaptor/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml index 51db938b4..7b1067195 100644 --- a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 286c8c2c0..448b4584b 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index ea2b8a137..4c5bfde44 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/ccsdk-ssh-adaptor/pom.xml b/adaptors/features/ccsdk-ssh-adaptor/pom.xml index aa240b491..957510abc 100644 --- a/adaptors/features/ccsdk-ssh-adaptor/pom.xml +++ b/adaptors/features/ccsdk-ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml index 23bb0cc6a..2f91f3a20 100644 --- a/adaptors/features/features-sli-adaptors/pom.xml +++ b/adaptors/features/features-sli-adaptors/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index 649432038..1a1cc822c 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index 2a4c2fee1..099a861f3 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml index 6c25fb7bc..506343427 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml +++ b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml index 7eb74c720..cd8aa9638 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml +++ b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/iaas-adaptor/pom.xml b/adaptors/iaas-adaptor/pom.xml index 6ea37a083..941c6492c 100644 --- a/adaptors/iaas-adaptor/pom.xml +++ b/adaptors/iaas-adaptor/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index 57a612b9e..9c10cd117 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index 47867dad1..00c0f86e2 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 686f298f3..6a5d501fc 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 52ba8427a..9a6cbaa7b 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index f2d5f425a..9ac2f4ebb 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index 8bc70e7fb..09caca16b 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index 984fa6a85..dddb2faa7 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml index c2a8fbca7..611831654 100644 --- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml +++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml index 543185493..7c47b8dcb 100644 --- a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml +++ b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/netconf-adaptor/pom.xml b/adaptors/netconf-adaptor/pom.xml index 47dd907e8..c9734e865 100644 --- a/adaptors/netconf-adaptor/pom.xml +++ b/adaptors/netconf-adaptor/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/pom.xml b/adaptors/pom.xml index 75fbeb034..256ad1717 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.adaptors diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index b7893d06d..2bba624e2 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index d6e87e81c..5d4788a84 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index 5ec3993bf..04a5a175b 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/rest-adaptor/pom.xml b/adaptors/rest-adaptor/pom.xml index 7cb0f30ee..f7575fce5 100644 --- a/adaptors/rest-adaptor/pom.xml +++ b/adaptors/rest-adaptor/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml index 534a418f2..d1327fae1 100644 --- a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml +++ b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml index 7ff665916..96564c7a7 100644 --- a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml +++ b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/saltstack-adaptor/pom.xml b/adaptors/saltstack-adaptor/pom.xml index 1c40935d1..5c880a2c5 100644 --- a/adaptors/saltstack-adaptor/pom.xml +++ b/adaptors/saltstack-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml index 51b6ab8d5..b0e570021 100644 --- a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml +++ b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml index 698edab1f..f9cdf3919 100644 --- a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml +++ b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml @@ -17,7 +17,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index ce5d17e3b..a0faefca9 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index e425019fc..85c07d8b9 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index d1cdac488..2a3b8a17d 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/ssh-adaptor/pom.xml b/adaptors/ssh-adaptor/pom.xml index d951ea9d9..74cde3c48 100644 --- a/adaptors/ssh-adaptor/pom.xml +++ b/adaptors/ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml index f32fc823c..2be4adca2 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java index fecb42fc2..038a6aaf4 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java @@ -32,11 +32,11 @@ import java.net.BindException; import java.nio.file.Paths; import java.util.Collections; import org.apache.sshd.common.util.OsUtils; +import org.apache.sshd.scp.server.ScpCommandFactory; import org.apache.sshd.server.SshServer; import org.apache.sshd.server.ServerFactoryManager; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; -import org.apache.sshd.server.scp.ScpCommandFactory; -import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; +import org.apache.sshd.sftp.server.SftpSubsystemFactory; import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Assert; diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 0b07a2275..e6ef5f422 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index a7833b26e..05e504a12 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index cbe36281f..3dec8b9dd 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index fb2a994ac..ebfb84a36 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index a2c9c22e3..d887abdb2 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index ea5a06fa4..b7e25e033 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 805549348..93f407cf4 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 3a79aae4d..25cdd482a 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index a8cc9e501..24ff3a1ef 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 5f033239b..754c325d4 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index e9cd86c34..3f9725846 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index 2f909d507..c2540b35f 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 9e0444ffb..879cae370 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/features/pom.xml b/core/features/pom.xml index 41933bbcc..c5c36ec77 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index c16ac7dd8..a692e8ce9 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 2e4ba90f4..80be64a2b 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index d0c239a01..b261065c5 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/pom.xml b/core/pom.xml index 9aaa57dfc..82f204b41 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index fb6c1055e..6faf31e81 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index a88e803d3..7c76d0ace 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index d4c0da2a9..ff5a329dd 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sli/pom.xml b/core/sli/pom.xml index 473ef6cfd..f127e2857 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index 43c9da533..a32ccf906 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index c207575b9..edcb63ee7 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT @@ -168,6 +168,26 @@ + + + org.codehaus.mojo + build-helper-maven-plugin + 3.0.0 + + + add-model-sources + generate-sources + + add-test-source + + + + ${basedir}/../model/target/generated-sources/BindingJavaFileGenerator + + + + + 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 37a6a5b24..8ffab7bee 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 @@ -311,7 +311,7 @@ public class MdsalHelper { } } else if (returnType.equals(Class.class)) { - } else if (List.class.isAssignableFrom(returnType) || Map.class.isAssignableFrom(returnType)) { + } else if (List.class.isAssignableFrom(returnType) || Map.class.isAssignableFrom(returnType) || Set.class.isAssignableFrom(returnType)) { // This getter method returns a list. try { @@ -320,8 +320,12 @@ public class MdsalHelper { m.setAccessible(true); } Object retList = m.invoke(fromObj); - if ((retList != null) && Map.class.isAssignableFrom(returnType)) { - retList = new ArrayList(((Map)retList).values()); + if (retList != null) { + if (Map.class.isAssignableFrom(returnType)) { + retList = new ArrayList(((Map) retList).values()); + } else if (Set.class.isAssignableFrom(returnType)) { + retList = new ArrayList(((Set) retList)); + } } //due duplicated getters with Map and List(deprecated) stop if already mapped if(!hasAlreadyKeys(props,propNamePfx + "." + fieldName)) { @@ -658,6 +662,155 @@ public class MdsalHelper { } } + public static Set toSet(Properties props, String pfx, Set 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 + "]"; + + // Sets are used to represent yang system-ordered leaf-lists. + // Each entry in the Set is an yang-generated object, + // to be constructed by a builder. + if (isYangGenerated(elemType)) { + + if (isIpAddress(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(IpAddressBuilder.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (isIpv4Address(elemType)) { + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(new Ipv4Address(curValue)); + foundValue = true; + } + + } else if (isIpv6Address(elemType)) { + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(new Ipv6Address(curValue)); + foundValue = true; + } + } else if (isIpPrefix(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(IpPrefixBuilder.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (isPortNumber(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(PortNumber.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (isDscp(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(Dscp.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (elemType.isEnum()) { + String curValue = props.getProperty(curBase, ""); + Object elemObj = null; + + try { + elemObj = Enum.valueOf(elemType, toJavaEnum(curValue)); + } catch (Exception e) { + LOG.error("Caught exception trying to convert field " + curBase + " to enum " + + elemType.getName(), e); + } + toObj.add(elemObj); + foundValue = true; + } else { + String builderName = elemType.getName() + "Builder"; + try { + 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); + toObj.add(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); + } + } + } else { + // Must be a leaf list + String curValue = props.getProperty(curBase, ""); + + toObj.add(curValue); + + if ((curValue != null) && (curValue.length() > 0)) { + foundValue = true; + } + } + } + + if (foundValue) { + return (toObj); + } else { + return (null); + } + } + public static Object toBuilder(Properties props, String pfx, Object toObj) { return (toBuilder(props, pfx, toObj, false)); } @@ -1102,6 +1255,37 @@ public class MdsalHelper { 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; + + } catch (Exception e) { + LOG.error("Caught exception trying to convert List returned by" + toClass.getName() + + "." + m.getName() + "() to Properties entry", e); + } + } + } else if (Set.class.isAssignableFrom(paramClass)) { + // Figure out what type of args are in Set and pass + // that to toList(). + + Type paramType = m.getGenericParameterTypes()[0]; + Type elementType = ((ParameterizedType) paramType).getActualTypeArguments()[0]; + Object paramObj = new HashSet(); + try { + paramObj = toSet(props, propName, (Set) paramObj, (Class) elementType); + } catch (Exception e) { + LOG.error("Caught exception trying to create list expected as argument to {}.{}", + toClass.getName(), m.getName(), e); + } + if (paramObj != null) { try { boolean isAccessible = m.isAccessible(); 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 index 573444bf2..e4d7618fe 100644 --- 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 @@ -401,7 +401,8 @@ public final class YangUtils { } public static Module findParentModule(final SchemaContext context, final SchemaNode schemaNode) { - final QName qname = schemaNode.getPath().getLastComponent(); + //final QName qname = schemaNode.getPath().getLastComponent(); + final QName qname = schemaNode.getQName(); 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 0c06923e2..1e4b67d8f 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 @@ -477,7 +477,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithDecimal64() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - BigDecimal myBigDecimal = new BigDecimal(".0000000000000000000000000000001"); + Decimal64 myBigDecimal = Decimal64.valueOf(".000000000000000001"); sampleBuilder.setSampleDecimal64(myBigDecimal); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -487,7 +487,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithEmpty() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - Empty isEmpty = Empty.getInstance(); + Empty isEmpty = Empty.value(); sampleBuilder.setSampleEmpty(isEmpty); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -646,8 +646,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithLeaftList() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - List nickNames = new ArrayList(); - sampleBuilder.setCustomerNicknames(nickNames); + Set nickNames = new LinkedHashSet(); String nameOne = "coffee"; String nameTwo = "java"; String nameThree = "mud"; @@ -655,10 +654,13 @@ public class MdsalHelperTest extends TestCase { nickNames.add(nameOne); nickNames.add(nameTwo); nickNames.add(nameThree); + sampleBuilder.setCustomerNicknames(nickNames); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); + props.forEach((k, v) -> { LOG.info("Property {} = {}", k, v);}); + assertEquals(nameOne, props.get("sample-container.customer-nicknames[0]")); assertEquals(nameTwo, props.get("sample-container.customer-nicknames[1]")); assertEquals(nameThree, props.get("sample-container.customer-nicknames[2]")); @@ -813,7 +815,8 @@ public class MdsalHelperTest extends TestCase { 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()); + IpAddress[] ipAddressArray = result.getIpAddressLeafList().toArray(new IpAddress[0]); + assertEquals("127.0.0.1", ipAddressArray[0].stringValue()); Map ipNamesMap = result.getIpAddressNames(); Iterator ipNamesIter = ipNamesMap.values().iterator(); assertEquals(true, ipNamesIter.hasNext()); 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 ada933d88..1ccbc90e9 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 @@ -24,10 +24,13 @@ package org.onap.ccsdk.sli.core.sli.provider; import java.util.Enumeration; import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; + 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; @@ -119,7 +122,7 @@ public class PrintYangToPropTest { // Set builder with values Map resultList = new HashMap<>(); resultBuilder.setTestIdentifier("test1"); - List results = new LinkedList<>(); + Set results = new LinkedHashSet (); results.add("pass"); resultBuilder.setResults(results); resultList.put(new TestResultKey(resultBuilder.getTestIdentifier()), resultBuilder.build()); diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index c5e69fa64..f60e8aa28 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 2603da054..25bcf7048 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 4003d1683..75e73b6f0 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index aef06da37..ccef32d01 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index b2b303297..f79bc75bc 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index 62afa9bb2..f31edbbd4 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.core diff --git a/core/sliapi/model/swagger/src/main/json/sliapi.json b/core/sliapi/model/swagger/src/main/json/sliapi.json index 7bf85d763..d78b10682 100644 --- a/core/sliapi/model/swagger/src/main/json/sliapi.json +++ b/core/sliapi/model/swagger/src/main/json/sliapi.json @@ -1 +1 @@ -{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.4.1-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}} \ No newline at end of file +{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.5.0-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}} \ No newline at end of file diff --git a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml index dfa008efc..2097ef1f3 100644 --- a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml +++ b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml @@ -18,7 +18,7 @@ info: Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\ \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\ \ notices." - version: "1.4.1-SNAPSHOT" + version: "1.5.0-SNAPSHOT" title: "SLI-API,ietf-yang-types,ietf-inet-types API" consumes: - "application/json" diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index 1af756e94..86caf4f77 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index d1ec3bca4..dab46e4f4 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index d93e0102c..601af3de6 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT 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 015ef5e57..27cb62e29 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 @@ -54,10 +54,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.exe 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.yangtools.concepts.ObjectRegistration; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.*; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; @@ -539,7 +536,7 @@ public class SliapiProvider implements AutoCloseable, SLIAPIService { if (suspended) { rpcResult = RpcResultBuilder.failed() - .withError(ErrorType.APPLICATION, "resource-denied", "Server Suspended").build(); + .withError(ErrorType.APPLICATION, ErrorTag.RESOURCE_DENIED, "Server Suspended").build(); } else { respBuilder.setResponseMessage("server is normal"); rpcResult = RpcResultBuilder.status(true).withResult(respBuilder.build()).build(); diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index 1fb8dc75e..cf2e5d8e5 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 54166dc17..04eab0e73 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 62434e0f6..695a32331 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index eac65a937..6ddd14fc0 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index 833334a5c..8f3a1f1cd 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index c917fd957..54bc54ca7 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 1e0f4f83f..4cfd9a7ae 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index a3e2c9185..4cb5b5679 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index e1c5203b6..030d5ed63 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index ca60db6bb..c62801c3a 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index c5d4cee1c..965b9da65 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 2f2d31627..7acaea4ea 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 09549305f..05fd0c410 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index cf98c86c3..f027527b8 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index 5900c3c78..4c3a50103 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index ceb937eac..d1ceb606a 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index f9c7fdcc8..9b24c7162 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent standalone-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 57be06851..bfad24766 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 8ed0a4d7e..8693ad473 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index 4e26557f8..6f4940368 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index 4a95a12b0..194ed3cb0 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index 31d5d6996..9cd87c062 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 592ef47d4..7a5361cdc 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index 6f718deba..303d8b343 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 53ce9ed29..910808598 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index bc95700ff..f90e4536b 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index ccce60838..2d4339ed1 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 3a3e7567b..46c791a0b 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index cbee6964e..2db096325 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/northbound/pom.xml b/northbound/pom.xml index 500236996..79a3db4f2 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index 3c68e000b..1dd686412 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent standalone-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.northbound diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index 1a8386aa2..ace9f438f 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index b42c1de42..9512d55cf 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index ae3018342..993ad5f35 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index 561723a98..32431ca99 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index 9e1fe07f8..a245f09fd 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index 517aff26e..1e69d2c9e 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 855808933..110519ee2 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index 056da16a9..9aadadd99 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index c8ee4e507..c870908af 100644 --- a/plugins/features/features-sli-plugins/pom.xml +++ b/plugins/features/features-sli-plugins/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index 22400074e..a4d8a1cc8 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index 7288b8dba..b9e4cbd65 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index 01435fda8..7b88b7dc8 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index ffd341418..985f7dc79 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index f21d41750..b271982a5 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index 2c4680863..1739feff4 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT diff --git a/plugins/pom.xml b/plugins/pom.xml index bf942900f..b8d498edd 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index ec76110b9..e64467efb 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 205a211d4..9d3cbcf30 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index fc323d971..804f557ad 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 85d9dfbb6..0b584263d 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index 56826b0e3..8ba64dc1f 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 740e28482..efe3a5cd8 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 451c4057d..876b7ddf4 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index b9888d8dd..56c93b148 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index 242603f72..bf0d18e1f 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins @@ -68,6 +68,16 @@ yang-data-impl provided + + org.opendaylight.yangtools + yang-parser-api + provided + + + org.opendaylight.yangtools + yang-repo-api + provided + com.fasterxml.jackson.core jackson-databind 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 4a2e18198..2e4a6c34c 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 @@ -87,8 +87,9 @@ 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; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; + +import org.opendaylight.yangtools.yang.parser.api.YangParserException; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -185,7 +186,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { String pp = p.responsePrefix != null ? p.responsePrefix + '.' : ""; Map props = new HashMap<>((Map)ctx.toProperties()); String uri = parseUrl(p.restapiUrl, p.httpMethod); - InstanceIdentifierContext insIdCtx = getInsIdCtx(p, uri); + InstanceIdentifierContext insIdCtx = getInsIdCtx(p, uri); String req = null; if (p.httpMethod != GET && p.httpMethod != DELETE) { @@ -311,7 +312,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { * @return instance identifier context * @throws SvcLogicException when getting schema context fails */ - private InstanceIdentifierContext getInsIdCtx(YangParameters params, + private InstanceIdentifierContext getInsIdCtx(YangParameters params, String uri) throws SvcLogicException { EffectiveModelContext context = getSchemaContext(params); @@ -394,7 +395,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { * @throws SvcLogicException when the data format type is wrong */ public String updateReq(String req, YangParameters p, - InstanceIdentifierContext insIdCtx) + InstanceIdentifierContext insIdCtx) throws SvcLogicException { SchemaNode schemaNode = insIdCtx.getSchemaNode(); diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java index 134868c15..ee5dacdce 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java @@ -25,7 +25,6 @@ package org.onap.ccsdk.sli.plugins.restconfapicall; import static org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode.getParameters; import static org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode.parseParam; -import static org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource.forFile; import java.io.File; import java.io.IOException; import java.net.URI; @@ -39,10 +38,11 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.plugins.restapicall.HttpMethod; import org.onap.ccsdk.sli.plugins.yangserializers.dfserializer.YangParameters; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParser; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; +import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.api.YangParser; +import org.opendaylight.yangtools.yang.parser.api.YangParserException; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException; /** * Utilities for restconf api call node. @@ -193,7 +193,7 @@ public final class RestconfApiUtils { YangParser parser = parserFactory.createParser(); for (File file : yangFiles) { try { - parser.addSource(forFile(file)); + parser.addSource(YangTextSchemaSource.forPath(file.toPath())); } catch (IOException | YangSyntaxErrorException e) { throw new SvcLogicException(YANG_FILE_ERR + e.getMessage(), e); } 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 9b0a31d09..efbbc0458 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 @@ -262,7 +262,7 @@ public final class MdsalPropertiesNodeUtils { String uri1 = uri.replaceAll(UNDERSCORE, COLON); try { - InstanceIdentifierContext id = toInstanceIdentifier( + InstanceIdentifierContext id = toInstanceIdentifier( uri1, context, Optional.ofNullable(null)); return new SchemaPathHolder(id, uri1); } catch (IllegalArgumentException | RestconfDocumentedException @@ -335,7 +335,7 @@ public final class MdsalPropertiesNodeUtils { if (node.contains(UNDERSCORE)) { secondHalf = node.substring(values[0].length()+1); } - InstanceIdentifierContext id; + InstanceIdentifierContext id; for (int i = 0; i< values.length-1; i++) { val = values[i]; val = firstHalf + val + COLON + secondHalf; diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java index a76bb52bf..153f6c2ad 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java @@ -6,8 +6,8 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; /*- * ============LICENSE_START======================================================= @@ -34,7 +34,7 @@ public class TestRestconfApiUtils { @Test public void testGetSchemaCtxFromDir() throws SvcLogicException { - YangParserFactory factory = new YangParserFactoryImpl(); + YangParserFactory factory = new DefaultYangParserFactory(); // Test with valid subdirectories diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java index 64173306d..02d52d215 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java @@ -29,7 +29,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import java.io.IOException; import java.net.URI; @@ -38,7 +38,7 @@ import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -107,7 +107,7 @@ public class TestRestconfDiscoveryNode { Map p = new HashMap<>(); RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); rdn.establishSubscription(p, ctx); } @@ -117,7 +117,7 @@ public class TestRestconfDiscoveryNode { ctx.setAttribute("restapi-result.response-code", "200"); ctx.setAttribute("response-code", "404"); RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); assertThat(rdn.getResponseCode("restapi-result", ctx), is("200")); assertThat(rdn.getResponseCode(null, ctx), @@ -133,7 +133,7 @@ public class TestRestconfDiscoveryNode { ctx.setAttribute("ietf-subscribed-notifications:establish-subscripti" + "on.output.identifier", "89"); RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); assertThat(rdn.getOutputIdentifier("restapi-result", ctx), is("89")); } @@ -144,7 +144,7 @@ public class TestRestconfDiscoveryNode { "futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarny" + "le3sdcqq9hftc4lebz464b5ffxmlbvg9"; RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); assertThat(rdn.getTokenId(customHttpHeaders), is("x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqkt" + diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java index a5353fad4..7f04bbaa9 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java @@ -33,12 +33,12 @@ import org.onap.ccsdk.sli.plugins.restapicall.HttpResponse; import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; @@ -94,7 +94,7 @@ public class DataFormatSerializerTest { p.put("responsePrefix", "response"); p.put("skipSending", "true"); restApi = new RestapiCallNode(); - parserFactory = new YangParserFactoryImpl(); + parserFactory = new DefaultYangParserFactory(); restconf = mock(RestconfApiCallNode.class); dfCaptor = new DfCaptor(); createMethodMocks(); diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java index 9abbb16b7..ca148033b 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java @@ -33,12 +33,12 @@ import org.onap.ccsdk.sli.plugins.restapicall.HttpResponse; import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; @@ -83,7 +83,7 @@ public class IdentifierValidationTest { p.put("responsePrefix", "response"); p.put("skipSending", "true"); restApi = new RestapiCallNode(); - parserFactory = new YangParserFactoryImpl(); + parserFactory = new DefaultYangParserFactory(); restconf = mock(RestconfApiCallNode.class); dfCaptor = new DfCaptor(); createMethodMocks(); diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java index 2bcd45e2b..ff5871519 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java @@ -83,7 +83,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont1.cont2.ll3[1]", "abc"); params.put("test-yang_cont1.cont2.ll4[0]", "abc"); params.put("test-yang_cont1.cont2.ll4[1]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( @@ -293,7 +293,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont1.cont2.ll5[0]", "abc"); params.put("test-yang_cont1.cont2.ll5[1]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -401,7 +401,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont8.ll7[0]", "abc"); params.put("test-yang_cont8.ll7[1]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -460,7 +460,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont9.ll8[0]", "abc"); params.put("test-yang_cont9.cont11.leaf25", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -498,7 +498,7 @@ public final class PropertiesSerializerTest { Map params = new HashMap<>(); params.put("test-yang_cont8.cont6.test-augment_leaf21", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -540,7 +540,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont13.leaf28", "abc"); params.put("test-yang_cont13.ll9[0]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -589,7 +589,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont9.cont11.cont13.list9[0].leaf27", "abc"); params.put("test-yang_cont9.cont11.cont13.leaf28", "abc"); params.put("test-yang_cont9.cont11.cont13.ll9[0]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -643,7 +643,7 @@ public final class PropertiesSerializerTest { params.put("test-augment_cont13.list9[0].leaf27", "abc"); params.put("test-augment_cont13.leaf28", "abc"); params.put("test-augment_cont13.ll9[0]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -695,7 +695,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont1.cont2.cont4.test-augment_cont13.leaf28", "abc"); params.put("test-yang_cont1.cont2.cont4.test-augment_cont13.ll9[0]", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -763,7 +763,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_create-sfc.input.cont13.ll9[0]", "abc"); params.put("test-yang_create-sfc.input.test-augment_leaf36", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -877,7 +877,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_create-sfc.output.cont13.ll9[0]", "abc"); params.put("test-yang_create-sfc.output.test-augment_leaf37", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -985,7 +985,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont18.cont18.list12[1].list12[0].leaf36", "xyz"); params.put("test-yang_cont18.cont18.list12[1].list12[1].leaf36", "hey!"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -1056,7 +1056,7 @@ public final class PropertiesSerializerTest { params.put("leaf41", "hi"); params.put("test-yang_cont18.leaf41", "abc"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -1078,7 +1078,7 @@ public final class PropertiesSerializerTest { params.put("identity-test_test.con1.interfaces.int-list[0].available.ll[0]", "identity-types:Loopback"); params.put("identity-test_test.con1.interfaces.int-list[0].available.leaf1", "identity-types-second:Ethernet"); params.put("identity-test_test.con1.interfaces.int-list[0].available.leaf2", "identity-types-second:iden2"); - InstanceIdentifierContext iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index 4e7b2efd3..54bd99d10 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index 68daf6cdc..3197c82e2 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 357316963..d35dc75fe 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index 774e6991b..1bdc78457 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 65540a97d..5612ff97f 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 618a0377a..dc08b67b1 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.4.0 + 2.4.1-SNAPSHOT org.onap.ccsdk.sli.plugins diff --git a/pom.xml b/pom.xml index 030b46435..2fb6c316b 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.4.0 + 2.4.1-SNAPSHOT -- cgit 1.2.3-korg