From dc3b33706bede001edbbff7aca61464d89d500ab Mon Sep 17 00:00:00 2001 From: Lathish Date: Mon, 25 May 2020 17:56:04 +0100 Subject: [PATCH] Version Up & Removed unncessary properties Issue-ID: NONRTRIC-225 Change-Id: I8ee3a2db7df3c9ad55b1d26aa5965e3ba67ba510 Signed-off-by: Lathish --- .../features/features-sdnc-a1-northbound/pom.xml | 2 +- .../northbound/features/installer/pom.xml | 2 +- sdnc-a1-controller/northbound/features/pom.xml | 2 +- .../features/sdnc-a1-northbound-all/pom.xml | 2 +- .../features/features-nonrt-ric-api/pom.xml | 2 +- .../northbound/nonrt-ric-api/features/pom.xml | 2 +- .../features/sdnc-nonrt-ric-api/pom.xml | 2 +- .../northbound/nonrt-ric-api/installer/pom.xml | 2 +- .../northbound/nonrt-ric-api/model/pom.xml | 2 +- .../northbound/nonrt-ric-api/pom.xml | 2 +- .../northbound/nonrt-ric-api/provider/pom.xml | 2 +- sdnc-a1-controller/northbound/pom.xml | 2 +- sdnc-a1-controller/oam/installation/pom.xml | 2 +- .../oam/installation/sdnc-a1/pom.xml | 16 ++--- .../src/main/properties/aaiclient.properties | 82 ---------------------- .../blueprints-processor-adaptor.properties | 35 --------- .../installation/src/main/yaml/docker-compose.yml | 2 +- .../oam/platform-logic/installer/pom.xml | 2 +- sdnc-a1-controller/oam/platform-logic/pom.xml | 2 +- .../oam/platform-logic/setup/pom.xml | 2 +- sdnc-a1-controller/oam/pom.xml | 6 +- sdnc-a1-controller/pom.xml | 2 +- 22 files changed, 27 insertions(+), 148 deletions(-) delete mode 100755 sdnc-a1-controller/oam/installation/src/main/properties/aaiclient.properties delete mode 100644 sdnc-a1-controller/oam/installation/src/main/properties/blueprints-processor-adaptor.properties diff --git a/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml index e16ed98d..39290622 100644 --- a/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml +++ b/sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml @@ -19,7 +19,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound features-sdnc-a1-northbound - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT feature sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/features/installer/pom.xml b/sdnc-a1-controller/northbound/features/installer/pom.xml index c8a35b08..238fad39 100755 --- a/sdnc-a1-controller/northbound/features/installer/pom.xml +++ b/sdnc-a1-controller/northbound/features/installer/pom.xml @@ -11,7 +11,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-a1-northbound-features-installer - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/features/pom.xml b/sdnc-a1-controller/northbound/features/pom.xml index b68d2836..6e6c676c 100755 --- a/sdnc-a1-controller/northbound/features/pom.xml +++ b/sdnc-a1-controller/northbound/features/pom.xml @@ -11,7 +11,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-northbound-feature-aggregator - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-northbound :: features diff --git a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml index 265f5769..2ab2bb84 100644 --- a/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml +++ b/sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml @@ -19,7 +19,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-a1-northbound-all - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT feature sdnc-a1-northbound :: features :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml index 6935b62a..74867ccc 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound features-nonrt-ric-api - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT feature sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml index 59a108fa..6547d330 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-features - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml index 4da7a697..4f4d2238 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-nonrt-ric-api - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT feature sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml index e17a79bc..aaa35172 100755 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-installer - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml index 1a686a3f..df2a5b0d 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml @@ -38,7 +38,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-model - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT bundle sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml index d0bacb0f..fbac7a5f 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml @@ -32,7 +32,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-northbound :: nonrt-ric-api diff --git a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml index e37d656f..4b4e081e 100644 --- a/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml +++ b/sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml @@ -40,7 +40,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound nonrt-ric-api-provider - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT bundle sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId} diff --git a/sdnc-a1-controller/northbound/pom.xml b/sdnc-a1-controller/northbound/pom.xml index e6727c32..fed4727e 100644 --- a/sdnc-a1-controller/northbound/pom.xml +++ b/sdnc-a1-controller/northbound/pom.xml @@ -38,7 +38,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.northbound sdnc-a1-northbound - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom diff --git a/sdnc-a1-controller/oam/installation/pom.xml b/sdnc-a1-controller/oam/installation/pom.xml index 1a2cc097..7ebda23d 100644 --- a/sdnc-a1-controller/oam/installation/pom.xml +++ b/sdnc-a1-controller/oam/installation/pom.xml @@ -30,7 +30,7 @@ pom org.o-ran-sc.nonrtric.sdnc-a1.oam installation - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT sdnc-a1-oam :: installation Installs SDN-C on local file system diff --git a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml index 27c89f74..9e1731ad 100644 --- a/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml +++ b/sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml @@ -30,19 +30,19 @@ pom org.o-ran-sc.nonrtric.sdnc-a1.oam installation-sdnc-a1 - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT sdnc-a1-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container - o-ran-sc/nonrtric-a1-controller - 1.7.4-SNAPSHOT - ${project.version} - ${maven.build.timestamp} - 1.7.3-SNAPSHOT - 0.7.0 - deploy + o-ran-sc/nonrtric-a1-controller + 1.7.5-SNAPSHOT + ${project.version} + ${maven.build.timestamp} + 1.7.5-SNAPSHOT + 0.7.0 + deploy diff --git a/sdnc-a1-controller/oam/installation/src/main/properties/aaiclient.properties b/sdnc-a1-controller/oam/installation/src/main/properties/aaiclient.properties deleted file mode 100755 index 65683836..00000000 --- a/sdnc-a1-controller/oam/installation/src/main/properties/aaiclient.properties +++ /dev/null @@ -1,82 +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========================================================= -### - -# -# Configuration file for A&AI Client -# - -# -# Certificate keystore and truststore -# -org.onap.ccsdk.sli.adaptors.aai.ssl.trust=/opt/onap/sdnc/data/stores/truststoreONAPall.jks -org.onap.ccsdk.sli.adaptors.aai.ssl.trust.psswd=changeit -org.onap.ccsdk.sli.adaptors.aai.host.certificate.ignore=true - -org.onap.ccsdk.sli.adaptors.aai.client.name=sdnc@sdnc.onap.org -org.onap.ccsdk.sli.adaptors.aai.client.psswd=demo123456! - -org.onap.ccsdk.sli.adaptors.aai.application=openECOMP -# -# Configuration file for A&AI Client -# -org.onap.ccsdk.sli.adaptors.aai.uri=https://aai.api.simpledemo.openecomp.org:8443 -connection.timeout=60000 -read.timeout=60000 - -# query -org.onap.ccsdk.sli.adaptors.aai.path.query=/aai/v13/search/sdn-zone-query -org.onap.ccsdk.sli.adaptors.aai.query.nodes=/aai/v13/search/nodes-query?search-node-type={node-type}&filter={entity-identifier}:EQUALS:{entity-name} -org.onap.ccsdk.sli.adaptors.aai.query.generic=/aai/v13/search/generic-query?key={identifier}:{value}&start-node-type={start-node-type}&include=complex&depth=3 - -# named query -org.onap.ccsdk.sli.adaptors.aai.query.named=/aai/search/named-query - -#update -org.onap.ccsdk.sli.adaptors.aai.update=/aai/v13/actions/update - -# UBB Notify -org.onap.ccsdk.sli.adaptors.aai.path.notify=/aai/v13/actions/notify -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.fqdn=<%= @ubbUri %>/restconf/config/L3SDN-API:services/layer3-service-list/{service-instance-id} -org.onap.ccsdk.sli.adaptors.aai.notify.selflink.avpn=<%= @ubbUri %>/restconf/config/L3AVPN-EVC-API:services/service-list/{service-instance-id}/service-data/avpn-logicalchannel-information - -# P-Interfaces -org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterfaces=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces -org.onap.ccsdk.sli.adaptors.aai.path.pserver.pinterface=/aai/v13/cloud-infrastructure/pservers/pserver/{hostname}/p-interfaces/p-interface/{interface-name} - -# VNF IMAGES -org.onap.ccsdk.sli.adaptors.aai.path.vnf.images=/aai/v13/service-design-and-creation/vnf-images -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image=/aai/v13/service-design-and-creation/vnf-images/vnf-image/{att-uuid} -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v13/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} - -# service instance -org.onap.ccsdk.sli.adaptors.aai.path.svcinst.query=/aai/v13/search/generic-query?key=service-instance.service-instance-id:{svc-instance-id}&start-node-type=service-instance&include=service-instance -org.onap.ccsdk.sli.adaptors.aai.path.service.instance=/aai/v13/business/customers/customer/{global-customer-id}/service-subscriptions/service-subscription/{service-type}/service-instances/service-instance/{service-instance-id} - -# VNF IMAGES QUERY -org.onap.ccsdk.sli.adaptors.aai.path.vnf.image.query=/aai/v13/service-design-and-creation/vnf-images/vnf-image?application={application_model}&application-vendor={application_vendor} - -# -# Formatting -# -org.onap.ccsdk.sli.adaptors.aai.param.format=filter=%s:%s -org.onap.ccsdk.sli.adaptors.aai.param.vnf_type=vnf-type -org.onap.ccsdk.sli.adaptors.aai.param.physical.location.id=physical-location-id -org.onap.ccsdk.sli.adaptors.aai.param.service.type=service-type diff --git a/sdnc-a1-controller/oam/installation/src/main/properties/blueprints-processor-adaptor.properties b/sdnc-a1-controller/oam/installation/src/main/properties/blueprints-processor-adaptor.properties deleted file mode 100644 index a3dcf674..00000000 --- a/sdnc-a1-controller/oam/installation/src/main/properties/blueprints-processor-adaptor.properties +++ /dev/null @@ -1,35 +0,0 @@ -### -# Copyright � 2017-2018 AT&T Intellectual Property. -# Modifications Copyright � 2018 IBM. -# -# 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. -### -# -# Configuration file for SDNC Controller Module -# - -org.onap.ccsdk.features.blueprints.adaptors.envtype=solo - -# Config Generator Microservices -org.onap.ccsdk.features.blueprints.adaptors.modelservice.type=generic -org.onap.ccsdk.features.blueprints.adaptors.modelservice.enable=true -org.onap.ccsdk.features.blueprints.adaptors.modelservice.url=http://controller-blueprints:8080/api/v1/ -org.onap.ccsdk.features.blueprints.adaptors.modelservice.user=ccsdkapps -org.onap.ccsdk.features.blueprints.adaptors.modelservice.passwd=ccsdkapps - -# Generic RESTCONF Adaptor -org.onap.ccsdk.features.blueprints.adaptors.restconf.type=generic -org.onap.ccsdk.features.blueprints.adaptors.restconf.enable=true -org.onap.ccsdk.features.blueprints.adaptors.restconf.user=admin -org.onap.ccsdk.features.blueprints.adaptors.restconf.passwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U -org.onap.ccsdk.features.blueprints.adaptors.restconf.url=http://sdnc:8282/restconf/ diff --git a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml index 70513515..c7244f7b 100644 --- a/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml +++ b/sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml @@ -38,7 +38,7 @@ services: max-file: "5" a1-controller: - image: o-ran-sc/nonrtric-a1-controller:1.7.4-SNAPSHOT + image: o-ran-sc/nonrtric-a1-controller:1.7.5-SNAPSHOT depends_on : - db container_name: a1-controller-container diff --git a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml index 99df343a..fb556859 100644 --- a/sdnc-a1-controller/oam/platform-logic/installer/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/installer/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic-installer - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-oam :: platform-logic :: ${project.artifactId} diff --git a/sdnc-a1-controller/oam/platform-logic/pom.xml b/sdnc-a1-controller/oam/platform-logic/pom.xml index 8589699f..f796613c 100644 --- a/sdnc-a1-controller/oam/platform-logic/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-oam :: platform-logic diff --git a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml index 8c5f5cd4..6f6cc715 100644 --- a/sdnc-a1-controller/oam/platform-logic/setup/pom.xml +++ b/sdnc-a1-controller/oam/platform-logic/setup/pom.xml @@ -30,7 +30,7 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam platform-logic-setup - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-oam :: platform-logic :: ${project.artifactId} diff --git a/sdnc-a1-controller/oam/pom.xml b/sdnc-a1-controller/oam/pom.xml index 14c7ce60..eb8a7202 100755 --- a/sdnc-a1-controller/oam/pom.xml +++ b/sdnc-a1-controller/oam/pom.xml @@ -29,15 +29,11 @@ org.o-ran-sc.nonrtric.sdnc-a1.oam sdnc-a1-oam - 1.7.3-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1-oam The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform. - https://wiki.onap.org - - AT&T - platform-logic diff --git a/sdnc-a1-controller/pom.xml b/sdnc-a1-controller/pom.xml index 96ca1a5d..daca84c3 100644 --- a/sdnc-a1-controller/pom.xml +++ b/sdnc-a1-controller/pom.xml @@ -25,7 +25,7 @@ org.o-ran-sc.nonrtric.sdnc-a1 sdnc-a1 - 1.7.4-SNAPSHOT + 1.7.5-SNAPSHOT pom sdnc-a1 -- 2.16.6