Bug fixes for SIM-71 and SIM-72.

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>

diff --git a/ntsimulator/.env b/ntsimulator/.env
index 40a1525..44ca67d 100644 (file)
--- a/ntsimulator/.env
+++ b/ntsimulator/.env
@@ -1,6 +1,6 @@
 DOCKER_REPO=o-ran-sc/
 NTS_MANAGER_PORT=8300
-NTS_BUILD_VERSION=1.3.0
+NTS_BUILD_VERSION=1.3.2
 
 IPv6_ENABLED=false
 SSH_CONNECTIONS=1

diff --git a/ntsimulator/deploy/base/ubuntu.Dockerfile b/ntsimulator/deploy/base/ubuntu.Dockerfile
index be86b97..46d2811 100644 (file)
--- a/ntsimulator/deploy/base/ubuntu.Dockerfile
+++ b/ntsimulator/deploy/base/ubuntu.Dockerfile
@@ -20,9 +20,7 @@
 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
@@ -44,8 +42,8 @@ WORKDIR /opt/dev
 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 && \
@@ -155,22 +153,20 @@ COPY ./deploy/base/generate-ssh-keys.sh /home/netconf/.ssh/generate-ssh-keys.sh
 
 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 \
-    && 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 \

diff --git a/ntsimulator/deploy/blank/container-tag.yaml b/ntsimulator/deploy/blank/container-tag.yaml
index 062c8a7..4ec296b 100644 (file)
--- a/ntsimulator/deploy/blank/container-tag.yaml
+++ b/ntsimulator/deploy/blank/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file

diff --git a/ntsimulator/deploy/nts-manager/container-tag.yaml b/ntsimulator/deploy/nts-manager/container-tag.yaml
index 062c8a7..4ec296b 100644 (file)
--- a/ntsimulator/deploy/nts-manager/container-tag.yaml
+++ b/ntsimulator/deploy/nts-manager/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file

diff --git a/ntsimulator/deploy/o-ran-du/container-tag.yaml b/ntsimulator/deploy/o-ran-du/container-tag.yaml
index 062c8a7..4ec296b 100644 (file)
--- a/ntsimulator/deploy/o-ran-du/container-tag.yaml
+++ b/ntsimulator/deploy/o-ran-du/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file

diff --git a/ntsimulator/deploy/o-ran-ru-fh/container-tag.yaml b/ntsimulator/deploy/o-ran-ru-fh/container-tag.yaml
index 062c8a7..4ec296b 100644 (file)
--- a/ntsimulator/deploy/o-ran-ru-fh/container-tag.yaml
+++ b/ntsimulator/deploy/o-ran-ru-fh/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file

diff --git a/ntsimulator/deploy/o-ran/container-tag.yaml b/ntsimulator/deploy/o-ran/container-tag.yaml
index 062c8a7..4ec296b 100644 (file)
--- a/ntsimulator/deploy/o-ran/container-tag.yaml
+++ b/ntsimulator/deploy/o-ran/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file

diff --git a/ntsimulator/deploy/x-ran/container-tag.yaml b/ntsimulator/deploy/x-ran/container-tag.yaml
index 062c8a7..4ec296b 100644 (file)
--- a/ntsimulator/deploy/x-ran/container-tag.yaml
+++ b/ntsimulator/deploy/x-ran/container-tag.yaml
@@ -1,2 +1,2 @@
 ---
-tag: 1.3.1
\ No newline at end of file
+tag: 1.3.2
\ No newline at end of file

diff --git a/ntsimulator/ntsim-ng/features/ves_pnf_registration/ves_pnf_registration.c b/ntsimulator/ntsim-ng/features/ves_pnf_registration/ves_pnf_registration.c
index d525475..71d62aa 100644 (file)
--- a/ntsimulator/ntsim-ng/features/ves_pnf_registration/ves_pnf_registration.c
+++ b/ntsimulator/ntsim-ng/features/ves_pnf_registration/ves_pnf_registration.c
@@ -87,7 +87,7 @@ int ves_pnf_registration_feature_start(sr_session_ctx_t *current_session) {
         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);
         }