Bug fix for SIM-71: pnfRegistration ignores IPv6_ENABLED flag when docker container has IPv6 address
Bug fix for SIM-72: edit-config operations break the operational datastore
Issue-ID: SIM-71
Issue-ID: SIM-72
Change-Id: I7c48f88ba8c43dba8fe8c76d04bf72312bb4d82f
Signed-off-by: Alex Stancu <alexandru.stancu@highstreet-technologies.com>
DOCKER_REPO=o-ran-sc/
NTS_MANAGER_PORT=8300
DOCKER_REPO=o-ran-sc/
NTS_MANAGER_PORT=8300
IPv6_ENABLED=false
SSH_CONNECTIONS=1
IPv6_ENABLED=false
SSH_CONNECTIONS=1
FROM ubuntu:20.04 as builder
LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
FROM ubuntu:20.04 as builder
LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
-RUN apt-get clean
-RUN apt-get update
-RUN DEBIAN_FRONTEND="noninteractive" apt-get install -y \
+RUN apt-get update && DEBIAN_FRONTEND="noninteractive" apt-get install -y \
# basic tools
tzdata build-essential git cmake pkg-config \
# libyang dependencies
# basic tools
tzdata build-essential git cmake pkg-config \
# libyang dependencies
RUN \
git config --global advice.detachedHead false && \
git clone --single-branch --branch v1.7.14 https://github.com/DaveGamble/cJSON.git && \
RUN \
git config --global advice.detachedHead false && \
git clone --single-branch --branch v1.7.14 https://github.com/DaveGamble/cJSON.git && \
- git clone --single-branch --branch v1.0.225 https://github.com/CESNET/libyang.git && \
- git clone --single-branch --branch v1.4.122 https://github.com/sysrepo/sysrepo.git && \
+ git clone --single-branch --branch libyang1 https://github.com/CESNET/libyang.git && \
+ git clone --single-branch --branch libyang1 https://github.com/sysrepo/sysrepo.git && \
git clone --single-branch --branch libssh-0.9.2 https://git.libssh.org/projects/libssh.git && \
git clone --single-branch --branch v1.1.43 https://github.com/CESNET/libnetconf2.git && \
git clone --single-branch --branch v1.1.70 https://github.com/CESNET/netopeer2.git && \
git clone --single-branch --branch libssh-0.9.2 https://git.libssh.org/projects/libssh.git && \
git clone --single-branch --branch v1.1.43 https://github.com/CESNET/libnetconf2.git && \
git clone --single-branch --branch v1.1.70 https://github.com/CESNET/netopeer2.git && \
FROM ubuntu:20.04
LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
FROM ubuntu:20.04
LABEL maintainer="alexandru.stancu@highstreet-technologies.com / adrian.lita@highstreet-technologies.com"
-RUN apt-get clean
-RUN apt-get update
-ARG BUILD_WITH_DEBUG
-ENV BUILD_WITH_DEBUG=${BUILD_WITH_DEBUG}
-RUN if [ -n "${BUILD_WITH_DEBUG}" ]; then DEBIAN_FRONTEND="noninteractive" apt-get install -y gdb valgrind nano mc ; fi
-
-RUN apt-get install -y --no-install-recommends \
+RUN apt-get update && apt-get install -y --no-install-recommends \
psmisc \
unzip \
openssl \
openssh-client \
vsftpd \
openssh-server \
psmisc \
unzip \
openssl \
openssh-client \
vsftpd \
openssh-server \
- && rm -rf /var/lib/apt/lists/* \
- && unset BUILD_WITH_DEBUG
+ && rm -rf /var/lib/apt/lists/*
+
+
+ARG BUILD_WITH_DEBUG
+ENV BUILD_WITH_DEBUG=${BUILD_WITH_DEBUG}
+RUN if [ -n "${BUILD_WITH_DEBUG}" ]; then DEBIAN_FRONTEND="noninteractive" apt-get install -y gdb valgrind nano mc && unset BUILD_WITH_DEBUG; fi
# add netconf user and configure access
RUN \
# add netconf user and configure access
RUN \
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file
if (framework_environment.settings.ip_v4 != 0) {
strcpy(nf_ip_v4_address, framework_environment.settings.ip_v4);
}
if (framework_environment.settings.ip_v4 != 0) {
strcpy(nf_ip_v4_address, framework_environment.settings.ip_v4);
}
- if (framework_environment.settings.ip_v6) {
+ if (framework_environment.settings.ip_v6 && framework_environment.settings.ip_v6_enabled) {
strcpy(nf_ip_v6_address, framework_environment.settings.ip_v6);
}
strcpy(nf_ip_v6_address, framework_environment.settings.ip_v6);
}