From: Dan Timoney Date: Fri, 5 Oct 2018 12:47:40 +0000 (+0000) Subject: Merge "Refactored SOTN and SDWAN DG" X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=716c00a9d2248385ebc620ead3104681b788d9f0;hp=d3d3ce137625a244accf736da3a8f6736b44300e;p=sdnc%2Foam.git Merge "Refactored SOTN and SDWAN DG" --- diff --git a/SdncReports/SdncReportsApi/pom.xml b/SdncReports/SdncReportsApi/pom.xml index f5320780..b6cb9483 100644 --- a/SdncReports/SdncReportsApi/pom.xml +++ b/SdncReports/SdncReportsApi/pom.xml @@ -5,12 +5,12 @@ jar SdncReportsApi org.onap.sdnc.oam - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: SdncReports :: SdncReportsApi org.onap.sdnc.oam SdncReports - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT diff --git a/SdncReports/SdncReportsDao/pom.xml b/SdncReports/SdncReportsDao/pom.xml index afcce957..2278f600 100644 --- a/SdncReports/SdncReportsDao/pom.xml +++ b/SdncReports/SdncReportsDao/pom.xml @@ -4,7 +4,7 @@ 4.0.0 org.onap.sdnc.oam SdncReportsDao - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT jar sdnc-oam :: SdncReports :: SdncReportsDao @@ -12,7 +12,7 @@ org.onap.sdnc.oam SdncReports - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT diff --git a/SdncReports/pom.xml b/SdncReports/pom.xml index 96fe28c3..d34e03a4 100644 --- a/SdncReports/pom.xml +++ b/SdncReports/pom.xml @@ -6,7 +6,7 @@ org.onap.sdnc.oam SdncReports - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: SdncReports diff --git a/admportal/pom.xml b/admportal/pom.xml index fa05074b..2342a41b 100644 --- a/admportal/pom.xml +++ b/admportal/pom.xml @@ -12,7 +12,7 @@ org.onap.sdnc.oam admportal - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: admportal diff --git a/configbackuprestore/getBackupVnfDetailService/pom.xml b/configbackuprestore/getBackupVnfDetailService/pom.xml index 08b805d3..04055b90 100644 --- a/configbackuprestore/getBackupVnfDetailService/pom.xml +++ b/configbackuprestore/getBackupVnfDetailService/pom.xml @@ -7,11 +7,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: vnfbackup :: getBackupVnfDetailService http://maven.apache.org diff --git a/configbackuprestore/pom.xml b/configbackuprestore/pom.xml index 7488c1c6..76452e28 100644 --- a/configbackuprestore/pom.xml +++ b/configbackuprestore/pom.xml @@ -7,7 +7,7 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: vnfbackup pom diff --git a/configbackuprestore/vnfconfigbackupservice/pom.xml b/configbackuprestore/vnfconfigbackupservice/pom.xml index d931ab03..e96b5a0a 100644 --- a/configbackuprestore/vnfconfigbackupservice/pom.xml +++ b/configbackuprestore/vnfconfigbackupservice/pom.xml @@ -8,12 +8,12 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigbackupservice - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigbackupservice http://maven.apache.org @@ -22,13 +22,13 @@ org.onap.sdnc.oam.vnfbackup getBackupVnfDetailService - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT diff --git a/configbackuprestore/vnfconfigreportsservice/pom.xml b/configbackuprestore/vnfconfigreportsservice/pom.xml index 49d4d325..8182b8a4 100644 --- a/configbackuprestore/vnfconfigreportsservice/pom.xml +++ b/configbackuprestore/vnfconfigreportsservice/pom.xml @@ -7,11 +7,11 @@ org.onap.sdnc.oam.vnfbackup configbackuprestore - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT org.onap.sdnc.oam.vnfbackup vnfconfigreportsservice - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: vnfbackup :: vnfconfigreportservice http://maven.apache.org diff --git a/dgbuilder/pom.xml b/dgbuilder/pom.xml index d3751082..c3af9476 100644 --- a/dgbuilder/pom.xml +++ b/dgbuilder/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam dgbuilder - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: dgbuilder diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index c85ae6fc..c6ac9fd1 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -12,7 +12,7 @@ pom org.onap.sdnc.oam installation-admportal - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates admportal Docker container diff --git a/installation/ansible-server/pom.xml b/installation/ansible-server/pom.xml index 0fd0b771..263938c3 100644 --- a/installation/ansible-server/pom.xml +++ b/installation/ansible-server/pom.xml @@ -11,7 +11,7 @@ pom org.onap.sdnc.oam installation-ansible-server - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ansible-server Docker container diff --git a/installation/dmaap-listener/pom.xml b/installation/dmaap-listener/pom.xml index 61d64538..8a7f55d5 100644 --- a/installation/dmaap-listener/pom.xml +++ b/installation/dmaap-listener/pom.xml @@ -11,7 +11,7 @@ pom org.onap.sdnc.oam installation-dmaap-listener - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates dmaap-listener Docker container diff --git a/installation/pom.xml b/installation/pom.xml index f02b9ca7..cdcfeea1 100644 --- a/installation/pom.xml +++ b/installation/pom.xml @@ -12,7 +12,7 @@ pom org.onap.sdnc.oam installation - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: installation Installs SDN-C on local file system diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 764725c5..28e26b30 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -12,7 +12,7 @@ pom org.onap.sdnc.oam installation-sdnc - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates SDN Controller Docker container @@ -20,7 +20,7 @@ onap/sdnc-image ${project.version} - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT ${https_proxy} deploy true diff --git a/installation/src/main/properties/blueprints-processor-adaptor.properties b/installation/src/main/properties/blueprints-processor-adaptor.properties new file mode 100644 index 00000000..a3dcf674 --- /dev/null +++ b/installation/src/main/properties/blueprints-processor-adaptor.properties @@ -0,0 +1,35 @@ +### +# 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/installation/ueb-listener/pom.xml b/installation/ueb-listener/pom.xml index 66fa812a..2c1ad719 100644 --- a/installation/ueb-listener/pom.xml +++ b/installation/ueb-listener/pom.xml @@ -11,7 +11,7 @@ pom org.onap.sdnc.oam installation-ueb-listener - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT sdnc-oam :: installation :: ${project.artifactId} Creates ueb-listener Docker container diff --git a/platform-logic/datachange/pom.xml b/platform-logic/datachange/pom.xml index 4209dc77..1581756d 100644 --- a/platform-logic/datachange/pom.xml +++ b/platform-logic/datachange/pom.xml @@ -12,7 +12,7 @@ org.onap.sdnc.oam platform-logic-datachange - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/generic-resource-api/pom.xml b/platform-logic/generic-resource-api/pom.xml index e5767dff..7ac1d80a 100644 --- a/platform-logic/generic-resource-api/pom.xml +++ b/platform-logic/generic-resource-api/pom.xml @@ -12,7 +12,7 @@ org.onap.sdnc.oam platform-logic-generic-resource-api - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/installer/pom.xml b/platform-logic/installer/pom.xml index 32408926..1b90ecef 100644 --- a/platform-logic/installer/pom.xml +++ b/platform-logic/installer/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam platform-logic-installer - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/lcm/pom.xml b/platform-logic/lcm/pom.xml index 4e2e90b9..b98fdec7 100644 --- a/platform-logic/lcm/pom.xml +++ b/platform-logic/lcm/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam platform-logic-lcm - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/pom.xml b/platform-logic/pom.xml index 1c803100..00f9a5fa 100644 --- a/platform-logic/pom.xml +++ b/platform-logic/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam platform-logic - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic diff --git a/platform-logic/restapi-templates/pom.xml b/platform-logic/restapi-templates/pom.xml index e43ed94e..8410f31d 100644 --- a/platform-logic/restapi-templates/pom.xml +++ b/platform-logic/restapi-templates/pom.xml @@ -12,7 +12,7 @@ org.onap.sdnc.oam platform-logic-restapi-templates - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/restconfapi-yang/pom.xml b/platform-logic/restconfapi-yang/pom.xml index 38874aa9..45b507a6 100644 --- a/platform-logic/restconfapi-yang/pom.xml +++ b/platform-logic/restconfapi-yang/pom.xml @@ -12,7 +12,7 @@ org.onap.sdnc.oam platform-logic-restconfapi-yang - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} @@ -36,7 +36,7 @@ src/main/yang - *.yang + **/*.yang true diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-subscribed-notifications.yang b/platform-logic/restconfapi-yang/src/main/yang/notification/ietf-subscribed-notifications.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-subscribed-notifications.yang rename to platform-logic/restconfapi-yang/src/main/yang/notification/ietf-subscribed-notifications.yang diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-service@2018-03-01.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-service@2018-03-01.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-service@2018-03-01.yang rename to platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-service@2018-03-01.yang diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-types@2018-05-24.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-types@2018-05-24.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-eth-tran-types@2018-05-24.yang rename to platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-eth-tran-types@2018-05-24.yang diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-inet-types.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-inet-types.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-inet-types.yang rename to platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-inet-types.yang diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-routing-types@2017-10-13.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-routing-types@2017-10-13.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-routing-types@2017-10-13.yang rename to platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-routing-types@2017-10-13.yang diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-te-types@2018-07-01.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-te-types@2018-07-01.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-te-types@2018-07-01.yang rename to platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-te-types@2018-07-01.yang diff --git a/platform-logic/restconfapi-yang/src/main/yang/ietf-yang-types.yang b/platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-yang-types.yang similarity index 100% rename from platform-logic/restconfapi-yang/src/main/yang/ietf-yang-types.yang rename to platform-logic/restconfapi-yang/src/main/yang/sotn/ietf-yang-types.yang diff --git a/platform-logic/setup/pom.xml b/platform-logic/setup/pom.xml index 1efbef1e..97183eba 100644 --- a/platform-logic/setup/pom.xml +++ b/platform-logic/setup/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam platform-logic-setup - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/platform-logic/vnfapi/pom.xml b/platform-logic/vnfapi/pom.xml index e0acd7d1..a5114f4c 100644 --- a/platform-logic/vnfapi/pom.xml +++ b/platform-logic/vnfapi/pom.xml @@ -11,7 +11,7 @@ org.onap.sdnc.oam platform-logic-vnfapi - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam :: platform-logic :: ${project.artifactId} diff --git a/pom.xml b/pom.xml index 4b59b4fc..67b92459 100755 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ org.onap.sdnc.oam sdnc-oam - 1.4.0-SNAPSHOT + 1.4.1-SNAPSHOT pom sdnc-oam