diff options
| -rw-r--r-- | installation/sdnc/pom.xml | 83 | ||||
| -rwxr-xr-x | installation/sdnc/src/main/docker/Dockerfile | 26 | ||||
| -rwxr-xr-x | pom.xml | 13 |
3 files changed, 102 insertions, 20 deletions
diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml index ae3d3590..ea9647ed 100644 --- a/installation/sdnc/pom.xml +++ b/installation/sdnc/pom.xml @@ -61,6 +61,71 @@ <type>zip</type> <classifier>repo</classifier> </dependency> + <!-- SDNR Related Features : Start --> + <dependency> + <groupId>org.onap.ccsdk.features</groupId> + <artifactId>features-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.wt</groupId> + <artifactId>sdnr-wt-feature-aggregator-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features</groupId> + <artifactId>aafshiro-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>sdnr-northbound-features-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>oofpcipoc-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>CMNotify-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.features.sdnr.northbound</groupId> + <artifactId>ranSlice-installer</artifactId> + <version>${ccsdk.features.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-northbound-installer</artifactId> + <version>${ccsdk.oran.a1adapter.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <dependency> + <groupId>org.onap.ccsdk.oran</groupId> + <artifactId>a1-adapter-installer</artifactId> + <version>${ccsdk.oran.a1adapter.version}</version> + <type>zip</type> + <classifier>repo</classifier> + </dependency> + <!-- SDNR Related Features : End --> </dependencies> <build> @@ -146,7 +211,8 @@ <id>copy-dockerfile</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -165,7 +231,8 @@ <id>copy-scripts</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/bin</outputDirectory> @@ -185,7 +252,8 @@ <id>copy-tarballs</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage</outputDirectory> @@ -206,7 +274,8 @@ <id>copy-data</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data</outputDirectory> @@ -226,7 +295,8 @@ <id>copy-properties</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/properties</outputDirectory> @@ -247,7 +317,8 @@ <id>copy-keystores</id> <goals> <goal>copy-resources</goal> - </goals><!-- here the phase you need --> + </goals> + <!-- here the phase you need --> <phase>validate</phase> <configuration> <outputDirectory>${basedir}/target/docker-stage/opt/onap/sdnc/data/stores</outputDirectory> diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 65b908ce..c4f4ac15 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -16,7 +16,7 @@ ENV SDNC_SECUREPORT ${sdnc.secureport} ARG AAF=false -# Copy onap +# Copy deliverables to opt COPY opt /opt RUN test -L /opt/sdnc || ln -s /opt/onap/sdnc /opt/sdnc RUN mkdir $ODL_HOME/current/certs @@ -25,15 +25,25 @@ RUN mkdir $ODL_HOME/current/certs COPY system /tmp/system RUN rsync -a /tmp/system $ODL_HOME -# Add odl-netconf-topology to boot repositories -RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.orig -RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg - -# Add SDNC repositories to boot repositories +# Add SDNC NORTHBOUND FEATURES repository ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features -RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg -RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg +# Add CCSDK SDNR FEATURES repositories +ENV SDNR_FEATURES_REPO mvn:org.onap.ccsdk.oran/a1-adapter-northbound/${ccsdk.oran.a1adapter.version}/xml/features,\ +mvn:org.onap.ccsdk.features/ccsdk-features-all/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.northbound/sdnr-northbound-all/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-oauth/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager/${ccsdk.features.version}/xml/features,\ +mvn:org.onap.ccsdk.features.sdnr.wt/sdnr-wt-feature-aggregator-devicemanager-base/${ccsdk.features.version}/xml/features + +# Backing up existing karaf cfg and updating features boot and features repository +RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.karaf.features.cfg.sdnc.orig +RUN sed -i -e "\|featuresBoot[^a-zA-Z]|s|$|,ccsdk-features-all,sdnc-northbound-all|" $ODL_HOME/etc/org.apache.karaf.features.cfg +RUN sed -i -e "\|featuresRepositories|s|$|,${SDNC_NORTHBOUND_REPO},${SDNR_FEATURES_REPO}|" $ODL_HOME/etc/org.apache.karaf.features.cfg + +# Add odl-netconf-topology to boot repositories +RUN sed -i "s/odl-restconf-all/odl-restconf-all,odl-netconf-topology/g" $ODL_HOME/etc/org.apache.karaf.features.cfg # Add aaa-app-config.xml Only if AAF is set to true (being passed as an argument in docker-maven-plugin configuration) COPY aaa-app-config.xml /tmp/aaa-app-config.xml @@ -24,13 +24,14 @@ <properties> <sdnc.project.version>${project.version}</sdnc.project.version> - <!-- Artifacts --> - <sdnc.northbound.version>2.1.5</sdnc.northbound.version> <!-- Used by installation/sdnc sdnc/northbound --> + <!-- All Version definition is placed in org.onap.ccsdk.parent/odlparent-lite --> + <ccsdk.oran.a1adapter.version>1.1.6</ccsdk.oran.a1adapter.version> + <sdnc.northbound.version>2.1.5</sdnc.northbound.version> <!-- Used by installation/sdnc --> - <!-- docker images --> - <ccsdk.docker.alpine.j11.version>1.1-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener onap/ccsdk-alpine-j11-image --> - <ccsdk.docker.odlsli.alpine.version>1.1-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc onap/ccsdk-odlsli-alpine-image --> - <ccsdk.docker.ansible.server.version>1.1-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server onap/ccsdk-ansible-server-image --> + <!-- docker images versions --> + <ccsdk.docker.alpine.j11.version>1.1-STAGING-latest</ccsdk.docker.alpine.j11.version> <!-- Used by dmaap-listener, ueb-listener --> + <ccsdk.docker.odlsli.alpine.version>1.1-SNAPSHOT-latest</ccsdk.docker.odlsli.alpine.version> <!-- Used by sdnc --> + <ccsdk.docker.ansible.server.version>1.1-STAGING-latest</ccsdk.docker.ansible.server.version> <!-- Used by ansible-server --> <ccsdk.docker.ubuntu.version>1.1-STAGING-latest</ccsdk.docker.ubuntu.version> <!-- Used by admportal --> </properties> |