Version Up & Removed unncessary properties 40/3840/1
authorLathish <lathishbabu.ganesan@est.tech>
Mon, 25 May 2020 16:56:04 +0000 (17:56 +0100)
committerLathish <lathishbabu.ganesan@est.tech>
Mon, 25 May 2020 17:13:27 +0000 (18:13 +0100)
Issue-ID: NONRTRIC-225
Change-Id: I8ee3a2db7df3c9ad55b1d26aa5965e3ba67ba510
Signed-off-by: Lathish <lathishbabu.ganesan@est.tech>
22 files changed:
sdnc-a1-controller/northbound/features/features-sdnc-a1-northbound/pom.xml
sdnc-a1-controller/northbound/features/installer/pom.xml
sdnc-a1-controller/northbound/features/pom.xml
sdnc-a1-controller/northbound/features/sdnc-a1-northbound-all/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/features/features-nonrt-ric-api/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/features/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/features/sdnc-nonrt-ric-api/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/installer/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/model/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/pom.xml
sdnc-a1-controller/northbound/nonrt-ric-api/provider/pom.xml
sdnc-a1-controller/northbound/pom.xml
sdnc-a1-controller/oam/installation/pom.xml
sdnc-a1-controller/oam/installation/sdnc-a1/pom.xml
sdnc-a1-controller/oam/installation/src/main/properties/aaiclient.properties [deleted file]
sdnc-a1-controller/oam/installation/src/main/properties/blueprints-processor-adaptor.properties [deleted file]
sdnc-a1-controller/oam/installation/src/main/yaml/docker-compose.yml
sdnc-a1-controller/oam/platform-logic/installer/pom.xml
sdnc-a1-controller/oam/platform-logic/pom.xml
sdnc-a1-controller/oam/platform-logic/setup/pom.xml
sdnc-a1-controller/oam/pom.xml
sdnc-a1-controller/pom.xml

index e16ed98..3929062 100644 (file)
@@ -19,7 +19,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>features-sdnc-a1-northbound</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>
index c8a35b0..238fad3 100755 (executable)
@@ -11,7 +11,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-a1-northbound-features-installer</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>
index b68d283..6e6c676 100755 (executable)
@@ -11,7 +11,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-northbound-feature-aggregator</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: features</name>
index 265f576..2ab2bb8 100644 (file)
@@ -19,7 +19,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-a1-northbound-all</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>sdnc-a1-northbound :: features :: ${project.artifactId}</name>
index 6935b62..74867cc 100644 (file)
@@ -30,7 +30,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>features-nonrt-ric-api</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>feature</packaging>
 
        <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
index 59a108f..6547d33 100644 (file)
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-features</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
index 4da7a69..4f4d223 100644 (file)
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>sdnc-nonrt-ric-api</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
     <packaging>feature</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
index e17a79b..aaa3517 100755 (executable)
@@ -30,7 +30,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>nonrt-ric-api-installer</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
index 1a686a3..df2a5b0 100644 (file)
@@ -38,7 +38,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-model</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
index d0bacb0..fbac7a5 100644 (file)
@@ -32,7 +32,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>nonrt-ric-api</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-northbound :: nonrt-ric-api</name>
index e37d656..4b4e081 100644 (file)
@@ -40,7 +40,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
     <artifactId>nonrt-ric-api-provider</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>sdnc-a1-northbound :: nonrt-ric-api :: ${project.artifactId}</name>
index e6727c3..fed4727 100644 (file)
@@ -38,7 +38,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.northbound</groupId>
        <artifactId>sdnc-a1-northbound</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <properties>
index 1a2cc09..7ebda23 100644 (file)
@@ -30,7 +30,7 @@
     <packaging>pom</packaging>
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>installation</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
 
     <name>sdnc-a1-oam :: installation</name>
     <description>Installs SDN-C on local file system</description>
index 27c89f7..9e1731a 100644 (file)
     <packaging>pom</packaging>
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>installation-sdnc-a1</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
 
     <name>sdnc-a1-oam :: installation :: ${project.artifactId}</name>
     <description>Creates SDN Controller Docker container</description>
 
     <properties>
-        <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
-       <standalone.image.version>1.7.4-SNAPSHOT</standalone.image.version>
-        <sdnc.project.version>${project.version}</sdnc.project.version>
-        <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
-        <sdnc.northbound.version>1.7.3-SNAPSHOT</sdnc.northbound.version>
-        <ccsdk.docker.version>0.7.0</ccsdk.docker.version>
-        <docker.push.phase>deploy</docker.push.phase>
+     <standalone.image.name>o-ran-sc/nonrtric-a1-controller</standalone.image.name>
+     <standalone.image.version>1.7.5-SNAPSHOT</standalone.image.version>
+     <sdnc.project.version>${project.version}</sdnc.project.version>
+     <sdnc.build.timestamp>${maven.build.timestamp}</sdnc.build.timestamp>
+     <sdnc.northbound.version>1.7.5-SNAPSHOT</sdnc.northbound.version>
+     <ccsdk.docker.version>0.7.0</ccsdk.docker.version>
+     <docker.push.phase>deploy</docker.push.phase>
     </properties>
 
     <dependencies>
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 (executable)
index 6568383..0000000
+++ /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 (file)
index a3dcf67..0000000
+++ /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/
index 7051351..c7244f7 100644 (file)
@@ -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
index 99df343..fb55685 100644 (file)
@@ -30,7 +30,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
        <artifactId>platform-logic-installer</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>
index 8589699..f796613 100644 (file)
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
     <artifactId>platform-logic</artifactId>
-    <version>1.7.3-SNAPSHOT</version>
+    <version>1.7.5-SNAPSHOT</version>
     <packaging>pom</packaging>
 
     <name>sdnc-a1-oam :: platform-logic</name>
index 8c5f5cd..6f6cc71 100644 (file)
@@ -30,7 +30,7 @@
 
     <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
        <artifactId>platform-logic-setup</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
     <name>sdnc-a1-oam :: platform-logic :: ${project.artifactId}</name>
index 14c7ce6..eb8a720 100755 (executable)
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1.oam</groupId>
        <artifactId>sdnc-a1-oam</artifactId>
-       <version>1.7.3-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1-oam</name>
        <description>The SDN-C OAM component contains the components needed to operate, administer and maintain the SDN-C platform.</description>
-       <url>https://wiki.onap.org</url>
-       <organization>
-               <name>AT&amp;T</name>
-       </organization>
 
        <modules>
                <module>platform-logic</module>
index 96ca1a5..daca84c 100644 (file)
@@ -25,7 +25,7 @@
 
        <groupId>org.o-ran-sc.nonrtric.sdnc-a1</groupId>
        <artifactId>sdnc-a1</artifactId>
-       <version>1.7.4-SNAPSHOT</version>
+       <version>1.7.5-SNAPSHOT</version>
        <packaging>pom</packaging>
 
        <name>sdnc-a1</name>