From 99fe1a5e5cd8348d6a7e501691d4b78eca97393b Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 29 Mar 2018 12:31:45 -0400 Subject: Add ansible adapter to CCSDK Copy APP-C Ansible adaptor to CCSDK Change-Id: Ie7f0662befd5cff446f2b2351a233bcfa7d6f4c0 Issue-ID: CCSDK-172 Signed-off-by: Timoney, Dan (dt5972) --- .../src/main/resources/ansible-adaptor.properties | 48 ++++++++++++++++++++++ .../blueprint/ansible-adapter-blueprint.xml | 39 ++++++++++++++++++ 2 files changed, 87 insertions(+) create mode 100644 ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties create mode 100755 ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml (limited to 'ansible-adapter/ansible-adapter-bundle/src/main/resources') diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties new file mode 100644 index 000000000..d49c0396c --- /dev/null +++ b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties @@ -0,0 +1,48 @@ +### +# ============LICENSE_START======================================================= +# ONAP : APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= +# 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END========================================================= +### + +# +# Default properties for the APP-C TestService Adapter +# +# ------------------------------------------------------------------------------------------------- +# +# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded +# to supply configuration options +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties + +appc.application.name=APPC + +# +# Define the message resource bundle name to be loaded +org.onap.appc.resources=org.onap/appc/i18n/MessageResources +# +# The name of the adapter. +org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter + + +# Default truststore path and password +org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js +org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit +org.onap.appc.adapter.ansible.clientType=DEFAULT diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml b/ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml new file mode 100755 index 000000000..d7be01e9d --- /dev/null +++ b/ansible-adapter/ansible-adapter-bundle/src/main/resources/org/opendaylight/blueprint/ansible-adapter-blueprint.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter + + + + -- cgit 1.2.3-korg From 13300c7f3b2cd087d74981006e5a98f8099c3cb3 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Thu, 10 May 2018 17:23:13 -0400 Subject: Set default http client type If ansible-adapter.properties cannot be found, default the http client type. Change-Id: Iddebd8f1b6ff1a70d6dfbf78105d305bf1870e03 Issue-ID: CCSDK-273 Signed-off-by: Timoney, Dan (dt5972) --- .../impl/AnsibleAdapterPropertiesProviderImpl.java | 5 +++ .../src/main/resources/ansible-adapter.properties | 48 ++++++++++++++++++++++ .../src/main/resources/ansible-adaptor.properties | 48 ---------------------- 3 files changed, 53 insertions(+), 48 deletions(-) create mode 100644 ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties delete mode 100644 ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties (limited to 'ansible-adapter/ansible-adapter-bundle/src/main/resources') diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java b/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java index bffb494f3..482aaf8e5 100755 --- a/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java +++ b/ansible-adapter/ansible-adapter-bundle/src/main/java/org/onap/ccsdk/sli/adaptors/ansible/impl/AnsibleAdapterPropertiesProviderImpl.java @@ -115,6 +115,11 @@ public class AnsibleAdapterPropertiesProviderImpl implements AnsibleAdapterPrope if (properties == null) { reportFailure("Missing configuration properties resource(3)", new ConfigurationException( "Missing configuration properties resource(3): " + ANSIBLEADAPTER_PROP_FILE_NAME)); + + LOG.info("Defaulting org.onap.appc.adapter.ansible.clientType to TRUST_ALL"); + + properties = new Properties(); + properties.setProperty("org.onap.appc.adapter.ansible.clientType", "TRUST_ALL"); } } diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties new file mode 100644 index 000000000..761758bbb --- /dev/null +++ b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adapter.properties @@ -0,0 +1,48 @@ +### +# ============LICENSE_START======================================================= +# ONAP : APPC +# ================================================================================ +# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Copyright (C) 2017 Amdocs +# ============================================================================= +# 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. +# +# ECOMP is a trademark and service mark of AT&T Intellectual Property. +# ============LICENSE_END========================================================= +### + +# +# Default properties for the APP-C TestService Adapter +# +# ------------------------------------------------------------------------------------------------- +# +# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded +# to supply configuration options +org.onap.appc.bootstrap.file=appc.properties +org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties + +appc.application.name=APPC + +# +# Define the message resource bundle name to be loaded +org.onap.appc.resources=org.onap/appc/i18n/MessageResources +# +# The name of the adapter. +org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter + + +# Default truststore path and password +org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js +org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit +org.onap.appc.adapter.ansible.clientType=TRUST_ALL diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties b/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties deleted file mode 100644 index d49c0396c..000000000 --- a/ansible-adapter/ansible-adapter-bundle/src/main/resources/ansible-adaptor.properties +++ /dev/null @@ -1,48 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP : APPC -# ================================================================================ -# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. -# ================================================================================ -# Copyright (C) 2017 Amdocs -# ============================================================================= -# 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. -# -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -# ============LICENSE_END========================================================= -### - -# -# Default properties for the APP-C TestService Adapter -# -# ------------------------------------------------------------------------------------------------- -# -# Define the name and path of any user-provided configuration (bootstrap) file that can be loaded -# to supply configuration options -org.onap.appc.bootstrap.file=appc.properties -org.onap.appc.bootstrap.path=${user.home},/opt/opendaylight/current/properties - -appc.application.name=APPC - -# -# Define the message resource bundle name to be loaded -org.onap.appc.resources=org.onap/appc/i18n/MessageResources -# -# The name of the adapter. -org.onap.appc.provider.adaptor.name=org.onap.appc.appc_ansible_adapter - - -# Default truststore path and password -org.onap.appc.adapter.ansible.trustStore=/opt/opendaylight/tls-client/mykeystore.js -org.onap.appc.adapter.ansible.trustStore.trustPasswd=changeit -org.onap.appc.adapter.ansible.clientType=DEFAULT -- cgit 1.2.3-korg From dbbd392fdc622c85958598213b2f423848666af6 Mon Sep 17 00:00:00 2001 From: "Timoney, Dan (dt5972)" Date: Wed, 3 Jul 2019 14:30:56 -0400 Subject: Code changes for OpenDaylight Neon Updated code for OpenDaylight Neon, using conversion script in ccsdk/parent/tools. Change-Id: Ic91cff9ee50102b8af1a73f829908de82995b2ef Issue-ID: CCSDK-1389 Signed-off-by: Timoney, Dan (dt5972) --- aai-service/features/ccsdk-aai-service/pom.xml | 4 +- aai-service/features/features-aai-service/pom.xml | 4 +- aai-service/features/pom.xml | 4 +- aai-service/installer/pom.xml | 4 +- aai-service/pom.xml | 4 +- aai-service/provider/pom.xml | 10 +- .../OSGI-INF/blueprint/aaiservice-blueprint.xml | 39 +++++++ ansible-adapter/ansible-adapter-bundle/pom.xml | 27 ++++- .../blueprint/ansible-adapter-blueprint.xml | 39 +++++++ .../ccsdk-ansible-adapter/pom.xml | 5 +- .../features-ansible-adapter/pom.xml | 4 +- ansible-adapter/ansible-adapter-features/pom.xml | 4 +- ansible-adapter/ansible-adapter-installer/pom.xml | 4 +- ansible-adapter/pom.xml | 4 +- artifacts/pom.xml | 21 +--- base/http/features/ccsdk-base-http/pom.xml | 2 +- base/http/features/features-base-http/pom.xml | 2 +- base/http/features/pom.xml | 2 +- base/http/installer/pom.xml | 2 +- base/http/pom.xml | 2 +- base/http/provider/pom.xml | 2 +- base/pom.xml | 2 +- features/ccsdk-sli-adaptors-all/pom.xml | 11 +- features/features-sli-adaptors/pom.xml | 4 +- features/installer/pom.xml | 4 +- features/pom.xml | 4 +- .../features/ccsdk-mdsal-resource/pom.xml | 6 +- .../features/features-mdsal-resource/pom.xml | 4 +- mdsal-resource/features/pom.xml | 4 +- mdsal-resource/installer/pom.xml | 4 +- mdsal-resource/pom.xml | 4 +- mdsal-resource/provider/pom.xml | 4 +- .../blueprint/mdsal-resource-blueprint.xml | 49 ++++++++ message-router/consumer/api/pom.xml | 2 +- .../features/ccsdk-messagerouter-consumer/pom.xml | 4 +- .../features-messagerouter-consumer/pom.xml | 4 +- message-router/consumer/features/pom.xml | 4 +- message-router/consumer/installer/pom.xml | 4 +- message-router/consumer/pom.xml | 2 +- message-router/consumer/provider/pom.xml | 2 +- message-router/pom.xml | 4 +- message-router/publisher/api/pom.xml | 2 +- .../features/ccsdk-messagerouter-publisher/pom.xml | 4 +- .../features-messagerouter-publisher/pom.xml | 4 +- message-router/publisher/features/pom.xml | 4 +- message-router/publisher/installer/pom.xml | 4 +- message-router/publisher/pom.xml | 2 +- message-router/publisher/provider/pom.xml | 2 +- message-router/publisher/sample.client/pom.xml | 2 +- netbox-client/features/ccsdk-netbox-client/pom.xml | 17 ++- .../features/features-netbox-client/pom.xml | 4 +- netbox-client/features/pom.xml | 4 +- netbox-client/installer/pom.xml | 4 +- netbox-client/pom.xml | 4 +- netbox-client/provider/pom.xml | 11 +- .../resources/OSGI-INF/blueprint/netbox-client.xml | 37 ++++++ pom.xml | 7 +- .../features/ccsdk-resource-assignment/pom.xml | 4 +- .../features/features-resource-assignment/pom.xml | 4 +- resource-assignment/features/pom.xml | 4 +- resource-assignment/installer/pom.xml | 4 +- resource-assignment/pom.xml | 4 +- resource-assignment/provider/pom.xml | 4 +- .../blueprint/resource-assignment-blueprint.xml | 33 ++++++ .../OSGI-INF/blueprint/resource-assignment.xml | 129 +++++++++++++++++++++ saltstack-adapter/pom.xml | 4 +- .../ccsdk-saltstack-adapter/pom.xml | 4 +- .../features-saltstack-adapter/pom.xml | 4 +- .../saltstack-adapter-features/pom.xml | 4 +- .../saltstack-adapter-installer/pom.xml | 4 +- .../saltstack-adapter-provider/pom.xml | 12 +- .../blueprint/saltstack-adapter-blueprint.xml | 42 +++++++ sql-resource/features/ccsdk-sql-resource/pom.xml | 4 +- .../features/features-sql-resource/pom.xml | 4 +- sql-resource/features/pom.xml | 4 +- sql-resource/installer/pom.xml | 4 +- sql-resource/pom.xml | 4 +- sql-resource/provider/pom.xml | 4 +- .../OSGI-INF/blueprint/sql-resource-blueprint.xml | 41 +++++++ version.properties | 4 +- 80 files changed, 584 insertions(+), 172 deletions(-) create mode 100755 aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml create mode 100755 ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml create mode 100755 mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml create mode 100644 netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml create mode 100755 resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml create mode 100755 resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml create mode 100755 saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml create mode 100755 sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml (limited to 'ansible-adapter/ansible-adapter-bundle/src/main/resources') diff --git a/aai-service/features/ccsdk-aai-service/pom.xml b/aai-service/features/ccsdk-aai-service/pom.xml index 1c5b5e3f8..d9a956a49 100644 --- a/aai-service/features/ccsdk-aai-service/pom.xml +++ b/aai-service/features/ccsdk-aai-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-aai-service - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/features/features-aai-service/pom.xml b/aai-service/features/features-aai-service/pom.xml index 6af177d8b..20b366ddb 100755 --- a/aai-service/features/features-aai-service/pom.xml +++ b/aai-service/features/features-aai-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-aai-service - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/features/pom.xml b/aai-service/features/pom.xml index 434687b55..10f643256 100755 --- a/aai-service/features/pom.xml +++ b/aai-service/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/installer/pom.xml b/aai-service/installer/pom.xml index 9205617b5..1e5cacfef 100755 --- a/aai-service/installer/pom.xml +++ b/aai-service/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} diff --git a/aai-service/pom.xml b/aai-service/pom.xml index cbebfb182..8fe15434d 100755 --- a/aai-service/pom.xml +++ b/aai-service/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: aai-service diff --git a/aai-service/provider/pom.xml b/aai-service/provider/pom.xml index e07c3ecf5..fa345562e 100755 --- a/aai-service/provider/pom.xml +++ b/aai-service/provider/pom.xml @@ -5,16 +5,17 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors aai-service-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-sli-adaptors :: aai-service :: ${project.artifactId} + http://maven.apache.org UTF-8 @@ -47,18 +48,17 @@ org.onap.ccsdk.sli.core sli-common - provided + compile org.onap.ccsdk.sli.core sli-provider - provided + compile org.onap.ccsdk.sli.core utils-provider ${ccsdk.sli.core.version} - provided org.osgi diff --git a/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml b/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml new file mode 100755 index 000000000..970936610 --- /dev/null +++ b/aai-service/provider/src/main/resources/OSGI-INF/blueprint/aaiservice-blueprint.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + org.onap.ccsdk.sli.adaptors.aai.AAIService + org.onap.ccsdk.sli.adaptors.aai.AAIClient + + + + diff --git a/ansible-adapter/ansible-adapter-bundle/pom.xml b/ansible-adapter/ansible-adapter-bundle/pom.xml index 00f92b5e7..da8a41f2f 100644 --- a/ansible-adapter/ansible-adapter-bundle/pom.xml +++ b/ansible-adapter/ansible-adapter-bundle/pom.xml @@ -17,13 +17,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adapter-bundle - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} @@ -57,21 +57,26 @@ commons-logging commons-logging + org.apache.httpcomponents httpclient + + org.glassfish.jersey.core jersey-common test + org.codehaus.jackson jackson-jaxrs test + junit junit @@ -85,13 +90,13 @@ org.onap.ccsdk.sli.core sli-common - provided + org.onap.ccsdk.sli.core sli-provider - provided + org.osgi org.osgi.core @@ -101,10 +106,24 @@ org.slf4j slf4j-api + + + org.slf4j + jcl-over-slf4j + + org.json json + + + + com.google.guava + guava + + + diff --git a/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml b/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml new file mode 100755 index 000000000..d7be01e9d --- /dev/null +++ b/ansible-adapter/ansible-adapter-bundle/src/main/resources/OSGI-INF/blueprint/ansible-adapter-blueprint.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + org.onap.ccsdk.sli.adaptors.ansible.AnsibleAdapter + + + + diff --git a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml index ef2757c0a..cc35a73c7 100644 --- a/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml +++ b/ansible-adapter/ansible-adapter-features/ccsdk-ansible-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-ansible-adapter - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: ansible-adapter:: ${project.artifactId} @@ -28,7 +28,6 @@ ${ccsdk.sli.core.version} xml features - provided diff --git a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml index 415597f99..0d6fa20f1 100755 --- a/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml +++ b/ansible-adapter/ansible-adapter-features/features-ansible-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-ansible-adapter - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} diff --git a/ansible-adapter/ansible-adapter-features/pom.xml b/ansible-adapter/ansible-adapter-features/pom.xml index 705bd09b0..6863e06be 100644 --- a/ansible-adapter/ansible-adapter-features/pom.xml +++ b/ansible-adapter/ansible-adapter-features/pom.xml @@ -16,12 +16,12 @@ odlparent-lite org.onap.ccsdk.parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adapter-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} pom diff --git a/ansible-adapter/ansible-adapter-installer/pom.xml b/ansible-adapter/ansible-adapter-installer/pom.xml index 263480b04..f2ab5bd49 100644 --- a/ansible-adapter/ansible-adapter-installer/pom.xml +++ b/ansible-adapter/ansible-adapter-installer/pom.xml @@ -27,12 +27,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adapter-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: ansible-adapter :: ${project.artifactId} pom diff --git a/ansible-adapter/pom.xml b/ansible-adapter/pom.xml index 02804a982..d09afdd97 100644 --- a/ansible-adapter/pom.xml +++ b/ansible-adapter/pom.xml @@ -27,13 +27,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ansible-adaptor - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: ansible-adapter Abstractions to interact with Ansible server via REST pom diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 0c3c4a287..f2528003a 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.sli.adaptors sli-adaptors-artifacts - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: sli-adaptors-artifacts @@ -17,7 +17,7 @@ org.onap.ccsdk.parent parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT @@ -71,13 +71,6 @@ xml feature - - org.onap.ccsdk.sli.adaptors - ccsdk-base-http - ${project.version} - xml - feature - org.onap.ccsdk.sli.adaptors aai-service-provider @@ -148,16 +141,6 @@ sql-resource-installer ${project.version} - - org.onap.ccsdk.sli.adaptors - base-http-provider - ${project.version} - - - org.onap.ccsdk.sli.adaptors - base-http-installer - ${project.version} - diff --git a/base/http/features/ccsdk-base-http/pom.xml b/base/http/features/ccsdk-base-http/pom.xml index 38181b683..c417382a4 100644 --- a/base/http/features/ccsdk-base-http/pom.xml +++ b/base/http/features/ccsdk-base-http/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/base/http/features/features-base-http/pom.xml b/base/http/features/features-base-http/pom.xml index 3b7766fd9..4b51ccccc 100644 --- a/base/http/features/features-base-http/pom.xml +++ b/base/http/features/features-base-http/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/base/http/features/pom.xml b/base/http/features/pom.xml index 960a71952..6e3cea56b 100644 --- a/base/http/features/pom.xml +++ b/base/http/features/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/base/http/installer/pom.xml b/base/http/installer/pom.xml index 4ba0614e1..443d8c4b6 100644 --- a/base/http/installer/pom.xml +++ b/base/http/installer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/base/http/pom.xml b/base/http/pom.xml index 65571050a..e556b94c6 100644 --- a/base/http/pom.xml +++ b/base/http/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/base/http/provider/pom.xml b/base/http/provider/pom.xml index 083a7fc7f..17ff73984 100644 --- a/base/http/provider/pom.xml +++ b/base/http/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/base/pom.xml b/base/pom.xml index 12a2f779c..f46dda7c5 100644 --- a/base/pom.xml +++ b/base/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT diff --git a/features/ccsdk-sli-adaptors-all/pom.xml b/features/ccsdk-sli-adaptors-all/pom.xml index 47a431464..e48b58e46 100644 --- a/features/ccsdk-sli-adaptors-all/pom.xml +++ b/features/ccsdk-sli-adaptors-all/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-sli-adaptors-all - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: features :: ${project.artifactId} @@ -80,12 +80,5 @@ xml features - - ${project.groupId} - ccsdk-base-http - ${project.version} - xml - features - diff --git a/features/features-sli-adaptors/pom.xml b/features/features-sli-adaptors/pom.xml index ed6835793..bbdbb6ee1 100644 --- a/features/features-sli-adaptors/pom.xml +++ b/features/features-sli-adaptors/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-sli-adaptors - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/installer/pom.xml b/features/installer/pom.xml index ffb577af1..76643efda 100755 --- a/features/installer/pom.xml +++ b/features/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sliadaptors-features-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: features :: ${project.artifactId} diff --git a/features/pom.xml b/features/pom.xml index 3677957b7..73ad702dd 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sliadaptors-feature-aggregator - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: features diff --git a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml index cbaee2570..cb73db08e 100644 --- a/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml +++ b/mdsal-resource/features/ccsdk-mdsal-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-mdsal-resource - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} @@ -29,8 +29,8 @@ ${ccsdk.sli.core.version} xml features - provided + ${project.groupId} mdsal-resource-provider diff --git a/mdsal-resource/features/features-mdsal-resource/pom.xml b/mdsal-resource/features/features-mdsal-resource/pom.xml index c99fe813f..7314197cb 100755 --- a/mdsal-resource/features/features-mdsal-resource/pom.xml +++ b/mdsal-resource/features/features-mdsal-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-mdsal-resource - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/features/pom.xml b/mdsal-resource/features/pom.xml index cdc1304cf..c597abd5c 100755 --- a/mdsal-resource/features/pom.xml +++ b/mdsal-resource/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/installer/pom.xml b/mdsal-resource/installer/pom.xml index 3fa53e1ce..649b66104 100755 --- a/mdsal-resource/installer/pom.xml +++ b/mdsal-resource/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/pom.xml b/mdsal-resource/pom.xml index accb8cb3d..364850f79 100755 --- a/mdsal-resource/pom.xml +++ b/mdsal-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: mdsal-resource diff --git a/mdsal-resource/provider/pom.xml b/mdsal-resource/provider/pom.xml index 2c69e4aa7..91534cb39 100755 --- a/mdsal-resource/provider/pom.xml +++ b/mdsal-resource/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors mdsal-resource-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-sli-adaptors :: mdsal-resource :: ${project.artifactId} diff --git a/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml b/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml new file mode 100755 index 000000000..9c691263c --- /dev/null +++ b/mdsal-resource/provider/src/main/resources/OSGI-INF/blueprint/mdsal-resource-blueprint.xml @@ -0,0 +1,49 @@ + + + + + + + + + + + + + + + + + + + org.onap.ccsdk.sli.adaptors.resource.mdsal.ConfigResource + + + + + + org.onap.ccsdk.sli.adaptors.resource.mdsal.OperationalResource + + + diff --git a/message-router/consumer/api/pom.xml b/message-router/consumer/api/pom.xml index 2b55169b3..43c314811 100755 --- a/message-router/consumer/api/pom.xml +++ b/message-router/consumer/api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter consumer.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT consumer.api diff --git a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml index f3fc352c4..f6dda2240 100755 --- a/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml +++ b/message-router/consumer/features/ccsdk-messagerouter-consumer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter ccsdk-messagerouter-consumer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature diff --git a/message-router/consumer/features/features-messagerouter-consumer/pom.xml b/message-router/consumer/features/features-messagerouter-consumer/pom.xml index a1e12a4b8..dac4461a9 100755 --- a/message-router/consumer/features/features-messagerouter-consumer/pom.xml +++ b/message-router/consumer/features/features-messagerouter-consumer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter features-messagerouter-consumer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId} diff --git a/message-router/consumer/features/pom.xml b/message-router/consumer/features/pom.xml index 2651a5013..54193f953 100755 --- a/message-router/consumer/features/pom.xml +++ b/message-router/consumer/features/pom.xml @@ -16,12 +16,12 @@ odlparent-lite org.onap.ccsdk.parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter consumer.features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId} pom diff --git a/message-router/consumer/installer/pom.xml b/message-router/consumer/installer/pom.xml index 1e6cc380a..304b639de 100755 --- a/message-router/consumer/installer/pom.xml +++ b/message-router/consumer/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.sli.adaptors.messagerouter consumer.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter consumer.installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom diff --git a/message-router/consumer/pom.xml b/message-router/consumer/pom.xml index 6476c407a..585b378c9 100755 --- a/message-router/consumer/pom.xml +++ b/message-router/consumer/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter messagerouter-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT consumer.aggregate diff --git a/message-router/consumer/provider/pom.xml b/message-router/consumer/provider/pom.xml index 3b1373edf..bc107db07 100755 --- a/message-router/consumer/provider/pom.xml +++ b/message-router/consumer/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter consumer.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT consumer.provider diff --git a/message-router/pom.xml b/message-router/pom.xml index 1e0590247..9f5c88cb7 100755 --- a/message-router/pom.xml +++ b/message-router/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter messagerouter-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom diff --git a/message-router/publisher/api/pom.xml b/message-router/publisher/api/pom.xml index 1bdc3a269..7a48fb4f8 100755 --- a/message-router/publisher/api/pom.xml +++ b/message-router/publisher/api/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT publisher.api diff --git a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml index 81423b45b..0acfb5e21 100755 --- a/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml +++ b/message-router/publisher/features/ccsdk-messagerouter-publisher/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter ccsdk-messagerouter-publisher - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature diff --git a/message-router/publisher/features/features-messagerouter-publisher/pom.xml b/message-router/publisher/features/features-messagerouter-publisher/pom.xml index 3460d8a88..2fc8c1450 100755 --- a/message-router/publisher/features/features-messagerouter-publisher/pom.xml +++ b/message-router/publisher/features/features-messagerouter-publisher/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter features-messagerouter-publisher - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId} diff --git a/message-router/publisher/features/pom.xml b/message-router/publisher/features/pom.xml index bf7d8b2f6..1c0825e75 100644 --- a/message-router/publisher/features/pom.xml +++ b/message-router/publisher/features/pom.xml @@ -16,12 +16,12 @@ odlparent-lite org.onap.ccsdk.parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter publisher.features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: messagerouter :: ${project.artifactId} pom diff --git a/message-router/publisher/installer/pom.xml b/message-router/publisher/installer/pom.xml index de3b51250..e34a66555 100644 --- a/message-router/publisher/installer/pom.xml +++ b/message-router/publisher/installer/pom.xml @@ -5,12 +5,12 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT org.onap.ccsdk.sli.adaptors.messagerouter publisher.installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom diff --git a/message-router/publisher/pom.xml b/message-router/publisher/pom.xml index 989254d0b..f7232fb50 100755 --- a/message-router/publisher/pom.xml +++ b/message-router/publisher/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter messagerouter-root - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT publisher.aggregate diff --git a/message-router/publisher/provider/pom.xml b/message-router/publisher/provider/pom.xml index 347e6a455..2ecbfd1ad 100755 --- a/message-router/publisher/provider/pom.xml +++ b/message-router/publisher/provider/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT publisher.provider diff --git a/message-router/publisher/sample.client/pom.xml b/message-router/publisher/sample.client/pom.xml index d7ddce522..81fbebadb 100755 --- a/message-router/publisher/sample.client/pom.xml +++ b/message-router/publisher/sample.client/pom.xml @@ -5,7 +5,7 @@ org.onap.ccsdk.sli.adaptors.messagerouter publisher.aggregate - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT sample.client diff --git a/netbox-client/features/ccsdk-netbox-client/pom.xml b/netbox-client/features/ccsdk-netbox-client/pom.xml index c9d105b9e..eee799198 100644 --- a/netbox-client/features/ccsdk-netbox-client/pom.xml +++ b/netbox-client/features/ccsdk-netbox-client/pom.xml @@ -20,38 +20,47 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-netbox-client - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} + ${project.version} + + + org.opendaylight.controller + odl-mdsal-broker + xml + features + + org.onap.ccsdk.sli.core ccsdk-sli ${ccsdk.sli.core.version} xml features - provided + org.onap.ccsdk.sli.core ccsdk-dblib ${ccsdk.sli.core.version} xml features - provided + ${project.groupId} netbox-client-provider diff --git a/netbox-client/features/features-netbox-client/pom.xml b/netbox-client/features/features-netbox-client/pom.xml index 556a8579f..b1195eba2 100755 --- a/netbox-client/features/features-netbox-client/pom.xml +++ b/netbox-client/features/features-netbox-client/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-netbox-client - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/features/pom.xml b/netbox-client/features/pom.xml index b3740b3c3..3556a4c5e 100755 --- a/netbox-client/features/pom.xml +++ b/netbox-client/features/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/installer/pom.xml b/netbox-client/installer/pom.xml index aab9b076a..ac85879b9 100755 --- a/netbox-client/installer/pom.xml +++ b/netbox-client/installer/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client :: ${project.artifactId} diff --git a/netbox-client/pom.xml b/netbox-client/pom.xml index c22560a0d..c1b4e3e71 100644 --- a/netbox-client/pom.xml +++ b/netbox-client/pom.xml @@ -20,13 +20,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: netbox-client diff --git a/netbox-client/provider/pom.xml b/netbox-client/provider/pom.xml index c6237d38b..cbc698b6a 100644 --- a/netbox-client/provider/pom.xml +++ b/netbox-client/provider/pom.xml @@ -19,13 +19,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors netbox-client-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle 4.0.0 @@ -71,13 +71,13 @@ org.onap.ccsdk.sli.core sli-common - provided + compile org.onap.ccsdk.sli.core sliPluginUtils-provider ${project.version} - provided + compile org.osgi @@ -101,13 +101,12 @@ com.github.tomakehurst wiremock + 2.23.2 test - org.eclipse.jetty jetty-server - 9.3.1.v20150714 test diff --git a/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml b/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml new file mode 100644 index 000000000..b667dcba5 --- /dev/null +++ b/netbox-client/provider/src/main/resources/OSGI-INF/blueprint/netbox-client.xml @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + diff --git a/pom.xml b/pom.xml index 61c05c14f..26bf386e4 100755 --- a/pom.xml +++ b/pom.xml @@ -4,7 +4,7 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT 4.0.0 @@ -103,15 +103,14 @@ mdsal-resource resource-assignment sql-resource - base - message-router features artifacts + message-router ONAP - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT diff --git a/resource-assignment/features/ccsdk-resource-assignment/pom.xml b/resource-assignment/features/ccsdk-resource-assignment/pom.xml index 61fdf4459..d89cda04a 100644 --- a/resource-assignment/features/ccsdk-resource-assignment/pom.xml +++ b/resource-assignment/features/ccsdk-resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-resource-assignment - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/features/features-resource-assignment/pom.xml b/resource-assignment/features/features-resource-assignment/pom.xml index 2a852f2cd..09e7a0626 100755 --- a/resource-assignment/features/features-resource-assignment/pom.xml +++ b/resource-assignment/features/features-resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-resource-assignment - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/features/pom.xml b/resource-assignment/features/pom.xml index 6c1dcda86..d7e77bab3 100755 --- a/resource-assignment/features/pom.xml +++ b/resource-assignment/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/installer/pom.xml b/resource-assignment/installer/pom.xml index 5501cf69d..900ad9f01 100755 --- a/resource-assignment/installer/pom.xml +++ b/resource-assignment/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/pom.xml b/resource-assignment/pom.xml index 425af0283..b17b31aa6 100755 --- a/resource-assignment/pom.xml +++ b/resource-assignment/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: resource-assignment diff --git a/resource-assignment/provider/pom.xml b/resource-assignment/provider/pom.xml index bb498e64e..a73949efc 100755 --- a/resource-assignment/provider/pom.xml +++ b/resource-assignment/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors resource-assignment-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-sli-adaptors :: resource-assignment :: ${project.artifactId} diff --git a/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml new file mode 100755 index 000000000..77c316d2a --- /dev/null +++ b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment-blueprint.xml @@ -0,0 +1,33 @@ + + + + + + + + + + + + diff --git a/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml new file mode 100755 index 000000000..7fcc70c54 --- /dev/null +++ b/resource-assignment/provider/src/main/resources/OSGI-INF/blueprint/resource-assignment.xml @@ -0,0 +1,129 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/saltstack-adapter/pom.xml b/saltstack-adapter/pom.xml index e9fbc14d4..1d618319f 100644 --- a/saltstack-adapter/pom.xml +++ b/saltstack-adapter/pom.xml @@ -27,13 +27,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adaptor - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: saltstack-adapter Abstractions to interact with Saltstack server via REST diff --git a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml index 28ddc6dcb..3d9ec2079 100644 --- a/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/ccsdk-saltstack-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-saltstack-adapter - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: saltstack-adapter:: ${project.artifactId} diff --git a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml index 2f6ad9f09..a3e21d9d3 100755 --- a/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/features-saltstack-adapter/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-saltstack-adapter - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} diff --git a/saltstack-adapter/saltstack-adapter-features/pom.xml b/saltstack-adapter/saltstack-adapter-features/pom.xml index c7e1d42d1..57875e823 100644 --- a/saltstack-adapter/saltstack-adapter-features/pom.xml +++ b/saltstack-adapter/saltstack-adapter-features/pom.xml @@ -15,12 +15,12 @@ odlparent-lite org.onap.ccsdk.parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} diff --git a/saltstack-adapter/saltstack-adapter-installer/pom.xml b/saltstack-adapter/saltstack-adapter-installer/pom.xml index d3643517a..639e308aa 100644 --- a/saltstack-adapter/saltstack-adapter-installer/pom.xml +++ b/saltstack-adapter/saltstack-adapter-installer/pom.xml @@ -27,12 +27,12 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} pom diff --git a/saltstack-adapter/saltstack-adapter-provider/pom.xml b/saltstack-adapter/saltstack-adapter-provider/pom.xml index d863ca08f..fb875e471 100644 --- a/saltstack-adapter/saltstack-adapter-provider/pom.xml +++ b/saltstack-adapter/saltstack-adapter-provider/pom.xml @@ -16,13 +16,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors saltstack-adapter-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-sli-adaptors :: saltstack-adapter :: ${project.artifactId} @@ -66,6 +66,10 @@ org.slf4j slf4j-api + + org.slf4j + jcl-over-slf4j + @@ -98,13 +102,11 @@ org.onap.ccsdk.sli.core sli-common - provided - + org.onap.ccsdk.sli.core sli-provider - provided diff --git a/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml new file mode 100755 index 000000000..e360f8184 --- /dev/null +++ b/saltstack-adapter/saltstack-adapter-provider/src/main/resources/OSGI-INF/blueprint/saltstack-adapter-blueprint.xml @@ -0,0 +1,42 @@ + + + + + + + + + + + + + + org.onap.ccsdk.sli.adaptors.saltstack.SaltstackAdapter + + + + + diff --git a/sql-resource/features/ccsdk-sql-resource/pom.xml b/sql-resource/features/ccsdk-sql-resource/pom.xml index 69defc4e7..4ca6c9fc4 100644 --- a/sql-resource/features/ccsdk-sql-resource/pom.xml +++ b/sql-resource/features/ccsdk-sql-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent single-feature-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors ccsdk-sql-resource - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/features/features-sql-resource/pom.xml b/sql-resource/features/features-sql-resource/pom.xml index c68504e86..75ee45d87 100755 --- a/sql-resource/features/features-sql-resource/pom.xml +++ b/sql-resource/features/features-sql-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent feature-repo-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors features-sql-resource - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT feature ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/features/pom.xml b/sql-resource/features/pom.xml index 48a896bef..e603e0a6f 100755 --- a/sql-resource/features/pom.xml +++ b/sql-resource/features/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-features - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/installer/pom.xml b/sql-resource/installer/pom.xml index 071f084c7..7f157d0fd 100755 --- a/sql-resource/installer/pom.xml +++ b/sql-resource/installer/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-installer - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/pom.xml b/sql-resource/pom.xml index 8304259a6..645576e18 100755 --- a/sql-resource/pom.xml +++ b/sql-resource/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent odlparent-lite - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT pom ccsdk-sli-adaptors :: sql-resource diff --git a/sql-resource/provider/pom.xml b/sql-resource/provider/pom.xml index 5197a1d6a..d49d01877 100755 --- a/sql-resource/provider/pom.xml +++ b/sql-resource/provider/pom.xml @@ -5,13 +5,13 @@ org.onap.ccsdk.parent binding-parent - 1.3.3-SNAPSHOT + 1.4.0-SNAPSHOT org.onap.ccsdk.sli.adaptors sql-resource-provider - 0.5.2-SNAPSHOT + 0.6.0-SNAPSHOT bundle ccsdk-sli-adaptors :: sql-resource :: ${project.artifactId} diff --git a/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml b/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml new file mode 100755 index 000000000..5e8d33946 --- /dev/null +++ b/sql-resource/provider/src/main/resources/OSGI-INF/blueprint/sql-resource-blueprint.xml @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + org.onap.ccsdk.sli.adaptors.resource.sql.SqlResource + + + + diff --git a/version.properties b/version.properties index 74fd99918..54c44bc24 100644 --- a/version.properties +++ b/version.properties @@ -4,8 +4,8 @@ # because they are used in Jenkins, whose plug-in doesn't support release_name=0 -sprint_number=5 -feature_revision=2 +sprint_number=6 +feature_revision=0 base_version=${release_name}.${sprint_number}.${feature_revision} -- cgit 1.2.3-korg