From b2175581c55981e2eb039f3543baffe76d13394d Mon Sep 17 00:00:00 2001 From: Dan Timoney Date: Fri, 31 Mar 2017 17:47:19 -0400 Subject: [SDNC-5] Rebase sdnc-oam Port to OpenDaylight Boron and sync updates since 16.10 Change-Id: I9f6febe0bd3d50c3d27c775e5a41806ee3d2e6cb Signed-off-by: Dan Timoney Former-commit-id: c7fb7db31a50d5f0005251d41f497fbd4fb2ae4b --- installation/admportal/pom.xml | 2 +- installation/admportal/src/main/docker/Dockerfile | 2 +- installation/dgbuilder/pom.xml | 37 +++++++++++----------- installation/dgbuilder/src/main/docker/Dockerfile | 6 ++-- installation/sdnc/pom.xml | 2 +- installation/sdnc/src/main/docker/Dockerfile | 10 +++--- ...karaf-0.4.2-Beryllium-SR2.tar.gz.REMOVED.git-id | 1 - ...ion-karaf-0.5.1-Boron-SR1.tar.gz.REMOVED.git-id | 1 + .../sdnc/src/main/scripts/installFeatures.sh | 4 +-- installation/sdnc/src/main/scripts/startODL.sh | 21 ++++++++++++ installation/src/main/yaml/docker-compose.yml | 8 ++--- installation/ubuntu/pom.xml | 2 +- installation/ubuntu/src/main/docker/Dockerfile | 10 +++--- 13 files changed, 64 insertions(+), 42 deletions(-) delete mode 100644 installation/sdnc/src/main/resources/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz.REMOVED.git-id create mode 100644 installation/sdnc/src/main/resources/distribution-karaf-0.5.1-Boron-SR1.tar.gz.REMOVED.git-id (limited to 'installation') diff --git a/installation/admportal/pom.xml b/installation/admportal/pom.xml index 03ebdfd6..491af965 100644 --- a/installation/admportal/pom.xml +++ b/installation/admportal/pom.xml @@ -18,7 +18,7 @@ Creates admportal Docker container - ecomp/admportal-sdnc-image + openecomp/admportal-sdnc-image diff --git a/installation/admportal/src/main/docker/Dockerfile b/installation/admportal/src/main/docker/Dockerfile index 8facc58b..4006af3e 100644 --- a/installation/admportal/src/main/docker/Dockerfile +++ b/installation/admportal/src/main/docker/Dockerfile @@ -1,5 +1,5 @@ # Base ubuntu with added packages needed for open ecomp -FROM ecomp/ubuntu-sdnc-image:${project.version} +FROM openecomp/ubuntu-sdnc-image:${project.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # create link for pm2 diff --git a/installation/dgbuilder/pom.xml b/installation/dgbuilder/pom.xml index daef9865..f7a6375d 100644 --- a/installation/dgbuilder/pom.xml +++ b/installation/dgbuilder/pom.xml @@ -18,7 +18,7 @@ Creates docker container for dgbuilder - ecomp/dgbuilder-sdnc-image + openecomp/dgbuilder-sdnc-image @@ -51,7 +51,7 @@ generate-images - process-sources + generate-sources build @@ -98,20 +98,21 @@ org.codehaus.mojo 1.5.0 - - make-path - generate-sources - - exec - - - /bin/mkdir - - -p - ${basedir}/target/docker-stage/opt/openecomp/sdnc - - - + + Unzip dgbuilder + generate-sources + + exec + + + /usr/bin/unzip + + -d + ${basedir}/target/docker-stage/opt/openecomp/sdnc + ../../dgbuilder/target/*.zip + + + Copy dgbuilder generate-sources @@ -137,7 +138,7 @@ /bin/bash - ${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir + ${basedir}/target/docker-stage/opt/openecomp/sdnc/dgbuilder/createReleaseDir.sh 1702 dguser change_email_id@dgbuilder.com @@ -147,7 +148,7 @@ change shell permissions - process-sources + process-sources exec diff --git a/installation/dgbuilder/src/main/docker/Dockerfile b/installation/dgbuilder/src/main/docker/Dockerfile index fd91e773..f3c0e815 100644 --- a/installation/dgbuilder/src/main/docker/Dockerfile +++ b/installation/dgbuilder/src/main/docker/Dockerfile @@ -1,11 +1,13 @@ # Base ubuntu with added packages needed for open ecomp -FROM ecomp/ubuntu-sdnc-image:${project.version} +FROM openecomp/ubuntu-sdnc-image:${project.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) # copy openecomp COPY opt /opt WORKDIR /opt/openecomp/sdnc/dgbuilder -RUN npm install +# Set the proxy if needed +# RUN npm config set proxy http://your.proxy.com:8080 +#RUN npm install #ENTRYPOINT /bin/bash /opt/openecomp/sdnc/dgbuilder/start sdnc1.0 EXPOSE 3100 diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index 51f49751..6efa823c 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -18,7 +18,7 @@ Creates SDN Controller Docker container - ecomp/sdnc-image + openecomp/sdnc-image ${project.version} ${project.version} ${project.version} diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 2e2140bc..14b77102 100644 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -1,15 +1,15 @@ # Base ubuntu with added packages needed for open ecomp -FROM ecomp/ubuntu-sdnc-image:${project.version} +FROM openecomp/ubuntu-sdnc-image:${project.version} MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) -ENV JAVA_HOME /usr/lib/jvm/java-7-openjdk-amd64 +ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk-amd64 ENV ODL_HOME /opt/opendaylight/current ENV SDNC_CONFIG_DIR /opt/openecomp/sdnc/data/properties # copy the opendaylight tar and expand -COPY distribution-karaf-0.4.2-Beryllium-SR2.tar.gz /tmp +COPY distribution-karaf-0.5.1-Boron-SR1.tar.gz /tmp RUN mkdir /opt/opendaylight /opt/openecomp -RUN tar zxvf /tmp/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz --directory /opt/opendaylight -RUN ln -s /opt/opendaylight/distribution-karaf-0.4.2-Beryllium-SR2 /opt/opendaylight/current +RUN tar zxvf /tmp/distribution-karaf-0.5.1-Boron-SR1.tar.gz --directory /opt/opendaylight +RUN ln -s /opt/opendaylight/distribution-karaf-0.5.1-Boron-SR1 /opt/opendaylight/current COPY idmlight.db.mv.db /opt/opendaylight/current # copy openecomp diff --git a/installation/sdnc/src/main/resources/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz.REMOVED.git-id b/installation/sdnc/src/main/resources/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz.REMOVED.git-id deleted file mode 100644 index 3d100916..00000000 --- a/installation/sdnc/src/main/resources/distribution-karaf-0.4.2-Beryllium-SR2.tar.gz.REMOVED.git-id +++ /dev/null @@ -1 +0,0 @@ -e3c6abcc979fe257f05da7f22ec22c6099d10a67 \ No newline at end of file diff --git a/installation/sdnc/src/main/resources/distribution-karaf-0.5.1-Boron-SR1.tar.gz.REMOVED.git-id b/installation/sdnc/src/main/resources/distribution-karaf-0.5.1-Boron-SR1.tar.gz.REMOVED.git-id new file mode 100644 index 00000000..db18b750 --- /dev/null +++ b/installation/sdnc/src/main/resources/distribution-karaf-0.5.1-Boron-SR1.tar.gz.REMOVED.git-id @@ -0,0 +1 @@ +b6c13a8f784e9c0fa155c8230ecf4dbc13d81895 \ No newline at end of file diff --git a/installation/sdnc/src/main/scripts/installFeatures.sh b/installation/sdnc/src/main/scripts/installFeatures.sh index 88a24f47..91b71fc6 100755 --- a/installation/sdnc/src/main/scripts/installFeatures.sh +++ b/installation/sdnc/src/main/scripts/installFeatures.sh @@ -10,9 +10,9 @@ # 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. diff --git a/installation/sdnc/src/main/scripts/startODL.sh b/installation/sdnc/src/main/scripts/startODL.sh index 93df96bb..bb50168f 100755 --- a/installation/sdnc/src/main/scripts/startODL.sh +++ b/installation/sdnc/src/main/scripts/startODL.sh @@ -1,5 +1,26 @@ #!/bin/bash +### +# ============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========================================================= +### + # Install SDN-C platform components if not already installed and start container diff --git a/installation/src/main/yaml/docker-compose.yml b/installation/src/main/yaml/docker-compose.yml index 2533403c..932e5bb9 100644 --- a/installation/src/main/yaml/docker-compose.yml +++ b/installation/src/main/yaml/docker-compose.yml @@ -17,7 +17,7 @@ services: sdnc: - image: ${NEXUS_DOCKER_REPO}/ecomp/sdnc-image:latest + image: openecomp/sdnc-image:latest depends_on : - db container_name: sdnc_controller_container @@ -39,7 +39,7 @@ services: web: - image: ${NEXUS_DOCKER_REPO}/ecomp/admportal-sdnc-image:latest + image: openecomp/admportal-sdnc-image:latest depends_on: - db container_name: sdnc_portal_container @@ -65,14 +65,14 @@ services: dgbuilder: - image: ${NEXUS_DOCKER_REPO}/ecomp/dgbuilder-sdnc-image:latest + image: openecomp/dgbuilder-sdnc-image:latest depends_on: - db container_name: sdnc_dgbuilder_container entrypoint: - "/bin/bash" - "-c" - - "cd /opt/openecomp/sdnc/dgbuilder/ && ./start sdnc1.0 && wait" + - "cd /opt/openecomp/sdnc/dgbuilder/ && ./start.sh sdnc1.0 && wait" ports: - "3000:3100" links: diff --git a/installation/ubuntu/pom.xml b/installation/ubuntu/pom.xml index 321c58ed..5397b4ba 100644 --- a/installation/ubuntu/pom.xml +++ b/installation/ubuntu/pom.xml @@ -18,7 +18,7 @@ Creates base ubuntu Docker container - ecomp/ubuntu-sdnc-image + openecomp/ubuntu-sdnc-image diff --git a/installation/ubuntu/src/main/docker/Dockerfile b/installation/ubuntu/src/main/docker/Dockerfile index 4c6de286..5d5b1b82 100644 --- a/installation/ubuntu/src/main/docker/Dockerfile +++ b/installation/ubuntu/src/main/docker/Dockerfile @@ -1,9 +1,7 @@ # Base ubuntu with added packages needed for open ecomp -FROM ubuntu:14.04.5 +FROM ubuntu:16.04 MAINTAINER SDN-C Team (sdnc@lists.openecomp.org) -# Steps needed to run inside ATT -#COPY sources.list /etc/apt -#COPY my_key.pub /tmp -#RUN apt-key add - < /tmp/my_key.pub +# Set proxy if needed +# RUN echo 'Acquire::http::Proxy "http://your.proxy.com:8080";' > /etc/apt/apt.conf # Add tools needed for OpenDaylight -RUN apt-get update && apt-get install -y git openjdk-7-jdk maven2 mysql-client nodejs nodejs-legacy python-pip graphviz npm +RUN apt-get update && apt-get install -y git openjdk-8-jdk maven mysql-client nodejs nodejs-legacy python-pip graphviz npm unzip -- cgit 1.2.3-korg