diff options
33 files changed, 69 insertions, 34 deletions
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 @@ <packaging>jar</packaging> <artifactId>SdncReportsApi</artifactId> <groupId>org.onap.sdnc.oam</groupId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: SdncReports :: SdncReportsApi</name> <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>SdncReports</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> 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 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.onap.sdnc.oam</groupId> <artifactId>SdncReportsDao</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>jar</packaging> <name>sdnc-oam :: SdncReports :: SdncReportsDao</name> @@ -12,7 +12,7 @@ <parent> <groupId>org.onap.sdnc.oam</groupId> <artifactId>SdncReports</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <dependencies> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>SdncReports</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: SdncReports</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>admportal</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: admportal</name> 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 @@ <parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>configbackuprestore</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>getBackupVnfDetailService</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: vnfbackup :: getBackupVnfDetailService</name> <url>http://maven.apache.org</url> <properties> 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 @@ <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>configbackuprestore</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: vnfbackup</name> <packaging>pom</packaging> 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 @@ <parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>configbackuprestore</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>vnfconfigbackupservice</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: vnfbackup :: vnfconfigbackupservice</name> <url>http://maven.apache.org</url> @@ -22,13 +22,13 @@ <dependency> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>getBackupVnfDetailService</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </dependency> <dependency> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>vnfconfigreportsservice</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </dependency> <dependency> 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 @@ <parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>configbackuprestore</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> </parent> <groupId>org.onap.sdnc.oam.vnfbackup</groupId> <artifactId>vnfconfigreportsservice</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: vnfbackup :: vnfconfigreportservice</name> <url>http://maven.apache.org</url> <properties> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>dgbuilder</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: dgbuilder</name> 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 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-admportal</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates admportal Docker container</description> 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 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-ansible-server</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates ansible-server Docker container</description> 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 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-dmaap-listener</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates dmaap-listener Docker container</description> 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 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: installation</name> <description>Installs SDN-C on local file system</description> 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 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-sdnc</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates SDN Controller Docker container</description> @@ -20,7 +20,7 @@ <properties> <image.name>onap/sdnc-image</image.name> <sdnc.project.version>${project.version}</sdnc.project.version> - <sdnc.northbound.version>1.4.0-SNAPSHOT</sdnc.northbound.version> + <sdnc.northbound.version>1.4.1-SNAPSHOT</sdnc.northbound.version> <docker.buildArg.https_proxy>${https_proxy}</docker.buildArg.https_proxy> <docker.push.phase>deploy</docker.push.phase> <docker.verbose>true</docker.verbose> 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 @@ <packaging>pom</packaging> <groupId>org.onap.sdnc.oam</groupId> <artifactId>installation-ueb-listener</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <name>sdnc-oam :: installation :: ${project.artifactId}</name> <description>Creates ueb-listener Docker container</description> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-datachange</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-generic-resource-api</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-installer</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-lcm</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-restapi-templates</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-restconfapi-yang</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> @@ -36,7 +36,7 @@ <resource> <directory>src/main/yang</directory> <includes> - <include>*.yang</include> + <include>**/*.yang</include> </includes> <filtering>true</filtering> </resource> 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 index f7e01be5..f7e01be5 100644 --- 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 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 index cb7c8f05..cb7c8f05 100644 --- 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 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 index 3775f36b..3775f36b 100644 --- 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 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 index c4033b80..c4033b80 100644 --- 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 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 index e33c4bc7..e33c4bc7 100644 --- 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 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 index 7a50210e..7a50210e 100644 --- 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 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 index 5231f6a3..5231f6a3 100644 --- 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 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-setup</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> 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 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>platform-logic-vnfapi</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam :: platform-logic :: ${project.artifactId}</name> @@ -10,7 +10,7 @@ <groupId>org.onap.sdnc.oam</groupId> <artifactId>sdnc-oam</artifactId> - <version>1.4.0-SNAPSHOT</version> + <version>1.4.1-SNAPSHOT</version> <packaging>pom</packaging> <name>sdnc-oam</name> |