Updated tr181 xml to 2.19.1

gitlab-ci/generate_supported_dm.sh

@@ -5,8 +5,8 @@ echo "Generate xml and xls artifacts"
 source ./gitlab-ci/shared.sh
 
 # install required packages
-exec_cmd apt update
+exec_cmd sudo apt update
-exec_cmd apt install -y python3-pip libxml2-utils
+exec_cmd sudo apt install -y python3-pip libxml2-utils
 exec_cmd pip3 install xlwt
 
 if [ -n "${CI_SERVER_HOST}" ]; then
@@ -20,10 +20,11 @@ install_libeasy
 install_libethernet
 install_libqos
 
-[ ! -d "${BBFDM_MS_DIR}" ] && mkdir -p "${BBFDM_MS_DIR}"
+[ ! -d "${BBFDM_MS_DIR}" ] && {
-rm -rf ${BBFDM_MS_DIR}/*
+	mkdir -p "${BBFDM_MS_DIR}"
-
+	rm -rf ${BBFDM_MS_DIR}/*
-mkdir -p ${BBFDM_MS_DIR}/core
+	mkdir -p ${BBFDM_MS_DIR}/core
+}
 
 if [ -z "${1}" ]; then
 	./tools/generate_dm.py tools/tools_input.json

gitlab-ci/shared.sh

@@ -113,9 +113,9 @@ function install_libeasy()
 
 		cd /opt/dev/libeasy
 		exec_cmd make
-		mkdir -p /usr/include/easy
+		sudo mkdir -p /usr/include/easy
-		cp -a libeasy*.so* /usr/lib
+		sudo cp -a libeasy*.so* /usr/lib
-		cp -a *.h /usr/include/easy/
+		sudo cp -a *.h /usr/include/easy/
 	)
 }
 
@@ -128,9 +128,9 @@ function install_libqos()
 
 		cd /opt/dev/libqos
 		exec_cmd make
-		mkdir -p /usr/include/
+		sudo mkdir -p /usr/include/
-		cp -a libqos*.so* /usr/lib/
+		sudo cp -a libqos*.so* /usr/lib/
-		cp -a include/*.h /usr/include/
+		sudo cp -a include/*.h /usr/include/
 	)
 }
 
@@ -142,8 +142,8 @@ function install_libethernet()
 	(
 		 cd /opt/dev/libethernet
 		 make PLATFORM=TEST
-		 cp ethernet.h /usr/include
+		 sudo cp ethernet.h /usr/include
-		 cp -a libethernet*.so* /usr/lib
+		 sudo cp -a libethernet*.so* /usr/lib
 		 sudo ldconfig
 	)
 }
@@ -158,7 +158,7 @@ function install_ethmngr_as_micro_service()
 
 	exec_cmd git clone https://dev.iopsys.eu/hal/ethmngr.git /opt/dev/ethmngr
 	exec_cmd make -C /opt/dev/ethmngr
-	exec_cmd cp -f /opt/dev/ethmngr/ethmngr /usr/sbin/ethmngr
+	exec_cmd sudo cp -f /opt/dev/ethmngr/ethmngr /usr/sbin/ethmngr
 }
 
 function install_netmngr_as_micro_service()
@@ -219,7 +219,7 @@ function error_on_zero()
 {
 	ret=$1
 	if [ "$ret" -eq 0 ]; then
-		echo "Validation of last command failed, ret(${ret})"
+		echo "Validation of Last command failed, ret(${ret})"
 		cp /tmp/memory-*.xml .
 		exit $ret
 	fi

test/tools/01-tr-181-2-19-1-usp-full.xml

@@ -59,8 +59,8 @@
         https://www.broadband-forum.org/cwmp/cwmp-datamodel-1-15.xsd
       urn:broadband-forum-org:cwmp:datamodel-report-1-0
         https://www.broadband-forum.org/cwmp/cwmp-datamodel-report-1-0.xsd"
-    spec="urn:broadband-forum-org:tr-181-2-19-0-usp"
+    spec="urn:broadband-forum-org:tr-181-2-19-1-usp"
-    file="tr-181-2-19-0-usp.xml">
+    file="tr-181-2-19-1-usp.xml">
 
   <dataType name="_AliasCommon">
     <description>
@@ -129298,8 +129298,9 @@
           The following describes the meaning of the permissions for Object
           type of Targets:
 
-          # Read: Grants the capability to read the meta-information of the
+          # Read: Grants the capability for Get to resolve Object paths. Grants
-            Object via GetSupportedDM.
+            the capability to read the meta-information of the Object via
+            GetSupportedDM.
 
           # Write: Grants no capabilities for Static Objects. Grants the
             capability to create a new instance of a Multi-Instanced Object via

tools/Dockerfile

@@ -2,7 +2,7 @@ FROM ubuntu:22.04
 
 LABEL maintainer="vivek.dutta@iopsys.eu"
 LABEL build="docker build -t bbfdm-tools ."
-LABEL run="docker run -it --rm -v ${PWD}/..:/builds/bbfdm bbfdm-tools"
+LABEL run="docker run -it --rm -v PWD/..:/builds/bbfdm bbfdm-tools"
 
 RUN \
     apt-get update && \
@@ -13,6 +13,17 @@ RUN \
 	libssl-dev \
         libcurl4-openssl-dev \
 	pkg-config \
+	libtool \
+	libnl-3-dev \
+	libnl-genl-3-dev \
+	libnl-route-3-dev \
+	autoconf \
+	automake \
+	autotools-dev \
+	binutils \
+	net-tools \
+	curl \
+	sudo \
         git
 
 RUN mkdir /opt/dev
@@ -50,4 +61,30 @@ RUN \
     make -j2 && \
     make install
 
-ENTRYPOINT ["/bin/bash"]
+# 1. Create new unprivileged user "dev"
+# 2. Install fixuid to accomodate for the host machine UID/GID
+ARG FIXUID_VERSION=0.5.1
+RUN useradd -m -s /bin/bash dev && \
+    curl -fsSL "https://github.com/boxboat/fixuid/releases/download/v${FIXUID_VERSION}/fixuid-${FIXUID_VERSION}-linux-amd64.tar.gz" | tar -C /usr/local/bin -xzf -
+
+# Copy fixuid configuration
+COPY docker/fixuid.yml /etc/fixuid/config.yml
+
+# Copy git configuration to dev's home folder
+COPY --chown=dev:dev docker/gitconfig /home/dev/.gitconfig
+
+RUN echo "dev ALL=(ALL) NOPASSWD:ALL" >> /etc/sudoers.d/10-dev
+
+ENTRYPOINT ["/usr/local/bin/fixuid", "-q"]
+CMD ["bash"]
+
+RUN mkdir -p /builds/bbf/bbfdm /home/dev/.ssh \
+    && chown -R dev:dev /builds/bbf/bbfdm \
+    && chown -R dev:dev /home/dev \
+    && chown -R dev:dev /opt/dev \
+    && mkdir -p /usr/share/bbfdm \
+    && chown -R dev:dev /usr/share/bbfdm
+
+USER dev:dev
+WORKDIR /builds/bbf/bbfdm
+VOLUME ["/builds/bbf/bbfdm"]

tools/bbf_common.py

@@ -178,7 +178,7 @@ def generate_shared_library(dm_name, source_files, vendor_prefix,
         return True
     except subprocess.CalledProcessError as e:
         print(f"     Error during compilation: {e}")
-        return False
+        sys.exit(-1)
 
 
 def build_and_install_bbfdm(vendor_prefix):
@@ -204,7 +204,7 @@ def build_and_install_bbfdm(vendor_prefix):
         "-DCMAKE_INSTALL_PREFIX=/"
     ]
     make_command = ["make"]
-    make_install_command = ["make", "install"]
+    make_install_command = ["sudo", "make", "install"]
 
     try:
         subprocess.check_call(cmake_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
@@ -242,7 +242,7 @@ def build_and_install_dmcli():
 
     try:
         subprocess.check_call(gcc_command, stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
-        subprocess.check_call(["mv", "dm-cli", "/usr/sbin/dm-cli"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
+        subprocess.check_call(["sudo", "mv", "dm-cli", "/usr/sbin/dm-cli"], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
     except subprocess.CalledProcessError as e:
         print(f"Error running commands: {e}")
         sys.exit(1)
@@ -368,6 +368,11 @@ def download_and_build_plugins(plugins, vendor_prefix):
         repo_path = None
         name = os.path.basename(repo).replace('.git', '')
 
+        path = os.path.expanduser("~/.netrc")
+        if not os.path.isfile(path):
+            repo = repo.replace("https://dev.iopsys.eu/", "git@dev.iopsys.eu:")
+
+        print(f"## Repo is {repo}")
         if not prefix:
             prefix = vendor_prefix
 

tools/docker/fixuid.yml

@@ -0,0 +1,4 @@
+user: dev
+group: dev
+paths:
+  - /home/dev

tools/docker/gitconfig

@@ -0,0 +1,4 @@
+[advice]
+	detachedHead = false
+[credential]
+	helper = store

tools/generate_dm.sh

@@ -2,7 +2,7 @@
 
 # Set variables
 CONTAINER_NAME="generate_dm_tools"
-IMAGE_NAME="dev.iopsys.eu:5050/bbf/bbfdm/tools:latest"
+IMAGE_NAME="dev.iopsys.eu:5050/bbf/bbfdm/tools:2.0"
 INPUT=""
 root="${PWD/tools}"
 
@@ -23,9 +23,9 @@ usages()
 runner()
 {
 	# Create and start the Docker container
-	docker run --rm -it -v"${root}:/bbfdm" -w "/bbfdm" \
+	docker run --rm -it -v ~/.ssh:/home/dev/.ssh -v"${root}:/builds/bbf/bbfdm" \
 		--entrypoint=/bin/bash --name "$CONTAINER_NAME" "$IMAGE_NAME" \
-		-c "./gitlab-ci/generate_supported_dm.sh /bbfdm/${1}"
+		-c "./gitlab-ci/generate_supported_dm.sh ${1}"
 }
 
 while getopts n:I:i:h opts

tools/tools_input.json

@@ -443,6 +443,18 @@
         "-I libdm/common"
       ]
     },
+    {
+      "repo": "https://dev.iopsys.eu/voice/tr104.git",
+      "proto": "git",
+      "version": "devel",
+      "dm_files": [
+        "libdm/extensions/iowrt/*.c"
+      ],
+      "extra_dependencies": [
+        "-I /builds/bbf/bbfdm/libbbfdm-api/legacy",
+        "-I libdm/common"
+      ]
+    },
     {
       "repo": "https://dev.iopsys.eu/system/logmngr.git",
       "proto": "git",
@@ -470,18 +482,6 @@
         "bbf_plugin/common.c"
       ]
     },
-    {
-      "repo": "https://dev.iopsys.eu/voice/tr104.git",
-      "proto": "git",
-      "version": "devel",
-      "dm_files": [
-        "libdm/extensions/iowrt/*.c"
-      ],
-      "extra_dependencies": [
-        "-I /builds/bbf/bbfdm/libbbfdm-api/legacy",
-        "-I libdm/common"
-      ]
-    },
     {
       "repo": "https://dev.iopsys.eu/feed/gnx.git",
       "proto": "git",