diff options
Diffstat (limited to 'installation')
4 files changed, 8 insertions, 1 deletions
diff --git a/installation/sdnc/src/main/docker/Dockerfile b/installation/sdnc/src/main/docker/Dockerfile index 7f7c0dea..df392101 100755 --- a/installation/sdnc/src/main/docker/Dockerfile +++ b/installation/sdnc/src/main/docker/Dockerfile @@ -13,6 +13,8 @@ ENV JAVA_SECURITY_DIR $SSL_CERTS_DIR/java ENV SDNC_NORTHBOUND_REPO mvn:org.onap.sdnc.northbound/sdnc-northbound-all/${sdnc.northbound.version}/xml/features +USER root + # imstall ssl and java certificates COPY AAF_RootCA.cer $SSL_CERTS_DIR @@ -35,6 +37,8 @@ RUN cp $ODL_HOME/etc/org.apache.karaf.features.cfg $ODL_HOME/etc/org.apache.kara 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 +RUN chown -R odl /opt +USER odl ENTRYPOINT /opt/onap/sdnc/bin/startODL.sh EXPOSE 8181 diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump index ee6d8460..dfe7f928 100644 --- a/installation/sdnc/src/main/resources/sdnctl.dump +++ b/installation/sdnc/src/main/resources/sdnctl.dump @@ -1554,6 +1554,7 @@ CREATE TABLE `NETWORK_MODEL` ( `network_type` varchar(255) DEFAULT NULL, `network_role` varchar(255) DEFAULT NULL, `network_technology` varchar(255) DEFAULT NULL, + `trunk_network_indicator` char(1) DEFAULT NULL, `network_scope` varchar(255) DEFAULT NULL, `naming_policy` varchar(255) DEFAULT NULL, `ecomp_generated_naming` char(1) DEFAULT NULL, diff --git a/installation/src/main/properties/generic-resource-api-dg.properties b/installation/src/main/properties/generic-resource-api-dg.properties index 16d5987f..8c21e687 100644 --- a/installation/src/main/properties/generic-resource-api-dg.properties +++ b/installation/src/main/properties/generic-resource-api-dg.properties @@ -31,6 +31,7 @@ restapi.sotn-attachment.templatefile=sotn-attachment-allotted-resource.json restapi.sdwan-attachment.templatefile=sdwan-attachment-allotted-resource.json restapi.oof-getpath.templatefile=oof-getpath.json restapi.naming.gen-name.templatefile=naming-ms-post-gen-name.json +restapi.ss.pnf.templatefile=self-serve-pnf-assignments.json restapi.ss.vnf.templatefile=self-serve-vnf-assignments.json restapi.ss.vfmodule.templatefile=self-serve-vfmodule-assignments.json restapi.ss.mS.vlan.tag.assign.templatefile=self-serve-mS-vlan-tag-assignments.json @@ -59,6 +60,7 @@ restapi.services=/restconf/config/GENERIC-RESOURCE-API:services/service/{service restapi.service.vnf.vfmodule-resource=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id} restapi.connection-attachment-allottedresource=/restconf/config/GENERIC-RESOURCE-API:connection-attachment-allotted-resources/connection-attachment-allotted-resource/{allotted-resource-id}/ restapi.naming.gen-name.service=/web/service/v1/genNetworkElementName +restapi.ss-pnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/pnfs/pnf/{pnf-id}/ restapi.ss-vnf-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/ restapi.ss-vfmodule-assignments=/restconf/config/GENERIC-RESOURCE-API:services/service/{service-instance-id}/service-data/vnfs/vnf/{vnf-id}/vnf-data/vf-modules/vf-module/{vf-module-id}/ restapi.ss-mS-vlan-tag-assign=/vlantagapi/v1/{action} diff --git a/installation/ueb-listener/src/main/docker/Dockerfile b/installation/ueb-listener/src/main/docker/Dockerfile index 0ff773d9..8008dfd9 100644 --- a/installation/ueb-listener/src/main/docker/Dockerfile +++ b/installation/ueb-listener/src/main/docker/Dockerfile @@ -1,7 +1,7 @@ # Base alpine with added packages needed for open ecomp FROM onap/ccsdk-alpine-image:${ccsdk.docker.version} MAINTAINER SDNC Team (onap-sdnc@lists.onap.org) -ENV JAVA_HOME /usr/lib/jvm/java-8-openjdk +ENV JAVA_HOME /usr/lib/jvm/java-1.8-openjdk ENV SDNC_CONFIG_DIR /opt/onap/sdnc/data/properties |