diff options
180 files changed, 582 insertions, 877 deletions
diff --git a/adaptors/aai-service/installer/pom.xml b/adaptors/aai-service/installer/pom.xml index f94485ac5..fd579dbbe 100755 --- a/adaptors/aai-service/installer/pom.xml +++ b/adaptors/aai-service/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/aai-service/pom.xml b/adaptors/aai-service/pom.xml index 25f0e5d4c..8547e6382 100755 --- a/adaptors/aai-service/pom.xml +++ b/adaptors/aai-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/aai-service/provider/pom.xml b/adaptors/aai-service/provider/pom.xml index 8b6eade1c..118abfbcf 100755 --- a/adaptors/aai-service/provider/pom.xml +++ b/adaptors/aai-service/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> @@ -36,6 +36,7 @@ <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-core</artifactId> + <version>3.12.4</version> <scope>test</scope> </dependency> <dependency> diff --git a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java index 66d34a8b8..0edb9d3f6 100755 --- a/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java +++ b/adaptors/aai-service/provider/src/test/java/org/onap/ccsdk/sli/adaptors/aai/GenericVnfTest.java @@ -2,8 +2,8 @@ * ============LICENSE_START======================================================= * openECOMP : SDN-C * ================================================================================ - * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights - * reserved. + * Copyright (C) 2017 - 2018 AT&T Intellectual Property. All rights reserved. + * Copyright (C) 2022 Samsung Electronics Intellectual Property. All rights reserved. * ================================================================================ * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -48,6 +48,7 @@ import org.onap.ccsdk.sli.adaptors.aai.AAIClient; import org.onap.ccsdk.sli.adaptors.aai.AAIRequest; import org.onap.ccsdk.sli.adaptors.aai.AAIService; import org.onap.ccsdk.sli.core.sli.SvcLogicContext; +import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.core.sli.SvcLogicResource.QueryStatus; import org.onap.aai.inventory.v25.GenericVnf; import org.slf4j.Logger; @@ -106,13 +107,8 @@ public class GenericVnfTest { QueryStatus resp = client.save("generic-vnf", false, false, "generic-vnf.vnf-id = '"+uuid+"'", data, "aaidata", ctx); assertNotNull(ctx); - - } - catch (Throwable e) - { - - } - ; + } + catch (SvcLogicException ignored) { }; } @Test diff --git a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml index 05dddb3e4..b1b129a0c 100644 --- a/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml +++ b/adaptors/ansible-adaptor/ansible-adaptor-bundle/pom.xml @@ -24,7 +24,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml index 005b3fdcd..6ef7cf650 100644 --- a/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml +++ b/adaptors/ansible-adaptor/ansible-adaptor-installer/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ansible-adaptor/pom.xml b/adaptors/ansible-adaptor/pom.xml index 261931f36..3bee1d0f3 100644 --- a/adaptors/ansible-adaptor/pom.xml +++ b/adaptors/ansible-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/artifacts/pom.xml b/adaptors/artifacts/pom.xml index e24a3b0e1..8c2a5f492 100755 --- a/adaptors/artifacts/pom.xml +++ b/adaptors/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/installer/pom.xml b/adaptors/base/http/installer/pom.xml index b0791ddc3..efb6b4870 100644 --- a/adaptors/base/http/installer/pom.xml +++ b/adaptors/base/http/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/pom.xml b/adaptors/base/http/pom.xml index dc84db7ce..6e1bd2740 100644 --- a/adaptors/base/http/pom.xml +++ b/adaptors/base/http/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/http/provider/pom.xml b/adaptors/base/http/provider/pom.xml index 2b1b8b1f1..57eb95aa2 100644 --- a/adaptors/base/http/provider/pom.xml +++ b/adaptors/base/http/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/base/pom.xml b/adaptors/base/pom.xml index d5ebb3feb..2d032e452 100644 --- a/adaptors/base/pom.xml +++ b/adaptors/base/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml index 070cb3dac..15169d1ab 100644 --- a/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml +++ b/adaptors/chef-adaptor/chef-adaptor-bundle/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml index 114cafb3c..2bc20e26d 100644 --- a/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml +++ b/adaptors/chef-adaptor/chef-adaptor-installer/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/chef-adaptor/pom.xml b/adaptors/chef-adaptor/pom.xml index 5c4c84f81..903d757d2 100644 --- a/adaptors/chef-adaptor/pom.xml +++ b/adaptors/chef-adaptor/pom.xml @@ -27,7 +27,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-aai-service/pom.xml b/adaptors/features/ccsdk-aai-service/pom.xml index aa79e1050..42f0f36ad 100644 --- a/adaptors/features/ccsdk-aai-service/pom.xml +++ b/adaptors/features/ccsdk-aai-service/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-ansible-adaptor/pom.xml b/adaptors/features/ccsdk-ansible-adaptor/pom.xml index 586291bf4..8eaf3b336 100644 --- a/adaptors/features/ccsdk-ansible-adaptor/pom.xml +++ b/adaptors/features/ccsdk-ansible-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-base-http/pom.xml b/adaptors/features/ccsdk-base-http/pom.xml index 4570a81c5..f06337a0f 100644 --- a/adaptors/features/ccsdk-base-http/pom.xml +++ b/adaptors/features/ccsdk-base-http/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-chef-adaptor/pom.xml b/adaptors/features/ccsdk-chef-adaptor/pom.xml index 61f7abb85..42aba476b 100644 --- a/adaptors/features/ccsdk-chef-adaptor/pom.xml +++ b/adaptors/features/ccsdk-chef-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-iaas-adaptor/pom.xml b/adaptors/features/ccsdk-iaas-adaptor/pom.xml index 1ed6ce373..b721099b9 100644 --- a/adaptors/features/ccsdk-iaas-adaptor/pom.xml +++ b/adaptors/features/ccsdk-iaas-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-mdsal-resource/pom.xml b/adaptors/features/ccsdk-mdsal-resource/pom.xml index c81b4148d..3963a2dc9 100644 --- a/adaptors/features/ccsdk-mdsal-resource/pom.xml +++ b/adaptors/features/ccsdk-mdsal-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml index 7465d5631..a1a0ea47c 100755 --- a/adaptors/features/ccsdk-messagerouter-consumer/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-consumer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> diff --git a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml index 79f2dfab3..c3e9f032b 100755 --- a/adaptors/features/ccsdk-messagerouter-publisher/pom.xml +++ b/adaptors/features/ccsdk-messagerouter-publisher/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors.messagerouter</groupId> diff --git a/adaptors/features/ccsdk-netbox-client/pom.xml b/adaptors/features/ccsdk-netbox-client/pom.xml index 14a8cf1bc..9f404e718 100644 --- a/adaptors/features/ccsdk-netbox-client/pom.xml +++ b/adaptors/features/ccsdk-netbox-client/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-netconf-adaptor/pom.xml b/adaptors/features/ccsdk-netconf-adaptor/pom.xml index d96e41fb8..0bfc4ce4e 100644 --- a/adaptors/features/ccsdk-netconf-adaptor/pom.xml +++ b/adaptors/features/ccsdk-netconf-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-resource-assignment/pom.xml b/adaptors/features/ccsdk-resource-assignment/pom.xml index 8318f4ddc..fb253d9c7 100644 --- a/adaptors/features/ccsdk-resource-assignment/pom.xml +++ b/adaptors/features/ccsdk-resource-assignment/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-rest-adaptor/pom.xml b/adaptors/features/ccsdk-rest-adaptor/pom.xml index 56bb6d903..1a8d31bf0 100644 --- a/adaptors/features/ccsdk-rest-adaptor/pom.xml +++ b/adaptors/features/ccsdk-rest-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml index 7fd8b92e0..7b1067195 100644 --- a/adaptors/features/ccsdk-saltstack-adaptor/pom.xml +++ b/adaptors/features/ccsdk-saltstack-adaptor/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml index 5fc317a1a..448b4584b 100644 --- a/adaptors/features/ccsdk-sli-adaptors-all/pom.xml +++ b/adaptors/features/ccsdk-sli-adaptors-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-sql-resource/pom.xml b/adaptors/features/ccsdk-sql-resource/pom.xml index 629d230a6..4c5bfde44 100644 --- a/adaptors/features/ccsdk-sql-resource/pom.xml +++ b/adaptors/features/ccsdk-sql-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/ccsdk-ssh-adaptor/pom.xml b/adaptors/features/ccsdk-ssh-adaptor/pom.xml index 9ff654573..957510abc 100644 --- a/adaptors/features/ccsdk-ssh-adaptor/pom.xml +++ b/adaptors/features/ccsdk-ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/features-sli-adaptors/pom.xml b/adaptors/features/features-sli-adaptors/pom.xml index a7ddcc628..2f91f3a20 100644 --- a/adaptors/features/features-sli-adaptors/pom.xml +++ b/adaptors/features/features-sli-adaptors/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/installer/pom.xml b/adaptors/features/installer/pom.xml index f62e7520d..1a1cc822c 100755 --- a/adaptors/features/installer/pom.xml +++ b/adaptors/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/features/pom.xml b/adaptors/features/pom.xml index c946b52d8..099a861f3 100755 --- a/adaptors/features/pom.xml +++ b/adaptors/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml index 38391b965..506343427 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml +++ b/adaptors/iaas-adaptor/iaas-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/iaas-adaptor/iaas-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/openstack/heat/model/TestProperties.java b/adaptors/iaas-adaptor/iaas-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/openstack/heat/model/TestProperties.java index 84abf12a0..70fbb753a 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/openstack/heat/model/TestProperties.java +++ b/adaptors/iaas-adaptor/iaas-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/openstack/heat/model/TestProperties.java @@ -3,6 +3,7 @@ * ONAP : APPC * ================================================================================ * Copyright 2018 TechMahindra +* Copyright (C) 2022 Samsung Electronics *================================================================================= * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,7 +37,6 @@ public class TestProperties { @Test public void testGetSize() { properties.setSize(123); - assertNotNull(properties.getSize()); assertEquals(properties.getSize(),123); } diff --git a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml index aa9c8824c..cd8aa9638 100644 --- a/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml +++ b/adaptors/iaas-adaptor/iaas-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/iaas-adaptor/pom.xml b/adaptors/iaas-adaptor/pom.xml index aea164795..941c6492c 100644 --- a/adaptors/iaas-adaptor/pom.xml +++ b/adaptors/iaas-adaptor/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/mdsal-resource/installer/pom.xml b/adaptors/mdsal-resource/installer/pom.xml index 396340863..9c10cd117 100755 --- a/adaptors/mdsal-resource/installer/pom.xml +++ b/adaptors/mdsal-resource/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/mdsal-resource/pom.xml b/adaptors/mdsal-resource/pom.xml index a10f2ea04..00c0f86e2 100755 --- a/adaptors/mdsal-resource/pom.xml +++ b/adaptors/mdsal-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/mdsal-resource/provider/pom.xml b/adaptors/mdsal-resource/provider/pom.xml index 1f28d722d..6a5d501fc 100755 --- a/adaptors/mdsal-resource/provider/pom.xml +++ b/adaptors/mdsal-resource/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/message-router/pom.xml b/adaptors/message-router/pom.xml index 2efae62b1..9a6cbaa7b 100755 --- a/adaptors/message-router/pom.xml +++ b/adaptors/message-router/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netbox-client/installer/pom.xml b/adaptors/netbox-client/installer/pom.xml index 27c66651f..9ac2f4ebb 100755 --- a/adaptors/netbox-client/installer/pom.xml +++ b/adaptors/netbox-client/installer/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netbox-client/pom.xml b/adaptors/netbox-client/pom.xml index c39646179..09caca16b 100644 --- a/adaptors/netbox-client/pom.xml +++ b/adaptors/netbox-client/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netbox-client/provider/pom.xml b/adaptors/netbox-client/provider/pom.xml index a6e52462d..dddb2faa7 100644 --- a/adaptors/netbox-client/provider/pom.xml +++ b/adaptors/netbox-client/provider/pom.xml @@ -20,7 +20,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml index bb712583a..611831654 100644 --- a/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml +++ b/adaptors/netconf-adaptor/netconf-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml index 0a261d70c..7c47b8dcb 100644 --- a/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml +++ b/adaptors/netconf-adaptor/netconf-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/netconf-adaptor/pom.xml b/adaptors/netconf-adaptor/pom.xml index be2b11b67..c9734e865 100644 --- a/adaptors/netconf-adaptor/pom.xml +++ b/adaptors/netconf-adaptor/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/pom.xml b/adaptors/pom.xml index 99b52cf17..256ad1717 100755 --- a/adaptors/pom.xml +++ b/adaptors/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.adaptors</groupId> diff --git a/adaptors/resource-assignment/installer/pom.xml b/adaptors/resource-assignment/installer/pom.xml index 98b3219c9..2bba624e2 100755 --- a/adaptors/resource-assignment/installer/pom.xml +++ b/adaptors/resource-assignment/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/resource-assignment/pom.xml b/adaptors/resource-assignment/pom.xml index f9a62562a..5d4788a84 100755 --- a/adaptors/resource-assignment/pom.xml +++ b/adaptors/resource-assignment/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/resource-assignment/provider/pom.xml b/adaptors/resource-assignment/provider/pom.xml index 94b77fc5a..04a5a175b 100755 --- a/adaptors/resource-assignment/provider/pom.xml +++ b/adaptors/resource-assignment/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/rest-adaptor/pom.xml b/adaptors/rest-adaptor/pom.xml index 31d72ac9f..f7575fce5 100644 --- a/adaptors/rest-adaptor/pom.xml +++ b/adaptors/rest-adaptor/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml index 5cd0f7dfc..d1327fae1 100644 --- a/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml +++ b/adaptors/rest-adaptor/rest-adaptor-bundle/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml index b3d9f38d8..96564c7a7 100644 --- a/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml +++ b/adaptors/rest-adaptor/rest-adaptor-installer/pom.xml @@ -25,7 +25,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/saltstack-adaptor/pom.xml b/adaptors/saltstack-adaptor/pom.xml index 7e05bafe6..5c880a2c5 100644 --- a/adaptors/saltstack-adaptor/pom.xml +++ b/adaptors/saltstack-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml index 8e008431f..b0e570021 100644 --- a/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml +++ b/adaptors/saltstack-adaptor/saltstack-adaptor-installer/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml index bee015081..f9cdf3919 100644 --- a/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml +++ b/adaptors/saltstack-adaptor/saltstack-adaptor-provider/pom.xml @@ -17,7 +17,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/sql-resource/installer/pom.xml b/adaptors/sql-resource/installer/pom.xml index be3ea52a3..a0faefca9 100755 --- a/adaptors/sql-resource/installer/pom.xml +++ b/adaptors/sql-resource/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/sql-resource/pom.xml b/adaptors/sql-resource/pom.xml index 7c4ff64b1..85c07d8b9 100755 --- a/adaptors/sql-resource/pom.xml +++ b/adaptors/sql-resource/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/sql-resource/provider/pom.xml b/adaptors/sql-resource/provider/pom.xml index 851c4302e..2a3b8a17d 100755 --- a/adaptors/sql-resource/provider/pom.xml +++ b/adaptors/sql-resource/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ssh-adaptor/pom.xml b/adaptors/ssh-adaptor/pom.xml index 7672d6ec4..74cde3c48 100644 --- a/adaptors/ssh-adaptor/pom.xml +++ b/adaptors/ssh-adaptor/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml index 4894b9146..2be4adca2 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/pom.xml @@ -28,7 +28,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java index fecb42fc2..038a6aaf4 100644 --- a/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java +++ b/adaptors/ssh-adaptor/ssh-adaptor-bundle/src/test/java/org/onap/ccsdk/sli/adaptors/ssh/sshd/SshAdaptorTest.java @@ -32,11 +32,11 @@ import java.net.BindException; import java.nio.file.Paths; import java.util.Collections; import org.apache.sshd.common.util.OsUtils; +import org.apache.sshd.scp.server.ScpCommandFactory; import org.apache.sshd.server.SshServer; import org.apache.sshd.server.ServerFactoryManager; import org.apache.sshd.server.keyprovider.SimpleGeneratorHostKeyProvider; -import org.apache.sshd.server.scp.ScpCommandFactory; -import org.apache.sshd.server.subsystem.sftp.SftpSubsystemFactory; +import org.apache.sshd.sftp.server.SftpSubsystemFactory; import org.hamcrest.CoreMatchers; import org.junit.After; import org.junit.Assert; diff --git a/core/artifacts/pom.xml b/core/artifacts/pom.xml index 3b4cd04d4..e6ef5f422 100755 --- a/core/artifacts/pom.xml +++ b/core/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/dblib/installer/pom.xml b/core/dblib/installer/pom.xml index 47fd9cb12..05e504a12 100755 --- a/core/dblib/installer/pom.xml +++ b/core/dblib/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/dblib/pom.xml b/core/dblib/pom.xml index ef82862f3..3dec8b9dd 100755 --- a/core/dblib/pom.xml +++ b/core/dblib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/dblib/provider/pom.xml b/core/dblib/provider/pom.xml index 803414de2..ebfb84a36 100755 --- a/core/dblib/provider/pom.xml +++ b/core/dblib/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-dblib/pom.xml b/core/features/ccsdk-dblib/pom.xml index ff6d42e9c..d887abdb2 100644 --- a/core/features/ccsdk-dblib/pom.xml +++ b/core/features/ccsdk-dblib/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-filters/pom.xml b/core/features/ccsdk-filters/pom.xml index ac91ef554..b7e25e033 100644 --- a/core/features/ccsdk-filters/pom.xml +++ b/core/features/ccsdk-filters/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sli-core-all/pom.xml b/core/features/ccsdk-sli-core-all/pom.xml index 50658bae5..93f407cf4 100644 --- a/core/features/ccsdk-sli-core-all/pom.xml +++ b/core/features/ccsdk-sli-core-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sli/pom.xml b/core/features/ccsdk-sli/pom.xml index 966a49d02..25cdd482a 100644 --- a/core/features/ccsdk-sli/pom.xml +++ b/core/features/ccsdk-sli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sliPluginUtils/pom.xml b/core/features/ccsdk-sliPluginUtils/pom.xml index 907343f24..24ff3a1ef 100644 --- a/core/features/ccsdk-sliPluginUtils/pom.xml +++ b/core/features/ccsdk-sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-sliapi/pom.xml b/core/features/ccsdk-sliapi/pom.xml index d41d70dd5..754c325d4 100644 --- a/core/features/ccsdk-sliapi/pom.xml +++ b/core/features/ccsdk-sliapi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/ccsdk-slicore-utils/pom.xml b/core/features/ccsdk-slicore-utils/pom.xml index 899f3654b..3f9725846 100644 --- a/core/features/ccsdk-slicore-utils/pom.xml +++ b/core/features/ccsdk-slicore-utils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/features-sli-core/pom.xml b/core/features/features-sli-core/pom.xml index 56645a105..c2540b35f 100644 --- a/core/features/features-sli-core/pom.xml +++ b/core/features/features-sli-core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/installer/pom.xml b/core/features/installer/pom.xml index 23639aabe..879cae370 100755 --- a/core/features/installer/pom.xml +++ b/core/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/features/pom.xml b/core/features/pom.xml index e8ea77fb7..c5c36ec77 100755 --- a/core/features/pom.xml +++ b/core/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/filters/installer/pom.xml b/core/filters/installer/pom.xml index 7950b6b8b..a692e8ce9 100755 --- a/core/filters/installer/pom.xml +++ b/core/filters/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/filters/pom.xml b/core/filters/pom.xml index bcffbf17b..80be64a2b 100644 --- a/core/filters/pom.xml +++ b/core/filters/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/filters/provider/pom.xml b/core/filters/provider/pom.xml index b5c21e77b..b261065c5 100755 --- a/core/filters/provider/pom.xml +++ b/core/filters/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/pom.xml b/core/pom.xml index 9ac6c731d..82f204b41 100755 --- a/core/pom.xml +++ b/core/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/common/pom.xml b/core/sli/common/pom.xml index f657351f3..6faf31e81 100755 --- a/core/sli/common/pom.xml +++ b/core/sli/common/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/installer/pom.xml b/core/sli/installer/pom.xml index 1355b5b61..7c76d0ace 100755 --- a/core/sli/installer/pom.xml +++ b/core/sli/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/model/pom.xml b/core/sli/model/pom.xml index f3f2ed295..ff5a329dd 100755 --- a/core/sli/model/pom.xml +++ b/core/sli/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/pom.xml b/core/sli/pom.xml index fef2a407d..f127e2857 100755 --- a/core/sli/pom.xml +++ b/core/sli/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/provider-base/pom.xml b/core/sli/provider-base/pom.xml index ec4fc6c44..a32ccf906 100644 --- a/core/sli/provider-base/pom.xml +++ b/core/sli/provider-base/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index 0671e657c..edcb63ee7 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> @@ -168,6 +168,26 @@ </environmentVariables> </configuration> </plugin> + <plugin> + <!-- a hint for IDE's to add the java sources to the classpath --> + <groupId>org.codehaus.mojo</groupId> + <artifactId>build-helper-maven-plugin</artifactId> + <version>3.0.0</version> + <executions> + <execution> + <id>add-model-sources</id> + <phase>generate-sources</phase> + <goals> + <goal>add-test-source</goal> + </goals> + <configuration> + <sources> + <source>${basedir}/../model/target/generated-sources/BindingJavaFileGenerator</source> + </sources> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> </project> diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java index 37a6a5b24..8ffab7bee 100755 --- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java +++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java @@ -311,7 +311,7 @@ public class MdsalHelper { } } else if (returnType.equals(Class.class)) { - } else if (List.class.isAssignableFrom(returnType) || Map.class.isAssignableFrom(returnType)) { + } else if (List.class.isAssignableFrom(returnType) || Map.class.isAssignableFrom(returnType) || Set.class.isAssignableFrom(returnType)) { // This getter method returns a list. try { @@ -320,8 +320,12 @@ public class MdsalHelper { m.setAccessible(true); } Object retList = m.invoke(fromObj); - if ((retList != null) && Map.class.isAssignableFrom(returnType)) { - retList = new ArrayList(((Map)retList).values()); + if (retList != null) { + if (Map.class.isAssignableFrom(returnType)) { + retList = new ArrayList(((Map) retList).values()); + } else if (Set.class.isAssignableFrom(returnType)) { + retList = new ArrayList(((Set) retList)); + } } //due duplicated getters with Map and List(deprecated) stop if already mapped if(!hasAlreadyKeys(props,propNamePfx + "." + fieldName)) { @@ -658,6 +662,155 @@ public class MdsalHelper { } } + public static Set toSet(Properties props, String pfx, Set toObj, Class elemType) { + + int maxIdx = -1; + boolean foundValue = false; + + if (props.containsKey(pfx + "_length")) { + try { + int listLength = Integer.parseInt(props.getProperty(pfx + "_length")); + + if (listLength > 0) { + maxIdx = listLength - 1; + } + } catch (NumberFormatException e) { + LOG.info("Invalid input for length ", e); + } + } + + String arrayKey = pfx + "["; + int arrayKeyLength = arrayKey.length(); + if (maxIdx == -1) { + // Figure out array size + for (Object pNameObj : props.keySet()) { + String key = (String) pNameObj; + + if (key.startsWith(arrayKey)) { + String idxStr = key.substring(arrayKeyLength); + int endloc = idxStr.indexOf("]"); + if (endloc != -1) { + idxStr = idxStr.substring(0, endloc); + } + try { + int curIdx = Integer.parseInt(idxStr); + if (curIdx > maxIdx) { + maxIdx = curIdx; + } + } catch (Exception e) { + LOG.error("Illegal subscript in property {}", key, e); + } + + } + } + } + + for (int i = 0; i <= maxIdx; i++) { + + String curBase = pfx + "[" + i + "]"; + + // Sets are used to represent yang system-ordered leaf-lists. + // Each entry in the Set is an yang-generated object, + // to be constructed by a builder. + if (isYangGenerated(elemType)) { + + if (isIpAddress(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(IpAddressBuilder.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (isIpv4Address(elemType)) { + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(new Ipv4Address(curValue)); + foundValue = true; + } + + } else if (isIpv6Address(elemType)) { + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(new Ipv6Address(curValue)); + foundValue = true; + } + } else if (isIpPrefix(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(IpPrefixBuilder.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (isPortNumber(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(PortNumber.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (isDscp(elemType)) { + + String curValue = props.getProperty(curBase, ""); + + if ((curValue != null) && (curValue.length() > 0)) { + toObj.add(Dscp.getDefaultInstance(curValue)); + foundValue = true; + } + } else if (elemType.isEnum()) { + String curValue = props.getProperty(curBase, ""); + Object elemObj = null; + + try { + elemObj = Enum.valueOf(elemType, toJavaEnum(curValue)); + } catch (Exception e) { + LOG.error("Caught exception trying to convert field " + curBase + " to enum " + + elemType.getName(), e); + } + toObj.add(elemObj); + foundValue = true; + } else { + String builderName = elemType.getName() + "Builder"; + try { + Class builderClass = Class.forName(builderName); + Object builderObj = builderClass.newInstance(); + Method buildMethod = builderClass.getMethod("build"); + builderObj = toBuilder(props, curBase, builderObj, true); + if (builderObj != null) { + Object builtObj = buildMethod.invoke(builderObj); + toObj.add(builtObj); + foundValue = true; + } + + } catch (ClassNotFoundException e) { + LOG.warn("Could not find builder class {}", builderName, e); + } catch (Exception e) { + LOG.error("Caught exception trying to populate list from {}", pfx, e); + } + } + } else { + // Must be a leaf list + String curValue = props.getProperty(curBase, ""); + + toObj.add(curValue); + + if ((curValue != null) && (curValue.length() > 0)) { + foundValue = true; + } + } + } + + if (foundValue) { + return (toObj); + } else { + return (null); + } + } + public static Object toBuilder(Properties props, String pfx, Object toObj) { return (toBuilder(props, pfx, toObj, false)); } @@ -1119,6 +1272,37 @@ public class MdsalHelper { + "." + m.getName() + "() to Properties entry", e); } } + } else if (Set.class.isAssignableFrom(paramClass)) { + // Figure out what type of args are in Set and pass + // that to toList(). + + Type paramType = m.getGenericParameterTypes()[0]; + Type elementType = ((ParameterizedType) paramType).getActualTypeArguments()[0]; + Object paramObj = new HashSet(); + try { + paramObj = toSet(props, propName, (Set) paramObj, (Class) elementType); + } catch (Exception e) { + LOG.error("Caught exception trying to create list expected as argument to {}.{}", + toClass.getName(), m.getName(), e); + } + + if (paramObj != null) { + try { + boolean isAccessible = m.isAccessible(); + if (!isAccessible) { + m.setAccessible(true); + } + m.invoke(toObj, paramObj); + if (!isAccessible) { + m.setAccessible(isAccessible); + } + foundValue = true; + + } catch (Exception e) { + LOG.error("Caught exception trying to convert List returned by" + toClass.getName() + + "." + m.getName() + "() to Properties entry", e); + } + } } else { // Setter expects something that is not a List and diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java index 573444bf2..e4d7618fe 100644 --- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java +++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/YangUtils.java @@ -401,7 +401,8 @@ public final class YangUtils { } public static Module findParentModule(final SchemaContext context, final SchemaNode schemaNode) { - final QName qname = schemaNode.getPath().getLastComponent(); + //final QName qname = schemaNode.getPath().getLastComponent(); + final QName qname = schemaNode.getQName(); checkState(qname != null, "Schema Path contains invalid state of path parts. " + "The Schema Path MUST contain at least ONE QName which defines namespace and Local name of path."); return context.findModule(qname.getModule()).orElse(null); diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java index 0c06923e2..1e4b67d8f 100755 --- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java +++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java @@ -477,7 +477,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithDecimal64() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - BigDecimal myBigDecimal = new BigDecimal(".0000000000000000000000000000001"); + Decimal64 myBigDecimal = Decimal64.valueOf(".000000000000000001"); sampleBuilder.setSampleDecimal64(myBigDecimal); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -487,7 +487,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithEmpty() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - Empty isEmpty = Empty.getInstance(); + Empty isEmpty = Empty.value(); sampleBuilder.setSampleEmpty(isEmpty); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); @@ -646,8 +646,7 @@ public class MdsalHelperTest extends TestCase { public void testToPropertiesWithLeaftList() throws Exception { SampleContainerBuilder sampleBuilder = new SampleContainerBuilder(); - List<String> nickNames = new ArrayList<String>(); - sampleBuilder.setCustomerNicknames(nickNames); + Set<String> nickNames = new LinkedHashSet<String>(); String nameOne = "coffee"; String nameTwo = "java"; String nameThree = "mud"; @@ -655,10 +654,13 @@ public class MdsalHelperTest extends TestCase { nickNames.add(nameOne); nickNames.add(nameTwo); nickNames.add(nameThree); + sampleBuilder.setCustomerNicknames(nickNames); Properties props = new Properties(); MdsalHelper.toProperties(props, sampleBuilder); + props.forEach((k, v) -> { LOG.info("Property {} = {}", k, v);}); + assertEquals(nameOne, props.get("sample-container.customer-nicknames[0]")); assertEquals(nameTwo, props.get("sample-container.customer-nicknames[1]")); assertEquals(nameThree, props.get("sample-container.customer-nicknames[2]")); @@ -813,7 +815,8 @@ public class MdsalHelperTest extends TestCase { assertEquals(true, ipAddrIter.hasNext()); assertEquals("10.20.0.1", ipAddrIter.next().getIpAddr().stringValue()); assertEquals(1, result.getIpAddressLeafList().size()); - assertEquals("127.0.0.1", result.getIpAddressLeafList().get(0).stringValue()); + IpAddress[] ipAddressArray = result.getIpAddressLeafList().toArray(new IpAddress[0]); + assertEquals("127.0.0.1", ipAddressArray[0].stringValue()); Map<IpAddressNamesKey, IpAddressNames> ipNamesMap = result.getIpAddressNames(); Iterator<IpAddressNames> ipNamesIter = ipNamesMap.values().iterator(); assertEquals(true, ipNamesIter.hasNext()); diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java index ada933d88..1ccbc90e9 100644 --- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java +++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java @@ -24,10 +24,13 @@ package org.onap.ccsdk.sli.core.sli.provider; import java.util.Enumeration; import java.util.HashMap; +import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; + import org.junit.Test; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder; @@ -119,7 +122,7 @@ public class PrintYangToPropTest { // Set builder with values Map<TestResultKey, TestResult> resultList = new HashMap<>(); resultBuilder.setTestIdentifier("test1"); - List<String> results = new LinkedList<>(); + Set<String> results = new LinkedHashSet <String>(); results.add("pass"); resultBuilder.setResults(results); resultList.put(new TestResultKey(resultBuilder.getTestIdentifier()), resultBuilder.build()); diff --git a/core/sliPluginUtils/installer/pom.xml b/core/sliPluginUtils/installer/pom.xml index 2c6e3c11d..f60e8aa28 100755 --- a/core/sliPluginUtils/installer/pom.xml +++ b/core/sliPluginUtils/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliPluginUtils/pom.xml b/core/sliPluginUtils/pom.xml index 214e9309e..25bcf7048 100755 --- a/core/sliPluginUtils/pom.xml +++ b/core/sliPluginUtils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliPluginUtils/provider/pom.xml b/core/sliPluginUtils/provider/pom.xml index 8610c5c4b..75e73b6f0 100755 --- a/core/sliPluginUtils/provider/pom.xml +++ b/core/sliPluginUtils/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/installer/pom.xml b/core/sliapi/installer/pom.xml index 2da64fd69..ccef32d01 100755 --- a/core/sliapi/installer/pom.xml +++ b/core/sliapi/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/model/pom.xml b/core/sliapi/model/pom.xml index fbb08b391..f79bc75bc 100755 --- a/core/sliapi/model/pom.xml +++ b/core/sliapi/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/model/swagger/pom.xml b/core/sliapi/model/swagger/pom.xml index 743f1a9bd..f31edbbd4 100644 --- a/core/sliapi/model/swagger/pom.xml +++ b/core/sliapi/model/swagger/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.core</groupId> diff --git a/core/sliapi/model/swagger/src/main/json/sliapi.json b/core/sliapi/model/swagger/src/main/json/sliapi.json index 7bf85d763..d78b10682 100644 --- a/core/sliapi/model/swagger/src/main/json/sliapi.json +++ b/core/sliapi/model/swagger/src/main/json/sliapi.json @@ -1 +1 @@ -{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.4.1-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}}
\ No newline at end of file +{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code. All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.5.0-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}}
\ No newline at end of file diff --git a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml index dfa008efc..2097ef1f3 100644 --- a/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml +++ b/core/sliapi/model/swagger/src/main/yaml/sliapi.yaml @@ -18,7 +18,7 @@ info: Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\ \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\ \ notices." - version: "1.4.1-SNAPSHOT" + version: "1.5.0-SNAPSHOT" title: "SLI-API,ietf-yang-types,ietf-inet-types API" consumes: - "application/json" diff --git a/core/sliapi/model/yang/pom.xml b/core/sliapi/model/yang/pom.xml index ed84271a0..86caf4f77 100755 --- a/core/sliapi/model/yang/pom.xml +++ b/core/sliapi/model/yang/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/pom.xml b/core/sliapi/pom.xml index 43de0b609..dab46e4f4 100755 --- a/core/sliapi/pom.xml +++ b/core/sliapi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/provider/pom.xml b/core/sliapi/provider/pom.xml index b18b888a3..601af3de6 100755 --- a/core/sliapi/provider/pom.xml +++ b/core/sliapi/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java b/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java index 015ef5e57..27cb62e29 100644 --- a/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java +++ b/core/sliapi/provider/src/main/java/org/onap/ccsdk/sli/core/sliapi/SliapiProvider.java @@ -54,10 +54,7 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.exe import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultBuilder; import org.opendaylight.yangtools.concepts.ObjectRegistration; -import org.opendaylight.yangtools.yang.common.QName; -import org.opendaylight.yangtools.yang.common.RpcError.ErrorType; -import org.opendaylight.yangtools.yang.common.RpcResult; -import org.opendaylight.yangtools.yang.common.RpcResultBuilder; +import org.opendaylight.yangtools.yang.common.*; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifier; import org.opendaylight.yangtools.yang.data.api.YangInstanceIdentifier.NodeIdentifierWithPredicates; @@ -539,7 +536,7 @@ public class SliapiProvider implements AutoCloseable, SLIAPIService { if (suspended) { rpcResult = RpcResultBuilder.<VlbcheckOutput>failed() - .withError(ErrorType.APPLICATION, "resource-denied", "Server Suspended").build(); + .withError(ErrorType.APPLICATION, ErrorTag.RESOURCE_DENIED, "Server Suspended").build(); } else { respBuilder.setResponseMessage("server is normal"); rpcResult = RpcResultBuilder.<VlbcheckOutput>status(true).withResult(respBuilder.build()).build(); diff --git a/core/utils/installer/pom.xml b/core/utils/installer/pom.xml index eb68adf6f..cf2e5d8e5 100755 --- a/core/utils/installer/pom.xml +++ b/core/utils/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/utils/pom.xml b/core/utils/pom.xml index 9bc114371..04eab0e73 100755 --- a/core/utils/pom.xml +++ b/core/utils/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/core/utils/provider/pom.xml b/core/utils/provider/pom.xml index 50c18e2c8..695a32331 100644 --- a/core/utils/provider/pom.xml +++ b/core/utils/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/artifacts/pom.xml b/northbound/artifacts/pom.xml index 575838c2b..6ddd14fc0 100755 --- a/northbound/artifacts/pom.xml +++ b/northbound/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/installer/pom.xml b/northbound/asdcApi/installer/pom.xml index 61c67d926..8f3a1f1cd 100755 --- a/northbound/asdcApi/installer/pom.xml +++ b/northbound/asdcApi/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/model/pom.xml b/northbound/asdcApi/model/pom.xml index 7b70dcb87..54bc54ca7 100755 --- a/northbound/asdcApi/model/pom.xml +++ b/northbound/asdcApi/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/pom.xml b/northbound/asdcApi/pom.xml index 35052b9fe..4cfd9a7ae 100755 --- a/northbound/asdcApi/pom.xml +++ b/northbound/asdcApi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/asdcApi/provider/pom.xml b/northbound/asdcApi/provider/pom.xml index 5f7e73a6a..4cb5b5679 100755 --- a/northbound/asdcApi/provider/pom.xml +++ b/northbound/asdcApi/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/installer/pom.xml b/northbound/daexim-offsite-backup/installer/pom.xml index 245bda2aa..030d5ed63 100755 --- a/northbound/daexim-offsite-backup/installer/pom.xml +++ b/northbound/daexim-offsite-backup/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/model/pom.xml b/northbound/daexim-offsite-backup/model/pom.xml index 8496546a6..c62801c3a 100755 --- a/northbound/daexim-offsite-backup/model/pom.xml +++ b/northbound/daexim-offsite-backup/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/pom.xml b/northbound/daexim-offsite-backup/pom.xml index 140ffe757..965b9da65 100755 --- a/northbound/daexim-offsite-backup/pom.xml +++ b/northbound/daexim-offsite-backup/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/daexim-offsite-backup/provider/pom.xml b/northbound/daexim-offsite-backup/provider/pom.xml index 5b280e8cf..7acaea4ea 100755 --- a/northbound/daexim-offsite-backup/provider/pom.xml +++ b/northbound/daexim-offsite-backup/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/installer/pom.xml b/northbound/dataChange/installer/pom.xml index ef77011bb..05fd0c410 100755 --- a/northbound/dataChange/installer/pom.xml +++ b/northbound/dataChange/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/model/pom.xml b/northbound/dataChange/model/pom.xml index 796d1f0d8..f027527b8 100755 --- a/northbound/dataChange/model/pom.xml +++ b/northbound/dataChange/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/pom.xml b/northbound/dataChange/pom.xml index d9fa44f69..4c3a50103 100755 --- a/northbound/dataChange/pom.xml +++ b/northbound/dataChange/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dataChange/provider/pom.xml b/northbound/dataChange/provider/pom.xml index a67779670..d1ceb606a 100755 --- a/northbound/dataChange/provider/pom.xml +++ b/northbound/dataChange/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/dmaap-listener/pom.xml b/northbound/dmaap-listener/pom.xml index 2e4739b90..9b24c7162 100755 --- a/northbound/dmaap-listener/pom.xml +++ b/northbound/dmaap-listener/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-asdcApi/pom.xml b/northbound/features/ccsdk-asdcApi/pom.xml index f8b4af18d..bfad24766 100644 --- a/northbound/features/ccsdk-asdcApi/pom.xml +++ b/northbound/features/ccsdk-asdcApi/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml index 517652de4..8693ad473 100644 --- a/northbound/features/ccsdk-daexim-offsite-backup/pom.xml +++ b/northbound/features/ccsdk-daexim-offsite-backup/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-dataChange/pom.xml b/northbound/features/ccsdk-dataChange/pom.xml index ecff28f94..6f4940368 100644 --- a/northbound/features/ccsdk-dataChange/pom.xml +++ b/northbound/features/ccsdk-dataChange/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-lcm/pom.xml b/northbound/features/ccsdk-lcm/pom.xml index a518a60a4..194ed3cb0 100644 --- a/northbound/features/ccsdk-lcm/pom.xml +++ b/northbound/features/ccsdk-lcm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/ccsdk-sli-northbound-all/pom.xml b/northbound/features/ccsdk-sli-northbound-all/pom.xml index e92455e1f..9cd87c062 100644 --- a/northbound/features/ccsdk-sli-northbound-all/pom.xml +++ b/northbound/features/ccsdk-sli-northbound-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/features-sli-northbound/pom.xml b/northbound/features/features-sli-northbound/pom.xml index 9e97c119a..7a5361cdc 100644 --- a/northbound/features/features-sli-northbound/pom.xml +++ b/northbound/features/features-sli-northbound/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/installer/pom.xml b/northbound/features/installer/pom.xml index b6c38d3e2..303d8b343 100755 --- a/northbound/features/installer/pom.xml +++ b/northbound/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/features/pom.xml b/northbound/features/pom.xml index 17041c97b..910808598 100755 --- a/northbound/features/pom.xml +++ b/northbound/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/installer/pom.xml b/northbound/lcm/installer/pom.xml index 78852636f..f90e4536b 100755 --- a/northbound/lcm/installer/pom.xml +++ b/northbound/lcm/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/model/pom.xml b/northbound/lcm/model/pom.xml index 7048ca1cb..2d4339ed1 100755 --- a/northbound/lcm/model/pom.xml +++ b/northbound/lcm/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/pom.xml b/northbound/lcm/pom.xml index 7acac4561..46c791a0b 100755 --- a/northbound/lcm/pom.xml +++ b/northbound/lcm/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/lcm/provider/pom.xml b/northbound/lcm/provider/pom.xml index 88067a099..2db096325 100755 --- a/northbound/lcm/provider/pom.xml +++ b/northbound/lcm/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/northbound/pom.xml b/northbound/pom.xml index 2a32e48d9..79a3db4f2 100644 --- a/northbound/pom.xml +++ b/northbound/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/northbound/ueb-listener/pom.xml b/northbound/ueb-listener/pom.xml index 242c7dff6..1dd686412 100755 --- a/northbound/ueb-listener/pom.xml +++ b/northbound/ueb-listener/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>standalone-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.northbound</groupId> diff --git a/plugins/artifacts/pom.xml b/plugins/artifacts/pom.xml index 1888e113c..ace9f438f 100755 --- a/plugins/artifacts/pom.xml +++ b/plugins/artifacts/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-gr-toolkit/pom.xml b/plugins/features/ccsdk-gr-toolkit/pom.xml index cfda3dca8..9512d55cf 100644 --- a/plugins/features/ccsdk-gr-toolkit/pom.xml +++ b/plugins/features/ccsdk-gr-toolkit/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-properties-node/pom.xml b/plugins/features/ccsdk-properties-node/pom.xml index 1c3a4b83d..993ad5f35 100644 --- a/plugins/features/ccsdk-properties-node/pom.xml +++ b/plugins/features/ccsdk-properties-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-restapi-call-node/pom.xml b/plugins/features/ccsdk-restapi-call-node/pom.xml index 27d00c3c7..32431ca99 100644 --- a/plugins/features/ccsdk-restapi-call-node/pom.xml +++ b/plugins/features/ccsdk-restapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-restconf-client/pom.xml b/plugins/features/ccsdk-restconf-client/pom.xml index 384459bd0..a245f09fd 100644 --- a/plugins/features/ccsdk-restconf-client/pom.xml +++ b/plugins/features/ccsdk-restconf-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-sli-plugins-all/pom.xml b/plugins/features/ccsdk-sli-plugins-all/pom.xml index b419775ec..1e69d2c9e 100644 --- a/plugins/features/ccsdk-sli-plugins-all/pom.xml +++ b/plugins/features/ccsdk-sli-plugins-all/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-sshapi-call-node/pom.xml b/plugins/features/ccsdk-sshapi-call-node/pom.xml index 8dfd5cdd0..110519ee2 100644 --- a/plugins/features/ccsdk-sshapi-call-node/pom.xml +++ b/plugins/features/ccsdk-sshapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/ccsdk-template-node/pom.xml b/plugins/features/ccsdk-template-node/pom.xml index fd0e86a2b..9aadadd99 100644 --- a/plugins/features/ccsdk-template-node/pom.xml +++ b/plugins/features/ccsdk-template-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>single-feature-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/features-sli-plugins/pom.xml b/plugins/features/features-sli-plugins/pom.xml index 34f1747fa..c870908af 100644 --- a/plugins/features/features-sli-plugins/pom.xml +++ b/plugins/features/features-sli-plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>feature-repo-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/installer/pom.xml b/plugins/features/installer/pom.xml index a3a16e08b..a4d8a1cc8 100755 --- a/plugins/features/installer/pom.xml +++ b/plugins/features/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/features/pom.xml b/plugins/features/pom.xml index 09b7a1cd7..b9e4cbd65 100755 --- a/plugins/features/pom.xml +++ b/plugins/features/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/installer/pom.xml b/plugins/grToolkit/installer/pom.xml index 216340daf..7b88b7dc8 100755 --- a/plugins/grToolkit/installer/pom.xml +++ b/plugins/grToolkit/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/model/pom.xml b/plugins/grToolkit/model/pom.xml index 0110565ad..985f7dc79 100755 --- a/plugins/grToolkit/model/pom.xml +++ b/plugins/grToolkit/model/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/pom.xml b/plugins/grToolkit/pom.xml index 3f4105ca2..b271982a5 100755 --- a/plugins/grToolkit/pom.xml +++ b/plugins/grToolkit/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/grToolkit/provider/pom.xml b/plugins/grToolkit/provider/pom.xml index 2db52595f..1739feff4 100755 --- a/plugins/grToolkit/provider/pom.xml +++ b/plugins/grToolkit/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> diff --git a/plugins/pom.xml b/plugins/pom.xml index dc55aa60b..b8d498edd 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/installer/pom.xml b/plugins/properties-node/installer/pom.xml index 49abd8836..e64467efb 100755 --- a/plugins/properties-node/installer/pom.xml +++ b/plugins/properties-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/pom.xml b/plugins/properties-node/pom.xml index 1305e70d9..9d3cbcf30 100755 --- a/plugins/properties-node/pom.xml +++ b/plugins/properties-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/properties-node/provider/pom.xml b/plugins/properties-node/provider/pom.xml index 616fa8bdf..804f557ad 100755 --- a/plugins/properties-node/provider/pom.xml +++ b/plugins/properties-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/installer/pom.xml b/plugins/restapi-call-node/installer/pom.xml index 65125165f..0b584263d 100755 --- a/plugins/restapi-call-node/installer/pom.xml +++ b/plugins/restapi-call-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/pom.xml b/plugins/restapi-call-node/pom.xml index 4ec2d8603..8ba64dc1f 100755 --- a/plugins/restapi-call-node/pom.xml +++ b/plugins/restapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/provider/pom.xml b/plugins/restapi-call-node/provider/pom.xml index 54c3e1409..efe3a5cd8 100755 --- a/plugins/restapi-call-node/provider/pom.xml +++ b/plugins/restapi-call-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java index 4236055dc..2064dc864 100755 --- a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java +++ b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/RestapiCallNode.java @@ -641,6 +641,8 @@ public class RestapiCallNode implements SvcLogicJavaPlugin { if (format == Format.JSON) { req = XmlJsonUtil.removeLastCommaJson(req); + // Use 'EMPTY_CONTAINER' as keyword within template to have an empty container placeholder. + req = req.replaceAll("EMPTY_CONTAINER", "{}"); } long t2 = System.currentTimeMillis(); @@ -803,7 +805,7 @@ public class RestapiCallNode implements SvcLogicJavaPlugin { URL proxyUrl = new URL(p.proxyUrl); HttpUrlConnectorProvider cp = new HttpUrlConnectorProvider(); config.connectorProvider(cp); - final Proxy proxy = + final Proxy proxy = new Proxy(Proxy.Type.HTTP, new InetSocketAddress(proxyUrl.getHost(), proxyUrl.getPort())); cp.connectionFactory(new ConnectionFactory() { @@ -822,12 +824,12 @@ public class RestapiCallNode implements SvcLogicJavaPlugin { ssl = createSSLContext(p); } - ClientBuilder builder = + ClientBuilder builder = ClientBuilder.newBuilder().hostnameVerifier(new AcceptIpAddressHostNameVerifier()); - if (ssl != null) { + if (ssl != null) { HttpsURLConnection.setDefaultSSLSocketFactory(ssl.getSocketFactory()); - builder = builder.sslContext(ssl); + builder = builder.sslContext(ssl); } if (config != null) { builder = builder.withConfig(config); diff --git a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java index d6ef7463a..a4407c005 100644 --- a/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java +++ b/plugins/restapi-call-node/provider/src/main/java/org/onap/ccsdk/sli/plugins/restapicall/XmlJsonUtil.java @@ -443,7 +443,6 @@ public final class XmlJsonUtil { i5 = s.length(); } - /*If template mandates empty construct to be present, those should not be removed.*/ if (template != null && template.contains(s.substring(i4))) { k = i1 + 1; diff --git a/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java index 595fc1de2..758b30d18 100755 --- a/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java +++ b/plugins/restapi-call-node/provider/src/test/java/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java @@ -29,6 +29,7 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; + import org.codehaus.jettison.json.JSONObject; import org.junit.Before; import org.junit.Test; @@ -213,7 +214,6 @@ public class TestRestapiCallNode { rcn.sendRequest(p, ctx); } - @Test(expected = SvcLogicException.class) public void testWithInvalidURI() throws SvcLogicException { SvcLogicContext ctx = new SvcLogicContext(); @@ -339,7 +339,7 @@ public class TestRestapiCallNode { Map<String, String> p = new HashMap<>(); //p.put("templateFileName", "src/test/resources/l3smvpntemplate.json"); p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services" - + "/vpnservice=10000000-0000-0000-0000-000000000001"); + + "/vpnservice=10000000-0000-0000-0000-000000000001"); p.put("restapiUser", "admin"); p.put("restapiPassword", "admin123"); p.put("format", "json"); @@ -425,7 +425,6 @@ public class TestRestapiCallNode { rcn.sendRequest(p, ctx); } - @Test public void testDeleteNoneAsContentType() throws SvcLogicException { SvcLogicContext ctx = new SvcLogicContext(); @@ -461,81 +460,82 @@ public class TestRestapiCallNode { RestapiCallNode rcn = new RestapiCallNode(); rcn.sendRequest(p, ctx); } + /* * { - "partnerOne": { - "url": "http://localhost:7001" 4 http://uebsb93kcdc.it.att.com:3904", - "test": "/metrics" - }, - "partnerTwo": { - "url": "http://localhost:7002", - "user": "controller_user", - "password": "P@ssword", - "test": "/metrics" - }, - "partnerThree": { - "url": "http://localhost:7003", - "user": "controller_admin" - } -} + "partnerOne": { + "url": "http://localhost:7001" 4 http://uebsb93kcdc.it.att.com:3904", + "test": "/metrics" + }, + "partnerTwo": { + "url": "http://localhost:7002", + "user": "controller_user", + "password": "P@ssword", + "test": "/metrics" + }, + "partnerThree": { + "url": "http://localhost:7003", + "user": "controller_admin" + } + } */ @Test - public void testPartners() throws Exception{ - String partnerTwoKey = "partnerTwo"; - String partnerTwoUsername = "controller_user"; - String partnerTwoPassword = "P@ssword"; + public void testPartners() throws Exception { + String partnerTwoKey = "partnerTwo"; + String partnerTwoUsername = "controller_user"; + String partnerTwoPassword = "P@ssword"; - System.setProperty("SDNC_CONFIG_DIR", "src/test/resources"); + System.setProperty("SDNC_CONFIG_DIR", "src/test/resources"); RestapiCallNode rcn = new RestapiCallNode(); assertNull(rcn.partnerStore.get("partnerOne")); PartnerDetails details = rcn.partnerStore.get(partnerTwoKey); - assertEquals(partnerTwoUsername,details.username); - assertEquals(partnerTwoPassword,details.password); + assertEquals(partnerTwoUsername, details.username); + assertEquals(partnerTwoPassword, details.password); assertNull(rcn.partnerStore.get("partnerThree")); //In this scenario the caller expects username, password and url to be picked up from the partners json Map<String, String> paramMap = new HashMap<>(); paramMap.put("partner", partnerTwoKey); - rcn.handlePartner(paramMap ); - assertEquals(partnerTwoUsername,paramMap.get(RestapiCallNode.restapiUserKey)); - assertEquals(partnerTwoPassword,paramMap.get(RestapiCallNode.restapiPasswordKey)); - assertEquals("http://localhost:7002",paramMap.get(RestapiCallNode.restapiUrlString)); + rcn.handlePartner(paramMap); + assertEquals(partnerTwoUsername, paramMap.get(RestapiCallNode.restapiUserKey)); + assertEquals(partnerTwoPassword, paramMap.get(RestapiCallNode.restapiPasswordKey)); + assertEquals("http://localhost:7002", paramMap.get(RestapiCallNode.restapiUrlString)); //In this scenario the caller expects username, password and url to be picked up from the partners json //the provided suffix will be appended to the default url from the partners json paramMap = new HashMap<>(); paramMap.put("partner", partnerTwoKey); paramMap.put("restapiUrlSuffix", "/networking/v1/instance/3"); - rcn.handlePartner(paramMap); - Parameters p = new Parameters(); - RestapiCallNode.getParameters(paramMap, p); - assertEquals(partnerTwoUsername,p.restapiUser); - assertEquals(partnerTwoPassword,p.restapiPassword); - assertEquals("http://localhost:7002/networking/v1/instance/3",p.restapiUrl); + rcn.handlePartner(paramMap); + Parameters p = new Parameters(); + RestapiCallNode.getParameters(paramMap, p); + assertEquals(partnerTwoUsername, p.restapiUser); + assertEquals(partnerTwoPassword, p.restapiPassword); + assertEquals("http://localhost:7002/networking/v1/instance/3", p.restapiUrl); } @Test public void retryPolicyBean() throws Exception { - Integer retries = 3; - String first = "http://localhost:7001"; - String second = "http://localhost:7001"; - - RetryPolicy p = new RetryPolicy(new String[] {first,second}, retries); - assertEquals(retries,p.getMaximumRetries()); - assertNotNull(p.getRetryMessage()); - String next = p.getNextHostName(); - assertEquals(second,next); - assertEquals(1,p.getRetryCount()); - next = p.getNextHostName(); - assertEquals(first,next); - assertEquals(2,p.getRetryCount()); + Integer retries = 3; + String first = "http://localhost:7001"; + String second = "http://localhost:7001"; + + RetryPolicy p = new RetryPolicy(new String[] {first, second}, retries); + assertEquals(retries, p.getMaximumRetries()); + assertNotNull(p.getRetryMessage()); + String next = p.getNextHostName(); + assertEquals(second, next); + assertEquals(1, p.getRetryCount()); + next = p.getNextHostName(); + assertEquals(first, next); + assertEquals(2, p.getRetryCount()); } @Test public void testEmbeddedJsonTemplate() throws Exception { SvcLogicContext ctx = new SvcLogicContext(); String complexObj = "{\"image_name\":\"Ubuntu 14.04\",\"service-instance-id\":\"1\",\"vnf-model-customization-uuid\":\"2f\",\"vnf-id\":\"3b\"}"; - ctx.setAttribute("reqId", "1235"); + ctx.setAttribute("reqId", "1235"); ctx.setAttribute("subReqId", "054243"); ctx.setAttribute("actionName", "CREATE"); ctx.setAttribute("myPrefix", "2016-09-09 16:30:35.0"); @@ -565,30 +565,30 @@ public class TestRestapiCallNode { //This will throw a JSONException and fail the test case if rest api call node doesn't form valid JSON assertNotNull(new JSONObject(request)); } - + @Test - public void testGetMultipleUrls() throws Exception{ + public void testGetMultipleUrls() throws Exception { String[] urls = RestapiCallNode.getMultipleUrls("http://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Banana,https://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Potato"); - assertEquals("http://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Banana",urls[0]); - assertEquals("https://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Potato",urls[1]); - - urls = RestapiCallNode.getMultipleUrls("https://wiki.onap.org/,http://localhost:7001/,http://wiki.onap.org/"); - assertEquals("https://wiki.onap.org/",urls[0]); - assertEquals("http://localhost:7001/",urls[1]); - assertEquals("http://wiki.onap.org/",urls[2]); - + assertEquals("http://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Banana", urls[0]); + assertEquals("https://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Potato", urls[1]); + + urls = RestapiCallNode.getMultipleUrls("https://wiki.onap.org/,http://localhost:7001/,http://wiki.onap.org/"); + assertEquals("https://wiki.onap.org/", urls[0]); + assertEquals("http://localhost:7001/", urls[1]); + assertEquals("http://wiki.onap.org/", urls[2]); + urls = RestapiCallNode.getMultipleUrls("https://wiki.onap.org/test=4,5,6,http://localhost:7001/test=1,2,3,http://wiki.onap.org/test=7,8,9,10"); - assertEquals("https://wiki.onap.org/test=4,5,6",urls[0]); - assertEquals("http://localhost:7001/test=1,2,3",urls[1]); - assertEquals("http://wiki.onap.org/test=7,8,9,10",urls[2]); + assertEquals("https://wiki.onap.org/test=4,5,6", urls[0]); + assertEquals("http://localhost:7001/test=1,2,3", urls[1]); + assertEquals("http://wiki.onap.org/test=7,8,9,10", urls[2]); - urls = RestapiCallNode.getMultipleUrls("https://wiki.onap.org/,https://readthedocs.org/projects/onap/"); - assertEquals("https://wiki.onap.org/",urls[0]); - assertEquals("https://readthedocs.org/projects/onap/",urls[1]); + urls = RestapiCallNode.getMultipleUrls("https://wiki.onap.org/,https://readthedocs.org/projects/onap/"); + assertEquals("https://wiki.onap.org/", urls[0]); + assertEquals("https://readthedocs.org/projects/onap/", urls[1]); } - + @Test - public void testContainsMultipleUrls() throws Exception{ + public void testContainsMultipleUrls() throws Exception { assertFalse(RestapiCallNode.containsMultipleUrls("https://wiki.onap.org/")); assertFalse(RestapiCallNode.containsMultipleUrls("http://wiki.onap.org/")); assertFalse(RestapiCallNode.containsMultipleUrls("http://localhost:8008/rest/restconf/data/abc:def/abc:action=Create,deviceType=Banana")); @@ -602,58 +602,53 @@ public class TestRestapiCallNode { } @Test - public void testKeepEmptyValue() throws Exception { - log.info("================= Testing keeping empty values ======================="); - - String template = "{\n" + - " \"name1\": \"value1\",\n" + - " \"name2\": ${empty},\n" + - " \"name3\": ${~empty},\n" + - " \"name4\": {\n" + - " \"name41\": \"value41\",\n" + - " \"name42\": ${~empty},\n" + - " \"name43\": ${~not_empty}\n" + - " },\n" + - " \"name5\": {\n"+ - " \"name51\": ${~empty},\n"+ - " \"name52\": ${empty}\n"+ - " },\n" + - " \"name6\": {\n"+ - " \"name61\": ${empty},\n"+ - " \"name62\": ${empty}\n"+ - " },\n" + - " \"name7\": \"${\"not_empty}\",\n" + - " \"name8\": \"${~\"not_empty}\",\n" + - " \"name9\": \"${\"empty}\",\n" + - " \"name10\": \"${~\"empty}\"\n" + - "}"; - - String expect = "{\n" + - " \"name1\": \"value1\",\n" + - " \"name3\": \"\",\n" + - " \"name4\": {\n" + - " \"name41\": \"value41\",\n" + - " \"name42\": \"\",\n" + - " \"name43\": \"some value\"\n" + - " },\n" + - " \"name5\": {\n" + - " \"name51\": \"\"\n" + - " },\n" + - " \"name7\": \"some value\",\n" + - " \"name8\": \"some value\",\n" + - " \"name10\": \"\"\n" + - "}"; + public void testKeepEmptyValueOrContainer() throws Exception { + log.info("================= Testing keeping empty value or container ======================="); + + String expect = "{\n" + + " \"name1\": \"value1\",\n" + + " \"name3\": \"\",\n" + + " \"name4\": {\n" + + " \"name41\": \"value41\",\n" + + " \"name42\": \"\",\n" + + " \"name43\": \"some value\"\n" + + " },\n" + + " \"name5\": {\n" + + " \"name51\": \"\"\n" + + " },\n" + + " \"name7\": \"some value\",\n" + + " \"name8\": \"some value\",\n" + + " \"name10\": \"\",\n" + + " \"list\": [\n" + + " \n" + + " {\n" + + " \"test1\": \"123\",\n" + + " \"container2\": {},\n" + + " \"container3\": {}\n" + + " },\n" + + " \n" + + " {\n" + + " \"test1\": \"456\",\n" + + " \"container2\": {},\n" + + " \"container3\": {}\n" + + " }\n" + + " ]\n" + + "}\n"; SvcLogicContext ctx = new SvcLogicContext(); ctx.setAttribute("empty", ""); ctx.setAttribute("not_empty", "some value"); - + ctx.setAttribute("tmp.list_length", "2"); + ctx.setAttribute("tmp.list[0]", "123"); + ctx.setAttribute("tmp.list[1]", "456"); + RestapiCallNode rcn = new RestapiCallNode(); - String req = rcn.buildXmlJsonRequest(ctx, template, Format.JSON); - + String req = rcn.buildXmlJsonRequest(ctx, rcn.readFile("src/test/resources/testEmptyValueNContainer.json"), Format.JSON); + log.info("Result:\n" + req); log.info("=================================================================="); assertEquals(expect, req); } + } diff --git a/plugins/restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java b/plugins/restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java deleted file mode 100755 index a130d4390..000000000 --- a/plugins/restapi-call-node/provider/src/test/org/onap/ccsdk/sli/plugins/restapicall/TestRestapiCallNode.java +++ /dev/null @@ -1,531 +0,0 @@ -/*- - * ============LICENSE_START======================================================= - * openECOMP : SDN-C - * ================================================================================ - * Copyright (C) 2017 AT&T Intellectual Property. All rights - * reserved. - * ================================================================================ - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * ============LICENSE_END========================================================= - */ - -package org.onap.ccsdk.sli.plugins.restapicall; - -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertNull; - -import java.util.HashMap; -import java.util.Map; -import org.junit.Rule; -import org.junit.Test; -import org.junit.contrib.java.lang.system.EnvironmentVariables; -import org.onap.ccsdk.sli.core.sli.SvcLogicContext; -import org.onap.ccsdk.sli.core.sli.SvcLogicException; -import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class TestRestapiCallNode { - - @SuppressWarnings("unused") - private static final Logger log = LoggerFactory.getLogger(TestRestapiCallNode.class); - @Rule - public EnvironmentVariables environmentVariables = new EnvironmentVariables(); - - - - @Test - public void testDelete() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map<String, String> p = new HashMap<>(); - p.put("restapiUrl", "https://echo.getpostman.com/delete"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "pwd1"); - p.put("httpMethod", "delete"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testDeleteWithPayload() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - ctx.setAttribute("prop.name", "site1"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/sdwan-site.json"); - p.put("restapiUrl", "https://echo.getpostman.com/delete"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "pwd1"); - p.put("httpMethod", "delete"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testJsonTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "3"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[1].clci", "clci"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[2].clci", "clci"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/test-template.json"); - p.put("restapiUrl", "http://echo.getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testInvalidRepeatTimes() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "a"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/test-template.json"); - p.put("restapiUrl", "http://echo.getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test(expected = SvcLogicException.class) - public void testInvalidTemplatePath() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resourcess/test-template.json"); - p.put("restapiUrl", "http://echo.getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test(expected = SvcLogicException.class) - public void testWithoutSkipSending() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/test-template.json"); - p.put("restapiUrl", "http://echo.getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "false"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - - @Test(expected = SvcLogicException.class) - public void testWithInvalidURI() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("tmp.sdn-circuit-req-row_length", "1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].source-uid", "APIDOC-123"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].action", "delete"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-timestamp", "2016-09-09 16:30:35.0"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].request-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].processing-status", "New"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].service-clfi", "testClfi1"); - ctx.setAttribute("tmp.sdn-circuit-req-row[0].clci", "clci"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/test-template.json"); - p.put("restapiUrl", "http://echo. getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "false"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testVpnJsonTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001"); - ctx.setAttribute("prop.l3vpn.topology", "point_to_point"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/l3smvpntemplate.json"); - p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services"); - p.put("restapiUser", "admin"); - p.put("restapiPassword", "admin123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "restapi-result"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testSiteJsonTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001"); - ctx.setAttribute("prop.l3vpn.topology", "point_to_point"); - - ctx.setAttribute("prop.l3vpn.site1_name", "10000000-0000-0000-0000-000000000002"); - ctx.setAttribute("prop.l3vpn.vpn-policy1-id", "10000000-0000-0000-0000-000000000003"); - ctx.setAttribute("prop.l3vpn.entry1-id", "1"); - ctx.setAttribute("prop.l3vpn.sna1_name", "10000000-0000-0000-0000-000000000004"); - ctx.setAttribute("prop.l3vpn.pe1_id", "a8098c1a-f86e-11da-bd1a-00112444be1e"); - ctx.setAttribute("prop.l3vpn.ac1_id", "a8098c1a-f86e-11da-bd1a-00112444be1b"); - ctx.setAttribute("prop.l3vpn.ac1-peer-ip", "192.168.1.1"); - ctx.setAttribute("prop.l3vpn.ac1-ip", "192.168.1.2"); - ctx.setAttribute("prop.l3vpn.sna1_svlan", "100"); - ctx.setAttribute("prop.l3vpn.ac1_protocol", "static"); - ctx.setAttribute("prop.l3vpn.sna1-route.ip-prefix", "192.168.1.1/24"); - ctx.setAttribute("prop.l3vpn.sna1-route.next-hop", "192.168.1.4"); - - ctx.setAttribute("prop.l3vpn.site2_name", "10000000-0000-0000-0000-000000000005"); - ctx.setAttribute("prop.l3vpn.vpn-policy2-id", "10000000-0000-0000-0000-000000000006"); - ctx.setAttribute("prop.l3vpn.entry2-id", "1"); - ctx.setAttribute("prop.l3vpn.sna2_name", "10000000-0000-0000-0000-000000000007"); - ctx.setAttribute("prop.l3vpn.pe2_id", "a8098c1a-f86e-11da-bd1a-00112444be1a"); - ctx.setAttribute("prop.l3vpn.ac2_id", "a8098c1a-f86e-11da-bd1a-00112444be1c"); - ctx.setAttribute("prop.l3vpn.ac2-peer-ip", "192.168.1.6"); - ctx.setAttribute("prop.l3vpn.ac2-ip", "192.168.1.5"); - ctx.setAttribute("prop.l3vpn.sna2_svlan", "200"); - ctx.setAttribute("prop.l3vpn.ac2_protocol", "bgp"); - ctx.setAttribute("prop.l3vpn.peer2-ip", "192.168.1.7"); - ctx.setAttribute("prop.l3vpn.ac2_protocol_bgp_as", "200"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/l3smsitetemplate.json"); - p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/sites"); - p.put("restapiUser", "admin"); - p.put("restapiPassword", "admin123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "restapi-result"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testVrfJsonTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.l3vpn.vrf1-id", "10000000-0000-0000-0000-000000000007"); - ctx.setAttribute("prop.l3vpn.vpn-policy1-id", "10000000-0000-0000-0000-000000000003"); - ctx.setAttribute("prop.l3vpn.pe1_id", "a8098c1a-f86e-11da-bd1a-00112444be1e"); - ctx.setAttribute("prop.l3vpn.vrf2-id", "10000000-0000-0000-0000-000000000009"); - ctx.setAttribute("prop.l3vpn.vpn-policy2-id", "10000000-0000-0000-0000-000000000006"); - ctx.setAttribute("prop.l3vpn.pe2_id", "a8098c1a-f86e-11da-bd1a-00112444be1a"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/l3smvrftemplate.json"); - p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vrf-attributes"); - p.put("restapiUser", "admin"); - p.put("restapiPassword", "admin123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "restapi-result"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testDeleteVpnJsonTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001"); - ctx.setAttribute("prop.l3vpn.topology", "point_to_point"); - - Map<String, String> p = new HashMap<>(); - //p.put("templateFileName", "src/test/resources/l3smvpntemplate.json"); - p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services" - + "/vpnservice=10000000-0000-0000-0000-000000000001"); - p.put("restapiUser", "admin"); - p.put("restapiPassword", "admin123"); - p.put("format", "json"); - p.put("httpMethod", "delete"); - p.put("responsePrefix", "restapi-result"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testL2DciTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.dci-connects.id", "Id1"); - ctx.setAttribute("prop.dci-connects.name", "Name1"); - ctx.setAttribute("prop.dci-connects.local_networks[0]", "NetId1"); - ctx.setAttribute("prop.dci-connects.local_networks[1]", "NetId2"); - ctx.setAttribute("prop.dci-connects.evpn_irts[0]", "100:1"); - ctx.setAttribute("prop.dci-connects.evpn_erts[0]", "100:2"); - ctx.setAttribute("prop.dci-connects.evpn_irts[1]", "200:1"); - ctx.setAttribute("prop.dci-connects.evpn_erts[1]", "200:2"); - ctx.setAttribute("prop.dci-connects.vni", "1"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/l2-dci-connects-template.json"); - p.put("restapiUrl", "http://echo.getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testL3DciTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.dci-connects.id", "Id1"); - ctx.setAttribute("prop.dci-connects.name", "Name1"); - ctx.setAttribute("prop.dci-connects.local_networks_length", "2"); - ctx.setAttribute("prop.dci-connects.local_networks[0]", "NetId1"); - ctx.setAttribute("prop.dci-connects.local_networks[1]", "NetId2"); - ctx.setAttribute("prop.dci-connects.evpn_irts[0]", "100:1"); - ctx.setAttribute("prop.dci-connects.evpn_erts[0]", "100:2"); - ctx.setAttribute("prop.dci-connects.evpn_irts[1]", "200:1"); - ctx.setAttribute("prop.dci-connects.evpn_erts[1]", "200:2"); - ctx.setAttribute("prop.dci-connects.vni", "1"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/l3-dci-connects-template.json"); - p.put("restapiUrl", "http://echo.getpostman.com"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "abc123"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "response"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - - } - - @Test - public void testControllerTokenTemplate() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.sdncRestApi.thirdpartySdnc.user", "admin"); - ctx.setAttribute("prop.sdncRestApi.thirdpartySdnc.password", "admin123"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/actokentemplate.json"); - p.put("restapiUrl", "https://ipwan:18002/controller/v2/tokens"); - p.put("format", "json"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "restapi-result"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - - @Test - public void testDeleteNoneAsContentType() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - - Map<String, String> p = new HashMap<>(); - p.put("restapiUrl", "https://echo.getpostman.com/delete"); - p.put("restapiUser", "user1"); - p.put("restapiPassword", "pwd1"); - p.put("httpMethod", "delete"); - p.put("format", "none"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - - @Test - public void testPostNoneAsContentType() throws SvcLogicException { - SvcLogicContext ctx = new SvcLogicContext(); - ctx.setAttribute("prop.l3vpn.name", "10000000-0000-0000-0000-000000000001"); - ctx.setAttribute("prop.l3vpn.topology", "point_to_point"); - - Map<String, String> p = new HashMap<>(); - p.put("templateFileName", "src/test/resources/l3smvpntemplate.json"); - p.put("restapiUrl", "http://ipwan:18002/restconf/data/huawei-ac-net-l3vpn-svc:l3vpn-svc-cfg/vpn-services"); - p.put("restapiUser", "admin"); - p.put("restapiPassword", "admin123"); - p.put("format", "none"); - p.put("httpMethod", "post"); - p.put("responsePrefix", "restapi-result"); - p.put("skipSending", "true"); - - RestapiCallNode rcn = new RestapiCallNode(); - rcn.sendRequest(p, ctx); - } - /* - * { - "partnerOne": { - "url": "http://localhost:7001" 4 http://uebsb93kcdc.it.att.com:3904", - "test": "/metrics" - }, - "partnerTwo": { - "url": "http://localhost:7002", - "user": "controller_user", - "password": "P@ssword", - "test": "/metrics" - }, - "partnerThree": { - "url": "http://localhost:7003", - "user": "controller_admin" - } -} - */ - @Test - public void testPartners() throws Exception{ - - environmentVariables.set("deployer_pass", "sdncp-123"); - assertEquals("sdncp-123", System.getenv("deployer_pass")); - - String partnerTwoKey = "partnerTwo"; - String partnerTwoUsername = "controller_user"; - String partnerTwoPassword = "P@ssword"; - - System.setProperty("SDNC_CONFIG_DIR", "src/test/resources"); - RestapiCallNode rcn = new RestapiCallNode(); - assertNull(rcn.partnerStore.get("partnerOne")); - PartnerDetails details = rcn.partnerStore.get(partnerTwoKey); - assertEquals(partnerTwoUsername,details.username); - assertEquals(partnerTwoPassword,details.password); - assertNull(rcn.partnerStore.get("partnerThree")); - - //In this scenario the caller expects username, password and url to be picked up from the partners json - Map<String, String> paramMap = new HashMap<String,String>(); - paramMap.put("partner", partnerTwoKey); - rcn.handlePartner(paramMap ); - assertEquals(partnerTwoUsername,paramMap.get(rcn.restapiUserKey)); - assertEquals(partnerTwoPassword,paramMap.get(rcn.restapiPasswordKey)); - assertEquals("http://localhost:7002",paramMap.get(rcn.restapiUrlString)); - - //In this scenario the caller expects username, password and url to be picked up from the partners json - //the provided suffix will be appended to the default url from the partners json - paramMap = new HashMap<String,String>(); - paramMap.put("partner", partnerTwoKey); - paramMap.put("restapiUrlSuffix", "/networking/v1/instance/3"); - rcn.handlePartner(paramMap); - p = new Parameters(); - RestapiCallNode.getParameters(paramMap, p); - assertEquals(partnerTwoUsername,p.restapiUser); - assertEquals(partnerTwoPassword,p.restapiPassword); - assertEquals("http://localhost:7002/networking/v1/instance/3",p.restapiUrl); - - paramMap = new HashMap<String, String>(); - paramMap.put("partner","partnerFour" ); - paramMap.put("httpMethod", "delete"); - paramMap.put("skipSending", "true"); - rcn.handlePartner(paramMap); - Parameters p = new Parameters(); - RestapiCallNode.getParameters(paramMap, p); - assertEquals(p.restapiPassword, "sdncp-123"); - assertEquals(p.restapiUser, "m30402@sdncp.att.com"); - assertEquals(p.restapiUrl, "http://localhost:7004"); - } - - @Test - public void retryPolicyBean() throws Exception { - Integer retries = 3; - String first = "http://localhost:7001"; - String second = "http://localhost:7001"; - - RetryPolicy p = new RetryPolicy(new String[] {first,second}, retries); - assertEquals(retries,p.getMaximumRetries()); - assertNotNull(p.getRetryMessage()); - String next = p.getNextHostName(); - assertEquals(second,next); - assertEquals(1,p.getRetryCount()); - next = p.getNextHostName(); - assertEquals(first,next); - assertEquals(2,p.getRetryCount()); - } -} diff --git a/plugins/restapi-call-node/provider/src/test/resources/testEmptyValueNContainer.json b/plugins/restapi-call-node/provider/src/test/resources/testEmptyValueNContainer.json new file mode 100644 index 000000000..b444e0e5b --- /dev/null +++ b/plugins/restapi-call-node/provider/src/test/resources/testEmptyValueNContainer.json @@ -0,0 +1,24 @@ +{ + "name1": "value1", + "name3": "", + "name4": { + "name41": "value41", + "name42": "", + "name43": "some value" + }, + "name5": { + "name51": "" + }, + "name7": "some value", + "name8": "some value", + "name10": "", + "list": [ + ${repeat:tmp.list_length: + { + "test1": ${tmp.list[${1}]}, + "container1": {}, + "container2": EMPTY_CONTAINER, + "container3": EMPTY_CONTAINER + }, + }] +} diff --git a/plugins/restconf-client/installer/pom.xml b/plugins/restconf-client/installer/pom.xml index 05783f120..876b7ddf4 100755 --- a/plugins/restconf-client/installer/pom.xml +++ b/plugins/restconf-client/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/pom.xml b/plugins/restconf-client/pom.xml index e37faf970..56c93b148 100755 --- a/plugins/restconf-client/pom.xml +++ b/plugins/restconf-client/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/restconf-client/provider/pom.xml b/plugins/restconf-client/provider/pom.xml index d073bd820..bf0d18e1f 100755 --- a/plugins/restconf-client/provider/pom.xml +++ b/plugins/restconf-client/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -69,6 +69,16 @@ <scope>provided</scope> </dependency> <dependency> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-parser-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.opendaylight.yangtools</groupId> + <artifactId>yang-repo-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> <groupId>com.fasterxml.jackson.core</groupId> <artifactId>jackson-databind</artifactId> </dependency> diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java index 4a2e18198..2e4a6c34c 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiCallNode.java @@ -87,8 +87,9 @@ import org.opendaylight.restconf.nb.rfc8040.utils.parser.ParserIdentifier; import org.opendaylight.yangtools.yang.common.XMLNamespace; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; import org.opendaylight.yangtools.yang.model.api.SchemaNode; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; + +import org.opendaylight.yangtools.yang.parser.api.YangParserException; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -185,7 +186,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { String pp = p.responsePrefix != null ? p.responsePrefix + '.' : ""; Map<String, String> props = new HashMap<>((Map)ctx.toProperties()); String uri = parseUrl(p.restapiUrl, p.httpMethod); - InstanceIdentifierContext<?> insIdCtx = getInsIdCtx(p, uri); + InstanceIdentifierContext insIdCtx = getInsIdCtx(p, uri); String req = null; if (p.httpMethod != GET && p.httpMethod != DELETE) { @@ -311,7 +312,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { * @return instance identifier context * @throws SvcLogicException when getting schema context fails */ - private InstanceIdentifierContext<?> getInsIdCtx(YangParameters params, + private InstanceIdentifierContext getInsIdCtx(YangParameters params, String uri) throws SvcLogicException { EffectiveModelContext context = getSchemaContext(params); @@ -394,7 +395,7 @@ public class RestconfApiCallNode implements SvcLogicJavaPlugin { * @throws SvcLogicException when the data format type is wrong */ public String updateReq(String req, YangParameters p, - InstanceIdentifierContext<?> insIdCtx) + InstanceIdentifierContext insIdCtx) throws SvcLogicException { SchemaNode schemaNode = insIdCtx.getSchemaNode(); diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java index 134868c15..ee5dacdce 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/restconfapicall/RestconfApiUtils.java @@ -25,7 +25,6 @@ package org.onap.ccsdk.sli.plugins.restconfapicall; import static org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode.getParameters; import static org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode.parseParam; -import static org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource.forFile; import java.io.File; import java.io.IOException; import java.net.URI; @@ -39,10 +38,11 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.plugins.restapicall.HttpMethod; import org.onap.ccsdk.sli.plugins.yangserializers.dfserializer.YangParameters; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParser; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserException; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.model.parser.api.YangSyntaxErrorException; +import org.opendaylight.yangtools.yang.model.repo.api.YangTextSchemaSource; +import org.opendaylight.yangtools.yang.parser.api.YangParser; +import org.opendaylight.yangtools.yang.parser.api.YangParserException; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.api.YangSyntaxErrorException; /** * Utilities for restconf api call node. @@ -193,7 +193,7 @@ public final class RestconfApiUtils { YangParser parser = parserFactory.createParser(); for (File file : yangFiles) { try { - parser.addSource(forFile(file)); + parser.addSource(YangTextSchemaSource.forPath(file.toPath())); } catch (IOException | YangSyntaxErrorException e) { throw new SvcLogicException(YANG_FILE_ERR + e.getMessage(), e); } diff --git a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java index 9b0a31d09..efbbc0458 100644 --- a/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java +++ b/plugins/restconf-client/provider/src/main/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/MdsalPropertiesNodeUtils.java @@ -262,7 +262,7 @@ public final class MdsalPropertiesNodeUtils { String uri1 = uri.replaceAll(UNDERSCORE, COLON); try { - InstanceIdentifierContext<?> id = toInstanceIdentifier( + InstanceIdentifierContext id = toInstanceIdentifier( uri1, context, Optional.ofNullable(null)); return new SchemaPathHolder(id, uri1); } catch (IllegalArgumentException | RestconfDocumentedException @@ -335,7 +335,7 @@ public final class MdsalPropertiesNodeUtils { if (node.contains(UNDERSCORE)) { secondHalf = node.substring(values[0].length()+1); } - InstanceIdentifierContext<?> id; + InstanceIdentifierContext id; for (int i = 0; i< values.length-1; i++) { val = values[i]; val = firstHalf + val + COLON + secondHalf; diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java index a76bb52bf..153f6c2ad 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfapicall/TestRestconfApiUtils.java @@ -6,8 +6,8 @@ import static org.junit.Assert.assertNull; import org.junit.Test; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.opendaylight.yangtools.yang.model.api.EffectiveModelContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; /*- * ============LICENSE_START======================================================= @@ -34,7 +34,7 @@ public class TestRestconfApiUtils { @Test public void testGetSchemaCtxFromDir() throws SvcLogicException { - YangParserFactory factory = new YangParserFactoryImpl(); + YangParserFactory factory = new DefaultYangParserFactory(); // Test with valid subdirectories diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java index 64173306d..02d52d215 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/restconfdiscovery/TestRestconfDiscoveryNode.java @@ -29,7 +29,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicContext; import org.onap.ccsdk.sli.core.sli.SvcLogicException; import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import java.io.IOException; import java.net.URI; @@ -38,7 +38,7 @@ import java.util.Map; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.mock; @@ -107,7 +107,7 @@ public class TestRestconfDiscoveryNode { Map<String, String> p = new HashMap<>(); RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); rdn.establishSubscription(p, ctx); } @@ -117,7 +117,7 @@ public class TestRestconfDiscoveryNode { ctx.setAttribute("restapi-result.response-code", "200"); ctx.setAttribute("response-code", "404"); RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); assertThat(rdn.getResponseCode("restapi-result", ctx), is("200")); assertThat(rdn.getResponseCode(null, ctx), @@ -133,7 +133,7 @@ public class TestRestconfDiscoveryNode { ctx.setAttribute("ietf-subscribed-notifications:establish-subscripti" + "on.output.identifier", "89"); RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); assertThat(rdn.getOutputIdentifier("restapi-result", ctx), is("89")); } @@ -144,7 +144,7 @@ public class TestRestconfDiscoveryNode { "futh9ho6eofy3wjsap7wqktemlqm4bbsmnar3vrtbyrzukbv5itd6m1cftldpjarny" + "le3sdcqq9hftc4lebz464b5ffxmlbvg9"; RestconfDiscoveryNode rdn = new RestconfDiscoveryNode( - new RestconfApiCallNode(new RestapiCallNode(), new YangParserFactoryImpl())); + new RestconfApiCallNode(new RestapiCallNode(), new DefaultYangParserFactory())); assertThat(rdn.getTokenId(customHttpHeaders), is("x-ik2ps4ikvzupbx0486ft1ebzs7rt85futh9ho6eofy3wjsap7wqkt" + diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java index a5353fad4..7f04bbaa9 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/DataFormatSerializerTest.java @@ -33,12 +33,12 @@ import org.onap.ccsdk.sli.plugins.restapicall.HttpResponse; import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; @@ -94,7 +94,7 @@ public class DataFormatSerializerTest { p.put("responsePrefix", "response"); p.put("skipSending", "true"); restApi = new RestapiCallNode(); - parserFactory = new YangParserFactoryImpl(); + parserFactory = new DefaultYangParserFactory(); restconf = mock(RestconfApiCallNode.class); dfCaptor = new DfCaptor(); createMethodMocks(); diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java index 9abbb16b7..ca148033b 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/dfserializer/IdentifierValidationTest.java @@ -33,12 +33,12 @@ import org.onap.ccsdk.sli.plugins.restapicall.HttpResponse; import org.onap.ccsdk.sli.plugins.restapicall.RestapiCallNode; import org.onap.ccsdk.sli.plugins.restconfapicall.RestconfApiCallNode; import org.opendaylight.restconf.common.context.InstanceIdentifierContext; -import org.opendaylight.yangtools.yang.model.parser.api.YangParserFactory; -import org.opendaylight.yangtools.yang.parser.impl.YangParserFactoryImpl; +import org.opendaylight.yangtools.yang.parser.api.YangParserFactory; +import org.opendaylight.yangtools.yang.parser.impl.DefaultYangParserFactory; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.core.Is.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doAnswer; import static org.mockito.Mockito.doCallRealMethod; import static org.mockito.Mockito.doReturn; @@ -83,7 +83,7 @@ public class IdentifierValidationTest { p.put("responsePrefix", "response"); p.put("skipSending", "true"); restApi = new RestapiCallNode(); - parserFactory = new YangParserFactoryImpl(); + parserFactory = new DefaultYangParserFactory(); restconf = mock(RestconfApiCallNode.class); dfCaptor = new DfCaptor(); createMethodMocks(); diff --git a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java index 2bcd45e2b..ff5871519 100644 --- a/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java +++ b/plugins/restconf-client/provider/src/test/java/org/onap/ccsdk/sli/plugins/yangserializers/pnserializer/PropertiesSerializerTest.java @@ -83,7 +83,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont1.cont2.ll3[1]", "abc"); params.put("test-yang_cont1.cont2.ll4[0]", "abc"); params.put("test-yang_cont1.cont2.ll4[1]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( @@ -293,7 +293,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont1.cont2.ll5[0]", "abc"); params.put("test-yang_cont1.cont2.ll5[1]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -401,7 +401,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont8.ll7[0]", "abc"); params.put("test-yang_cont8.ll7[1]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -460,7 +460,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont9.ll8[0]", "abc"); params.put("test-yang_cont9.cont11.leaf25", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -498,7 +498,7 @@ public final class PropertiesSerializerTest { Map<String, String> params = new HashMap<>(); params.put("test-yang_cont8.cont6.test-augment_leaf21", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -540,7 +540,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont13.leaf28", "abc"); params.put("test-yang_cont13.ll9[0]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -589,7 +589,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont9.cont11.cont13.list9[0].leaf27", "abc"); params.put("test-yang_cont9.cont11.cont13.leaf28", "abc"); params.put("test-yang_cont9.cont11.cont13.ll9[0]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -643,7 +643,7 @@ public final class PropertiesSerializerTest { params.put("test-augment_cont13.list9[0].leaf27", "abc"); params.put("test-augment_cont13.leaf28", "abc"); params.put("test-augment_cont13.ll9[0]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -695,7 +695,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont1.cont2.cont4.test-augment_cont13.leaf28", "abc"); params.put("test-yang_cont1.cont2.cont4.test-augment_cont13.ll9[0]", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -763,7 +763,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_create-sfc.input.cont13.ll9[0]", "abc"); params.put("test-yang_create-sfc.input.test-augment_leaf36", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -877,7 +877,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_create-sfc.output.cont13.ll9[0]", "abc"); params.put("test-yang_create-sfc.output.test-augment_leaf37", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -985,7 +985,7 @@ public final class PropertiesSerializerTest { params.put("test-yang_cont18.cont18.list12[1].list12[0].leaf36", "xyz"); params.put("test-yang_cont18.cont18.list12[1].list12[1].leaf36", "hey!"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -1056,7 +1056,7 @@ public final class PropertiesSerializerTest { params.put("leaf41", "hi"); params.put("test-yang_cont18.leaf41", "abc"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( iCtx.getSchemaNode(), context, uri); @@ -1078,7 +1078,7 @@ public final class PropertiesSerializerTest { params.put("identity-test_test.con1.interfaces.int-list[0].available.ll[0]", "identity-types:Loopback"); params.put("identity-test_test.con1.interfaces.int-list[0].available.leaf1", "identity-types-second:Ethernet"); params.put("identity-test_test.con1.interfaces.int-list[0].available.leaf2", "identity-types-second:iden2"); - InstanceIdentifierContext<?> iCtx = ParserIdentifier + InstanceIdentifierContext iCtx = ParserIdentifier .toInstanceIdentifier(uri, context, null); PropertiesNodeSerializer ser = new MdsalPropertiesNodeSerializer( diff --git a/plugins/sshapi-call-node/installer/pom.xml b/plugins/sshapi-call-node/installer/pom.xml index 216c05590..54bd99d10 100755 --- a/plugins/sshapi-call-node/installer/pom.xml +++ b/plugins/sshapi-call-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/sshapi-call-node/pom.xml b/plugins/sshapi-call-node/pom.xml index 460608fe2..3197c82e2 100755 --- a/plugins/sshapi-call-node/pom.xml +++ b/plugins/sshapi-call-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/sshapi-call-node/provider/pom.xml b/plugins/sshapi-call-node/provider/pom.xml index 525ee363b..d35dc75fe 100755 --- a/plugins/sshapi-call-node/provider/pom.xml +++ b/plugins/sshapi-call-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/installer/pom.xml b/plugins/template-node/installer/pom.xml index 80792bac6..1bdc78457 100644 --- a/plugins/template-node/installer/pom.xml +++ b/plugins/template-node/installer/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/pom.xml b/plugins/template-node/pom.xml index 5d8f79337..5612ff97f 100644 --- a/plugins/template-node/pom.xml +++ b/plugins/template-node/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> diff --git a/plugins/template-node/provider/pom.xml b/plugins/template-node/provider/pom.xml index 65d6975f6..dc08b67b1 100644 --- a/plugins/template-node/provider/pom.xml +++ b/plugins/template-node/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.ccsdk.sli.plugins</groupId> @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>odlparent-lite</artifactId> - <version>2.3.3</version> + <version>2.4.1-SNAPSHOT</version> <relativePath/> </parent> |