From 0e061be8935d3fd361e8ad916948215043f1ebab Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Tue, 28 Mar 2023 09:37:21 -0400 Subject: ODL Chlorine changes Update ccsdk/sli for OpenDaylight Chlorine release. Issue-ID: CCSDK-3812 Signed-off-by: Dan Timoney Change-Id: I886292c4232e7028967f1518d9f0b09f2d0a6106 --- adaptors/aai-service/installer/pom.xml | 2 +- adaptors/aai-service/pom.xml | 2 +- adaptors/aai-service/provider/pom.xml | 2 +- .../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 +- 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 | 2 +- .../ccsdk/sli/core/sli/provider/MdsalHelper.java | 14 ++++---- .../sli/core/sli/provider/MdsalHelperTest.java | 39 ++++++++++------------ .../sli/core/sli/provider/PrintYangToPropTest.java | 13 ++++---- .../yang/gen/v1/test/TestObjectBuilder.java | 4 +-- 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 | 34 +++++++++---------- core/sliapi/model/yang/pom.xml | 2 +- core/sliapi/pom.xml | 2 +- core/sliapi/provider/pom.xml | 2 +- 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 | 3 +- 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 | 6 +++- plugins/restconf-client/installer/pom.xml | 2 +- plugins/restconf-client/pom.xml | 2 +- plugins/restconf-client/provider/pom.xml | 18 +++++++--- 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 +- 163 files changed, 227 insertions(+), 214 deletions(-) diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index 1e67eb558..c860abf92 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.5.3 + 2.5.4 diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index 14d7d5f4a..60467f233 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index d32f2d0f9..609da9310 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.5.3 + 2.5.4 diff --git a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml index 8661c4594..35da27107 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.5.3 + 2.5.4 diff --git a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml index 93155ce4f..35a2641e2 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.5.3 + 2.5.4 diff --git a/adaptors/ansible-adaptor/pom.xml b/adaptors/ansible-adaptor/pom.xml index ccbef4ab0..36c10bd55 100644 --- a/adaptors/ansible-adaptor/pom.xml +++ b/adaptors/ansible-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index 1bfed1bca..f0b1debea 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index 9d06dc432..ef7275310 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.5.3 + 2.5.4 diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index 2d82859b3..18a4ca549 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 488c07984..8431be35a 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.5.3 + 2.5.4 diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index 3900edd2d..1f053ab35 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml index f26cb61c6..080b6b9a1 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.5.3 + 2.5.4 diff --git a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml index 2142a6c14..ca845326a 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.5.3 + 2.5.4 diff --git a/adaptors/chef-adaptor/pom.xml b/adaptors/chef-adaptor/pom.xml index 10baf80c2..cfb336bdc 100644 --- a/adaptors/chef-adaptor/pom.xml +++ b/adaptors/chef-adaptor/pom.xml @@ -27,7 +27,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index 8f870bbcd..c7b8293bf 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-ansible-adaptor/pom.xml b/adaptors/features/ccsdk-ansible-adaptor/pom.xml index c41c0dca0..24a7dd241 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 3be1e785e..0db616d1a 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-chef-adaptor/pom.xml b/adaptors/features/ccsdk-chef-adaptor/pom.xml index ea70e4cf2..7125e5b9a 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-iaas-adaptor/pom.xml b/adaptors/features/ccsdk-iaas-adaptor/pom.xml index 4822a9ae3..cf93e4c5f 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index d5c4683a8..1efb8c355 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index cf382ad97..35ecca223 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.5.3 + 2.5.4 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 b092bdebe..e09dd1faf 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.5.3 + 2.5.4 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 fa1fce1c0..698627d18 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-netconf-adaptor/pom.xml b/adaptors/features/ccsdk-netconf-adaptor/pom.xml index b4ab26a32..89cd041bf 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index 9901eb01f..b9b7c5bdd 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-rest-adaptor/pom.xml b/adaptors/features/ccsdk-rest-adaptor/pom.xml index 48320a26e..55c2e95d3 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml index 07efc2f90..28bc0b68a 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 69298d2a8..eec81bd72 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index c73f5d71d..6c6286065 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.5.3 + 2.5.4 diff --git a/adaptors/features/ccsdk-ssh-adaptor/pom.xml b/adaptors/features/ccsdk-ssh-adaptor/pom.xml index dacbee8c5..de089f51e 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.5.3 + 2.5.4 diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml index d75a596f3..139009790 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.5.3 + 2.5.4 diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index c3780eb0f..4fc1a94af 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index ea16c77e1..067887941 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml index 8817cec20..f768ccef0 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.5.3 + 2.5.4 diff --git a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml index b29714d48..813ac21cb 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.5.3 + 2.5.4 diff --git a/adaptors/iaas-adaptor/pom.xml b/adaptors/iaas-adaptor/pom.xml index 42d65aa38..a684accf9 100644 --- a/adaptors/iaas-adaptor/pom.xml +++ b/adaptors/iaas-adaptor/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index 06c85b54a..a69629e37 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.5.3 + 2.5.4 diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index a96a56aa5..c12fd0441 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index dbf8a87f9..f1292dc8a 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.5.3 + 2.5.4 diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 0a518ac1d..829de7b4b 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index db60a72ba..8bd6645f9 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.5.3 + 2.5.4 diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index 6de983880..68b05377c 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -20,7 +20,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index 1e6e3b4da..3e39b0fae 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.5.3 + 2.5.4 diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml index a0a9aa827..262b21457 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.5.3 + 2.5.4 diff --git a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml index 402a34a51..32acfe6ce 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.5.3 + 2.5.4 diff --git a/adaptors/netconf-adaptor/pom.xml b/adaptors/netconf-adaptor/pom.xml index 2d18d67ea..bf0bf91fc 100644 --- a/adaptors/netconf-adaptor/pom.xml +++ b/adaptors/netconf-adaptor/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/pom.xml b/adaptors/pom.xml index 2fb903be0..168a5712d 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.adaptors diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index 0422d27bb..17e3e2c6a 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.5.3 + 2.5.4 diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index fa8b69b2e..7dde6b1dc 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index b94d91efe..36a6d899d 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.5.3 + 2.5.4 diff --git a/adaptors/rest-adaptor/pom.xml b/adaptors/rest-adaptor/pom.xml index 3fc536a7e..8f77afd82 100644 --- a/adaptors/rest-adaptor/pom.xml +++ b/adaptors/rest-adaptor/pom.xml @@ -25,7 +25,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml index f4d6ddfce..4f9fb2f6c 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.5.3 + 2.5.4 diff --git a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml index a53f272c1..4274809d4 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.5.3 + 2.5.4 diff --git a/adaptors/saltstack-adaptor/pom.xml b/adaptors/saltstack-adaptor/pom.xml index 3e528a0e0..4afd62f02 100644 --- a/adaptors/saltstack-adaptor/pom.xml +++ b/adaptors/saltstack-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml index 4ae243f2c..43ddcaf94 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.5.3 + 2.5.4 diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml index 921b20e0a..1269b2bd9 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.5.3 + 2.5.4 diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index 0cbf123f4..3cc009a93 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.5.3 + 2.5.4 diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index 045ca7625..18937ceec 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index 9cfaef039..ba26419df 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.5.3 + 2.5.4 diff --git a/adaptors/ssh-adaptor/pom.xml b/adaptors/ssh-adaptor/pom.xml index ed022725a..24f5238a3 100644 --- a/adaptors/ssh-adaptor/pom.xml +++ b/adaptors/ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml index 7e769f2e7..ab351d4bb 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.5.3 + 2.5.4 diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index d6e03b1af..01e638aa0 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 5f4e1ed6a..ef6d95ead 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index b8300f865..8fdd4ab95 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 3c52a14c8..18027a646 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index 1319b9432..44df2659d 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.5.3 + 2.5.4 diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index 5deffa5a3..84377fb44 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.5.3 + 2.5.4 diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 49760399c..c953f50d5 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.5.3 + 2.5.4 diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 43b6ade4e..02b161acc 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.5.3 + 2.5.4 diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index b8f59bb8a..c0ca893b4 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.5.3 + 2.5.4 diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index 504c433b9..18ffdad87 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.5.3 + 2.5.4 diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index 9698f9e5d..0a2a83153 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.5.3 + 2.5.4 diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index 9b75b6d7d..7c90f5828 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.5.3 + 2.5.4 diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 39dbd2154..252e46c2f 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/features/pom.xml b/core/features/pom.xml index 38692b9bc..8c3e83dda 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index 144db38d3..9b7d36a5a 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/filters/pom.xml b/core/filters/pom.xml index 528d399fa..960fd87f6 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index 2af5c96cf..6bf05a3c1 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/core/pom.xml b/core/pom.xml index f7fab42cc..8e9be6f73 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index 2a1bf3064..beae950ea 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index e78a12286..898dc1abd 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index 08233a16b..5ce324ff1 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/core/sli/pom.xml b/core/sli/pom.xml index 6bfda7dba..8c7bcc44d 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index bb1ec2f93..7f3da40ce 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.5.3 + 2.5.4 diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index 5544d673a..8f78bed8a 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 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 8ffab7bee..67726ecce 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 @@ -488,7 +488,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpAddressBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipAddressFor(curValue)); foundValue = true; } } else if (isIpv4Address(elemType)) { @@ -511,7 +511,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpPrefixBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipPrefixFor(curValue)); foundValue = true; } } else if (isPortNumber(elemType)) { @@ -719,7 +719,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpAddressBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipAddressFor(curValue)); foundValue = true; } } else if (isIpv4Address(elemType)) { @@ -742,7 +742,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpPrefixBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipPrefixFor(curValue)); foundValue = true; } } else if (isPortNumber(elemType)) { @@ -916,7 +916,7 @@ public class MdsalHelper { if ((paramValue != null) && (paramValue.length() > 0)) { try { - IpAddress ipAddr = IpAddressBuilder.getDefaultInstance(paramValue); + IpAddress ipAddr = IetfInetUtil.ipAddressFor(paramValue); if (IPV4_ADDRESS.equals(simpleName)) { m.invoke(toObj, ipAddr.getIpv4Address()); @@ -953,7 +953,7 @@ public class MdsalHelper { } else if (IP_PREFIX.equals(simpleName)) { if ((paramValue != null) && (paramValue.length() > 0)) { try { - IpPrefix ipPrefix = IpPrefixBuilder.getDefaultInstance(paramValue); + IpPrefix ipPrefix = IetfInetUtil.ipPrefixFor(paramValue); m.invoke(toObj, ipPrefix); foundValue = true; } catch (Exception e) { @@ -998,7 +998,7 @@ public class MdsalHelper { } else if ("Host".equals(simpleName)) { if ((paramValue != null) && (paramValue.length() > 0)) { try { - Host host = HostBuilder.getDefaultInstance(paramValue); + Host host = IetfInetUtil.hostFor(paramValue); m.invoke(toObj, host); foundValue = true; } catch (Exception e) { 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 1e4b67d8f..676c5fce3 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 @@ -29,6 +29,7 @@ import java.util.*; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.Builtin.SampleBits; @@ -47,12 +48,8 @@ import org.opendaylight.yang.gen.v1.test.WrapperObj; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.HostBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZoneBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpVersion; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; @@ -112,18 +109,18 @@ public class MdsalHelperTest extends TestCase { parmBuilder.setParameterName("ipaddress4-parm"); parmBuilder.setStringValue(null); - parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); + parmBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("127.0.0.1")); newParm = parmBuilder.build(); params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipaddress6-parm"); - parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("ef::1")); + parmBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("ef::1")); newParm = parmBuilder.build(); params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipprefix-parm"); parmBuilder.setIpaddressValue(null); - parmBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("10.0.0.0/24")); + parmBuilder.setIpprefixValue(IetfInetUtil.ipPrefixFor("10.0.0.0/24")); newParm = parmBuilder.build(); params.put(newParm.key(), newParm); @@ -217,10 +214,10 @@ public class MdsalHelperTest extends TestCase { public void testSingleIpAddressToProperties() throws Exception { Properties props = new Properties(); String ipAddress = "11.11.11.11"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(ipAddress)); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(ipAddress)); assertEquals(ipAddress, props.getProperty("")); ipAddress = "cafe::8888"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(ipAddress)); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(ipAddress)); assertEquals(ipAddress, props.getProperty("")); } @@ -245,7 +242,7 @@ public class MdsalHelperTest extends TestCase { String ipAddress = "11.11.11.11"; TestObjectBuilder b = new TestObjectBuilder(); List ipAddressList = new ArrayList(); - ipAddressList.add(IpAddressBuilder.getDefaultInstance(ipAddress)); + ipAddressList.add(IetfInetUtil.ipAddressFor(ipAddress)); b.setFloatingIp(ipAddressList); MdsalHelper.toProperties(props, b.build()); assertEquals(ipAddress, props.getProperty("test-object.floating-ip[0]")); @@ -273,7 +270,7 @@ public class MdsalHelperTest extends TestCase { public void testSingleIpv4AddressToProperties() throws Exception { Properties props = new Properties(); String v4address = "11.11.11.11"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(v4address).getIpv4Address()); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(v4address).getIpv4Address()); assertEquals(v4address, props.getProperty("")); } @@ -292,7 +289,7 @@ public class MdsalHelperTest extends TestCase { TestObjectBuilder b = new TestObjectBuilder(); List v4list = new ArrayList(); - v4list.add(IpAddressBuilder.getDefaultInstance(v4address).getIpv4Address()); + v4list.add(IetfInetUtil.ipAddressFor(v4address).getIpv4Address()); b.setFloatingIpV4(v4list); MdsalHelper.toProperties(props, b.build()); assertEquals(v4address, props.getProperty("test-object.floating-ip-v4[0]")); @@ -312,8 +309,8 @@ public class MdsalHelperTest extends TestCase { public void testSingleIpv6AddressToProperties() throws Exception { Properties props = new Properties(); String v6address = "cafe::8888"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(v6address).getIpv6Address()); - MdsalHelper.toBuilder(props, IpAddressBuilder.getDefaultInstance("cafe::8887")); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(v6address).getIpv6Address()); + MdsalHelper.toBuilder(props, IetfInetUtil.ipAddressFor("cafe::8887")); assertEquals(v6address, props.getProperty("")); } @@ -332,7 +329,7 @@ public class MdsalHelperTest extends TestCase { TestObjectBuilder b = new TestObjectBuilder(); List v6list = new ArrayList(); - v6list.add(IpAddressBuilder.getDefaultInstance(v6address).getIpv6Address()); + v6list.add(IetfInetUtil.ipAddressFor(v6address).getIpv6Address()); b.setFloatingIpV6(v6list); MdsalHelper.toProperties(props, b.build()); assertEquals(v6address, props.getProperty("test-object.floating-ip-v6[0]")); @@ -396,7 +393,7 @@ public class MdsalHelperTest extends TestCase { public void testIpPrefix() throws Exception { String ipPrefix = "10.0.0.0/24"; Properties props = new Properties(); - MdsalHelper.toProperties(props, IpPrefixBuilder.getDefaultInstance(ipPrefix)); + MdsalHelper.toProperties(props, IetfInetUtil.ipPrefixFor(ipPrefix)); assertEquals(ipPrefix, props.getProperty("")); } @@ -417,7 +414,7 @@ public class MdsalHelperTest extends TestCase { public void testIetfInet() throws Exception { Properties props = new Properties(); Inet6Address address = - IetfInetUtil.INSTANCE.inet6AddressFor(IpAddressBuilder.getDefaultInstance("cafe::8888").getIpv6Address()); + IetfInetUtil.INSTANCE.inet6AddressFor(IetfInetUtil.ipAddressFor("cafe::8888").getIpv6Address()); MdsalHelper.toProperties(props, address); assertEquals("/cafe:0:0:0:0:0:0:8888", props.getProperty("")); } @@ -711,14 +708,14 @@ public class MdsalHelperTest extends TestCase { sampleBuilder.setIpv6FlowLabel(Ipv6FlowLabel.getDefaultInstance("3")); sampleBuilder.setAsNumber(AsNumber.getDefaultInstance("4")); sampleBuilder.setIpv6Address(Ipv6Address.getDefaultInstance("fdda:5cc1:23:4::1f")); - sampleBuilder.setIpAddressNoZone(IpAddressNoZoneBuilder.getDefaultInstance("fdda:5cc1:23:4::1f")); + sampleBuilder.setIpAddressNoZone(IetfInetUtil.ipAddressNoZoneFor("fdda:5cc1:23:4::1f")); sampleBuilder.setIpv4Address(Ipv4Address.getDefaultInstance("192.168.1.2")); sampleBuilder.setIpv4AddressNoZone(Ipv4AddressNoZone.getDefaultInstance("192.168.1.3")); sampleBuilder.setIpv6AddressNoZone(Ipv6AddressNoZone.getDefaultInstance("fdda:5cc1:23:4::1f")); sampleBuilder.setIpv4Prefix(Ipv4Prefix.getDefaultInstance("198.51.100.0/24")); sampleBuilder.setIpv6Prefix(Ipv6Prefix.getDefaultInstance("2001:db8:aaaa:1111::100/64")); sampleBuilder.setDomainName(DomainName.getDefaultInstance("onap.org")); - sampleBuilder.setHost(HostBuilder.getDefaultInstance("machine.onap.org")); + sampleBuilder.setHost(IetfInetUtil.hostFor("machine.onap.org")); sampleBuilder.setUri(Uri.getDefaultInstance("http://wiki.onap.org:8080")); Properties props = new Properties(); @@ -792,7 +789,7 @@ public class MdsalHelperTest extends TestCase { assertEquals(AsNumber.getDefaultInstance("4"), result.getAsNumber()); assertEquals(DomainName.getDefaultInstance("onap.org"), result.getDomainName()); assertEquals(Dscp.getDefaultInstance("1"), result.getDscp()); - // assertEquals(HostBuilder.getDefaultInstance("machine.onap.org").getDomainName(), + // assertEquals(IetfInetUtil.hostFor("machine.onap.org").getDomainName(), // result.getHost().getDomainName()); assertEquals(Ipv6AddressNoZone.getDefaultInstance("fdda:5cc1:23:4::1f").getValue(), result.getIpv6AddressNoZone().getValue()); @@ -801,7 +798,7 @@ public class MdsalHelperTest extends TestCase { assertEquals(Ipv4AddressNoZone.getDefaultInstance("192.168.1.3"), result.getIpv4AddressNoZone()); assertEquals(Ipv4Prefix.getDefaultInstance("198.51.100.0/24"), result.getIpv4Prefix()); assertEquals(Ipv6Address.getDefaultInstance("fdda:5cc1:23:4::1f"), result.getIpv6Address()); - assertEquals(IpAddressNoZoneBuilder.getDefaultInstance("fdda:5cc1:23:4::1f").getIpv6AddressNoZone().getValue(), + assertEquals(IetfInetUtil.ipAddressNoZoneFor("fdda:5cc1:23:4::1f").getIpv6AddressNoZone().getValue(), result.getIpv6AddressNoZone().getValue()); assertEquals(Ipv6FlowLabel.getDefaultInstance("3"), result.getIpv6FlowLabel()); assertEquals(Ipv6Prefix.getDefaultInstance("2001:db8:aaaa:1111::100/64"), result.getIpv6Prefix()); 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 1ccbc90e9..552375c7e 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 @@ -41,8 +41,9 @@ 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.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Ieee754Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,17 +81,17 @@ public class PrintYangToPropTest { pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipaddress-value1"); pBuilder.setBooleanValue(null); - pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); + pBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("127.0.0.1")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipaddress-value2"); - pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("::1")); + pBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("::1")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipprefix-value1"); pBuilder.setIpaddressValue(null); - pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("192.168.0.0/16")); + pBuilder.setIpprefixValue(IetfInetUtil.ipPrefixFor("192.168.0.0/16")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipprefix-value2"); - pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("2001:db8:3c4d::/48")); + pBuilder.setIpprefixValue(IetfInetUtil.ipPrefixFor("2001:db8:3c4d::/48")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); diff --git a/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java index 63ce63672..aaf8f85c0 100755 --- a/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java +++ b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java @@ -5,9 +5,9 @@ import java.util.List; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address; -import org.opendaylight.yangtools.concepts.Builder; -public class TestObjectBuilder implements Builder { + +public class TestObjectBuilder { private List _floatingIp; private List _floatingIpV4; private List _floatingIpV6; diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index a20fcdc29..837d79b78 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index b73d58761..672a52578 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index d4f5d25f7..72d00122f 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index 7ea9d7376..8b3fa1ccc 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index 1c111182b..c28be5bde 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index ccbd682c4..5c6ee5e3b 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.5.3 + 2.5.4 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 a0e5d6558..e356735f9 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":"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.,Defines API to service logic interpreter","version":"1.6.1-SNAPSHOT","title":"ietf-yang-types,ietf-inet-types,SLI-API 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.6.2-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 4b7263c47..8ca9fc6f2 100644 --- a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml +++ b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml @@ -1,25 +1,25 @@ --- swagger: "2.0" info: - description: "This module contains a collection of generally useful derived\nYANG\ - \ data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\n\ - authors 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\n\ + 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\n\ + Redistribution 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\n\ 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.,Defines API to service logic interpreter" - version: "1.6.1-SNAPSHOT" - title: "ietf-yang-types,ietf-inet-types,SLI-API API" + \ 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\n\ + 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.6.2-SNAPSHOT" + title: "SLI-API,ietf-yang-types,ietf-inet-types API" consumes: - "application/json" - "application/xml" diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index b2a1cc160..a227f8aa4 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.5.3 + 2.5.4 diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index c15ba8396..1a9d448b7 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index 41b94028f..f86831d81 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index e8745928c..1888aaec3 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 797299cf8..810bb9f59 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 213a29f8a..70e44b1cc 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 1c24626ed..ecc5b3b33 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index 5a4dc5b1c..38fa9dd76 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index 4f729942d..9f4666135 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 9e57c1b4d..1330510d0 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index 253c70f2b..097cee0cb 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 0041fa27c..e57f8a530 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.5.3 + 2.5.4 diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index d6be86687..7ec99d024 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.5.3 + 2.5.4 diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 166156c12..8fc980634 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.5.3 + 2.5.4 diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 3727edab3..81795b751 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.5.3 + 2.5.4 diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index 7b0fce711..8f5265cbe 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 509784419..c02e1f31a 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index d22880eb2..8cb838f22 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index 1798ce8cd..931ea4f62 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index 5da5e99ee..196a07558 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent standalone-parent - 2.5.3 + 2.5.4 @@ -24,6 +24,7 @@ yyyyMMdd'T'HHmmss'Z' ${maven.build.timestamp} ${project.version}-${build.number} + 2.13.4 diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index 3494ee26f..9d735c4bc 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.5.3 + 2.5.4 diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 4f6fe27bd..2521ef5bb 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.5.3 + 2.5.4 diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index 75f226011..af387cacd 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.5.3 + 2.5.4 diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index 7c5add3c9..21c723053 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.5.3 + 2.5.4 diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index ee417ef6a..85f145203 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.5.3 + 2.5.4 diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index dba18bb49..e341ed92c 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.5.3 + 2.5.4 diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index 8502ea478..3ac0d7d8a 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 3fa1baf3c..ee92729da 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 958f9bced..53c6149fe 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index 61c2efc91..5cf5fd78c 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 10bddefd4..499ba294a 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index a06d9ac3a..e103863bc 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/northbound/pom.xml b/northbound/pom.xml index a0f1c7574..ce23d2224 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.northbound diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index 9173d8c2c..3570c4805 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent standalone-parent - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.northbound diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index d7b1a0508..255f6541f 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index fda13a67e..0c771bb49 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.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index 012a30d97..d18462023 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.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index 14bb01ff0..82b89ba1a 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.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index fdb355893..1fa8a25ff 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.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index a5bcf4ec0..fcd4781cf 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.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 1a78510f4..43660028e 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.5.3 + 2.5.4 diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index db46594c2..033069b59 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.5.3 + 2.5.4 diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index 900873349..9278c0295 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.5.3 + 2.5.4 diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index bc4d5afe6..73ff780fb 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index 5cd95e7eb..7f7aa435a 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index 3d3ba0514..f06a639cd 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index d9128e023..7f3f16198 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index c2b88fd33..983af7f8e 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index 3c7aed24c..b932b831e 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 2.5.3 + 2.5.4 diff --git a/plugins/pom.xml b/plugins/pom.xml index f62dc4396..315803c4b 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index bb96db935..4fd22b356 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 46be5a7ad..870ad03bc 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index 7d29c9dbb..f740de68d 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index ae8560a77..6bf437b54 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index d959caa81..4a0af7b60 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index ee1f421a5..bbfbfedd9 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins @@ -71,6 +71,10 @@ org.glassfish.jersey.media jersey-media-multipart + + org.glassfish.jersey.inject + jersey-hk2 + org.onap.logging-analytics logging-filter-base diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index d86e4dd03..33fe9a09c 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index 20c525b32..13013e41d 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index 244fd5c8b..09e8f43fa 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins @@ -15,6 +15,10 @@ ccsdk-sli-plugins :: ${project.artifactId} + + 2.3.3 + + @@ -27,7 +31,7 @@ org.glassfish.jersey jersey-bom - 2.27 + 2.37 pom import @@ -97,8 +101,8 @@ org.opendaylight.netconf - restconf-nb-rfc8040 - provided + restconf-nb + 4.0.4 javax.xml @@ -116,6 +120,12 @@ org.osgi.core provided + + org.glassfish.jaxb + jaxb-runtime + ${jaxb-api.version} + + diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index 5bcb6e574..350fdfe78 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index d5e8d2bd4..1b7b577d5 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 40dc90e12..c2335fb66 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index 0b11810c6..0c30ca4d0 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 0a8e928f6..affa3db9a 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 641590501..eb9c751af 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.5.3 + 2.5.4 org.onap.ccsdk.sli.plugins diff --git a/pom.xml b/pom.xml index 6c9ae63b6..704e06e78 100755 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 2.5.3 + 2.5.4 -- cgit 1.2.3-korg