diff options
8 files changed, 77 insertions, 25 deletions
diff --git a/ms/blueprintsprocessor/parent/pom.xml b/ms/blueprintsprocessor/parent/pom.xml index ecd123da..409c8ade 100644 --- a/ms/blueprintsprocessor/parent/pom.xml +++ b/ms/blueprintsprocessor/parent/pom.xml @@ -16,8 +16,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.apps</groupId> @@ -158,7 +157,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>25.1-jre</version> + </dependency> <!-- Database --> diff --git a/ms/controllerblueprints/parent/pom.xml b/ms/controllerblueprints/parent/pom.xml index 8af57c7d..8b719f57 100644 --- a/ms/controllerblueprints/parent/pom.xml +++ b/ms/controllerblueprints/parent/pom.xml @@ -16,11 +16,7 @@ ~ See the License for the specific language governing permissions and ~ limitations under the License. --> - -<project - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd" - xmlns="http://maven.apache.org/POM/4.0.0" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <modelVersion>4.0.0</modelVersion> <parent> <groupId>org.onap.ccsdk.apps</groupId> @@ -97,7 +93,7 @@ <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> - <version>25.1-jre</version> + </dependency> <!-- Kotlin Dependencies --> diff --git a/ms/neng/opt/etc/config/application-live.properties b/ms/neng/opt/etc/config/application-live.properties new file mode 100644 index 00000000..23feb8de --- /dev/null +++ b/ms/neng/opt/etc/config/application-live.properties @@ -0,0 +1,30 @@ +#============LICENSE_START======================================================= +# ONAP : CCSDK.apps +# ================================================================================ +# Copyright (C) 2018 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 used for running the application in a live env, in a docker +# container, with real DB and interfaces. +# +#========================================================================= +datasource.db.url=${neng_db_url} +datasource.db.username=${neng_db_user} +datasource.db.password=${neng_db_pass} +jpa.hibernate.ddl-auto=none +jpa.show-sql=true +hibernate.show_sql:true diff --git a/ms/neng/pom.xml b/ms/neng/pom.xml index 9cf6f33c..8390350a 100644 --- a/ms/neng/pom.xml +++ b/ms/neng/pom.xml @@ -438,7 +438,7 @@ <artifactId>docker-maven-plugin</artifactId> <version>0.4.11</version> <configuration> - <imageName>${docker.registry}/org.onap.ccsdk.apps/${serviceArtifactName}:${project.version}</imageName> + <imageName>onap/ccsdk-apps-ms-neng:${project.version}</imageName> <dockerDirectory>src/main/docker</dockerDirectory> <serverId>docker-hub</serverId> <registryUrl>https://${docker.registry}</registryUrl> diff --git a/ms/neng/src/main/compose/docker-compose.yaml b/ms/neng/src/main/compose/docker-compose.yaml new file mode 100644 index 00000000..93dbbf0d --- /dev/null +++ b/ms/neng/src/main/compose/docker-compose.yaml @@ -0,0 +1,29 @@ + +nengdb: + image: mariadb + container_name: nengdb + ports: + - "${NENG_DB_PORT}:3306" + volumes: + - /var/lib/nengdb:/var/lib/mysql + restart: always + environment: + MYSQL_ROOT_PASSWORD: "${NENG_DB_ROOT}" + MYSQL_DATABASE: neng + MYSQL_USER: "${NENG_DB_USER}" + MYSQL_PASSWORD: "${NENG_DB_PASS}" + +neng: + #depends_on: + #- nengdb + image: onap/ccsdk-apps-ms-neng + container_name: neng + ports: + - "${NENG_SERV_PORT}:8080" + restart: always + environment: + SPRING_PROFILE: "${SPRING_PROFILE}" + NENG_DB_URL: "${NENG_DB_URL}" + NENG_DB_USER: "${NENG_DB_USER}" + NENG_DB_PASS: "${NENG_DB_PASS}" + diff --git a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql index 7b0973c2..bb257082 100644 --- a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql +++ b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/04_ref_data_extrn_int.sql @@ -1,32 +1,32 @@ --liquibase formatted sql --changeset ref_data_update:18_10.ref_data_update.sql -delete from external_interface; +delete from EXTERNAL_INTERFACE; -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vnf-name','nodes/generic-vnfs?vnf-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VNF','nodes/generic-vnfs?vnf-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vnfc-name','nodes/vnfcs?vnfc-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VNFC','nodes/vnfcs?vnfc-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vserver-name','nodes/vservers?vserver-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','vf-module-name','nodes/vf-modules?vf-module-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VFMODULE','nodes/vf-modules?vf-module-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VF-MODULE','nodes/vf-modules?vf-module-name=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','service-instance-id','nodes/service-instances?service-instance-id=',sysdate(),'nengsys',sysdate(),'nengsys'); -insert into external_interface(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) +insert into EXTERNAL_INTERFACE(SYSTEM,PARAM,URL_SUFFIX,CREATED_TIME,CREATED_BY,LAST_UPDATED_TIME,LAST_UPDATED_BY) values('aai','VM','nodes/vservers?vserver-name=',sysdate(),'nengsys',sysdate(),'nengsys'); commit; diff --git a/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml index 7f9640f2..7dd3e739 100644 --- a/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml +++ b/sdnr/wireless-transport/code-Carbon-SR1/apps/devicemanager/impl/pom.xml @@ -3,8 +3,7 @@ the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> <parent> <groupId>org.opendaylight.mwtn</groupId> <artifactId>config-parent</artifactId> @@ -346,4 +345,3 @@ </build> </project> - diff --git a/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml b/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml index a7892d2c..e5329d89 100644 --- a/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml +++ b/sdnr/wireless-transport/code-Carbon-SR1/apps/dlux/loader/impl/pom.xml @@ -79,7 +79,7 @@ <include>dlux/</include> <include>index/</include> </includes> - <excludes></excludes> + <excludes/> <followSymlinks>false</followSymlinks> </fileset> </filesets> |