Suppress cppcheck errors and warning

Merge branch 'integration_2023_w02' into 'develop'
integration_2023_w02 See merge request oai/openairinterface5g!1906 !1796 Make SFN dependent on GPS time !1874 Processing time optimization for SRS !1881 Fix documentation of dot_product() !1884 Prevent Msg3 to be scheduled in downlink slot when nrofUplinkSymbols = 0 and DDDSU !1888 Adopting new BWP structure at UE (first MR) !1890 Fix setup_time overflow in VNF processing thread !1892 system.c cleaning check result of system call !1893 fix buildhelper Soapy folder name, case not respected, reinstall was broken !1894 doc(ci): adding constraint on the branch name !1895 ASN_SEQUENCE_ADD return code was checked only in 0.5% of calls !1900 bugfix CU/DU: use correct IP address for GTP-U !1901 Adding NRPPA ASN1 definitions and library !1903 bugfix in function channelmod_modify_cmd !1867 CI: new Python classes for SSH & Local execution restore LDPC docs
2026-07-13 04:30:28 +00:00 · 2023-01-16 10:54:59 +01:00 · 2023-01-14 08:39:57 +00:00 · 2023-01-13 13:42:13 +01:00 · 2023-01-12 18:05:16 +01:00 · 2023-01-12 18:02:45 +01:00
577 changed files with 69680 additions and 88171 deletions
--- a/.clang-format
+++ b/.clang-format
@@ -103,5 +103,85 @@ SpacesInParentheses: false
 SpacesInSquareBrackets: false
 TabWidth:        2
 UseTab:          Never
+---
+Language: JavaScript
+# BasedOnStyle:  Google
+AccessModifierOffset: -1
+AlignAfterOpenBracket: Align
+AlignConsecutiveAssignments: false
+AlignConsecutiveDeclarations: false
+AlignOperands:   true
+AlignTrailingComments: false
+AllowAllParametersOfDeclarationOnNextLine: false
+AllowShortBlocksOnASingleLine: false
+AllowShortCaseLabelsOnASingleLine: false
+AllowShortFunctionsOnASingleLine: None
+AllowShortIfStatementsOnASingleLine: false
+AllowShortLoopsOnASingleLine: false
+AlwaysBreakAfterDefinitionReturnType: None
+AlwaysBreakAfterReturnType: None
+AlwaysBreakBeforeMultilineStrings: true
+BinPackArguments: false
+BinPackParameters: false
+BraceWrapping:
+  AfterClass:      false
+  AfterControlStatement: false
+  AfterEnum:       false
+  AfterFunction:   true
+  AfterNamespace:  false
+  AfterObjCDeclaration: false
+  BeforeCatch:     false
+  BeforeElse:      false
+  IndentBraces:    false
+  SplitEmptyFunction: true
+  SplitEmptyRecord: true
+  SplitEmptyNamespace: true
+BreakBeforeBinaryOperators: NonAssignment
+BreakBeforeBraces: Custom
+BreakBeforeInheritanceComma: false
+BreakBeforeTernaryOperators: true
+BreakConstructorInitializersBeforeComma: false
+BreakConstructorInitializers: BeforeColon
+BreakStringLiterals: true
+ColumnLimit:     200
+CommentPragmas:  '^ IWYU pragma:'
+CompactNamespaces: false
+ConstructorInitializerAllOnOneLineOrOnePerLine: true
+ConstructorInitializerIndentWidth: 4
+ContinuationIndentWidth: 4
+Cpp11BracedListStyle: true
+DisableFormat:   false
+FixNamespaceComments: true
+IndentCaseLabels: true
+IndentPPDirectives: None
+IndentWidth:     2
+IndentWrappedFunctionNames: false
+KeepEmptyLinesAtTheStartOfBlocks: false
+MaxEmptyLinesToKeep: 1
+NamespaceIndentation: None
+PenaltyBreakAssignment: 2
+PenaltyBreakBeforeFirstCallParameter: 1
+PenaltyBreakComment: 300
+PenaltyBreakFirstLessLess: 120
+PenaltyBreakString: 1000
+PenaltyExcessCharacter: 1000000
+PenaltyReturnTypeOnItsOwnLine: 200
+ReflowComments:  true
+SortUsingDeclarations: false
+SpaceAfterCStyleCast: false
+SpaceAfterTemplateKeyword: true
+SpaceBeforeAssignmentOperators: true
+SpaceBeforeParens: ControlStatements
+SpaceInEmptyParentheses: false
+SpacesBeforeTrailingComments: 1
+SpacesInAngles:  false
+SpacesInContainerLiterals: true
+SpacesInCStyleCastParentheses: false
+SpacesInParentheses: false
+SpacesInSquareBrackets: false
+DeriveLineEnding: true
+TabWidth:        2
+JavaScriptQuotes: Double 
+UseTab:          Never
 ...

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -12,6 +12,8 @@ We want to make contributing to this project as easy and transparent as possible
      * This decision was made for the license reasons.
      * The Continuous Integration will reject your merge request.
   - All merge requests SHALL have `develop` branch as target branch.
+   - All merge requests SHALL have source branch names that SHALL not contain the `/` character.
+      * We are using a `docker` registry scheme and the image names are based on the source branch name.

 ## Coding Styles ##

--- a/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
+++ b/charts/physims/charts/dlsim.100rb+tm2/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.dlsim100rbtm2}}
+      nodeName: {{ .Values.global.nodeName.dlsim100rbtm2 }}
+      {{- end }}
--- a/charts/physims/charts/dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/dlsim.basic/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }} 
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.dlsimbasic}}
+      nodeName: {{ .Values.global.nodeName.dlsimbasic }}
+      {{- end }}
--- a/charts/physims/charts/ldpctest/templates/job.yaml
+++ b/charts/physims/charts/ldpctest/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.ldpctest}}
+      nodeName: {{ .Values.global.nodeName.ldpctest }}
+      {{- end }}
--- a/charts/physims/charts/nr-dlschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-dlschsim/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrdlschsim}}
+      nodeName: {{ .Values.global.nodeName.nrdlschsim }}
+      {{- end }}
--- a/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.basic/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrdlsimbasic}}
+      nodeName: {{ .Values.global.nodeName.nrdlsimbasic }}
+      {{- end }}
--- a/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.dmrs+ptrs/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrdlsimdmrsptrs}}
+      nodeName: {{ .Values.global.nodeName.nrdlsimdmrsptrs }}
+      {{- end }}
--- a/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.mcs+mimo/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrdlsimmcsmimo}}
+      nodeName: {{ .Values.global.nodeName.nrdlsimmcsmimo }}
+      {{- end }}
--- a/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
+++ b/charts/physims/charts/nr-dlsim.offset/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrdlsimoffset}}
+      nodeName: {{ .Values.global.nodeName.nrdlsimoffset }}
+      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.106rb/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrpbschsim106rb}}
+      nodeName: {{ .Values.global.nodeName.nrpbschsim106rb }}
+      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.217rb/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrpbchsim217rb}}
+      nodeName: {{ .Values.global.nodeName.nrpbchsim217rb }}
+      {{- end }}
--- a/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
+++ b/charts/physims/charts/nr-pbchsim.273rb/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrpbchsim273rb}}
+      nodeName: {{ .Values.global.nodeName.nrpbchsim273rb }}
+      {{- end }}
--- a/charts/physims/charts/nr-prachsim/templates/job.yaml
+++ b/charts/physims/charts/nr-prachsim/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrprachsim}}
+      nodeName: {{ .Values.global.nodeName.nrprachsim }}
+      {{- end }}
--- a/charts/physims/charts/nr-pucchsim/templates/job.yaml
+++ b/charts/physims/charts/nr-pucchsim/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrpucchsim}}
+      nodeName: {{ .Values.global.nodeName.nrpucchsim }}
+      {{- end }}
--- a/charts/physims/charts/nr-ulschsim/templates/job.yaml
+++ b/charts/physims/charts/nr-ulschsim/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrulschsim}}
+      nodeName: {{ .Values.global.nodeName.nrulschsim }}
+      {{- end }}
--- a/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.3gpp/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrulsim3gpp}}
+      nodeName: {{ .Values.global.nodeName.nrulsim3gpp }}
+      {{- end }}
--- a/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.mimo/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrulsimmimo}}
+      nodeName: {{ .Values.global.nodeName.nrulsimmimo }}
+      {{- end }}
--- a/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.misc/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrulsimmisc}}
+      nodeName: {{ .Values.global.nodeName.nrulsimmisc }}
+      {{- end }}
--- a/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
+++ b/charts/physims/charts/nr-ulsim.sc-fdma/templates/job.yaml
@@ -35,5 +35,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.nrulsimscfdma}}
+      nodeName: {{ .Values.global.nodeName.nrulsimscfdma }}
+      {{- end }}
--- a/charts/physims/charts/polartest/templates/job.yaml
+++ b/charts/physims/charts/polartest/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.polartest}}
+      nodeName: {{ .Values.global.nodeName.polartest }}
+      {{- end }}
--- a/charts/physims/charts/smallblocktest/templates/job.yaml
+++ b/charts/physims/charts/smallblocktest/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.smallblocktest}}
+      nodeName: {{ .Values.global.nodeName.smallblocktest }}
+      {{- end }}
--- a/charts/physims/charts/ulsim/templates/job.yaml
+++ b/charts/physims/charts/ulsim/templates/job.yaml
@@ -33,5 +33,10 @@ spec:
      schedulerName: default-scheduler
      serviceAccountName: {{ .Values.global.serviceAccountName }}
      terminationGracePeriodSeconds: 30
+      {{- if .Values.global.nodeSelector}}
      nodeSelector:
-         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+         {{- toYaml .Values.global.nodeSelector | nindent 12 }}
+      {{- end }}
+      {{- if .Values.global.nodeName.ulsim}}
+      nodeName: {{ .Values.global.nodeName.ulsim }}
+      {{- end }}
--- a/charts/physims/values.yaml
+++ b/charts/physims/values.yaml
@@ -11,6 +11,29 @@ global:
    version: TAG
    # pullPolicy: IfNotPresent or Never or Always
    pullPolicy: Always
-  nodeSelector:
-    worker: "telco"
-
+  # removing the node selector
+  nodeSelector: {}
+  # It is not a good way of assigning pods to the nodes: this way we bypass the scheduler. At the moment we don't provide the resource information of these pods.
+  # Therefore, Openshift assigns the pods to the same node because it thinks the pods don't consume much resources. This isn't the case, they consume a lot of resources.
+  nodeName:
+    dlsim100rbtm2: acamas
+    dlsimbasic: acamas
+    ldpctest: acamas
+    nrdlschsim: acamas
+    nrdlsimbasic: acamas
+    nrdlsimdmrsptrs: acamas
+    nrdlsimmcsmimo: acamas
+    nrdlsimoffset: dedale
+    nrpbschsim106rb: dedale
+    nrpbchsim217rb: dedale
+    nrpbchsim273rb: dedale
+    nrprachsim: dedale
+    nrpucchsim: dedale
+    nrulschsim: theseus
+    nrulsim3gpp: theseus
+    nrulsimmimo: theseus
+    nrulsimmisc: theseus
+    nrulsimscfdma: theseus
+    polartest: theseus
+    smallblocktest: theseus
+    ulsim: theseus
--- a/ci-scripts/buildOnVM.sh
+++ b/ci-scripts/buildOnVM.sh
@@ -62,7 +62,7 @@ function build_on_vm {
    echo "ARCHIVES_LOC        = $ARCHIVES_LOC"
    echo "BUILD_OPTIONS       = $BUILD_OPTIONS"

-    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-basic-sim"* ]] || [[ "$VM_NAME" == *"-flexran-rtc"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]]
+    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-basic-sim"* ]] || [[ "$VM_NAME" == *"-flexran-rtc"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]] || [[ "$VM_NAME" == *"rf5g-sim"* ]] || [[ "$VM_NAME" == *"gnb-usrp"* ]] || [[ "$VM_NAME" == *"nr-ue-usrp"* ]]
    then
        echo "This VM type is no longer supported in the pipeline framework"
        return
--- a/ci-scripts/cls_cluster.py
+++ b/ci-scripts/cls_cluster.py
@@ -19,29 +19,27 @@
 # *      contact@openairinterface.org
 # */
 #---------------------------------------------------------------------
-# Python for CI of OAI-eNB + COTS-UE
 #
 #   Required Python Version
 #     Python 3.x
 #
-#   Required Python Package
-#     pexpect
 #---------------------------------------------------------------------

 #-----------------------------------------------------------
 # Import
 #-----------------------------------------------------------
 import logging
-import sshconnection as SSH
-import cls_oai_html
-#import os
 import re
 import time
-#import subprocess
-import sys
+
+import cls_oai_html
 import constants as CONST
 import helpreadme as HELP
 import cls_containerize
+import cls_cmd
+
+IMAGE_REGISTRY_SERVICE_NAME = "image-registry.openshift-image-registry.svc"
+NAMESPACE = "oaicicd-ran"

 class Cluster:
 	def __init__(self):
@@ -58,86 +56,73 @@ class Cluster:
 		self.ranCommitID = ""
 		self.ranAllowMerge = False
 		self.ranTargetBranch = ""
+		self.cmd = None

-	def _recreate_entitlements(self, sshSession):
+
+	def _recreate_entitlements(self):
 		# recreating entitlements, don't care if deletion fails
-		sshSession.command('oc delete secret etc-pki-entitlement', '\$', 5)
-		if re.search(r"not found", sshSession.getBefore()):
-			logging.warning("no secrets etc-pki-entitlement found, recreating")
-		sshSession.command('ls /etc/pki/entitlement/???????????????????.pem | tail -1', '\$', 5, silent=True)
-		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", sshSession.getBefore())
-		sshSession.command('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', '\$', 5, silent=True)
-		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", sshSession.getBefore())
+		self.cmd.run('oc delete secret etc-pki-entitlement')
+		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????.pem | tail -1', silent=True)
+		regres1 = re.search(r"/etc/pki/entitlement/[0-9]+.pem", ret.stdout)
+		ret = self.cmd.run('ls /etc/pki/entitlement/???????????????????-key.pem | tail -1', silent=True)
+		regres2 = re.search(r"/etc/pki/entitlement/[0-9]+-key.pem", ret.stdout)
 		if regres1 is None or regres2 is None:
 			logging.error("could not find entitlements")
-			return false
+			return False
 		file1 = regres1.group(0)
 		file2 = regres2.group(0)
-		sshSession.command(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}', '\$', 5)
-		regres = re.search(r"secret/etc-pki-entitlement created", sshSession.getBefore())
-		if regres is None:
+		ret = self.cmd.run(f'oc create secret generic etc-pki-entitlement --from-file {file1} --from-file {file2}')
+		regres = re.search(r"secret/etc-pki-entitlement created", ret.stdout)
+		if ret.returncode != 0 or regres is None:
 			logging.error("could not create secret/etc-pki-entitlement")
 			return False
 		return True

-	def _recreate_bc(self, sshSession, name, newTag, filename):
-		self._retag_image_statement(sshSession, name, name, newTag, filename)
-		sshSession.command(f'oc delete -f {filename}', '\$', 5)
-		sshSession.command(f'oc create -f {filename}', '\$', 5)
-		before = sshSession.getBefore()
-		if re.search('buildconfig.build.openshift.io/[a-zA-Z\-0-9]+ created', before) is not None:
+	def _recreate_bc(self, name, newTag, filename):
+		self._retag_image_statement(name, name, newTag, filename)
+		self.cmd.run(f'oc delete -f {filename}')
+		ret = self.cmd.run(f'oc create -f {filename}')
+		if re.search('buildconfig.build.openshift.io/[a-zA-Z\-0-9]+ created', ret.stdout) is not None:
 			return True
-		logging.error('error while creating buildconfig: ' + sshSession.getBefore())
+		logging.error('error while creating buildconfig: ' + ret.stdout)
 		return False

-	def _recreate_is_tag(self, sshSession, name, newTag, filename):
-		sshSession.command(f'oc describe is {name}', '\$', 5)
-		if sshSession.getBefore().count('NotFound') > 0:
-			sshSession.command(f'oc create -f {filename}', '\$', 5)
-			before = sshSession.getBefore()
-			if re.search(f'imagestream.image.openshift.io/{name} created', before) is None:
-				logging.error('error while creating imagestream: ' + sshSession.getBefore())
+	def _recreate_is_tag(self, name, newTag, filename):
+		ret = self.cmd.run(f'oc describe is {name}')
+		if ret.returncode != 0:
+			ret = self.cmd.run(f'oc create -f {filename}')
+			if ret.returncode != 0:
+				logging.error(f'error while creating imagestream: {ret.stdout}')
 				return False
 		else:
 			logging.debug(f'-> imagestream {name} found')
 		image = f'{name}:{newTag}'
-		sshSession.command(f'oc delete istag {image}', '\$', 5) # we don't care if this fails, e.g., if it is missing
-		sshSession.command(f'oc create istag {image}', '\$', 5)
-		before = sshSession.getBefore()
-		if re.search(f'imagestreamtag.image.openshift.io/{image} created', before) is not None:
+		self.cmd.run(f'oc delete istag {image}', reportNonZero=False) # we don't care if this fails, e.g., if it is missing
+		ret = self.cmd.run(f'oc create istag {image}')
+		if ret.returncode == 0:
 			return True
-		logging.error('error while creating imagestreamtag: ' + sshSession.getBefore())
+		logging.error(f'error while creating imagestreamtag: {ret.stdout}')
 		return False

-	def _start_build(self, sshSession, name):
+	def _start_build(self, name):
 		# will return "immediately" but build runs in background
 		# if multiple builds are started at the same time, this can take some time, however
-		ret = sshSession.command(f'oc start-build {name} --from-file={self.eNBSourceCodePath}', '\$', 300)
-		before = sshSession.getBefore()
-		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', str(before))
-		if ret != 0 or before.count('Uploading finished') != 1 or regres is None:
-			logging.error("error during oc start-build: " + sshSession.getBefore())
-			self._delete_pod(sshSession, name)
+		ret = self.cmd.run(f'oc start-build {name} --from-file={self.eNBSourceCodePath}')
+		regres = re.search(r'build.build.openshift.io/(?P<jobname>[a-zA-Z0-9\-]+) started', ret.stdout)
+		if ret.returncode != 0 or ret.stdout.count('Uploading finished') != 1 or regres is None:
+			logging.error(f"error during oc start-build: {ret.stdout}")
 			return None
 		return regres.group('jobname') + '-build'

-	def _delete_pod(self, sshSession, shortName):
-		sshSession.command(f"oc get pods | grep {shortName}", '\$', 5)
-		regres = re.search(rf'{shortName}-[0-9]+-build', sshSession.getBefore())
-		if regres is not None:
-			sshSession.command(f"oc delete pod {regres.group(0)}", '\$', 5)
-		else:
-			logging.warning(f"no pod found with name {shortName}")
-
-	def _wait_build_end(self, sshSession, jobs, timeout_sec, check_interval_sec = 5):
+	def _wait_build_end(self, jobs, timeout_sec, check_interval_sec = 5):
 		logging.debug(f"waiting for jobs {jobs} to finish building")
 		while timeout_sec > 0:
 			# check status
 			for j in jobs:
-				sshSession.command(f'oc get pods | grep {j}', '\$', 30, silent = True)
-				if sshSession.getBefore().count('Completed') > 0: jobs.remove(j)
-				if sshSession.getBefore().count('Error') > 0:
-					logging.error(f'error for job {j}: ' + sshSession.getBefore())
+				ret = self.cmd.run(f'oc get pods | grep {j}', silent = True)
+				if ret.stdout.count('Completed') > 0: jobs.remove(j)
+				if ret.stdout.count('Error') > 0:
+					logging.error(f'error for job {j}: {ret.stdout}')
 					return False
 			if jobs == []:
 				logging.debug('all jobs completed')
@@ -147,44 +132,43 @@ class Cluster:
 		logging.error(f"timeout while waiting for end of build of {jobs}")
 		return False

-	def _retag_image_statement(self, sshSession, oldImage, newImage, newTag, filename):
-		sshSession.command(f'sed -i -e "s#{oldImage}:latest#{newImage}:{newTag}#" {filename}', '\$', 5)
+	def _retag_image_statement(self, oldImage, newImage, newTag, filename):
+		self.cmd.run(f'sed -i -e "s#{oldImage}:latest#{newImage}:{newTag}#" {filename}')

-	def _get_image_size(self, sshSession, image, tag):
+	def _get_image_size(self, image, tag):
 		# get the SHA of the image we built using the image name and its tag
-		sshSession.command(f'oc describe is {image} | grep -A4 {tag}', '\$', 5)
-		result = re.search(f'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/(?P<imageSha>{image}@sha256:[a-f0-9]+)', sshSession.getBefore())
+		ret = self.cmd.run(f'oc describe is {image} | grep -A4 {tag}')
+		result = re.search(f'{IMAGE_REGISTRY_SERVICE_NAME}:5000/{NAMESPACE}/(?P<imageSha>{image}@sha256:[a-f0-9]+)', ret.stdout)
 		if result is None:
 			return -1
 		imageSha = result.group("imageSha")

 		# retrieve the size
-		sshSession.command(f'oc get -o json isimage {imageSha} | jq -Mc "{{dockerImageSize: .image.dockerImageMetadata.Size}}"', '\$', 5)
-		result = re.search('{"dockerImageSize":(?P<size>[0-9]+)}', str(sshSession.getBefore()))
+		ret = self.cmd.run(f'oc get -o json isimage {imageSha} | jq -Mc "{{dockerImageSize: .image.dockerImageMetadata.Size}}"')
+		result = re.search('{"dockerImageSize":(?P<size>[0-9]+)}', ret.stdout)
 		if result is None:
 			return -1
 		return int(result.group("size"))

-	def _deploy_pod(self, sshSession, filename, timeout = 30):
-		sshSession.command(f'oc create -f {filename}', '\$', 10)
-		result = re.search(f'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', sshSession.getBefore())
+	def _deploy_pod(self, filename, timeout = 30):
+		ret = self.cmd.run(f'oc create -f {filename}')
+		result = re.search(f'pod/(?P<pod>[a-zA-Z0-9_\-]+) created', ret.stdout)
 		if result is None:
-			logging.error(f'could not deploy pod: {sshSession.getBefore()}')
+			logging.error(f'could not deploy pod: {ret.stdout}')
 			return None
 		pod = result.group("pod")
 		logging.debug(f'checking if pod {pod} is in Running state')
 		while timeout > 0:
-			sshSession.command(f'oc get pod {pod} -o json | jq -Mc .status.phase', '\$', 5, silent=True)
-			if re.search('"Running"', sshSession.getBefore()) is not None: return pod
+			ret = self.cmd.run(f'oc get pod {pod} -o json | jq -Mc .status.phase', silent=True)
+			if re.search('"Running"', ret.stdout) is not None: return pod
 			timeout -= 1
 			time.sleep(1)
 		logging.error(f'pod {pod} did not reach Running state')
-		self._undeploy_pod(sshSession, filename)
+		self._undeploy_pod(filename)
 		return None

-	def _undeploy_pod(self, sshSession, filename):
-		# to save time we start this in the background and trust that oc stops correctly
-		sshSession.command(f'oc delete -f {filename} &', '\$', 5)
+	def _undeploy_pod(self, filename):
+		self.cmd.run(f'oc delete -f {filename}')

 	def BuildClusterImage(self, HTML):
 		if self.ranRepository == '' or self.ranBranch == '' or self.ranCommitID == '':
@@ -194,8 +178,7 @@ class Cluster:
 		lIpAddr = self.eNBIPAddress
 		lSourcePath = self.eNBSourceCodePath
 		if lIpAddr == '' or lSourcePath == '':
-			HELP.GenericHelp(CONST.Version)
-			sys.exit('Insufficient Parameter: no SSH Credentials')
+			sys.exit('Insufficient Parameter: eNBSourceCodePath missing')
 		ocUserName = self.OCUserName
 		ocPassword = self.OCPassword
 		ocProjectName = self.OCProjectName
@@ -206,29 +189,27 @@ class Cluster:
 			sys.exit(f'ocRegistry {self.OCRegistry} should not start with http:// or https:// and end on a slash /')

 		logging.debug(f'Building on cluster triggered from server: {lIpAddr}')
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, "oaicicd", "SHOULD NOT BE NECESSARY")
+		self.cmd = cls_cmd.RemoteCmd(lIpAddr)

 		self.testCase_id = HTML.testCase_id

 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
-			mySSH.command(f'rm -Rf {lSourcePath}', '\$', 15)
-		cls_containerize.CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+			self.cmd.run(f'rm -Rf {lSourcePath}')
+		cls_containerize.CreateWorkspace(self.cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

-		# we don't necessarily need a forced workspace cleanup, but in
-		# order to reduce the amount of data send to OpenShift, we
+		# to reduce the amount of data send to OpenShift, we
 		# manually delete all generated files in the workspace
-		mySSH.command(f'rm -rf {lSourcePath}/cmake_targets/ran_build', '\$', 30);
+		self.cmd.run(f'rm -rf {lSourcePath}/cmake_targets/ran_build');

 		baseTag = 'develop'
 		forceBaseImageBuild = False
 		imageTag = 'develop'
 		if self.ranAllowMerge: # merging MR branch into develop -> temporary image
-			imageTag = 'ci-temp'
+			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == 'develop':
-				mySSH.command(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX', '\$', 5)
-				result = re.search('index', mySSH.getBefore())
+				ret = self.cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base.rhel8.2 | grep --colour=never -i INDEX')
+				result = re.search('index', ret.stdout)
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
@@ -236,122 +217,120 @@ class Cluster:
 			forceBaseImageBuild = True

 		# logging to OC Cluster and then switch to corresponding project
-		mySSH.command(f'oc login -u {ocUserName} -p {ocPassword} --server {self.OCUrl}', '\$', 31)
-		if mySSH.getBefore().count('Login successful.') == 0:
+		ret = self.cmd.run(f'oc login -u {ocUserName} -p {ocPassword} --server {self.OCUrl}')
+		if ret.returncode != 0:
 			logging.error('\u001B[1m OC Cluster Login Failed\u001B[0m')
-			mySSH.close()
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_LOGIN_FAIL)
 			return False

-		mySSH.command(f'oc project {ocProjectName}', '\$', 30)
-		if mySSH.getBefore().count(f'Already on project "{ocProjectName}"') == 0 and mySSH.getBefore().count(f'Now using project "{self.OCProjectName}"') == 0:
+		ret = self.cmd.run(f'oc project {ocProjectName}')
+		if ret.returncode != 0:
 			logging.error(f'\u001B[1mUnable to access OC project {ocProjectName}\u001B[0m')
-			mySSH.command('oc logout', '\$', 30)
-			mySSH.close()
+			self.cmd.run('oc logout')
 			HTML.CreateHtmlTestRow('N/A', 'KO', CONST.OC_PROJECT_FAIL)
 			return False

-		self._recreate_entitlements(mySSH)
+		self._recreate_entitlements()

 		status = True # flag to abandon compiling if any image fails
 		attemptedImages = []
 		if forceBaseImageBuild:
-			self._recreate_is_tag(mySSH, 'ran-base', baseTag, 'openshift/ran-base-is.yaml')
-			self._recreate_bc(mySSH, 'ran-base', baseTag, 'openshift/ran-base-bc.yaml')
-			ranbase_job = self._start_build(mySSH, 'ran-base')
+			self._recreate_is_tag('ran-base', baseTag, 'openshift/ran-base-is.yaml')
+			self._recreate_bc('ran-base', baseTag, 'openshift/ran-base-bc.yaml')
+			ranbase_job = self._start_build('ran-base')
 			attemptedImages += ['ran-base']
-			status = ranbase_job is not None and self._wait_build_end(mySSH, [ranbase_job], 600)
+			status = ranbase_job is not None and self._wait_build_end([ranbase_job], 600)
 			if not status: logging.error('failure during build of ran-base')
-			mySSH.command(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log', '\$', 10)
+			self.cmd.run(f'oc logs {ranbase_job} &> cmake_targets/log/ran-base.log') # cannot use cmd.run because of redirect
 			# recover logs by mounting image
-			self._retag_image_statement(mySSH, 'ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
-			pod = self._deploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
+			self._retag_image_statement('ran-base', 'ran-base', baseTag, 'openshift/ran-base-log-retrieval.yaml')
+			pod = self._deploy_pod('openshift/ran-base-log-retrieval.yaml')
 			if pod is not None:
-				mySSH.command(f'mkdir -p cmake_targets/log/ran-base', '\$', 5)
-				mySSH.command(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ cmake_targets/log/ran-base', '\$', 5)
-				self._undeploy_pod(mySSH, 'openshift/ran-base-log-retrieval.yaml')
+				self.cmd.run(f'mkdir -p cmake_targets/log/ran-base')
+				self.cmd.run(f'oc rsync {pod}:/oai-ran/cmake_targets/log/ cmake_targets/log/ran-base')
+				self._undeploy_pod('openshift/ran-base-log-retrieval.yaml')
 			else:
 				status = False

 		if status:
-			self._recreate_is_tag(mySSH, 'oai-physim', imageTag, 'openshift/oai-physim-is.yaml')
-			self._recreate_bc(mySSH, 'oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel8.2')
-			physim_job = self._start_build(mySSH, 'oai-physim')
+			self._recreate_is_tag('oai-physim', imageTag, 'openshift/oai-physim-is.yaml')
+			self._recreate_bc('oai-physim', imageTag, 'openshift/oai-physim-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.phySim.rhel8.2')
+			physim_job = self._start_build('oai-physim')
 			attemptedImages += ['oai-physim']

-			self._recreate_is_tag(mySSH, 'ran-build', imageTag, 'openshift/ran-build-is.yaml')
-			self._recreate_bc(mySSH, 'ran-build', imageTag, 'openshift/ran-build-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel8.2')
-			ranbuild_job = self._start_build(mySSH, 'ran-build')
+			self._recreate_is_tag('ran-build', imageTag, 'openshift/ran-build-is.yaml')
+			self._recreate_bc('ran-build', imageTag, 'openshift/ran-build-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.build.rhel8.2')
+			ranbuild_job = self._start_build('ran-build')
 			attemptedImages += ['ran-build']

-			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end(mySSH, [ranbuild_job, physim_job], 1200)
+			wait = ranbuild_job is not None and physim_job is not None and self._wait_build_end([ranbuild_job, physim_job], 1200)
 			if not wait: logging.error('error during build of ranbuild_job or physim_job')
 			status = status and wait
-			mySSH.command(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log', '\$', 10)
-			mySSH.command(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log', '\$', 10)
-			mySSH.command('oc get pods.metrics.k8s.io >> cmake_targets/log/build-metrics.log', '\$', 10)
+			self.cmd.run(f'oc logs {ranbuild_job} &> cmake_targets/log/ran-build.log')
+			self.cmd.run(f'oc logs {physim_job} &> cmake_targets/log/oai-physim.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)

 		if status:
-			self._recreate_is_tag(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
-			self._recreate_bc(mySSH, 'oai-enb', imageTag, 'openshift/oai-enb-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel8.2')
-			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel8.2')
-			enb_job = self._start_build(mySSH, 'oai-enb')
+			self._recreate_is_tag('oai-enb', imageTag, 'openshift/oai-enb-is.yaml')
+			self._recreate_bc('oai-enb', imageTag, 'openshift/oai-enb-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.eNB.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.eNB.rhel8.2')
+			enb_job = self._start_build('oai-enb')
 			attemptedImages += ['oai-enb']

-			self._recreate_is_tag(mySSH, 'oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
-			self._recreate_bc(mySSH, 'oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel8.2')
-			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel8.2')
-			gnb_job = self._start_build(mySSH, 'oai-gnb')
+			self._recreate_is_tag('oai-gnb', imageTag, 'openshift/oai-gnb-is.yaml')
+			self._recreate_bc('oai-gnb', imageTag, 'openshift/oai-gnb-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.rhel8.2')
+			gnb_job = self._start_build('oai-gnb')
 			attemptedImages += ['oai-gnb']

-			self._recreate_is_tag(mySSH, 'oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-is.yaml')
-			self._recreate_bc(mySSH, 'oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
-			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
-			gnb_aw2s_job = self._start_build(mySSH, 'oai-gnb-aw2s')
+			self._recreate_is_tag('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-is.yaml')
+			self._recreate_bc('oai-gnb-aw2s', imageTag, 'openshift/oai-gnb-aw2s-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.gNB.aw2s.rhel8.2')
+			gnb_aw2s_job = self._start_build('oai-gnb-aw2s')
 			attemptedImages += ['oai-gnb-aw2s']

-			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end(mySSH, [enb_job, gnb_job, gnb_aw2s_job], 600)
+			wait = enb_job is not None and gnb_job is not None and gnb_aw2s_job is not None and self._wait_build_end([enb_job, gnb_job, gnb_aw2s_job], 600)
 			if not wait: logging.error('error during build of eNB/gNB')
 			status = status and wait
 			# recover logs
-			mySSH.command(f'oc logs {enb_job} &> cmake_targets/log/oai-enb.log', '\$', 10)
-			mySSH.command(f'oc logs {gnb_job} &> cmake_targets/log/oai-gnb.log', '\$', 10)
-			mySSH.command(f'oc logs {gnb_aw2s_job} &> cmake_targets/log/oai-gnb-aw2s.log', '\$', 10)
+			self.cmd.run(f'oc logs {enb_job} &> cmake_targets/log/oai-enb.log')
+			self.cmd.run(f'oc logs {gnb_job} &> cmake_targets/log/oai-gnb.log')
+			self.cmd.run(f'oc logs {gnb_aw2s_job} &> cmake_targets/log/oai-gnb-aw2s.log')

-			self._recreate_is_tag(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
-			self._recreate_bc(mySSH, 'oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel8.2')
-			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel8.2')
-			lteue_job = self._start_build(mySSH, 'oai-lte-ue')
+			self._recreate_is_tag('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-is.yaml')
+			self._recreate_bc('oai-lte-ue', imageTag, 'openshift/oai-lte-ue-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.lteUE.rhel8.2')
+			lteue_job = self._start_build('oai-lte-ue')
 			attemptedImages += ['oai-lte-ue']

-			self._recreate_is_tag(mySSH, 'oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
-			self._recreate_bc(mySSH, 'oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
-			self._retag_image_statement(mySSH, 'ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel8.2')
-			self._retag_image_statement(mySSH, 'ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel8.2')
-			nrue_job = self._start_build(mySSH, 'oai-nr-ue')
+			self._recreate_is_tag('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-is.yaml')
+			self._recreate_bc('oai-nr-ue', imageTag, 'openshift/oai-nr-ue-bc.yaml')
+			self._retag_image_statement('ran-base', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-base', baseTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			self._retag_image_statement('ran-build', 'image-registry.openshift-image-registry.svc:5000/oaicicd-ran/ran-build', imageTag, 'docker/Dockerfile.nrUE.rhel8.2')
+			nrue_job = self._start_build('oai-nr-ue')
 			attemptedImages += ['oai-nr-ue']

-			wait = lteue_job is not None and nrue_job is not None and self._wait_build_end(mySSH, [lteue_job, nrue_job], 600)
+			wait = lteue_job is not None and nrue_job is not None and self._wait_build_end([lteue_job, nrue_job], 600)
 			if not wait: logging.error('error during build of lteUE/nrUE')
 			status = status and wait
 			# recover logs
-			mySSH.command(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log', '\$', 10)
-			mySSH.command(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log', '\$', 10)
-			mySSH.command('oc get pods.metrics.k8s.io >> cmake_targets/log/build-metrics.log', '\$', 10)
+			self.cmd.run(f'oc logs {lteue_job} &> cmake_targets/log/oai-lte-ue.log')
+			self.cmd.run(f'oc logs {nrue_job} &> cmake_targets/log/oai-nr-ue.log')
+			self.cmd.run(f'oc get pods.metrics.k8s.io &>> cmake_targets/log/build-metrics.log', '\$', 10)

 		# split and analyze logs
 		imageSize = {}
 		for image in attemptedImages:
-			mySSH.command(f'mkdir -p cmake_targets/log/{image}', '\$', 5)
-			mySSH.command(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log', '\$', 5)
+			self.cmd.run(f'mkdir -p cmake_targets/log/{image}')
+			self.cmd.run(f'python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log')
 			tag = imageTag if image != 'ran-base' else baseTag
-			size = self._get_image_size(mySSH, image, tag)
+			size = self._get_image_size(image, tag)
 			if size <= 0:
 				imageSize[image] = 'unknown -- BUILD FAILED'
 				status = False
@@ -361,17 +340,17 @@ class Cluster:
 			logging.info(f'\u001B[1m{image} size is {imageSize[image]}\u001B[0m')

 		grep_exp = "\|".join(attemptedImages)
-		mySSH.command(f'oc get images | grep -e \'{grep_exp}\' &> cmake_targets/log/image_registry.log', '\$', 10);
-		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc get pod $pod -o json >> cmake_targets/log/build_pod_summary.log; done', '\$', 60)
+		self.cmd.run(f'oc get images | grep -e \'{grep_exp}\' &> cmake_targets/log/image_registry.log');
+		self.cmd.run(f'for pod in $(oc get pods | tail -n +2 | awk \'{{print $1}}\'); do oc get pod $pod -o json &>> cmake_targets/log/build_pod_summary.log; done', '\$', 60)

 		build_log_name = f'build_log_{self.testCase_id}'
-		cls_containerize.CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, 'oaicicd', CONST.CI_NO_PASSWORD)
+		cls_containerize.CopyLogsToExecutor(self.cmd, lSourcePath, build_log_name)

-		mySSH.command('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc delete pod ${pod}; done', '\$', 60)
+		self.cmd.run('for pod in $(oc get pods | tail -n +2 | awk \'{print $1}\'); do oc delete pod ${pod}; done')

 		# logout will return eventually, but we don't care when -> start in background
-		mySSH.command('oc logout &', '\$', 5)
-		mySSH.close()
+		self.cmd.run(f'oc logout')
+		self.cmd.close()

 		# Analyze the logs
 		collectInfo = cls_containerize.AnalyzeBuildLogs(build_log_name, attemptedImages, status)
--- a/ci-scripts/cls_cmd.py
+++ b/ci-scripts/cls_cmd.py
@@ -0,0 +1,217 @@
+#/*
+# * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+# * contributor license agreements.  See the NOTICE file distributed with
+# * this work for additional information regarding copyright ownership.
+# * The OpenAirInterface Software Alliance licenses this file to You under
+# * the OAI Public License, Version 1.1  (the "License"); you may not use this file
+# * except in compliance with the License.
+# * You may obtain a copy of the License at
+# *
+# *      http://www.openairinterface.org/?page_id=698
+# *
+# * Unless required by applicable law or agreed to in writing, software
+# * distributed under the License is distributed on an "AS IS" BASIS,
+# * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# * See the License for the specific language governing permissions and
+# * limitations under the License.
+# *-------------------------------------------------------------------------------
+# * For more information about the OpenAirInterface (OAI) Software Alliance:
+# *      contact@openairinterface.org
+# */
+#---------------------------------------------------------------------
+#
+#   Required Python Version
+#     Python 3.x
+#
+#---------------------------------------------------------------------
+
+import abc
+import logging
+import subprocess as sp
+import os
+import paramiko
+import uuid
+
+# provides a partial interface for the legacy SSHconnection class (getBefore(), command())
+class Cmd(metaclass=abc.ABCMeta):
+	def cd(self, d, silent=False):
+		if d == None or d == '' or d == []:
+			self.cwd = None
+		elif d[0] == '/':
+			self.cwd = d
+		else:
+			if not self.cwd:
+				# no cwd set: get current working directory
+				self.cwd = self.run('pwd').stdout.strip()
+			self.cwd += f"/{d}"
+		if not silent:
+			logging.debug(f'cd {self.cwd}')
+
+	@abc.abstractmethod
+	def run(self, line, timeout=300, silent=False):
+		return
+
+	@abc.abstractmethod
+	def command(self, commandline, expectedline, timeout, silent=False, resync=False):
+		return
+
+	@abc.abstractmethod
+	def close(self):
+		return
+
+	@abc.abstractmethod
+	def getBefore(self):
+		return
+
+	@abc.abstractmethod
+	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
+		return
+
+	@abc.abstractmethod
+	def copyout(self, scpIp, scpUser, scpPw, src, tgt):
+		return
+
+class LocalCmd(Cmd):
+	def __init__(self, d = None):
+		self.cwd = d
+		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
+
+	def run(self, line, timeout=300, silent=False, reportNonZero=True):
+		if type(line) is str:
+			line = [s for s in line.split(' ') if len(s) > 0]
+		if not silent:
+			logging.debug(' '.join(line))
+		try:
+			ret = sp.run(line, cwd=self.cwd, stdout=sp.PIPE, stderr=sp.STDOUT, timeout=timeout)
+		except Exception as e:
+			ret = sp.CompletedProcess(args=line, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
+		if ret.stdout is None:
+			ret.stdout = b''
+		ret.stdout = ret.stdout.decode('utf-8').strip()
+		if reportNonZero and ret.returncode != 0:
+			cmd = ' '.join(ret.args)
+			logging.warning(f'command "{cmd}" returned non-zero returncode {ret.returncode}: output:\n{ret.stdout}')
+		self.cp = ret
+		return ret
+
+	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
+		line = [s for s in commandline.split(' ') if len(s) > 0]
+		if line[0] == 'cd':
+			self.cd(line[1], silent)
+		else:
+			self.run(line, timeout, silent)
+		return 0
+
+	def close(self):
+		pass
+
+	def getBefore(self):
+		return self.cp.stdout
+
+	def copyin(self, scpIp, scpUser, scpPw, src, tgt):
+		logging.warning("LocalCmd emulating sshconnection.copyin() function")
+		self.run(f'cp -r {src} {tgt}')
+
+	def copyout(self, scpIp, scpUser, scpPw, src, tgt):
+		logging.warning("LocalCmd emulating sshconnection.copyout() function")
+		self.run(f'cp -r {src} {tgt}')
+
+class RemoteCmd(Cmd):
+	def __init__(self, hostname, d=None):
+		logging.getLogger('paramiko').setLevel(logging.INFO) # prevent spamming through Paramiko
+		self.client = paramiko.SSHClient()
+		self.client.set_missing_host_key_policy(paramiko.AutoAddPolicy())
+		cfg = RemoteCmd._lookup_ssh_config(hostname)
+		self.client.connect(**cfg)
+		self.cwd = d
+		self.cp = sp.CompletedProcess(args='', returncode=0, stdout='')
+
+	def _lookup_ssh_config(hostname):
+		ssh_config = paramiko.SSHConfig()
+		user_config_file = os.path.expanduser("~/.ssh/config")
+		if os.path.exists(user_config_file):
+			with open(user_config_file) as f:
+				ssh_config.parse(f)
+		else:
+			raise FileNotFoundError('class needs SSH config at ~/.ssh/config')
+		ucfg = ssh_config.lookup(hostname)
+		if 'identityfile' not in ucfg or 'user' not in ucfg:
+			raise KeyError(f'no identityfile or user in SSH config for host {hostname}')
+		cfg = {'hostname':hostname, 'username':ucfg['user'], 'key_filename':ucfg['identityfile']}
+		if 'hostname' in ucfg:
+			cfg['hostname'] = ucfg['hostname'] # override user-given hostname with what is in config
+		if 'port' in ucfg:
+			cfg['port'] = int(ucfg['port'])
+		if 'proxycommand' in ucfg:
+			cfg['sock'] = paramiko.ProxyCommand(ucfg['proxycommand'])
+		return cfg
+
+	def run(self, line, timeout=300, silent=False, reportNonZero=True):
+		if type(line) is list:
+			line = ' '.join(line)
+		if not silent:
+			logging.debug(line)
+		if self.cwd:
+			line = f"cd {self.cwd} && {line}"
+		args = line.split(' ')
+		try:
+			stdin, stdout, stderr = self.client.exec_command(line, timeout=timeout)
+			ret = sp.CompletedProcess(args=args, returncode=stdout.channel.recv_exit_status(), stdout=stdout.read(size=None) + stderr.read(size=None))
+		except Exception as e:
+			ret = sp.CompletedProcess(args=args, returncode=255, stdout=f'Exception: {str(e)}'.encode('utf-8'))
+		ret.stdout = ret.stdout.decode('utf-8').strip()
+		if reportNonZero and ret.returncode != 0:
+			cmd = ' '.join(ret.args)
+			logging.warning(f'command "{cmd}" returned non-zero returncode {ret.returncode}: output:\n{ret.stdout}')
+		self.cp = ret
+		return ret
+
+	def command(self, commandline, expectedline=None, timeout=300, silent=False, resync=False):
+		line = [s for s in commandline.split(' ') if len(s) > 0]
+		if line[0] == 'cd':
+			self.cd(line[1], silent)
+		else:
+			self.run(line, timeout, silent)
+		return 0
+
+	def close(self):
+		self.client.close()
+
+	def getBefore(self):
+		return self.cp.stdout
+
+	def copyout(self, src, tgt, recursive=False):
+		logging.warning("RemoteCmd emulating sshconnection.copyout() function, ignoring scpIp")
+		logging.debug(f"copyout: local:{src} -> remote:{tgt}")
+		if recursive:
+			tmpfile = f"{uuid.uuid4()}.tar"
+			abstmpfile = f"/tmp/{tmpfile}"
+			cmd = LocalCmd()
+			cmd.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.put(abstmpfile, abstmpfile)
+			sftp.close()
+			cmd.run(f"rm {abstmpfile}")
+			self.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+		else:
+			sftp = self.client.open_sftp()
+			sftp.put(src, tgt)
+			sftp.close()
+
+	def copyin(self, src, tgt, recursive=False):
+		logging.warning("RemoteCmd emulating sshconnection.copyout() function")
+		logging.debug(f"copyin: remote:{src} -> local:{tgt}")
+		if recursive:
+			tmpfile = f"{uuid.uuid4()}.tar"
+			abstmpfile = f"/tmp/{tmpfile}"
+			self.run(f"tar -cf {abstmpfile} {src}")
+			sftp = self.client.open_sftp()
+			sftp.get(abstmpfile, abstmpfile)
+			sftp.close()
+			self.run(f"rm {abstmpfile}")
+			cmd = LocalCmd()
+			cmd.run(f"mv {abstmpfile} {tgt}; cd {tgt} && tar -xf {tmpfile} && rm {tmpfile}")
+		else:
+			sftp = self.client.open_sftp()
+			sftp.get(src, tgt)
+			sftp.close()
--- a/ci-scripts/cls_containerize.py
+++ b/ci-scripts/cls_containerize.py
@@ -44,6 +44,7 @@ from zipfile import ZipFile
 #-----------------------------------------------------------
 # OAI Testing modules
 #-----------------------------------------------------------
+import cls_cmd
 import sshconnection as SSH
 import helpreadme as HELP
 import constants as CONST
@@ -83,20 +84,20 @@ def CreateWorkspace(sshSession, sourcePath, ranRepository, ranCommitID, ranTarge
 		logging.debug(f'Merging with the target branch: {ranTargetBranch}')
 		sshSession.command(f'git merge --ff origin/{ranTargetBranch} -m "Temporary merge for CI"', '\$', 30)

-def CopyLogsToExecutor(sshSession, sourcePath, log_name, scpIp, scpUser, scpPw):
-	sshSession.command(f'cd {sourcePath}/cmake_targets', '\$', 5)
-	sshSession.command(f'rm -f {log_name}.zip', '\$', 5)
-	sshSession.command(f'mkdir -p {log_name}', '\$', 5)
-	sshSession.command(f'mv log/* {log_name}', '\$', 5)
-	sshSession.command(f'zip -r -qq {log_name}.zip {log_name}', '\$', 5)
+def CopyLogsToExecutor(cmd, sourcePath, log_name):
+	cmd.cd(f'{sourcePath}/cmake_targets')
+	cmd.run(f'rm -f {log_name}.zip')
+	cmd.run(f'mkdir -p {log_name}')
+	cmd.run(f'mv log/* {log_name}')
+	cmd.run(f'zip -r -qq {log_name}.zip {log_name}')

 	# copy zip to executor for analysis
 	if (os.path.isfile(f'./{log_name}.zip')):
 		os.remove(f'./{log_name}.zip')
 	if (os.path.isdir(f'./{log_name}')):
 		shutil.rmtree(f'./{log_name}')
-	sshSession.copyin(scpIp, scpUser, scpPw, f'{sourcePath}/cmake_targets/{log_name}.zip', '.')
-	sshSession.command(f'rm -f {log_name}.zip','\$', 5)
+	cmd.copyin(f'{sourcePath}/cmake_targets/{log_name}.zip', f'./{log_name}.zip')
+	cmd.run(f'rm -f {log_name}.zip')
 	ZipFile(f'{log_name}.zip').extractall('.')

 def AnalyzeBuildLogs(buildRoot, images, globalStatus):
@@ -153,11 +154,11 @@ def AnalyzeBuildLogs(buildRoot, images, globalStatus):

 def AnalyzeIperf(cliOptions, clientReport, serverReport):
 	req_bw = 1.0 # default iperf throughput, in Mbps
-	result = re.search('-b *(?P<iperf_bandwidth>[0-9\.]+)(?P<magnitude>[KMG])', cliOptions)
+	result = re.search('-b *(?P<iperf_bandwidth>[0-9\.]+)(?P<magnitude>[kKMG])', cliOptions)
 	if result is not None:
 		req_bw = float(result.group('iperf_bandwidth'))
 		magn = result.group('magnitude')
-		if magn == "K":
+		if magn == "k" or magn == "K":
 			req_bw /= 1000
 		elif magn == "G":
 			req_bw *= 1000
@@ -180,7 +181,7 @@ def AnalyzeIperf(cliOptions, clientReport, serverReport):
 			reportLine = clientReportLines[l+1]
 			logging.debug(f'found server report: "{reportLine}"')

-	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [KMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[KMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ ..\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
+	statusTemplate = '(?:|\[ *\d+\].*) +0\.0-\s*(?P<duration>[0-9\.]+) +sec +[0-9\.]+ [kKMG]Bytes +(?P<bitrate>[0-9\.]+) (?P<magnitude>[kKMG])bits\/sec +(?P<jitter>[0-9\.]+) ms +(\d+\/ ..\d+) +(\((?P<packetloss>[0-9\.]+)%\))'
 	# if we do not find a server report in the client logs, check the server logs
 	# and use the last line which is typically close/identical to server report
 	if reportLine is None:
@@ -201,10 +202,10 @@ def AnalyzeIperf(cliOptions, clientReport, serverReport):
 	duration = float(result.group('duration'))
 	bitrate = float(result.group('bitrate'))
 	magn = result.group('magnitude')
-	if magn == "K":
-		bitrate *= 1000
-	elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
+	if magn == "k" or magn == "K":
 		bitrate /= 1000
+	elif magn == "G": # we assume bitrate in Mbps, therefore it must be G now
+		bitrate *= 1000
 	jitter = float(result.group('jitter'))
 	packetloss = float(result.group('packetloss'))

@@ -329,12 +330,11 @@ class Containerize():
 			HELP.GenericHelp(CONST.Version)
 			sys.exit('Insufficient Parameter')
 		logging.debug('Building on server: ' + lIpAddr)
-		mySSH = SSH.SSHConnection()
-		mySSH.open(lIpAddr, lUserName, lPassWord)
+		cmd = cls_cmd.RemoteCmd(lIpAddr)
 	
 		# Checking the hostname to get adapted on cli and dockerfileprefixes
-		mySSH.command('hostnamectl', '\$', 5)
-		result = re.search('Ubuntu|Red Hat',  mySSH.getBefore())
+		cmd.run('hostnamectl')
+		result = re.search('Ubuntu|Red Hat', cmd.getBefore())
 		self.host = result.group(0)
 		if self.host == 'Ubuntu':
 			self.cli = 'docker'
@@ -369,18 +369,18 @@ class Containerize():
 		
 		# Workaround for some servers, we need to erase completely the workspace
 		if self.forcedWorkspaceCleanup:
-			mySSH.command('echo ' + lPassWord + ' | sudo -S rm -Rf ' + lSourcePath, '\$', 15)
+			cmd.run(f'sudo -S rm -Rf {lSourcePath}')
 	
 		self.testCase_id = HTML.testCase_id
 	
-		CreateWorkspace(mySSH, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)
+		CreateWorkspace(cmd, lSourcePath, self.ranRepository, self.ranCommitID, self.ranTargetBranch, self.ranAllowMerge)

 		# if asterix, copy the entitlement and subscription manager configurations
 		if self.host == 'Red Hat':
-			mySSH.command('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca', '\$', 5)
-			mySSH.command('sudo cp /etc/rhsm/rhsm.conf ./rhsm-conf/', '\$', 5)
-			mySSH.command('sudo cp /etc/rhsm/ca/redhat-uep.pem ./rhsm-ca/', '\$', 5)
-			mySSH.command('sudo cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/', '\$', 5)
+			cmd.run('mkdir -p ./etc-pki-entitlement ./rhsm-conf ./rhsm-ca')
+			cmd.run('cp /etc/rhsm/rhsm.conf ./rhsm-conf/')
+			cmd.run('cp /etc/rhsm/ca/redhat-uep.pem ./rhsm-ca/')
+			cmd.run('cp /etc/pki/entitlement/*.pem ./etc-pki-entitlement/')

 		baseImage = 'ran-base'
 		baseTag = 'develop'
@@ -389,8 +389,8 @@ class Containerize():
 		if (self.ranAllowMerge):
 			imageTag = 'ci-temp'
 			if self.ranTargetBranch == 'develop':
-				mySSH.command('git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base' + self.dockerfileprefix + ' | grep --colour=never -i INDEX', '\$', 5)
-				result = re.search('index', mySSH.getBefore())
+				cmd.run(f'git diff HEAD..origin/develop -- cmake_targets/build_oai cmake_targets/tools/build_helper docker/Dockerfile.base{self.dockerfileprefix} | grep --colour=never -i INDEX')
+				result = re.search('index', cmd.getBefore())
 				if result is not None:
 					forceBaseImageBuild = True
 					baseTag = 'ci-temp'
@@ -398,31 +398,31 @@ class Containerize():
 			forceBaseImageBuild = True

 		# Let's remove any previous run artifacts if still there
-		mySSH.command(self.cli + ' image prune --force', '\$', 30)
+		cmd.run(f"{self.cli} image prune --force")
 		if forceBaseImageBuild:
-			mySSH.command(self.cli + ' image rm ' + baseImage + ':' + baseTag + ' || true', '\$', 30)
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
 		for image,pattern in imageNames:
-			mySSH.command(self.cli + ' image rm ' + image + ':' + imageTag + ' || true', '\$', 30)
+			cmd.run(f"{self.cli} image rm {image}:{imageTag}")

 		# Build the base image only on Push Events (not on Merge Requests)
 		# On when the base image docker file is being modified.
 		if forceBaseImageBuild:
-			mySSH.command(self.cli + ' build ' + self.cliBuildOptions + ' --target ' + baseImage + ' --tag ' + baseImage + ':' + baseTag + ' --file docker/Dockerfile.base' + self.dockerfileprefix + ' . > cmake_targets/log/ran-base.log 2>&1', '\$', 1600)
+			cmd.run(f"{self.cli} build {self.cliBuildOptions} --target {baseImage} --tag {baseImage}:{baseTag} --file docker/Dockerfile.base{self.dockerfileprefix} . &> cmake_targets/log/ran-base.log", timeout=1600)
 		# First verify if the base image was properly created.
-		mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + baseImage + ':' + baseTag, '\$', 5)
+		ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {baseImage}:{baseTag}")
 		allImagesSize = {}
-		if mySSH.getBefore().count('o such image') != 0:
+		if ret.returncode != 0:
 			logging.error('\u001B[1m Could not build properly ran-base\u001B[0m')
 			# Recover the name of the failed container?
-			mySSH.command(self.cli + ' ps --quiet --filter "status=exited" -n1 | xargs ' + self.cli + ' rm -f', '\$', 5)
-			mySSH.command(self.cli + ' image prune --force', '\$', 30)
-			mySSH.close()
+			cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
+			cmd.run(f"{self.cli} image prune --force")
+			cmd.close()
 			logging.error('\u001B[1m Building OAI Images Failed\u001B[0m')
 			HTML.CreateHtmlTestRow(self.imageKind, 'KO', CONST.ALL_PROCESSES_OK)
 			HTML.CreateHtmlTabFooter(False)
 			sys.exit(1)
 		else:
-			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+			result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 			if result is not None:
 				size = float(result.group("size")) / 1000000
 				imageSizeStr = f'{size:.1f}'
@@ -432,10 +432,10 @@ class Containerize():
 				logging.debug('ran-base size is unknown')

 		# Recover build logs, for the moment only possible when build is successful
-		mySSH.command(self.cli + ' create --name test ' + baseImage + ':' + baseTag, '\$', 5)
-		mySSH.command('mkdir -p cmake_targets/log/ran-base', '\$', 5)
-		mySSH.command(self.cli + ' cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base', '\$', 5)
-		mySSH.command(self.cli + ' rm -f test', '\$', 5)
+		cmd.run(f"{self.cli} create --name test {baseImage}:{baseTag}")
+		cmd.run("mkdir -p cmake_targets/log/ran-base")
+		cmd.run(f"{self.cli} cp test:/oai-ran/cmake_targets/log/. cmake_targets/log/ran-base")
+		cmd.run(f"{self.cli} rm -f test")

 		# Build the target image(s)
 		status = True
@@ -444,26 +444,26 @@ class Containerize():
 			attemptedImages += [image]
 			# the archived Dockerfiles have "ran-base:latest" as base image
 			# we need to update them with proper tag
-			mySSH.command(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}', '\$', 5)
+			cmd.run(f'sed -i -e "s#{baseImage}:latest#{baseImage}:{baseTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
 			if image != 'ran-build':
-				mySSH.command(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}', '\$', 5)
-			mySSH.command(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', '\$', 1200)
+				cmd.run(f'sed -i -e "s#ran-build:latest#ran-build:{imageTag}#" docker/Dockerfile.{pattern}{self.dockerfileprefix}')
+			cmd.run(f'{self.cli} build {self.cliBuildOptions} --target {image} --tag {image}:{imageTag} --file docker/Dockerfile.{pattern}{self.dockerfileprefix} . > cmake_targets/log/{image}.log 2>&1', timeout=1200)
 			# split the log
-			mySSH.command('mkdir -p cmake_targets/log/' + image, '\$', 5)
-			mySSH.command('python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/' + image + '.log', '\$', 5)
-			# checking the status of the build
-			mySSH.command(self.cli + ' image inspect --format=\'Size = {{.Size}} bytes\' ' + image + ':' + imageTag, '\$', 5)
-			if mySSH.getBefore().count('o such image') != 0:
+			cmd.run(f"mkdir -p cmake_targets/log/{image}")
+			cmd.run(f"python3 ci-scripts/docker_log_split.py --logfilename=cmake_targets/log/{image}.log")
+			# check the status of the build
+			ret = cmd.run(f"{self.cli} image inspect --format=\'Size = {{{{.Size}}}} bytes\' {image}:{imageTag}")
+			if ret.returncode != 0:
 				logging.error('\u001B[1m Could not build properly ' + image + '\u001B[0m')
 				status = False
 				# Here we should check if the last container corresponds to a failed command and destroy it
-				mySSH.command(self.cli + ' ps --quiet --filter "status=exited" -n1 | xargs ' + self.cli + ' rm -f', '\$', 5)
+				cmd.run(f"{self.cli} ps --quiet --filter \"status=exited\" -n1 | xargs {self.cli} rm -f")
 				allImagesSize[image] = 'N/A -- Build Failed'
 				break
 			else:
-				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', mySSH.getBefore())
+				result = re.search('Size *= *(?P<size>[0-9\-]+) *bytes', cmd.getBefore())
 				if result is not None:
-					size = float(result.group("size")) / 1000000
+					size = float(result.group("size")) / 1000000 # convert to MB
 					imageSizeStr = f'{size:.1f}'
 					logging.debug(f'\u001B[1m   {image} size is {imageSizeStr} Mbytes\u001B[0m')
 					allImagesSize[image] = f'{imageSizeStr} Mbytes'
@@ -471,18 +471,18 @@ class Containerize():
 					logging.debug(f'{image} size is unknown')
 					allImagesSize[image] = 'unknown'
 			# Now pruning dangling images in between target builds
-			mySSH.command(self.cli + ' image prune --force', '\$', 30)
+			cmd.run(f"{self.cli} image prune --force")

 		# Remove all intermediate build images and clean up
 		if self.ranAllowMerge and forceBaseImageBuild:
-			mySSH.command(f'{self.cli} image rm {baseImage}:{baseTag} || true', '\$', 30)
-		mySSH.command(f'{self.cli} image rm ran-build:{imageTag}','\$', 30)
-		mySSH.command(f'{self.cli} volume prune --force','\$', 15)
+			cmd.run(f"{self.cli} image rm {baseImage}:{baseTag}")
+		cmd.run(f"{self.cli} image rm ran-build:{imageTag}")
+		cmd.run(f"{self.cli} volume prune --force")

 		# create a zip with all logs
 		build_log_name = f'build_log_{self.testCase_id}'
-		CopyLogsToExecutor(mySSH, lSourcePath, build_log_name, lIpAddr, lUserName, lPassWord)
-		mySSH.close()
+		CopyLogsToExecutor(cmd, lSourcePath, build_log_name)
+		cmd.close()

 		# Analyze the logs
 		collectInfo = AnalyzeBuildLogs(build_log_name, attemptedImages, status)
--- a/ci-scripts/cls_oaicitest.py
+++ b/ci-scripts/cls_oaicitest.py
@@ -3669,7 +3669,7 @@ class OaiCiTest():
 	def LogCollectPing(self,EPC):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
-		if self.IPAddress == 'none':
+		if EPC.IPAddress == 'none':
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
@@ -3683,7 +3683,7 @@ class OaiCiTest():
 	def LogCollectIperf(self,EPC):
 		# Some pipelines are using "none" IP / Credentials
 		# In that case, just forget about it
-		if self.IPAddress == 'none':
+		if EPC.IPAddress == 'none':
 			sys.exit(0)
 		SSH = sshconnection.SSHConnection()
 		SSH.open(EPC.IPAddress, EPC.UserName, EPC.Password)
--- a/ci-scripts/cls_physim1.py
+++ b/ci-scripts/cls_physim1.py
@@ -32,13 +32,14 @@
 # Import
 #-----------------------------------------------------------
 import logging
-import sshconnection as SSH
-import cls_oai_html
 import os
 import re
 import time
 import subprocess
 import sys
+
+import sshconnection as SSH
+import cls_oai_html
 import constants as CONST
 import helpreadme as HELP

@@ -105,7 +106,7 @@ class PhySim:
 		if self.ranCommitID != '':
 			mySSH.command('git checkout -f ' + self.ranCommitID, '\$', 30)
 		if self.ranAllowMerge:
-			imageTag = "ci-temp"
+			imageTag = f'{self.ranBranch}-{self.ranCommitID[0:8]}'
 			if self.ranTargetBranch == '':
 				if (self.ranBranch != 'develop') and (self.ranBranch != 'origin/develop'):
 					mySSH.command('git merge --ff origin/develop -m "Temporary merge for CI"', '\$', 30)
--- a/ci-scripts/conf_files/README.md
+++ b/ci-scripts/conf_files/README.md
@@ -0,0 +1,36 @@
+# Configuration files: naming style guide
+
+The configuration files should have the following name format:
+
+```
+<type>[.<sa|nsa>][.band<num>.[u<num>.]<num>prb].<sdr>[.<opt>].conf
+```
+
+Where:
+- `[]` means this field is optional
+- `<type>`: one of `gnb`, `enb`, `gnb-cu`, `gnb-du`, `nrue`, `lteue`, etc.
+- `<sa|nsa>`: in the case of 5G, notes whether this is SA or NSA
+- `<num>` for `band`/`u`/`prb`: numerical value. Note that band/PRB are only
+  applicable in some cases. The numerology `u` is only to be set for 5G if it
+  differs from `u1`.
+- `<sdr>`: what SDR board/split this is tailored for:
+  * e.g., `usrpb210`, `usrpn310`, `rfsim`, `aw2s`
+  * if there is no SDR (e.g., for a CU), use the south-bound split, e.g., `f1`, `if4p5`, etc.
+  * for the L2simulator, write `l2sim`
+- `<opt>`: optional specifiers. If there are multiple, concatenated
+  using a dash (`-`). Examples:
+  * `2x2`
+  * `prs` (positioning reference signal)
+  * `ddsuu` (specific TDD pattern)
+  * `tm2`: Transmission Mode 2 in 4G
+  * `oaiue`: specifies usage with OAI UE and not COTS UE
+
+Examples:
+- standard monolithic gNB, 2x2 configuration, with SDAP: `gnb.sa.band78.162prb.usrpn310.2x2-sdap.conf`
+- gNB-CU: `gnb-cu.sa.f1.conf`
+- monolithic gNB, L2sim: `gnb.sa.band77.106prb.l2sim.conf`
+- RCC (4G eNB with IF4.5 split): `enb.band40.25prb.if45.tm1-fairscheduler.conf`
+
+Notes:
+- there is no need for TDD/FDD, this is encoded in the band number
+- there is no need for FR1/FR2, this is encoded in the band number
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.asue.conf
@@ -26,7 +26,7 @@ gNBs =
    pusch_AntennaPorts                                        = 2;
    pdsch_AntennaPorts_XP                                     = 2;
    ul_prbblacklist                                           = "51,52,53,54"
-    do_SRS                                                    = 1;
+    do_SRS                                                    = 0;
    do_CSIRS                                                  = 1;

    pdcch_ConfigSIB1 = (
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf
@@ -25,7 +25,7 @@ gNBs =

    pdsch_AntennaPorts_XP                                     = 2;
    pusch_AntennaPorts                                        = 2;
-    do_SRS                                                    = 1;
+    do_SRS                                                    = 0;

    pdcch_ConfigSIB1 = (
      {
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.ddsuu.2x2.usrpn310.conf
@@ -25,7 +25,7 @@ gNBs =

    pusch_AntennaPorts                                        = 2;
    ul_prbblacklist                                           = "51,52,53,54"
-    do_SRS                                                    = 1;
+    do_SRS                                                    = 0;

    pdcch_ConfigSIB1 = (
      {
--- a/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
+++ b/ci-scripts/conf_files/gnb.band78.sa.fr1.162PRB.2x2.usrpn310.conf
@@ -28,6 +28,7 @@ gNBs =
    #pusch_TargetSNRx10                                        = 200;
    #pucch_TargetSNRx10                                        = 200;
    ul_prbblacklist                                           = "79,80,81,82"
+    do_SRS                                                    = 0;

    pdcch_ConfigSIB1 = (
      {
--- a/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
+++ b/ci-scripts/conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf
@@ -166,7 +166,7 @@ gNBs =


    ////////// AMF parameters:
-    amf_ip_address      = ( { ipv4       = "192.168.70.132";
+    amf_ip_address      = ( { ipv4       = "192.168.71.132";
                              ipv6       = "192:168:30::17";
                              active     = "yes";
                              preference = "ipv4";
@@ -177,9 +177,9 @@ gNBs =
    NETWORK_INTERFACES :
    {
        GNB_INTERFACE_NAME_FOR_NG_AMF            = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.70.129/24";
+        GNB_IPV4_ADDRESS_FOR_NG_AMF              = "192.168.71.140/24";
        GNB_INTERFACE_NAME_FOR_NGU               = "demo-oai";
-        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.70.129/24";
+        GNB_IPV4_ADDRESS_FOR_NGU                 = "192.168.71.140/24";
        GNB_PORT_FOR_S1U                         = 2152; # Spec 2152
    };

--- a/ci-scripts/createVM.sh
+++ b/ci-scripts/createVM.sh
@@ -87,7 +87,7 @@ function create_vm {
    echo "VM_CPU              = $VM_CPU"
    echo "VM_DISK             = $VM_DISK GBytes"

-    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]]
+    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]] || [[ "$VM_NAME" == *"rf5g-sim"* ]]
    then
        echo "This VM type is no longer supported in the pipeline framework"
        return
--- a/ci-scripts/runTestOnVM.sh
+++ b/ci-scripts/runTestOnVM.sh
@@ -1095,12 +1095,12 @@ function start_rf_sim_gnb {
    then
        if [ $LOC_RA_SA_TEST -eq 0 ] #no RA test => use --phy-test option
        then
-            echo "echo \"./nr-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor,time --parallel-config PARALLEL_SINGLE_THREAD --noS1 --nokrnmod 1 --rfsim --phy-test --lowmem --noS1\" > ./my-nr-softmodem-run.sh " >> $1
+            echo "echo \"./nr-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor,time --parallel-config PARALLEL_SINGLE_THREAD --noS1 --nokrnmod 1 --rfsim --phy-test --noS1\" > ./my-nr-softmodem-run.sh " >> $1
        elif [ $LOC_RA_SA_TEST -eq 1 ] #RA test => use --do-ra option
        then
-            echo "echo \"./nr-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor,time --parallel-config PARALLEL_SINGLE_THREAD --rfsim --do-ra --lowmem --noS1\" > ./my-nr-softmodem-run.sh " >> $1
+            echo "echo \"./nr-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor,time --parallel-config PARALLEL_SINGLE_THREAD --rfsim --do-ra --noS1\" > ./my-nr-softmodem-run.sh " >> $1
        else #SA test => use --sa option
-            echo "echo \"./nr-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor,time --parallel-config PARALLEL_SINGLE_THREAD --rfsim --sa --lowmem \" > ./my-nr-softmodem-run.sh " >> $1
+            echo "echo \"./nr-softmodem -O /home/ubuntu/tmp/ci-scripts/conf_files/ci-$LOC_CONF_FILE --log_config.global_log_options level,nocolor,time --parallel-config PARALLEL_SINGLE_THREAD --rfsim --sa \" > ./my-nr-softmodem-run.sh " >> $1
        fi
    fi
    echo "chmod 775 ./my-nr-softmodem-run.sh" >> $1
@@ -1305,14 +1305,8 @@ function run_test_on_vm {
        return
    elif [[ (( "$RUN_OPTIONS" == "complex" ) && ( $VM_NAME =~ .*-rf5g-sim.* ))  ]]
    then
-        GNB_VM_NAME=`echo $VM_NAME | sed -e "s#rf5g-sim#gnb-usrp#"`
-        GNB_VM_CMDS=${GNB_VM_NAME}_cmds.txt
-        echo "GNB_VM_NAME         = $GNB_VM_NAME"
-        echo "GNB_VM_CMD_FILE     = $GNB_VM_CMDS"
-        NR_UE_VM_NAME=`echo $VM_NAME | sed -e "s#rf5g-sim#nr-ue-usrp#"`
-        NR_UE_VM_CMDS=${UE_VM_NAME}_cmds.txt
-        echo "NR_UE_VM_NAME       = $NR_UE_VM_NAME"
-        echo "NR_UE_VM_CMD_FILE   = $NR_UE_VM_CMDS"
+        echo "This VM test type is no longer supported in the pipeline framework"
+        return
    else
        echo "VM_NAME             = $VM_NAME"
        echo "VM_CMD_FILE         = $VM_CMDS"
--- a/ci-scripts/waitBuildOnVM.sh
+++ b/ci-scripts/waitBuildOnVM.sh
@@ -47,7 +47,7 @@ function wait_on_vm_build {
    echo "ARCHIVES_LOC        = $ARCHIVES_LOC"
    echo "BUILD_OPTIONS       = $BUILD_OPTIONS"

-    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-basic-sim"* ]] || [[ "$VM_NAME" == *"-flexran-rtc"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]]
+    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-basic-sim"* ]] || [[ "$VM_NAME" == *"-flexran-rtc"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]] || [[ "$VM_NAME" == *"rf5g-sim"* ]] || [[ "$VM_NAME" == *"gnb-usrp"* ]] || [[ "$VM_NAME" == *"nr-ue-usrp"* ]]
    then
        echo "This VM type is no longer supported in the pipeline framework"
        return
@@ -93,7 +93,7 @@ function wait_on_vm_build {
 }

 function check_on_vm_build {
-    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-basic-sim"* ]] || [[ "$VM_NAME" == *"-flexran-rtc"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]]
+    if [[ "$VM_NAME" == *"-enb-usrp"* ]] || [[ "$VM_NAME" == *"-cppcheck"* ]] || [[ "$VM_NAME" == *"-phy-sim"* ]] || [[ "$VM_NAME" == *"-basic-sim"* ]] || [[ "$VM_NAME" == *"-flexran-rtc"* ]] || [[ "$VM_NAME" == *"-rf-sim"* ]] || [[ "$VM_NAME" == *"-ethernet"* ]] || [[ "$VM_NAME" == *"rf5g-sim"* ]] || [[ "$VM_NAME" == *"gnb-usrp"* ]] || [[ "$VM_NAME" == *"nr-ue-usrp"* ]]
    then
        echo "This VM type is no longer supported in the pipeline framework"
        return
--- a/ci-scripts/xml_files/container_5g_rfsim.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-tdd</htmlTabRef>
-        <htmlTabName>Monolithic TDD gNB</htmlTabName>
+        <htmlTabName>Monolithic SA TDD gNB</htmlTabName>
        <htmlTabIcon>wrench</htmlTabIcon>
        <repeatCount>1</repeatCount>
        <TestCaseRequestedList>
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb.xml
@@ -0,0 +1,124 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-24prb-5gnr-tdd</htmlTabRef>
+        <htmlTabName>Monolithic SA TDD gNB 24PRB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 111111
+ 100001
+ 000000
+ 000001
+ 000002
+ 000003
+ 020001
+ 020002
+ 030001
+ 030002
+ 100001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy MySql Database</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <services>mysql</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000001">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G CoreNetwork</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <services>oai-nrf oai-amf oai-smf oai-spgwu oai-ext-dn</services>
+                <nb_healthy>6</nb_healthy>
+        </testCase>
+
+        <testCase id="000002">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <services>oai-gnb</services>
+                <nb_healthy>7</nb_healthy>
+        </testCase>
+
+        <testCase id="000003">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>8</nb_healthy>
+        </testCase>
+
+        <testCase id="020001">
+                <class>PingFromContainer</class>
+                <desc>Ping ext-dn from NR-UE</desc>
+                <container_name>rfsim5g-oai-nr-ue</container_name>
+                <options>-I oaitun_ue1 -c 20 -i0.2 192.168.72.135</options>
+                <loss_threshold>5</loss_threshold>
+        </testCase>
+
+        <testCase id="020002">
+                <class>PingFromContainer</class>
+                <desc>Ping NR-UE from ext-dn</desc>
+                <container_name>rfsim5g-oai-ext-dn</container_name>
+                <options>-c 20 12.1.1.2 -i0.2</options>
+                <loss_threshold>5</loss_threshold>
+        </testCase>
+
+        <testCase id="030001">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-ext-dn</client_container_name>
+                <server_options>-B 12.1.1.2 -u -i 1 -s</server_options>
+                <client_options>-c 12.1.1.2 -u -i 1 -t 5 -b 3M</client_options>
+        </testCase>
+
+        <testCase id="030002">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-ext-dn</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-u -i 1 -s</server_options>
+                <client_options>-B 12.1.1.2 -c 192.168.72.135 -u -i 1 -t 5 -b 1M</client_options>
+        </testCase>
+
+        <testCase id="100001">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+                <d_retx_th>1,0,0,0</d_retx_th>
+                <u_retx_th>1,0,0,0</u_retx_th>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_24prb_down.xml
@@ -0,0 +1,45 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-24prb-5gnr-down</htmlTabRef>
+        <htmlTabName>CleanUp Monolithic SA TDD gNB 24PRB</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100002
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100002">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_24prb</yaml_path>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_down.xml
@@ -22,7 +22,7 @@
 -->
 <testCaseList>
        <htmlTabRef>rfsim-5gnr-down</htmlTabRef>
-        <htmlTabName>CleanUp Monolithic TDD gNB</htmlTabName>
+        <htmlTabName>CleanUp SA Monolithic TDD gNB</htmlTabName>
        <htmlTabIcon>trash</htmlTabIcon>
        <TestCaseRequestedList>
 100002
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest.xml
@@ -0,0 +1,106 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-5gnr-fdd-phytest</htmlTabRef>
+        <htmlTabName>Monolithic FDD phytest gNB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 111111
+ 100011
+ 000010
+ 000011
+ 020011
+ 020012
+ 030011
+ 030012
+ 100011
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000010">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G gNB RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <services>oai-gnb</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000011">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI 5G NR-UE RF sim SA</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
+        </testCase>
+
+        <testCase id="020011">
+                <class>PingFromContainer</class>
+                <desc>Ping gNB from NR-UE</desc>
+                <container_name>rfsim5g-oai-nr-ue</container_name>
+                <options>-c20 -i0.2 10.0.1.1</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="020012">
+                <class>PingFromContainer</class>
+                <desc>Ping NR-UE from gNB</desc>
+                <container_name>rfsim5g-oai-gnb</container_name>
+                <options>-c20 -i0.2 10.0.1.2</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="030011">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Downlink</desc>
+                <server_container_name>rfsim5g-oai-nr-ue</server_container_name>
+                <client_container_name>rfsim5g-oai-gnb</client_container_name>
+                <server_options>-sui1 -B10.0.1.2</server_options>
+                <client_options>-uc10.0.1.2 -i1 -t10 -b30k -B10.0.1.1</client_options>
+        </testCase>
+
+        <testCase id="030012">
+                <class>IperfFromContainer</class>
+                <desc>Iperf UDP Uplink</desc>
+                <server_container_name>rfsim5g-oai-gnb</server_container_name>
+                <client_container_name>rfsim5g-oai-nr-ue</client_container_name>
+                <server_options>-sui1 -B10.0.1.1</server_options>
+                <client_options>-uc10.0.1.1 -i1 -t10 -b30k -B10.0.1.2</client_options>
+        </testCase>
+
+        <testCase id="100011">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+                <d_retx_th>10,100,100,100</d_retx_th> <!-- phytest: will fail at start! -->
+                <u_retx_th>10,100,100,100</u_retx_th> <!-- phytest: will fail at start! -->
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fdd_phytest_down.xml
@@ -0,0 +1,45 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-5gnr-fdd-phytest-down</htmlTabRef>
+        <htmlTabName>CleanUp Monolithic FDD phytest gNB</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100012
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100012">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fdd_phytest</yaml_path>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb.xml
@@ -0,0 +1,86 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-fr2-32prb-5gnr-tdd</htmlTabRef>
+        <htmlTabName>Monolithic FR2 do-ra gNB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 111111
+ 100001
+ 000000
+ 000001
+ 020001
+ 020002
+ 100001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI gNB</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <services>oai-gnb</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000001">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI NR-UE</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
+        </testCase>
+
+        <testCase id="020001">
+                <class>PingFromContainer</class>
+                <desc>Ping gNB from NR-UE</desc>
+                <container_name>rfsim5g-oai-nr-ue</container_name>
+                <options>-c20 -i0.2 10.0.1.1</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="020002">
+                <class>PingFromContainer</class>
+                <desc>Ping NR-UE from gNB</desc>
+                <container_name>rfsim5g-oai-gnb</container_name>
+                <options>-c20 -i0.2 10.0.1.2</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="100001">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+                <d_retx_th>0,0,0,0</d_retx_th>
+                <u_retx_th>0,0,0,0</u_retx_th>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_fr2_32prb_down.xml
@@ -0,0 +1,45 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-fr2-32prb-5gnr-down</htmlTabRef>
+        <htmlTabName>CleanUp Monolithic FR2 do-ra gNB</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100002
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100002">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_fr2_32prb</yaml_path>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora.xml
@@ -0,0 +1,86 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-tdd-dora-5gnr-tdd</htmlTabRef>
+        <htmlTabName>Monolithic do-ra TDD gNB</htmlTabName>
+        <htmlTabIcon>wrench</htmlTabIcon>
+        <repeatCount>1</repeatCount>
+        <TestCaseRequestedList>
+ 111111
+ 100001
+ 000000
+ 000001
+ 020001
+ 020002
+ 100001
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="111111">
+                <class>Pull_Local_Registry</class>
+                <desc>Pull Images from Local Registry</desc>
+                <test_svr_id>0</test_svr_id>
+                <images_to_pull>oai-gnb oai-nr-ue</images_to_pull>
+        </testCase>
+
+        <testCase id="000000">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI gNB</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <services>oai-gnb</services>
+                <nb_healthy>1</nb_healthy>
+        </testCase>
+
+        <testCase id="000001">
+                <class>DeployGenObject</class>
+                <desc>Deploy OAI NR-UE</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <services>oai-nr-ue</services>
+                <nb_healthy>2</nb_healthy>
+        </testCase>
+
+        <testCase id="020001">
+                <class>PingFromContainer</class>
+                <desc>Ping gNB from NR-UE</desc>
+                <container_name>rfsim5g-oai-nr-ue</container_name>
+                <options>-c20 -i0.2 10.0.1.1</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="020002">
+                <class>PingFromContainer</class>
+                <desc>Ping NR-UE from gNB</desc>
+                <container_name>rfsim5g-oai-gnb</container_name>
+                <options>-c20 -i0.2 10.0.1.2</options>
+                <loss_threshold>0</loss_threshold>
+        </testCase>
+
+        <testCase id="100001">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+                <d_retx_th>0,0,0,0</d_retx_th>
+                <u_retx_th>0,0,0,0</u_retx_th>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml
+++ b/ci-scripts/xml_files/container_5g_rfsim_tdd_dora_down.xml
@@ -0,0 +1,45 @@
+<!--
+
+ Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The OpenAirInterface Software Alliance licenses this file to You under
+ the OAI Public License, Version 1.1  (the "License"); you may not use this file
+ except in compliance with the License.
+ You may obtain a copy of the License at
+
+      http://www.openairinterface.org/?page_id=698
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+
+ For more information about the OpenAirInterface (OAI) Software Alliance:
+      contact@openairinterface.org
+
+-->
+<testCaseList>
+        <htmlTabRef>rfsim-tdd-dora-5gnr-down</htmlTabRef>
+        <htmlTabName>CleanUp Monolithic do-ra TDD gNB</htmlTabName>
+        <htmlTabIcon>trash</htmlTabIcon>
+        <TestCaseRequestedList>
+ 100002
+ 222222
+        </TestCaseRequestedList>
+        <TestCaseExclusionList></TestCaseExclusionList>
+
+        <testCase id="100002">
+                <class>UndeployGenObject</class>
+                <desc>Undeploy all OAI 5G stack</desc>
+                <yaml_path>yaml_files/5g_rfsimulator_tdd_dora</yaml_path>
+        </testCase>
+
+        <testCase id="222222">
+                <class>Clean_Test_Server_Images</class>
+                <desc>Clean Test Images on Test Server</desc>
+                <test_svr_id>0</test_svr_id>
+        </testCase>
+
+</testCaseList>
--- a/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
+++ b/ci-scripts/xml_files/fr1_sa_oaiue_n310.xml
@@ -54,7 +54,7 @@
 	<testCase id="040000">
 		<class>Initialize_eNB</class>
 		<desc>Initialize gNB</desc>
-		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.usrpn310.conf --sa --usrp-tx-thread-config 1 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
+		<Initialize_eNB_args>-O ci-scripts/conf_files/gnb.band78.sa.fr1.106PRB.2x2.usrpn310.conf --gNBs.[0].min_rxtxtime 5 --sa --usrp-tx-thread-config 1 --tune-offset 30000000 --thread-pool 1,3,5,7,9,11,13,15 --gNBs.[0].min_rxtxtime 5 --log_config.global_log_options level,nocolor,time</Initialize_eNB_args>
 		<eNB_instance>0</eNB_instance>
 		<eNB_serverId>0</eNB_serverId>
 		<air_interface>nr</air_interface>
--- a/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
+++ b/ci-scripts/yaml_files/4g_rfsimulator_fembms/docker-compose.yml
@@ -12,7 +12,7 @@ services:
            TZ: Europe/Paris
            USE_VOLUMED_CONF: 'yes'
            RFSIMULATOR: enb
-            USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --MCEs.[0].mbms_sched_info.mbms_area_config_list.[0].pmch_config_list.[0].allocated_sf_end 512 --log_config.global_log_options level,nocolor,time
+            USE_ADDITIONAL_OPTIONS: --rfsim --noS1 --eNBs.[0].component_carriers.[0].mbms_dedicated_serving_cell ENABLE --log_config.global_log_options level,nocolor,time
        volumes:
            - ../../conf_files/enb.band7.tm1.25PRB.rfsim.mbms.conf:/opt/oai-enb/etc/mounted.conf
        healthcheck:
--- a/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_24prb/docker-compose.yaml
@@ -0,0 +1,299 @@
+version: '3.8'
+services:
+    oai-nrf:
+        container_name: "rfsim5g-oai-nrf"
+        image: oai-nrf:august-dev
+        environment:
+            - NRF_INTERFACE_NAME_FOR_SBI=eth0
+            - NRF_INTERFACE_PORT_FOR_SBI=80
+            - NRF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
+            - NRF_API_VERSION=v1
+            - INSTANCE=0
+            - PID_DIRECTORY=/var/run
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.130
+        volumes:
+            - ../5g_rfsimulator/nrf-healthcheck.sh:/openair-nrf/bin/nrf-healthcheck.sh
+        healthcheck:
+            test: /bin/bash -c "/openair-nrf/bin/nrf-healthcheck.sh"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    mysql:
+        container_name: "rfsim5g-mysql"
+        image: mysql:5.7
+        volumes:
+            - ../5g_rfsimulator/oai_db.sql:/docker-entrypoint-initdb.d/oai_db.sql
+            - ../5g_rfsimulator/mysql-healthcheck.sh:/tmp/mysql-healthcheck.sh
+        environment:
+            - TZ=Europe/Paris
+            - MYSQL_DATABASE=oai_db
+            - MYSQL_USER=test
+            - MYSQL_PASSWORD=test
+            - MYSQL_ROOT_PASSWORD=linux
+        healthcheck:
+            test: /bin/bash -c "/tmp/mysql-healthcheck.sh"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.131
+
+    oai-amf:
+        container_name: "rfsim5g-oai-amf"
+        image: oai-amf:august-dev
+        environment:
+            - TZ=Europe/paris
+            - INSTANCE=0
+            - PID_DIRECTORY=/var/run
+            - MCC=208
+            - MNC=99
+            - REGION_ID=128
+            - AMF_SET_ID=1
+            - SERVED_GUAMI_MCC_0=208
+            - SERVED_GUAMI_MNC_0=99
+            - SERVED_GUAMI_REGION_ID_0=128
+            - SERVED_GUAMI_AMF_SET_ID_0=1
+            - SERVED_GUAMI_MCC_1=460
+            - SERVED_GUAMI_MNC_1=11
+            - SERVED_GUAMI_REGION_ID_1=10
+            - SERVED_GUAMI_AMF_SET_ID_1=1
+            - PLMN_SUPPORT_MCC=208
+            - PLMN_SUPPORT_MNC=99
+            - PLMN_SUPPORT_TAC=0x0001
+            - SST_0=1
+            - SD_0=0xffffff
+            - SST_1=1
+            - SD_1=1
+            - AMF_INTERFACE_NAME_FOR_NGAP=eth0
+            - AMF_INTERFACE_NAME_FOR_N11=eth0
+            - SMF_INSTANCE_ID_0=1
+            - SMF_FQDN_0=oai-smf
+            - SMF_IPV4_ADDR_0=0.0.0.0
+            - SMF_HTTP_VERSION_0=v1
+            - SELECTED_0=true
+            - SMF_INSTANCE_ID_1=2
+            - SMF_FQDN_1=oai-smf
+            - SMF_IPV4_ADDR_1=0.0.0.0
+            - SMF_HTTP_VERSION_1=v1
+            - SELECTED_1=false
+            - MYSQL_SERVER=192.168.71.131
+            - MYSQL_USER=root
+            - MYSQL_PASS=linux
+            - MYSQL_DB=oai_db
+            - OPERATOR_KEY=c42449363bbad02b66d16bc975d77cc1
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_PORT=80
+            - NF_REGISTRATION=yes
+            - SMF_SELECTION=yes
+            - USE_FQDN_DNS=yes
+            - NRF_API_VERSION=v1
+            - NRF_FQDN=oai-nrf
+            - EXTERNAL_AUSF=no
+            - AUSF_IPV4_ADDRESS=0.0.0.0
+            - AUSF_PORT=80
+            - AUSF_API_VERSION=v1
+            - AUSF_FQDN=localhost
+        depends_on:
+            - oai-nrf
+            - mysql
+        volumes:
+            - ../5g_rfsimulator/amf-healthcheck.sh:/openair-amf/bin/amf-healthcheck.sh
+        healthcheck:
+            test: /bin/bash -c "/openair-amf/bin/amf-healthcheck.sh"
+            interval: 10s
+            timeout: 15s
+            retries: 5
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.132
+
+    oai-smf:
+        container_name: "rfsim5g-oai-smf"
+        image: oai-smf:august-dev
+        environment:
+            - TZ=Europe/Paris
+            - INSTANCE=0
+            - PID_DIRECTORY=/var/run
+            - SMF_INTERFACE_NAME_FOR_N4=eth0
+            - SMF_INTERFACE_NAME_FOR_SBI=eth0
+            - SMF_INTERFACE_PORT_FOR_SBI=80
+            - SMF_INTERFACE_HTTP2_PORT_FOR_SBI=9090
+            - SMF_API_VERSION=v1
+            - DEFAULT_DNS_IPV4_ADDRESS=172.21.3.100
+            - DEFAULT_DNS_SEC_IPV4_ADDRESS=4.4.4.4
+            - AMF_IPV4_ADDRESS=0.0.0.0
+            - AMF_PORT=80
+            - AMF_API_VERSION=v1
+            - AMF_FQDN=oai-amf
+            - UDM_IPV4_ADDRESS=127.0.0.1
+            - UDM_PORT=80
+            - UDM_API_VERSION=v1
+            - UDM_FQDN=localhost
+            - UPF_IPV4_ADDRESS=192.168.71.134
+            - UPF_FQDN_0=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_PORT=80
+            - NRF_API_VERSION=v1
+            - NRF_FQDN=oai-nrf
+            - REGISTER_NRF=yes
+            - DISCOVER_UPF=yes
+            - USE_FQDN_DNS=yes
+            - DNN_NI0=oai
+            - TYPE0=IPv4
+            - DNN_RANGE0=12.1.1.2 - 12.1.1.127
+            - NSSAI_SST0=1
+            - NSSAI_SD0=0xFFFFFF
+            - SESSION_AMBR_UL0=200Mbps
+            - SESSION_AMBR_DL0=400Mbps
+            - DNN_NI2=oai.ipv4
+        depends_on:
+            - oai-nrf
+            - oai-amf
+        volumes:
+            - ../5g_rfsimulator/smf-healthcheck.sh:/openair-smf/bin/smf-healthcheck.sh
+        healthcheck:
+            test: /bin/bash -c "/openair-smf/bin/smf-healthcheck.sh"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.133
+
+    oai-spgwu:
+        container_name: "rfsim5g-oai-spgwu"
+        image: oai-spgwu-tiny:august-dev
+        environment:
+            - TZ=Europe/Paris
+            - PID_DIRECTORY=/var/run
+            - SGW_INTERFACE_NAME_FOR_S1U_S12_S4_UP=eth0
+            - SGW_INTERFACE_NAME_FOR_SX=eth0
+            - PGW_INTERFACE_NAME_FOR_SGI=eth0
+            - NETWORK_UE_NAT_OPTION=yes
+            - NETWORK_UE_IP=12.1.1.0/24
+            - SPGWC0_IP_ADDRESS=192.168.71.133
+            - BYPASS_UL_PFCP_RULES=no
+            - MCC=208
+            - MNC=99
+            - MNC03=099
+            - TAC=1
+            - GTP_EXTENSION_HEADER_PRESENT=yes
+            - GW_ID=1
+            - REALM=openairinterface.org
+            - ENABLE_5G_FEATURES=yes
+            - REGISTER_NRF=yes
+            - USE_FQDN_NRF=yes
+            - UPF_FQDN_5G=oai-spgwu
+            - NRF_IPV4_ADDRESS=192.168.71.130
+            - NRF_PORT=80
+            - NRF_API_VERSION=v1
+            - NRF_FQDN=oai-nrf
+            - NSSAI_SST_0=1
+            - NSSAI_SD_0=0xffffff
+            - DNN_0=oai
+        depends_on:
+            - oai-nrf
+            - oai-smf
+        cap_add:
+            - NET_ADMIN
+            - SYS_ADMIN
+        cap_drop:
+            - ALL
+        privileged: true
+        volumes:
+            - ../5g_rfsimulator/spgwu-healthcheck.sh:/openair-spgwu-tiny/bin/spgwu-healthcheck.sh
+        healthcheck:
+            test: /bin/bash -c "/openair-spgwu-tiny/bin/spgwu-healthcheck.sh"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.134
+            traffic_net:
+                ipv4_address: 192.168.72.134
+
+    oai-ext-dn:
+        image: ubuntu:bionic
+        privileged: true
+        container_name: rfsim5g-oai-ext-dn
+        entrypoint: /bin/bash -c \
+              "apt update; apt install -y procps iptables iproute2 iperf iputils-ping;"\
+              "iptables -t nat -A POSTROUTING -o eth0 -j MASQUERADE;"\
+              "ip route add 12.1.1.0/24 via 192.168.72.134 dev eth0; sleep infinity"
+        depends_on:
+            - oai-spgwu
+        networks:
+            traffic_net:
+                ipv4_address: 192.168.72.135
+        healthcheck:
+            test: /bin/bash -c "ping -c 2 192.168.72.134"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-gnb:
+        image: oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-gnb
+        environment:
+            RFSIMULATOR: server
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim --log_config.global_log_options level,nocolor,time
+        depends_on:
+            - oai-ext-dn
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ../../conf_files/gnb.sa.band78.fr1.24PRB.usrpb210.conf:/opt/oai-gnb/etc/mounted.conf
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue
+        environment:
+            RFSIMULATOR: 192.168.71.140
+            FULL_IMSI: '208990100001100'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
+            USE_ADDITIONAL_OPTIONS: --sa --rfsim -r 24 --ssb 24 --numerology 1 -C 3604320000 --nokrnmod --log_config.global_log_options level,nocolor,time
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
+    traffic_net:
+        driver: bridge
+        name: rfsim5g-oai-traffic-net
+        ipam:
+            config:
+                - subnet: 192.168.72.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-traffic"
--- a/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fdd_phytest/docker-compose.yaml
@@ -0,0 +1,59 @@
+version: '3.8'
+services:
+    oai-gnb:
+        image: oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-gnb
+        environment:
+            RFSIMULATOR: server
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --nokrnmod --log_config.global_log_options level,nocolor,time
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ../../conf_files/gnb.band66.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf
+            - rrc.config:/opt/oai-gnb/
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue
+        environment:
+            RFSIMULATOR: 192.168.71.140
+            FULL_IMSI: '208930100001100'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
+            USE_ADDITIONAL_OPTIONS: --phy-test --rfsim --noS1 --nokrnmod --rrc_config_path etc/rrc/ --log_config.global_log_options level,nocolor,time
+        volumes:
+          - rrc.config:/opt/oai-nr-ue/etc/rrc/
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+volumes:
+    rrc.config:
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
--- a/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_fr2_32prb/docker-compose.yaml
@@ -0,0 +1,59 @@
+version: '3.8'
+services:
+    oai-gnb:
+        image: oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-gnb
+        environment:
+            RFSIMULATOR: server
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --nokrnmod --log_config.global_log_options level,nocolor,time
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ../../conf_files/gnb.band261.tm1.32PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf
+            - rrc.config:/opt/oai-gnb/
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue
+        environment:
+            RFSIMULATOR: 192.168.71.140
+            FULL_IMSI: '311480100001100'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --nokrnmod --log_config.global_log_options level,nocolor,time
+        volumes:
+          - rrc.config:/opt/oai-nr-ue/etc/rrc/
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+volumes:
+    rrc.config:
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
--- a/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
+++ b/ci-scripts/yaml_files/5g_rfsimulator_tdd_dora/docker-compose.yaml
@@ -0,0 +1,59 @@
+version: '3.8'
+services:
+    oai-gnb:
+        image: oai-gnb:develop
+        privileged: true
+        container_name: rfsim5g-oai-gnb
+        environment:
+            RFSIMULATOR: server
+            USE_VOLUMED_CONF: 'yes'
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --nokrnmod --log_config.global_log_options level,nocolor,time
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.140
+        volumes:
+            - ../../conf_files/gnb.band78.tm1.106PRB.usrpn300.conf:/opt/oai-gnb/etc/mounted.conf
+            - rrc.config:/opt/oai-gnb/
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-softmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+    oai-nr-ue:
+        image: oai-nr-ue:develop
+        privileged: true
+        container_name: rfsim5g-oai-nr-ue
+        environment:
+            RFSIMULATOR: 192.168.71.140
+            FULL_IMSI: '208930100001100'
+            FULL_KEY: 'fec86ba6eb707ed08905757b1bb44b8f'
+            OPC: 'C42449363BBAD02B66D16BC975D77CC1'
+            DNN: oai
+            NSSAI_SST: 1
+            USE_ADDITIONAL_OPTIONS: --do-ra --rfsim --noS1 --rrc_config_path etc/rrc/ --nokrnmod --log_config.global_log_options level,nocolor,time
+        volumes:
+          - rrc.config:/opt/oai-nr-ue/etc/rrc/
+        depends_on:
+            - oai-gnb
+        networks:
+            public_net:
+                ipv4_address: 192.168.71.150
+        healthcheck:
+            test: /bin/bash -c "pgrep nr-uesoftmodem"
+            interval: 10s
+            timeout: 5s
+            retries: 5
+
+volumes:
+    rrc.config:
+
+networks:
+    public_net:
+        driver: bridge
+        name: rfsim5g-oai-public-net
+        ipam:
+            config:
+                - subnet: 192.168.71.128/26
+        driver_opts:
+            com.docker.network.bridge.name: "rfsim5g-public"
--- a/cmake_targets/autotests/run_exec_autotests.bash
+++ b/cmake_targets/autotests/run_exec_autotests.bash
@@ -114,6 +114,7 @@ function test_run() {

     for (( run_index=1; run_index <= $nruns; run_index++ ))
      do
+        temp_exec_log="$log_dir/test.$test_case_name.${tags_array[$tags_array_index]}.run_$run_index"
        echo "</EXECUTION LOG Test Case = $test_case_name.${tags_array[$tags_array_index]},  Run = $run_index >" >> $temp_exec_log  2>&1
        cat "$temp_exec_log" >> "$log_file"  2>&1

--- a/cmake_targets/autotests/test_case_list.xml
+++ b/cmake_targets/autotests/test_case_list.xml
@@ -399,12 +399,16 @@
    <testCase id="nr_ulsim.mimo">
      <desc>nr_ulsim Test cases. (Test1: MCS 19 50 PRBs 2 RX_Antenna),
                                 (Test2: MCS 9 106 PRBs MIMO 2 layers),
-                                 (Test3: MCS 9 106 PRBs MIMO 4 layers)</desc>
+                                 (Test3: MCS 10 106 PRBs MIMO 2 layers),
+                                 (Test4: MCS 19 106 PRBs MIMO 2 layers),
+                                 (Test5: MCS 9 106 PRBs MIMO 4 layers)</desc>
      <main_exec>nr_ulsim</main_exec>
      <main_exec_args>-n100 -m19 -s10 -S15 -z2
                      -n100 -m9 -r106 -s8 -W2 -y2 -z2
+                      -n100 -m10 -r106 -s12 -W2 -y2 -z2
+                      -n100 -m19 -r106 -s22 -W2 -y2 -z2
                      -n100 -m9 -r106 -s10 -W4 -y4 -z4</main_exec_args>
-      <tags>test1 test2 test3</tags>
+      <tags>test1 test2 test3 test4 test5</tags>
      <search_expr_true>PUSCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
      <nruns>3</nruns>
@@ -436,30 +440,30 @@
                                 (Test23: 3GPP G-FR1-A5-14, PUSCH Type B, 100 MHz BW, 30 kHz SCS, 4 RX Antennas Requirements Test),
                                 (Test24: 3GPP G-FR1-A5-14, PUSCH Type B, 100 MHz BW, 30 kHz SCS, 8 RX Antennas Requirements Test)</desc>
      <main_exec>nr_ulsim</main_exec>
-      <main_exec_args>-n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z2 -s12.4 -S12.4
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z4 -s8.5 -S8.5
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z8 -s5.4 -S5.4
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R25 -r25 -U 1,1,1,2 -z2 -s12.5 -S12.5
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R25 -r25 -U 1,1,1,2 -z4 -s8.9 -S8.9
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R25 -r25 -U 1,1,1,2 -z8 -s5.7 -S5.7
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R52 -r52 -U 1,1,1,2 -z2 -s12.6 -S12.6
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R52 -r52 -U 1,1,1,2 -z4 -s8.9 -S8.9
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R52 -r52 -U 1,1,1,2 -z8 -s5.8 -S5.8
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R106 -r106 -U 1,1,1,2 -z2 -s12.3 -S12.3
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R106 -r106 -U 1,1,1,2 -z4 -s8.8 -S8.8
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 0 -m20 -R106 -r106 -U 1,1,1,2 -z8 -s5.7 -S5.7
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R24 -r24 -U 1,1,1,2 -z2 -s12.5 -S12.5
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R24 -r24 -U 1,1,1,2 -z4 -s8.6 -S8.6
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R24 -r24 -U 1,1,1,2 -z8 -s5.6 -S5.6
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R51 -r51 -U 1,1,1,2 -z2 -s12.5 -S12.5
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R51 -r51 -U 1,1,1,2 -z4 -s8.6 -S8.6
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R51 -r51 -U 1,1,1,2 -z8 -s5.6 -S5.6
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z2 -s12.5 -S12.5
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z4 -s8.7 -S8.7
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z8 -s5.5 -S5.5
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z2 -s13.1 -S13.1
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z4 -s9.2 -S9.2
-                      -n100 -b14 -I15 -i 1,1 -g A,l -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z8 -s5.9 -S5.9</main_exec_args>
+      <main_exec_args>-n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z2 -s12.4 -S12.4
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z4 -s8.5 -S8.5
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 0,1,1,2 -z8 -s5.4 -S5.4
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R25 -r25 -U 1,1,1,2 -z2 -s12.5 -S12.5
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R25 -r25 -U 1,1,1,2 -z4 -s8.9 -S8.9
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R25 -r25 -U 1,1,1,2 -z8 -s5.7 -S5.7
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R52 -r52 -U 1,1,1,2 -z2 -s12.6 -S12.6
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R52 -r52 -U 1,1,1,2 -z4 -s8.9 -S8.9
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R52 -r52 -U 1,1,1,2 -z8 -s5.8 -S5.8
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R106 -r106 -U 1,1,1,2 -z2 -s12.3 -S12.3
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R106 -r106 -U 1,1,1,2 -z4 -s8.8 -S8.8
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 0 -m20 -R106 -r106 -U 1,1,1,2 -z8 -s5.7 -S5.7
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R24 -r24 -U 1,1,1,2 -z2 -s12.5 -S12.5
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R24 -r24 -U 1,1,1,2 -z4 -s8.6 -S8.6
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R24 -r24 -U 1,1,1,2 -z8 -s5.6 -S5.6
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R51 -r51 -U 1,1,1,2 -z2 -s12.5 -S12.5
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R51 -r51 -U 1,1,1,2 -z4 -s8.6 -S8.6
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R51 -r51 -U 1,1,1,2 -z8 -s5.6 -S5.6
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z2 -s12.5 -S12.5
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z4 -s8.7 -S8.7
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R106 -r106 -U 1,1,1,2 -z8 -s5.5 -S5.5
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z2 -s13.1 -S13.1
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z4 -s9.2 -S9.2
+                      -n100 -b14 -I7 -i 0,1 -g A,l,10 -t70 -u 1 -m20 -R273 -r273 -U 1,1,1,2 -z8 -s5.9 -S5.9</main_exec_args>
      <tags>test1 test2 test3 test4 test5 test6 test7 test8 test9 test10 test11 test12 test13 test14 test15 test16 test17 test18 test19 test20 test21 test22 test23 test24</tags>
      <search_expr_true>PUSCH test OK</search_expr_true>
      <search_expr_false>segmentation fault|assertion|exiting|fatal</search_expr_false>
--- a/cmake_targets/build_oai
+++ b/cmake_targets/build_oai
@@ -56,6 +56,13 @@ CMAKE_CMD="$CMAKE"
 BUILD_ECLIPSE=0
 NR="False"
 OPTIONAL_LIBRARIES="telnetsrv enbscope uescope nrscope"
+ulfiusdep=$(basename ./`find /usr/lib* -name libulfius.so`)
+jssondep=$(basename ./`find /usr/lib* -name libjansson.so`)
+if [ "$ulfiusdep" == "libulfius.so" -a "$jssondep" == "libjansson.so" ] ; then
+  OPTIONAL_LIBRARIES+=" websrv"
+else
+  echo_warning "  websrv optional build not included in build-lib option  as dependencies requirements not met "
+fi
 RU=0
 CMAKE_C_FLAGS=()
 CMAKE_CXX_FLAGS=()
@@ -333,7 +340,8 @@ function main() {
            echo_info "Will compile with verbose instructions"
            shift;;
       --build-doxygen)
-	        BUILD_DOXYGEN=1
+            CMAKE_CMD="$CMAKE_CMD -DGENERATE_DOXYGEN=ON"
+            BUILD_DOXYGEN=1
            echo_info "Will build doxygen support"
            shift;;     
       --build-coverity-scan)
@@ -535,9 +543,8 @@ function main() {
      execlist="$execlist nr-uesoftmodem"
  fi

-  if [[ "$execlist" == "" && "$SIMUS_PHY" != "1" ]]; then
-    echo_success "installing dependencies successful"
-    exit
+  if [[ "$execlist" == "" && "$SIMUS_PHY" != "1" && "$HW" == "None" ]]; then
+    SKIP_SHARED_LIB_FLAG="True"
  fi

  echo_info "3. building the compilation directives ..."
@@ -644,9 +651,27 @@ function main() {
  if [ ! -z "$BUILD_OPTLIB" ] ; then 
     for oklib in $BUILD_OPTLIB ; do
         compilations $BUILD_DIR $oklib
+         if [ "$oklib" == "websrv" ] ; then
+           BUILD_WEBSRVFRONT=1
+           echo_info "Build of websrv frontend enabled"
+           fi
     done
  fi
  
+  ############################################
+  # Optional targets (others than libraries) #
+  ############################################  
+  if [ "$BUILD_WEBSRVFRONT" = "1" ] ; then
+    npmv=`command npm -v`
+    npms=$?
+    nodev=`command node -v`
+    nodes=$?
+    if [ "$npms" == "0" -a "$nodes" == "0" ] ; then
+      compilations $BUILD_DIR websrvfront
+    else
+      echo_warning "build of websrv front-end skipped, dependencies not met : " $npmv " " $nodev
+    fi
+  fi
  ####################################################
  # Build RF device and transport protocol libraries #
  ####################################################
@@ -727,11 +752,7 @@ function main() {
    echo_info "Doxygen generation log is located here: $doxygen_log"
    echo_info "Generating Doxygen files....please wait"
    (
-    [ "$CLEAN" = "1" ] && rm -rf $OPENAIR_DIR/cmake_targets/doxygen/build
-    mkdir -p $OPENAIR_DIR/cmake_targets/doxygen/build
-    cd $OPENAIR_DIR/cmake_targets/doxygen/build
-    eval $CMAKE_CMD ..
-    make doc
+    $MAKE_CMD doc
    ) >& $doxygen_log
  fi

--- a/cmake_targets/doxygen/CMakeLists.txt
+++ b/cmake_targets/doxygen/CMakeLists.txt
@@ -1,11 +0,0 @@
-cmake_minimum_required(VERSION 2.8)
-include(${CMAKE_CURRENT_SOURCE_DIR}/../CMakeLists.txt)
-find_package(Doxygen)
-if(DOXYGEN_FOUND)
-configure_file(${OPENAIR_TARGETS}/DOCS/Doxyfile ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
-add_custom_target(doc
-${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile
-WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-COMMENT "Generating API documentation with Doxygen" VERBATIM
-)
-endif(DOXYGEN_FOUND)
--- a/cmake_targets/macros.cmake
+++ b/cmake_targets/macros.cmake
@@ -82,21 +82,6 @@ function(make_version VERSION_VALUE)
  set(${VERSION_VALUE} "${RESULT}" PARENT_SCOPE)
 endfunction()

-macro(compile_asn1 asn1Source asn1cCmd ResultFlag)
-   # Warning: if you modify ASN.1 source file to generate new C files, cmake should be re-run instead of make
-   execute_process(COMMAND ${asn1cCmd}  ${asn1Source} RESULT_VARIABLE ret)
-
-   if (NOT ${ret} STREQUAL 0)
-      message(FATAL_ERROR "${ret}: error")
-   endif (NOT ${ret} STREQUAL 0)
-
-   add_custom_target (
-     ${ResultFlag} ALL
-     ${asn1cCmd} ${asn1Source}
-     DEPENDS ${asn1Source}
-   )
-endmacro(compile_asn1)
-
 macro(eval_boolean VARIABLE)
  if(${ARGN})
    set(${VARIABLE} ON)
--- a/cmake_targets/tools/asn1tostruct.py
+++ b/cmake_targets/tools/asn1tostruct.py
@@ -1,697 +0,0 @@
-import re, os, sys, string
-import datetime
-import getopt
-import getpass
-
-version = "1.0.2"
-
-lines = ""
-iesDefs = {}
-ieofielist = {}
-outdir = './'
-
-filenames = []
-verbosity = 0
-prefix = ""
-
-FAIL = '\033[91m'
-WARN = '\033[93m'
-ENDC = '\033[0m'
-
-fileprefix = ""
-fileprefix_first_upper = ""
-
-def printFail(string):
-    sys.stderr.write(FAIL + string + ENDC + "\n")
-
-def printWarning(string):
-    print WARN + string + ENDC
-
-def printDebug(string):
-    if verbosity > 0:
-        print string
-
-def outputHeaderToFile(f, filename):
-    now = datetime.datetime.now()
-    f.write("""/*
- * Licensed to the OpenAirInterface (OAI) Software Alliance under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The OpenAirInterface Software Alliance licenses this file to You under
- * the OAI Public License, Version 1.1  (the "License"); you may not use this file
- * except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.openairinterface.org/?page_id=698
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *-------------------------------------------------------------------------------
- * For more information about the OpenAirInterface (OAI) Software Alliance:
- *      contact@openairinterface.org
- */
-
-""")
-    f.write("/*******************************************************************************\n")
-    f.write(" * This file had been created by asn1tostruct.py script v%s\n" % (version))
-    f.write(" * Please do not modify this file but regenerate it via script.\n")
-    f.write(" * Created on: %s by %s\n * from %s\n" % (str(now), getpass.getuser(), filenames))
-    f.write(" ******************************************************************************/\n")
-
-def lowerFirstCamelWord(word):
-    """ puts the first word in a CamelCase Word in lowercase.
-
-    I.e. CustomerID becomes customerID, XMLInfoTest becomes xmlInfoTest
-    """
-    newstr = ''
-    swapped = word.swapcase()
-    idx = 0
-
-    # if it's all-caps, return an all-lowered version
-    lowered = word.lower()
-
-    if swapped == lowered:
-        return lowered
-
-    for c in swapped:
-        if c in string.lowercase:
-            newstr += c
-            idx    += 1
-        else:
-            break
-    if idx < 2:
-        newstr += word[idx:]
-    else:
-        newstr = newstr[:-1]+ word[idx-1:]
-
-    return newstr
-
-def usage():
-    print "Python parser for asn1 v%s" % (version)
-    print "Usage: python asn1tostruct.py [options]"
-    print "Available options:"
-    print "-d        Enable script debug"
-    print "-f [file] Input file to parse"
-    print "-o [dir]  Output files to given directory"
-    print "-h        Print this help and return"
-
-try:
-    opts, args = getopt.getopt(sys.argv[1:], "df:ho:", ["debug", "file", "help", "outdir"])
-except getopt.GetoptError as err:
-    # print help information and exit:
-    usage()
-    sys.exit(2)
-
-for o, a in opts:
-    if o in ("-f", "--file"):
-        filenames.append(a)
-    if o in ("-d", "--debug"):
-        verbosity = 1
-    if o in ("-o", "--outdir"):
-        outdir = a
-        if outdir.rfind('/') != len(outdir):
-            outdir += '/'
-    if o in ("-h", "--help"):
-        usage()
-        sys.exit(2)
-
-for filename in filenames:
-    file = open(filename, 'r')
-    for line in file:
-        # Removing any comment
-        if line.find('--') >= 0:
-            line = line[:line.find('--')]
-        # Removing any carriage return
-        lines += re.sub('\r', '', line)
-
-    for m in re.findall(r'([a-zA-Z0-9-]+)\s*::=\s+SEQUENCE\s+\(\s*SIZE\s*\(\s*\d+\s*\.\.\s*[0-9a-zA-Z-]+\s*\)\s*\)\s*OF\s+[a-zA-Z-]+\s*\{\s*\{\s*([0-9a-zA-Z-]+)\s*\}\s*\}', lines, re.MULTILINE):
-        ieofielist[m[0]] = m[1]
-    for m in re.findall(r'([a-zA-Z0-9-]+)\s*::=\s+E-RAB-IE-ContainerList\s*\{\s*\{\s*([a-zA-Z0-9-]+)\s*\}\s*\}', lines, re.MULTILINE):
-        ieofielist[m[0]] = m[1]
-
-    for i in re.findall(r'([a-zA-Z0-9-]+)\s+([A-Z0-9-]+)\s*::=\s*\{\s+([\,\|\{\}\t\n\.{3}\ \-a-zA-Z0-9]+)\s+}\n', lines, re.MULTILINE):
-        ies = []
-        maxLength = 0
-        # TODO: handle extensions
-        if i[1].find('EXTENSION') >= 0:
-            continue
-        if fileprefix == "":
-            fileprefix = i[1][:i[1].find('-')].lower()
-        for j in re.findall(r'\s*\{\s*([a-zA-Z0-9-\ \t]+)\s*\}\s*[\|,]*', i[2], re.MULTILINE):
-            for k in re.findall(r'ID\s*([a-zA-Z0-9\-]+)\s*CRITICALITY\s*([a-zA-Z0-9\-]+)\s+[A-Z]+\s+([a-zA-Z0-9\-]+)\s*PRESENCE\s*([a-zA-Z0-9\-]+)', j, re.MULTILINE):
-                printDebug("Got new ie for message " + i[0] + ": " + str(k))
-                if len(k[2]) > maxLength:
-                    maxLength = len(k[2])
-                ies.append(k)
-
-        if len(ies) > 0:
-            iesDefs[i[0]] = { "length": maxLength, "ies": ies }
-        else:
-            printWarning("Didn't find any information element for message: " + i[0])
-
-if len(iesDefs) == 0:
-    printFail("No Information Element parsed, exiting")
-    sys.exit(0)
-
-fileprefix_first_upper = fileprefix[0].upper() + fileprefix[1:]
-
-f = open(outdir + fileprefix + '_ies_defs.h', 'w')
-outputHeaderToFile(f, filename)
-f.write("#include \"%s_common.h\"\n\n" % (fileprefix))
-f.write("#ifndef %s_IES_DEFS_H_\n#define %s_IES_DEFS_H_\n\n" % (fileprefix.upper(), fileprefix.upper()))
-f.write("/* Define the version of script used to generate this file */\n")
-f.write("#define %s_SCRIPT_VERSION (%s)\n\n" % (fileprefix.upper(), re.sub('\.', '', version)))
-
-for key in iesDefs:
-
-    if key not in ieofielist.values():
-        continue
-
-    for (i, j) in ieofielist.items():
-        if j == key:
-            break
-
-    f.write("typedef struct %sIEs_s {\n" % (re.sub('-', '_', i)))
-    f.write("    A_SEQUENCE_OF(struct %s_s) %s;\n" % (re.sub('IEs', '', re.sub('-', '_', ieofielist[i])), lowerFirstCamelWord(re.sub('IEs', '', re.sub('-', '_', ieofielist[i])))))
-    f.write("} %sIEs_t;\n\n" % (re.sub('-', '_', i)))
-
-for key in iesDefs:
-    keyupperunderscore = re.sub('-', '_', key.upper())
-    keylowerunderscore = re.sub('-', '_', key.lower())
-    shift = 0
-
-    if len(iesDefs[key]["ies"]) == 0:
-        continue
-
-    # Presence mask
-    for ie in iesDefs[key]["ies"]:
-        ieupperunderscore = re.sub('-', '_', re.sub('id-', '', ie[0])).upper()
-
-        if ie[3] == "optional" or ie[3] == "conditional":
-            f.write("#define {0:<{pad}} {1}\n".format("%s_%s_PRESENT" % (keyupperunderscore, ieupperunderscore), "(1 << %d)" % shift,
-            pad=iesDefs[key]["length"] + len(keyupperunderscore) + 9))
-            shift += 1
-    if (shift > 0):
-        f.write("\n")
-
-    f.write("typedef struct %s_s {\n" % (re.sub('-', '_', key)))
-    if (shift > 0):
-        f.write("    {0:<{pad}} {1};\n".format("uint16_t", "presenceMask", pad=iesDefs[key]["length"] + 2))
-    for ie in iesDefs[key]["ies"]:
-        ieunderscore = re.sub('-', '_', ie[2])
-        iename = re.sub('id-', '', ie[0])
-        ienameunderscore = lowerFirstCamelWord(re.sub('-', '_', iename))
-        if ie[2] in ieofielist:
-            f.write("    %sIEs_t %s;" % (re.sub('-', '_', ie[2]), ienameunderscore))
-        else:
-            f.write("    {0:<{pad}} {1};".format("%s_t" % ieunderscore, ienameunderscore, pad=iesDefs[key]["length"] + 2))
-        if ie[3] == "optional":
-            f.write(" ///< Optional field")
-        elif ie[3] == "conditional":
-            f.write(" ///< Conditional field")
-        f.write("\n")
-
-    f.write("} %s_t;\n\n" % (re.sub('-', '_', key)))
-
-f.write("typedef struct %s_message_s {\n" % (fileprefix))
-f.write("    %s_ProcedureCode_t procedureCode;\n" % (fileprefix_first_upper))
-f.write("    %s_Criticality_t   criticality;\n" % (fileprefix_first_upper))
-f.write("    uint8_t            direction;\n")
-f.write("    union {\n")
-
-messageList = iesDefs.keys()
-messageList.sort()
-for message in messageList:
-    if message in ieofielist.values():
-        continue
-    if len(iesDefs[message]["ies"]) == 0:
-        continue
-    f.write("        %s_t %s;\n" % (re.sub('-', '_', message), lowerFirstCamelWord(re.sub('-', '_', message))))
-f.write("    } msg;\n")
-f.write("} %s_message;\n\n" % (fileprefix))
-
-for key in iesDefs:
-    if key in ieofielist.values():
-        continue
-    structName = re.sub('ies', '', key)
-    asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key)))
-    asn1cStruct = re.sub('Item', 'List', asn1cStruct)
-    keylowerunderscore = re.sub('-', '_', key.lower())
-    firstlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct)))
-    f.write("/** \\brief Decode function for %s ies.\n" % (key))
-    if len(iesDefs[key]["ies"]) != 0:
-        f.write(" * \\param %s Pointer to ASN1 structure in which data will be stored\n" % (lowerFirstCamelWord(re.sub('-', '_', key))))
-    f.write(" *  \\param any_p Pointer to the ANY value to decode.\n")
-    f.write(" **/\n")
-    f.write("int %s_decode_%s(\n" % (fileprefix, keylowerunderscore))
-
-    if len(iesDefs[key]["ies"]) != 0:
-        f.write("    %s_t *%s,\n" % (re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key))))
-    f.write("    ANY_t *any_p);\n\n")
-
-    if len(iesDefs[key]["ies"]) == 0:
-        continue
-
-    f.write("/** \\brief Encode function for %s ies.\n" % (key))
-    f.write(" *  \\param %s Pointer to the ASN1 structure.\n" % (firstlower))
-    f.write(" *  \\param %s Pointer to the IES structure.\n" % (lowerFirstCamelWord(re.sub('-', '_', key))))
-    f.write(" **/\n")
-    f.write("int %s_encode_%s(\n" % (fileprefix, re.sub('-', '_', structName.lower())))
-    f.write("    %s_t *%s,\n" % (asn1cStruct, firstlower))
-    f.write("    %s_t *%s);\n\n" % (re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key))))
-
-for key in iesDefs:
-    if key not in ieofielist.values():
-        continue
-    asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key))
-    asn1cStruct = re.sub('Item', 'List', asn1cStruct)
-    firstlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct)))
-    f.write("/** \\brief Encode function for %s ies.\n" % (key))
-    f.write(" *  \\param %s Pointer to the ASN1 structure.\n" % (firstlower))
-    f.write(" *  \\param %s Pointer to the IES structure.\n" % (lowerFirstCamelWord(re.sub('-', '_', key))))
-    f.write(" **/\n")
-    f.write("int %s_encode_%s(\n" % (fileprefix, firstlower.lower()))
-    f.write("    %s_t *%s,\n" % (asn1cStruct, firstlower))
-    f.write("    %sIEs_t *%sIEs);\n\n" % (asn1cStruct, firstlower))
-    f.write("/** \\brief Decode function for %s ies.\n" % (key))
-    f.write(" *  \\param any_p Pointer to the ANY value to decode.\n")
-    f.write(" *  \\param callback Callback function called when any_p is successfully decoded.\n")
-    f.write(" **/\n")
-    f.write("int %s_decode_%s(\n" % (fileprefix, firstlower.lower()))
-    f.write("    %sIEs_t *%sIEs,\n" % (asn1cStruct, firstlower))
-    f.write("    %s_t *%s);\n\n" % (asn1cStruct, lowerFirstCamelWord(asn1cStruct)))
-
-for key in iesDefs:
-    asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key))
-    asn1cStruct = re.sub('Item', 'List', asn1cStruct)
-    firstlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct)))
-
-    if key in ieofielist.values():
-        f.write("/** \\brief Display %s encapsulated IE using XER encoding.\n" % (asn1cStruct))
-        f.write(" *  \\param %s Pointer to the IES structure.\n" % (lowerFirstCamelWord(re.sub('-', '_', key))))
-        f.write(" *  \\param file File descriptor to write output.\n")
-        f.write(" **/\n")
-        f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('item', 'list', firstlower.lower())))
-        f.write("    asn_app_consume_bytes_f *cb,\n")
-        f.write("    void *app_key,\n")
-        f.write("    %sIEs_t *%sIEs);\n\n" % (re.sub('item', 'list', asn1cStruct), firstlower))
-    else:
-        f.write("/** \\brief Display %s message using XER encoding.\n" % (asn1cStruct))
-        f.write(" *  \\param message_p Pointer to root message.\n")
-        f.write(" *  \\param file File descriptor to write output.\n")
-        f.write(" **/\n")
-        f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, firstlower.lower()))
-        f.write("    asn_app_consume_bytes_f *cb,\n")
-        f.write("    void *app_key,\n")
-        f.write("    %s_message *message_p);\n\n" % (fileprefix))
-
-f.write("int %s_xer__print2sp(const void *buffer, size_t size, void *app_key);\n\n" % (fileprefix.lower()))
-f.write("int %s_xer__print2fp(const void *buffer, size_t size, void *app_key);\n\n" % (fileprefix.lower()))
-f.write("extern size_t %s_string_total_size;\n\n" % (fileprefix.lower()))
-f.write("#endif /* %s_IES_DEFS_H_ */\n\n" % (fileprefix.upper()))
-
-#Generate Decode functions
-f = open(outdir + fileprefix + '_decoder.c', 'w')
-outputHeaderToFile(f, filename)
-f.write("#include \"%s_common.h\"\n#include \"%s_ies_defs.h\"\n\n" % (fileprefix, fileprefix))
-for key in iesDefs:
-    if key in ieofielist.values():
-        continue
-    structName = re.sub('ies', '', key)
-    asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key))
-    if asn1cStruct.rfind('_') == len(asn1cStruct) - 1:
-        asn1cStruct = asn1cStruct[:-1]
-    asn1cStruct = re.sub('Item', 'List', asn1cStruct)
-    ielistname = re.sub('UE', 'ue', asn1cStruct)
-    ielistnamefirstlower = ielistname[:1].lower() + ielistname[1:]
-    asn1cStructfirstlower = asn1cStruct[:1].lower() + asn1cStruct[1:]
-    keyName = re.sub('-', '_', key)
-    keyupperunderscore = keyName.upper()
-    firstlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct)))
-
-    iesaccess = ""
-    if key not in ieofielist.values():
-        iesaccess = "%s_ies." % (firstlower)
-
-    f.write("int %s_decode_%s(\n" % (fileprefix, re.sub('-', '_', structName.lower())))
-    if len(iesDefs[key]["ies"]) != 0:
-        f.write("    %s_t *%s,\n" % (re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key))))
-    f.write("    ANY_t *any_p) {\n\n")
-
-    f.write("    %s_t  %s;\n    %s_t *%s_p = &%s;\n" % (asn1cStruct, asn1cStructfirstlower, asn1cStruct, asn1cStructfirstlower, asn1cStructfirstlower))
-    f.write("    int i, decoded = 0;\n")
-    if len(iesDefs[key]["ies"]) != 0:
-        f.write("    int tempDecoded = 0;\n")
-
-    f.write("    assert(any_p != NULL);\n")
-    if len(iesDefs[key]["ies"]) != 0:
-        f.write("    assert(%s != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', key))))
-
-    f.write("    %s_DEBUG(\"Decoding message %s (%%s:%%d)\\n\", __FILE__, __LINE__);\n\n" % (fileprefix.upper(), re.sub('-', '_', keyName)))
-    f.write("    ANY_to_type_aper(any_p, &asn_DEF_%s, (void**)&%s_p);\n\n" % (asn1cStruct, asn1cStructfirstlower))
-    f.write("    for (i = 0; i < %s_p->%slist.count; i++) {\n" % (asn1cStructfirstlower, iesaccess))
-    f.write("        %s_IE_t *ie_p;\n" % (fileprefix[0].upper() + fileprefix[1:]))
-    f.write("        ie_p = %s_p->%slist.array[i];\n" % (asn1cStructfirstlower, iesaccess))
-    f.write("        switch(ie_p->id) {\n")
-    for ie in iesDefs[key]["ies"]:
-        iename = re.sub('id-', '', ie[0])
-        ienameunderscore = lowerFirstCamelWord(re.sub('-', '_', iename))
-        ienameunderscorefirstlower = lowerFirstCamelWord(ienameunderscore)
-        ietypesubst = re.sub('-', '', ie[2])
-        ietypeunderscore = re.sub('-', '_', ie[2])
-        ieupperunderscore = re.sub('-', '_', re.sub('id-', '', ie[0])).upper()
-
-        if ie[3] == "optional":
-            f.write("            /* Optional field */\n")
-        elif ie[3] == "conditional":
-            f.write("            /* Conditional field */\n")
-        f.write("            case %s_ProtocolIE_ID_%s:\n" % (fileprefix_first_upper, re.sub('-', '_', ie[0])))
-        f.write("            {\n")
-        f.write("                %s_t *%s_p = NULL;\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
-        if ie[3] != "mandatory":
-            f.write("                %s->presenceMask |= %s_%s_PRESENT;\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), keyupperunderscore, ieupperunderscore))
-        f.write("                tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_%s, (void**)&%s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
-        f.write("                if (tempDecoded < 0 || %s_p == NULL) {\n" % (lowerFirstCamelWord(ietypesubst)))
-        f.write("                    %s_ERROR(\"Decoding of IE %s failed\\n\");\n" % (fileprefix.upper(), ienameunderscore))
-        f.write("                    if (%s_p)\n" % (lowerFirstCamelWord(ietypesubst)))
-        f.write("                        ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
-        f.write("                    return -1;\n")
-        f.write("                }\n")
-        f.write("                decoded += tempDecoded;\n")
-        f.write("                if (asn1_xer_print)\n")
-        f.write("                    xer_fprint(stdout, &asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
-        if ie[2] in ieofielist.keys():
-            f.write("                if (%s_decode_%s(&%s->%s, %s_p) < 0) {\n" % (fileprefix, ietypeunderscore.lower(), lowerFirstCamelWord(re.sub('-', '_', key)), ienameunderscore, lowerFirstCamelWord(ietypesubst)))
-            f.write("                    %s_ERROR(\"Decoding of encapsulated IE %s failed\\n\");\n" % (fileprefix.upper(), lowerFirstCamelWord(ietypesubst)))
-            f.write("                    ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
-            f.write("                }\n")
-        else:
-            f.write("                memcpy(&%s->%s, %s_p, sizeof(%s_t));\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienameunderscore, lowerFirstCamelWord(ietypesubst), ietypeunderscore))
-            #f.write("                ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (ietypeunderscore, lowerFirstCamelWord(ietypesubst)))
-        f.write("            } break;\n")
-    f.write("            default:\n")
-    f.write("                %s_ERROR(\"Unknown protocol IE id (%%d) for message %s\\n\", (int)ie_p->id);\n" % (fileprefix.upper(), re.sub('-', '_', structName.lower())))
-    f.write("                return -1;\n")
-    f.write("        }\n")
-    f.write("    }\n")
-    f.write("    return decoded;\n")
-    f.write("}\n\n")
-
-for key in iesDefs:
-    if key not in ieofielist.values():
-        continue
-
-    keyname = re.sub('IEs', '', re.sub('Item', 'List', key))
-
-    f.write("int %s_decode_%s(\n" % (fileprefix, re.sub('-', '_', keyname).lower()))
-    f.write("    %sIEs_t *%sIEs,\n" % (re.sub('-', '_', keyname), lowerFirstCamelWord(re.sub('-', '_', keyname))))
-    f.write("    %s_t *%s) {\n\n" % (re.sub('-', '_', keyname), lowerFirstCamelWord(re.sub('-', '_', keyname))))
-    f.write("    int i, decoded = 0;\n")
-    f.write("    int tempDecoded = 0;\n\n")
-
-    f.write("    assert(%s != NULL);\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname))));
-    f.write("    assert(%sIEs != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname))));
-
-    f.write("    for (i = 0; i < %s->list.count; i++) {\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname))))
-    f.write("        %s_IE_t *ie_p = %s->list.array[i];\n" % (fileprefix[0].upper() + fileprefix[1:], lowerFirstCamelWord(re.sub('-', '_', keyname))))
-    f.write("        switch (ie_p->id) {\n")
-    for ie in iesDefs[key]["ies"]:
-        iename = re.sub('id-', '', ie[0])
-        ienameunderscore = lowerFirstCamelWord(re.sub('-', '_', iename))
-        f.write("            case %s_ProtocolIE_ID_%s:\n" % (fileprefix_first_upper, re.sub('-', '_', ie[0])))
-        f.write("            {\n")
-        f.write("                %s_t *%s_p = NULL;\n" % (re.sub('-', '_', ie[2]), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("                tempDecoded = ANY_to_type_aper(&ie_p->value, &asn_DEF_%s, (void**)&%s_p);\n" % (re.sub('-', '_', ie[2]), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("                if (tempDecoded < 0 || %s_p == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("                    %s_ERROR(\"Decoding of IE %s for message %s failed\\n\");\n" % (fileprefix.upper(), ienameunderscore, re.sub('-', '_', keyname)))
-        f.write("                    if (%s_p)\n" % (lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        #f.write("                        free(%s_p);\n" % (lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("                        ASN_STRUCT_FREE(asn_DEF_%s, %s_p);\n" % (re.sub('-', '_', ie[2]), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("                    return -1;\n")
-        f.write("                }\n")
-        f.write("                decoded += tempDecoded;\n")
-        f.write("                if (asn1_xer_print)\n")
-        f.write("                    xer_fprint(stdout, &asn_DEF_%s, %s_p);\n" % (re.sub('-', '_', ie[2]), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("                ASN_SEQUENCE_ADD(&%sIEs->%s, %s_p);\n" % (lowerFirstCamelWord(re.sub('-', '_', keyname)),
-        re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key))), lowerFirstCamelWord(re.sub('-', '', ie[2]))))
-        f.write("            } break;\n")
-    f.write("            default:\n")
-    f.write("                %s_ERROR(\"Unknown protocol IE id (%%d) for message %s\\n\", (int)ie_p->id);\n" % (fileprefix.upper(), re.sub('-', '_', structName.lower())))
-    f.write("                return -1;\n")
-    f.write("        }\n")
-    f.write("    }\n")
-    f.write("    return decoded;\n")
-    f.write("}\n\n")
-
-
-#Generate IES Encode functions
-f = open(outdir + fileprefix + '_encoder.c', 'w')
-outputHeaderToFile(f,filename)
-f.write("#include \"%s_common.h\"\n" % (fileprefix))
-f.write("#include \"%s_ies_defs.h\"\n\n" % (fileprefix))
-for key in iesDefs:
-    if key in ieofielist.values():
-        continue
-
-    structName = re.sub('ies', '', key)
-    asn1cStruct = re.sub('-', '_', re.sub('IEs', '', key))
-    asn1cStruct = re.sub('Item', 'List', asn1cStruct)
-    if asn1cStruct.rfind('_') == len(asn1cStruct) - 1:
-        asn1cStruct = asn1cStruct[:-1]
-    asn1cStructfirstlower = asn1cStruct[:1].lower() + asn1cStruct[1:]
-    firstwordlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct)))
-
-    iesaccess = ""
-    if key not in ieofielist.values():
-        iesaccess = "%s_ies." % (firstwordlower)
-
-    keyName = re.sub('-', '_', key)
-    keyupperunderscore = keyName.upper()
-    # No IE to encode...
-    if len(iesDefs[key]["ies"]) == 0:
-        continue
-
-    f.write("int %s_encode_%s(\n" % (fileprefix, re.sub('-', '_', structName.lower())))
-    f.write("    %s_t *%s,\n" % (asn1cStruct, firstwordlower))
-    f.write("    %s_t *%s) {\n\n" % (re.sub('-', '_', key), lowerFirstCamelWord(re.sub('-', '_', key))))
-
-    f.write("    %s_IE_t *ie;\n\n" % (fileprefix_first_upper))
-
-    f.write("    assert(%s != NULL);\n" % (firstwordlower));
-    f.write("    assert(%s != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', key))));
-
-    for ie in iesDefs[key]["ies"]:
-        iename = re.sub('-', '_', re.sub('id-', '', ie[0]))
-        ienameunderscore = re.sub('-', '_', iename)
-        ienamefirstwordlower = lowerFirstCamelWord(iename)
-        ieupperunderscore = re.sub('-', '_', re.sub('id-', '', ie[0])).upper()
-        ietypeunderscore = re.sub('-', '_', ie[2])
-
-        if ie[3] != "mandatory":
-            if ie[3] == "optional":
-                f.write("    /* Optional field */\n")
-            elif ie[3] == "conditional":
-                f.write("    /* Conditional field */\n")
-            f.write("    if (%s->presenceMask & %s_%s_PRESENT) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), keyupperunderscore, ieupperunderscore))
-            #f.write("        == %s_%s_PRESENT) {\n" % (keyupperunderscore, ieupperunderscore))
-            f.write("        if ((ie = %s_new_ie(%s_ProtocolIE_ID_%s,\n" % (fileprefix, fileprefix_first_upper, re.sub('-', '_', ie[0])))
-            f.write("                            %s_Criticality_%s,\n" % (fileprefix_first_upper, ie[1]))
-            f.write("                            &asn_DEF_%s,\n" % (ietypeunderscore))
-            f.write("                            &%s->%s)) == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower))
-            f.write("            return -1;\n")
-            f.write("        }\n")
-            f.write("        ASN_SEQUENCE_ADD(&%s->%slist, ie);\n" % (firstwordlower, iesaccess))
-            f.write("    }\n\n")
-        else:
-            if ie[2] in ieofielist.keys():
-                f.write("    %s_t %s;\n\n" % (ietypeunderscore, ienamefirstwordlower))
-                f.write("    memset(&%s, 0, sizeof(%s_t));\n" % (ienamefirstwordlower, ietypeunderscore))
-                f.write("\n")
-                f.write("    if (%s_encode_%s(&%s, &%s->%s) < 0) return -1;\n" % (fileprefix, ietypeunderscore.lower(), ienamefirstwordlower, lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower))
-            f.write("    if ((ie = %s_new_ie(%s_ProtocolIE_ID_%s,\n" % (fileprefix, fileprefix_first_upper, re.sub('-', '_', ie[0])))
-            f.write("                        %s_Criticality_%s,\n" % (fileprefix_first_upper, ie[1]))
-            f.write("                        &asn_DEF_%s,\n" % (ietypeunderscore))
-            if ie[2] in ieofielist.keys():
-                f.write("                          &%s)) == NULL) {\n" % (ienamefirstwordlower))
-            else:
-                f.write("                          &%s->%s)) == NULL) {\n" % (lowerFirstCamelWord(re.sub('-', '_', key)), ienamefirstwordlower))
-            f.write("        return -1;\n")
-            f.write("    }\n")
-            f.write("    ASN_SEQUENCE_ADD(&%s->%slist, ie);\n\n" % (firstwordlower, iesaccess))
-            if ie[2] in ieofielist.keys():
-                f.write("    /* Free any dynamic allocation that is no more used */\n")
-                f.write("    ASN_STRUCT_FREE_CONTENTS_ONLY(asn_DEF_%s, &%s);\n\n" % (ietypeunderscore, ienamefirstwordlower))
-
-    f.write("    return 0;\n")
-    f.write("}\n\n")
-
-for (key, value) in iesDefs.items():
-    if key not in ieofielist.values():
-        continue
-
-    ie = value["ies"][0]
-    ietypeunderscore = re.sub('-', '_', ie[2])
-    asn1cStruct = re.sub('-', '_', re.sub('IEs', '', re.sub('-IEs', '', key)))
-    asn1cStruct = re.sub('Item', 'List', asn1cStruct)
-    firstwordlower = re.sub('Item', 'List', re.sub('enb', 'eNB', lowerFirstCamelWord(asn1cStruct)))
-
-    for (i, j) in ieofielist.items():
-        if j == key:
-            break
-    f.write("int %s_encode_%s(\n" % (fileprefix, re.sub('-', '_', i).lower()))
-    f.write("    %s_t *%s,\n" % (asn1cStruct, firstwordlower))
-    f.write("    %sIEs_t *%sIEs) {\n\n" % (re.sub('-', '_', i), lowerFirstCamelWord(re.sub('-', '_', i))))
-    f.write("    int i;\n")
-
-    f.write("    %s_IE_t *ie;\n\n" % (fileprefix_first_upper))
-
-    f.write("    assert(%s != NULL);\n" % (firstwordlower));
-    f.write("    assert(%sIEs != NULL);\n\n" % (lowerFirstCamelWord(re.sub('-', '_', i))));
-
-    f.write("    for (i = 0; i < %sIEs->%s.count; i++) {\n" % (firstwordlower, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
-    f.write("        if ((ie = %s_new_ie(%s_ProtocolIE_ID_%s,\n" % (fileprefix, fileprefix_first_upper, re.sub('-', '_', ie[0])))
-    f.write("                            %s_Criticality_%s,\n" % (fileprefix_first_upper, ie[1]))
-    f.write("                            &asn_DEF_%s,\n" % (ietypeunderscore))
-    f.write("                            %sIEs->%s.array[i])) == NULL) {\n" % (firstwordlower, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
-    f.write("            return -1;\n")
-    f.write("        }\n")
-    f.write("        ASN_SEQUENCE_ADD(&%s->list, ie);\n" % (firstwordlower))
-    f.write("    }\n")
-    f.write("    return 0;\n")
-    f.write("}\n\n")
-
-#Generate xer print functions
-f = open(outdir + fileprefix + '_xer_print.c', 'w')
-outputHeaderToFile(f, filename)
-f.write("#include <stdlib.h>\n")
-f.write("#include <stdio.h>\n\n")
-f.write("#include <asn_application.h>\n#include <asn_internal.h>\n\n")
-f.write("#include \"%s_common.h\"\n#include \"%s_ies_defs.h\"\n\n" % (fileprefix, fileprefix))
-
-f.write("size_t %s_string_total_size = 0;\n\n" % (fileprefix.lower()))
-f.write("""int
-%s_xer__print2fp(const void *buffer, size_t size, void *app_key) {
-    FILE *stream = (FILE *)app_key;
-
-    if(fwrite(buffer, 1, size, stream) != size)
-        return -1;
-
-    return 0;
-}
-
-""" % (fileprefix.lower()))
-
-f.write("""int %s_xer__print2sp(const void *buffer, size_t size, void *app_key) {
-    char *string = (char *)app_key;
-
-    /* Copy buffer to the formatted string */
-    memcpy(&string[%s_string_total_size], buffer, size);
-
-    %s_string_total_size += size;
-
-    return 0;
-}
-
-""" % (fileprefix.lower(), fileprefix.lower(), fileprefix.lower()))
-
-f.write("""static asn_enc_rval_t
-xer_encode_local(asn_TYPE_descriptor_t *td, void *sptr,
-        asn_app_consume_bytes_f *cb, void *app_key, int indent) {
-    asn_enc_rval_t er, tmper;
-    const char *mname;
-    size_t mlen;
-    int xcan = 2;
-
-    if(!td || !sptr) goto cb_failed;
-
-    mname = td->xml_tag;
-    mlen = strlen(mname);
-
-    _i_ASN_TEXT_INDENT(0, indent);
-    _ASN_CALLBACK3("<", 1, mname, mlen, ">", 1);
-
-    tmper = td->xer_encoder(td, sptr, indent + 1, XER_F_BASIC, cb, app_key);
-    if(tmper.encoded == -1) return tmper;
-
-    _ASN_CALLBACK3("</", 2, mname, mlen, ">\\n", xcan);
-
-    er.encoded = 4 + xcan + (2 * mlen) + tmper.encoded;
-
-    _ASN_ENCODED_OK(er);
-cb_failed:
-    _ASN_ENCODE_FAILED;
-}
-""")
-
-for (key, value) in iesDefs.items():
-    keyName = re.sub('-', '_', key)
-    keyupperunderscore = keyName.upper()
-    iesStructName = lowerFirstCamelWord(re.sub('-', '_', key))
-
-    ie = value["ies"][0]
-    ietypeunderscore = re.sub('-', '_', ie[2])
-
-    if key in ieofielist.values():
-        f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('ies', '', re.sub('item', 'list', re.sub('-', '_', key).lower()))))
-    else:
-        f.write("asn_enc_rval_t %s_xer_print_%s(\n" % (fileprefix, re.sub('ies', '', re.sub('-', '_', key).lower())))
-    #f.write("    FILE *file,\n")
-    f.write("    asn_app_consume_bytes_f *cb,\n")
-    f.write("    void *app_key,\n")
-    if key in ieofielist.values():
-        iesStructName = lowerFirstCamelWord(re.sub('Item', 'List', re.sub('-', '_', key)))
-        f.write("    %sIEs_t *%s) {\n\n" % (re.sub('IEs', '', re.sub('Item', 'List', re.sub('-', '_', key))), iesStructName))
-        f.write("    int i;\n")
-        f.write("    asn_enc_rval_t er;\n")
-    else:
-        f.write("    %s_message *message_p)\n{\n" % (fileprefix))
-        f.write("    %s_t *%s;\n" % (re.sub('-', '_', key), iesStructName))
-        f.write("    asn_enc_rval_t er;\n")
-        #f.write("    void *app_key = (void *)file;\n")
-        #f.write("    asn_app_consume_bytes_f *cb = %s_xer__print2fp;\n\n" % (fileprefix.lower()))
-
-        f.write("    %s = &message_p->msg.%s;\n\n" % (iesStructName, iesStructName))
-
-    if key in ieofielist.values():
-        # Increase indentation level
-        f.write("    for (i = 0; i < %s->%s.count; i++) {\n" % (iesStructName, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
-        #f.write("        xer_fprint(file, &asn_DEF_%s, %s->%s.array[i]);\n" % (ietypeunderscore, iesStructName, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
-        f.write("        er = xer_encode(&asn_DEF_%s, %s->%s.array[i], XER_F_BASIC, cb, app_key);\n" % (ietypeunderscore, iesStructName, re.sub('IEs', '', lowerFirstCamelWord(re.sub('-', '_', key)))))
-        f.write("    }\n")
-    else:
-        f.write("    cb(\"<%s-PDU>\\n\", %d, app_key);\n" % (key, len("<%s-PDU>\n" % (key))))
-        f.write("    xer_encode_local(&asn_DEF_%s_Criticality, &message_p->criticality, cb, app_key, 1);\n" % fileprefix_first_upper)
-        f.write("    xer_encode_local(&asn_DEF_%s_ProcedureCode, &message_p->procedureCode, cb, app_key, 1);\n" % fileprefix_first_upper)
-
-        f.write("    cb(\"    <%s>\\n\", %d, app_key);\n" % (key, len("    <%s>\n" % (key))))
-
-        for ie in iesDefs[key]["ies"]:
-            iename = re.sub('-', '_', re.sub('id-', '', ie[0]))
-            ienameunderscore = re.sub('-', '_', iename)
-            ienamefirstwordlower = lowerFirstCamelWord(iename)
-            ietypeunderscore = re.sub('-', '_', ie[2])
-            ieupperunderscore = re.sub('-', '_', re.sub('id-', '', ie[0])).upper()
-
-            if ie[3] != "mandatory":
-                if ie[3] == "optional":
-                    f.write("    /* Optional field */\n")
-                elif ie[3] == "conditional":
-                    f.write("    /* Conditional field */\n")
-                f.write("    if (%s->presenceMask & %s_%s_PRESENT)\n    " % (iesStructName, keyupperunderscore, ieupperunderscore))
-
-            # Is it an encapsulated IE ?
-            if ie[2] in ieofielist.keys():
-                f.write("    %s_xer_print_%s(cb, app_key, &%s->%s);\n" % (fileprefix, re.sub('ies', '', re.sub('-', '_', ie[2]).lower()), iesStructName, ienamefirstwordlower))
-            else:
-                f.write("    xer_encode_local(&asn_DEF_%s, &%s->%s, cb, app_key, 2);\n" % (ietypeunderscore, iesStructName, ienamefirstwordlower))
-        f.write("    cb(\"    </%s>\\n\", %d, app_key);\n" % (key, len("    </%s>\n" % (key))))
-        f.write("    cb(\"</%s-PDU>\\n\", %d, app_key);\n" % (key, len("</%s-PDU>\n" % (key))))
-
-    f.write("    _ASN_ENCODED_OK(er);\n")
-    #if key not in ieofielist.values():
-        #f.write("cb_failed:\n")
-        #f.write("    return er;\n")
-    f.write("}\n\n")
--- a/cmake_targets/tools/build_helper
+++ b/cmake_targets/tools/build_helper
@@ -461,7 +461,7 @@ install_soapy_from_source(){
    (
    cd /tmp
    echo "Downloading SoapySDR"
-    rm -rf /tmp/soapysdr
+    rm -rf /tmp/SoapySDR
    git clone -b soapy-sdr-0.7.0 --single-branch https://github.com/pothosware/SoapySDR.git
    cd SoapySDR
    #git checkout tags/release_003_010_001_001
@@ -474,7 +474,7 @@ install_soapy_from_source(){
    $SUDO ldconfig
    cd /tmp
    echo "Downloading SoapyRemote"
-    rm -rf /tmp/soapyremote
+    rm -rf /tmp/SoapyRemote
    git clone -b soapy-remote-0.5.0 --single-branch https://github.com/pothosware/SoapyRemote.git
    cd SoapyRemote
    #git checkout tags/release_003_010_001_001
--- a/cmake_targets/tools/fix_asn1
+++ b/cmake_targets/tools/fix_asn1
@@ -1,221 +0,0 @@
-#!/bin/bash
-
-# in those arrays, each line is:
-#   <file> <sha1sum of file (without line 4 which changes depending on the location of the files)> <patch to apply to file>
-
-RRC_Rel14=(
-  "SystemInformation-r8-IEs.h" 4df485c5ddf2540eca271876cdc512caa19b0890 "fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff"
-  "SystemInformation-NB-r13-IEs.h" 6d91332d5c39205819b06e5e36efe62ff8e5b33b "fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff"
-)
-
-RRC_Rel10=(
-  "SystemInformation-r8-IEs.h" 603cd6615cff36ec7020692d72c0d6de7c4859cb "fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff"
-)
-
-X2AP_Rel11_2=(
-  "X2ap-CriticalityDiagnostics-IE-List.h" ae96308b37fcbcbf39da5012e42968135fc5f27b "fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff"
-)
-
-red_color="$(tput setaf 1)"
-green_color="$(tput setaf 2)"
-reset_color="$(tput sgr0)"
-
-function error()
-{
-  echo -e "$red_color"ERROR: "$@""$reset_color"
-#  exit 1
-}
-
-function check_sha1()
-{
-  local file="$1"
-  local target_sha1="$2"
-
-  if [ ! -f "$file" ]
-  then
-    error "$file: no such file"
-  fi
-
-  # we don't use the line 4 of the file
-  # it contains the location of the ASN1 grammar
-  # and this location is not the same on every
-  # installation (this is for *.h files, for *.c
-  # files it's no big deal to skip that line)
-  local computed_sha1=$(sed 4d "$file" | sha1sum | cut -f 1 -d ' ')
-
-  if [ "$target_sha1" != "$computed_sha1" ]
-  then
-    error "$file: wrong SHA1"
-  fi
-}
-
-function patch_file()
-{
-  local patch="$1"
-  local file="$2"
-
-  echo -e "$green_color""patch file $file with $OPENAIR_DIR/cmake_targets/tools/$patch""$reset_color"
-
-#  patch "$file" "$OPENAIR_DIR/cmake_targets/tools/$patch"
-#  if [ $? -ne 0 ]
-#  then
-#    error "patching of $file with $OPENAIR_DIR/cmake_targets/tools/$patch failed"
-#  fi
-}
-
-function apply_patches()
-{
-  local directory="$1"
-  local array=$2
-  local len=$3       # the length could be computed locally but the way to do it is not clear to me [CROUX]
-
-  local i
-  local file
-  local sha1
-  local patch
-  local item
-
-  for (( i = 0; i < $len; i += 3 ))
-  do
-    # special bash syntax to access the array
-    item=$array[$i];       file=${!item}
-    item=$array[$((i+1))]; sha1=${!item}
-    item=$array[$((i+2))]; patch=${!item}
-    check_sha1 "$directory/$file" "$sha1"
-    patch_file "$patch" "$directory/$file"
-  done
-}
-
-function patch_rrc()
-{
-  local directory="$1"
-  local version="$2"
-
-  case "$version" in
-    Rel14 )
-      echo "patching RRC files release 14"
-      #apply_patches "$directory" RRC_Rel14 ${#RRC_Rel14[*]}
-      ;;
-    Rel10 )
-      echo "patching RRC files release 10"
-      apply_patches "$directory" RRC_Rel10 ${#RRC_Rel10[*]}
-      ;;
-    Rel8 )
-      echo "patching RRC files release 8 TODO?"
-      ;;
-    * )
-      error unknwon/unhandled RRC version \'"$version"\'
-      ;;
-  esac
-}
-
-function patch_nr_rrc()
-{
-  local directory="$1"
-  local version="$2"
-
-  case "$version" in
-    NR_Rel15 )
-      echo "patching NR_RRC files release 15"
-      apply_patches "$directory" NR_RRC_Rel15 ${#NR_RRC_Rel15[*]}
-      ;;
-    * )
-      error unknwon/unhandled NR_RRC version \'"$version"\'
-      ;;
-  esac
-}
-
-
-function patch_x2ap()
-{
-  local directory="$1"
-  local version="$2"
-
-  case "$version" in
-    R14 )
-      ;;
-    R11 )
-      echo "patching X2AP files release 11.2"
-      apply_patches "$directory" X2AP_Rel11_2 ${#X2AP_Rel11_2[*]}
-      ;;
-    * )
-      error unknwon/unhandled X2AP version \'"$version"\'
-      ;;
-  esac
-}
-
-function patch_s1ap()
-{
-  local directory="$1"
-  local version="$2"
-
-  case "$version" in
-    R14 )
-      ;;
-    R10 )
-      #nothing to do anymore (fixes went to asn1c)
-      ;;
-    * )
-      error unknwon/unhandled S1AP version \'"$version"\'
-      ;;
-  esac
-}
-
-function patch_f1ap()
-{
-  local directory="$1"
-  local version="$2"
-
-  case "$version" in
-    R15 )
-      #nothing to do anymore (fixes went to asn1c)
-      ;;
-    * )
-      error unknwon/unhandled F1AP version \'"$version"\'
-      ;;
-  esac
-}
-
-
-function main()
-{
-  if [ $# -ne 3 ]
-  then
-    echo "ERROR: pass <output directory> <module> <version>"
-    exit 1
-  fi
-
-  if [ x"$OPENAIR_DIR" = x ]
-  then
-    error "the variable OPENAIR_DIR is not set"
-  fi
-
-  local directory="$1"
-  local module="$2"
-  local version="$3"
-
-  case "$module" in
-    RRC )
-      patch_rrc "$directory" "$version"
-      ;;
-    NR_RRC )
-      patch_nr_rrc "$directory" "$version"
-      ;;
-    X2AP )
-      patch_x2ap "$directory" "$version"
-      ;;
-    S1AP )
-      patch_s1ap "$directory" "$version"
-      ;;
-    F1AP )
-      patch_f1ap "$directory" "$version"
-      ;;
-    * )
-      error unknown module "$module"
-      ;;
-  esac
-
-  exit 0
-}
-
-main "$@"
--- a/cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
+++ b/cmake_targets/tools/fix_asn1.data/RRC.rel10/SystemInformation-r8-IEs.h.diff
@@ -1,23 +0,0 @@
-57,61d56
-< /* SystemInformation-r8-IEs */
-< typedef struct SystemInformation_r8_IEs {
-< 	struct SystemInformation_r8_IEs__sib_TypeAndInfo {
-< 		A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
-< 			SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
-79c74,78
-< 			} choice;
---
-> 			};
-> 
-> 		struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
-> 			SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
-> 			union SystemInformation_r8_IEs__sib_TypeAndInfo__Member_u choice;
-83c82,87
-< 		} ) list;
---
-> 		};
-> 
-> /* SystemInformation-r8-IEs */
-> typedef struct SystemInformation_r8_IEs {
-> 	struct SystemInformation_r8_IEs__sib_TypeAndInfo {
-> 		A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member) list;
--- a/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff
+++ b/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-NB-r13-IEs.h.diff
@@ -1,47 +0,0 @@
-48a49,70
-> struct SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member {
-> 	SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_PR present;
-> 	union SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_u {
-> 		SystemInformationBlockType2_NB_r13_t	 sib2_r13;
-> 		SystemInformationBlockType3_NB_r13_t	 sib3_r13;
-> 		SystemInformationBlockType4_NB_r13_t	 sib4_r13;
-> 		SystemInformationBlockType5_NB_r13_t	 sib5_r13;
-> 		SystemInformationBlockType14_NB_r13_t	 sib14_r13;
-> 		SystemInformationBlockType16_NB_r13_t	 sib16_r13;
-> 		/*
-> 		 * This type is extensible,
-> 		 * possible extensions are below.
-> 		 */
-> 		SystemInformationBlockType15_NB_r14_t	 sib15_v1430;
-> 		SystemInformationBlockType20_NB_r14_t	 sib20_v1430;
-> 		SystemInformationBlockType22_NB_r14_t	 sib22_v1430;
-> 	} choice;
-> 	
-> 	/* Context for parsing across buffer boundaries */
-> 	asn_struct_ctx_t _asn_ctx;
-> };
-> 
-52,72c74
-< 		A_SEQUENCE_OF(struct SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member {
-< 			SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_PR present;
-< 			union SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member_u {
-< 				SystemInformationBlockType2_NB_r13_t	 sib2_r13;
-< 				SystemInformationBlockType3_NB_r13_t	 sib3_r13;
-< 				SystemInformationBlockType4_NB_r13_t	 sib4_r13;
-< 				SystemInformationBlockType5_NB_r13_t	 sib5_r13;
-< 				SystemInformationBlockType14_NB_r13_t	 sib14_r13;
-< 				SystemInformationBlockType16_NB_r13_t	 sib16_r13;
-< 				/*
-< 				 * This type is extensible,
-< 				 * possible extensions are below.
-< 				 */
-< 				SystemInformationBlockType15_NB_r14_t	 sib15_v1430;
-< 				SystemInformationBlockType20_NB_r14_t	 sib20_v1430;
-< 				SystemInformationBlockType22_NB_r14_t	 sib22_v1430;
-< 			} choice;
-< 			
-< 			/* Context for parsing across buffer boundaries */
-< 			asn_struct_ctx_t _asn_ctx;
-< 		} ) list;
---
-> 		A_SEQUENCE_OF(struct SystemInformation_NB_r13_IEs__sib_TypeAndInfo_r13__Member) list;
--- a/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff
+++ b/cmake_targets/tools/fix_asn1.data/RRC.rel14/SystemInformation-r8-IEs.h.diff
@@ -1,23 +0,0 @@
-73,77d72
-< /* SystemInformation-r8-IEs */
-< typedef struct SystemInformation_r8_IEs {
-< 	struct SystemInformation_r8_IEs__sib_TypeAndInfo {
-< 		A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
-< 			SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
-103c98,102
-< 			} choice;
---
-> 			};
-> 
-> 		struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member {
-> 			SystemInformation_r8_IEs__sib_TypeAndInfo__Member_PR present;
-> 			union SystemInformation_r8_IEs__sib_TypeAndInfo__Member_u choice;
-107c106,111
-< 		} ) list;
---
-> 		};
-> 
-> /* SystemInformation-r8-IEs */
-> typedef struct SystemInformation_r8_IEs {
-> 	struct SystemInformation_r8_IEs__sib_TypeAndInfo {
-> 		A_SEQUENCE_OF(struct SystemInformation_r8_IEs__sib_TypeAndInfo__Member) list;
--- a/cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
+++ b/cmake_targets/tools/fix_asn1.data/X2AP.rel11.2/X2ap-CriticalityDiagnostics-IE-List.h.diff
@@ -1,15 +0,0 @@
-29,31c29
-< /* X2ap-CriticalityDiagnostics-IE-List */
-< typedef struct X2ap_CriticalityDiagnostics_IE_List {
-< 	A_SEQUENCE_OF(struct X2ap_CriticalityDiagnostics_IE_List__Member {
---
-> struct X2ap_CriticalityDiagnostics_IE_List__Member {
-43c41,46
-< 	} ) list;
---
-> 	};
-> 
-> /* X2ap-CriticalityDiagnostics-IE-List */
-> typedef struct X2ap_CriticalityDiagnostics_IE_List {
-> 	A_SEQUENCE_OF(struct X2ap_CriticalityDiagnostics_IE_List__Member
-> 	) list;
--- a/cmake_targets/tools/generate_asn1
+++ b/cmake_targets/tools/generate_asn1
@@ -1,179 +0,0 @@
-#!/bin/bash
-
-function main()
-{
-PROTOCOL_DIR=$1
-mkdir -p ${PROTOCOL_DIR}
-cd ${PROTOCOL_DIR}
-
-# Because use $* also include directory, so we need shift
-shift
-
-local module="$2"
-
-#if this script is called with only 2 arguments (so 1 here after the shift), it's for RRC
-#(there may be a better way...)
-if [ $# -eq 2 ]; then
-
-    #asn1c does not work well with extension groups, we need the following fix:
-    # replace [[ by '<name> SEQUENCE {'
-    #     and ]] by '} OPTIONAL'
-    #<name> is ext<N> with N starting from 1 and incremented at each new [[ ]] just
-    #following another [[ ]]
-    #
-    #this is what the following C program does
-
-    echo generate asnfix.c
-
-cat << EOF > asnfix.c
-/* transforms:
- * '[[' to 'name SEQUENCE {'
- * ']]' to '} OPTIONAL'
- * name is ext1, ext2, ..., for each [[ at the same level
- * levels are delimited by { and }
- * -- to end of line is a comment and unprocessed
- * nested [[ ]] not handled
- * { and } must be balanced
- * [[ and ]] can be whatever, every combination is valid
- */
-#include <stdio.h>
-#include <stdlib.h>
-
-void level(int toplevel)
-{
-  int c;
-  int next_name = 1;
-
-  while (1) {
-    c = getchar();
-next:
-    if (c == EOF) { if (toplevel) break; abort(); }
-
-    if (c == '-') {
-      c = getchar();
-      if (c != '-') { putchar('-'); goto next; }
-      putchar(c); putchar(c);
-      while (1) {
-        c = getchar(); if (c == EOF) abort();
-        putchar(c);
-        if (c == '\n') break;
-      }
-      continue;
-    }
-
-    if (c == '[') {
-      c = getchar();
-      if (c != '[') { putchar('['); goto next; }
-      printf("ext%d SEQUENCE {", next_name);
-      next_name++;
-      continue;
-    }
-
-    if (c == ']') {
-      c = getchar();
-      if (c != ']') { putchar(']'); goto next; }
-      printf("} OPTIONAL");
-      continue;
-    }
-
-    putchar(c);
-    if (c == '}') { if (toplevel) abort(); break; }
-    if (c == '{') level(0);
-  }
-}
-
-int main(void)
-{
-  level(1);
-  fflush(stdout);
-  return 0;
-}
-EOF
-
-    echo compile asnfix.c
-
-    gcc -Wall -o asnfix asnfix.c
-
-    echo run asnfix on $1
-
-    ./asnfix < $1 > fixed_grammar.asn
-
-    rm -f asnfix asnfix.c
-
-    echo done with asnfix
-
-    echo running asn1c
-
-case "$module" in
-  RRC )
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  NR_RRC )
-    	export ASN1C_PREFIX=NR_
-  	asn1c -gen-PER -fcompound-names -findirect-choice -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  S1AP )
-	export ASN1C_PREFIX=S1AP_
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  X2AP )
-	export ASN1C_PREFIX=X2AP_
-  	asn1c -gen-PER -fcompound-names -no-gen-example fixed_grammar.asn 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-esac
-
-
-    rm -f fixed_grammar.asn
-
-    echo asn1c done
-
-elif echo ${PROTOCOL_DIR} | grep -q "F1AP"; then
-    
-    asn1c -gen-PER -fcompound-names -no-gen-example -findirect-choice -fno-include-deps $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
-    
-else
-
-case "$module" in
-  RRC )
-  	 asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample
-  ;; 
-  NR_RRC )
-    	export ASN1C_PREFIX=NR_
-  	asn1c -fcompound-names -findirect-choice -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  S1AP )
-    	export ASN1C_PREFIX=S1AP_
-    	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-  X2AP )
-    	export ASN1C_PREFIX=X2AP_
-    	asn1c -fcompound-names -fno-include-deps -gen-PER -no-gen-OER -no-gen-example $* 2>&1 | grep -v -- '->' | grep -v '^Compiled' |grep -v sample	
-  ;;
-esac
-
-fi
-
-awk ' 
-  BEGIN { 
-     print "#ifndef __ASN1_CONSTANTS_H__"
-     print "#define __ASN1_CONSTANTS_H__"
-  }  
-  /INTEGER ::=/ { 
-     gsub("INTEGER ::=","")
-     gsub("--","//")
-     gsub("-1","_minus_1")
-     gsub("-","_")
-     printf("#define %s\n",$0)
-  } 
-  /::=.*INTEGER.*[(]/ {
-     nb_fields=split($0,val,"[:=().]+");
-     gsub("-","_",val[1]);
-     printf("#define min_val_%s %s\n",val[1],val[nb_fields-2]);
-     printf("#define max_val_%s %s\n",val[1],val[nb_fields-1]);
-  }
-  END {
-     print "#endif ";
-  } ' $1  > asn1_constants.h
-}
-
-main "$@"
--- a/cmake_targets/tools/make_asn1c_includes.sh
+++ b/cmake_targets/tools/make_asn1c_includes.sh
@@ -1,34 +0,0 @@
-#!/bin/bash
-export ASN1C_PREFIX=$1
-shift
-options=$1
-shift
-GENERATED_FULL_DIR=$1
-shift
-ASN1_SOURCE_DIR=$*
-done_flag="$GENERATED_FULL_DIR"/done
-rebuild=0
-for f in $ASN1_SOURCE_DIR ; do
-   if [ "$done_flag" -ot "$f" ] ; then
-      rebuild=1
-   fi
-done
-if [ $rebuild -eq 1 ] ; then
-   rm -f "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.c "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}*.h
-   mkdir -p "$GENERATED_FULL_DIR"
-   asn1c -pdu=all -fcompound-names -gen-PER -no-gen-OER -no-gen-example $options -D $GENERATED_FULL_DIR $ASN1_SOURCE_DIR |& egrep -v "^Copied|^Compiled" | sort -u
-  if [ "$ASN1C_PREFIX" = "X2AP_" ] ; then
-    sed -i 's/18446744073709551615))/18446744073709551615U))/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReport-Item.c
-    sed -i 's/18446744073709551615 }/18446744073709551615U }/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReport-Item.c
-  fi
-  if [ "$ASN1C_PREFIX" = "S1AP_" ] ; then
-    sed -i 's/18446744073709551615))/18446744073709551615U))/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReportItem.c
-    sed -i 's/18446744073709551615 }/18446744073709551615U }/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}E-RABUsageReportItem.c
-  fi
-  if [ "$ASN1C_PREFIX" = "NGAP_" ] ; then
-    sed -i 's/18446744073709551615))/18446744073709551615U))/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}VolumeTimedReport-Item.c
-    sed -i 's/18446744073709551615 }/18446744073709551615U }/g' "$GENERATED_FULL_DIR"/${ASN1C_PREFIX}VolumeTimedReport-Item.c
-  fi
-
-fi
-touch $done_flag
--- a/common/config/DOC/config/rtusage.md
+++ b/common/config/DOC/config/rtusage.md
@@ -18,6 +18,7 @@ The debug level is a mask:
 *  bit 2: print memory allocation/free performed by the config module
 *  bit 3: print command line processing messages
 *  bit 4: disable execution abort when parameters checking fails
+*  bit 5: write a config file  reflecting the parameters after reading the configuration file and processing the command line

 As a oai user, you may have to use bit 1 (dbgl1) , to check your configuration and get the full name of a parameter you would like to modify on the command line. Other bits are for developers usage, (dbgl7 will print all debug messages).

@@ -27,7 +28,10 @@ $ ./lte-softmodem -O libconfig:<config>:dbgl1
 ```bash
 $ ./lte-uesoftmodem -O cmdlineonly:dbgl1
 ```
+bit 5 (dbgl32) can be useful to detect unused parameters from a config file or to detect parameters set to their default values, and not present in the config file
+
 To get help on supported parameters you can use specific options:
+
 *  ---help: print help for command line only parameters and for parameters not defined in a specific section
 	*  ---help_< prefix > : print help for parameters defined under the section < prefix >

--- a/common/config/config_load_configmodule.c
+++ b/common/config/config_load_configmodule.c
@@ -88,10 +88,26 @@ int load_config_sharedlib(configmodule_interface_t *cfgptr) {
      st = -1;
    }

+    if (cfgptr->rtflags & CONFIG_SAVERUNCFG) {
+      sprintf(fname, "config_%s_set", cfgptr->cfgmode);
+      cfgptr->set = dlsym(lib_handle, fname);
+
+      if (cfgptr->set == NULL) {
+        printf("[CONFIG] %s %d no function %s for config mode %s\n", __FILE__, __LINE__, fname, cfgptr->cfgmode);
+        st = -1;
+      }
+      sprintf(fname, "config_%s_write_parsedcfg", cfgptr->cfgmode);
+      cfgptr->write_parsedcfg = dlsym(lib_handle, fname);
+
+      if (cfgptr->write_parsedcfg == NULL) {
+        printf("[CONFIG] %s %d no function %s for config mode %s\n", __FILE__, __LINE__, fname, cfgptr->cfgmode);
+      }
+    }
+
    sprintf (fname,"config_%s_end",cfgptr->cfgmode);
    cfgptr->end = dlsym(lib_handle,fname);

-    if (cfgptr->getlist == NULL ) {
+    if (cfgptr->end == NULL) {
      printf("[CONFIG] %s %d no function %s for config mode %s\n",
             __FILE__, __LINE__,fname, cfgptr->cfgmode);
    }
@@ -193,6 +209,7 @@ configmodule_interface_t *load_configmodule(int argc,
  uint32_t tmpflags=0;
  int i;
  int OoptIdx=-1;
+  int OWoptIdx = -1;

  printf("CMDLINE: ");
  for (int i=0; i<argc; i++)
@@ -209,6 +226,10 @@ configmodule_interface_t *load_configmodule(int argc,
      OoptIdx=i;
    }

+    char *OWopt = strstr(argv[i], "OW");
+    if (OWopt == argv[i] + 2) {
+      OWoptIdx = i;
+    }
    if ( strstr(argv[i], "help_config") != NULL  ) {
      config_printhelp(Config_Params,CONFIG_PARAMLENGTH(Config_Params),CONFIG_SECTIONNAME);
      exit(0);
@@ -258,6 +279,11 @@ configmodule_interface_t *load_configmodule(int argc,
  /* argv[0] is the exec name, always Ok */
    cfgptr->argv_info[0] |= CONFIG_CMDLINEOPT_PROCESSED;

+    /* When reuested _(_--OW or rtflag is 5), a file with config parameters, as defined after all processing, will be created */
+    if (OWoptIdx >= 0) {
+      cfgptr->argv_info[OWoptIdx] |= CONFIG_CMDLINEOPT_PROCESSED;
+      cfgptr->rtflags |= CONFIG_SAVERUNCFG;
+    }
  /* when OoptIdx is >0, -O option has been detected at position OoptIdx 
   *  we must memorize arv[OoptIdx is Ok                                  */ 
    if (OoptIdx >= 0) {
@@ -294,14 +320,18 @@ configmodule_interface_t *load_configmodule(int argc,
    printf("%s ",cfgptr->cfgP[i]);
  }

-  printf(", debug flags: 0x%08x\n",cfgptr->rtflags);
-
+  if (cfgptr->rtflags & CONFIG_PRINTPARAMS) {
+    cfgptr->status = malloc(sizeof(configmodule_status_t));
+  }
  if (strstr(cfgparam,CONFIG_CMDLINEONLY) == NULL) {
    i=load_config_sharedlib(cfgptr);

    if (i ==  0) {
      printf("[CONFIG] config module %s loaded\n",cfgmode);
-      Config_Params[CONFIGPARAM_DEBUGFLAGS_IDX].uptr=&(cfgptr->rtflags);
+      int idx = config_paramidx_fromname(Config_Params, CONFIG_PARAMLENGTH(Config_Params), CONFIGP_DEBUGFLAGS);
+      Config_Params[idx].uptr = &(cfgptr->rtflags);
+      idx = config_paramidx_fromname(Config_Params, CONFIG_PARAMLENGTH(Config_Params), CONFIGP_TMPDIR);
+      Config_Params[idx].strptr = &(cfgptr->tmpdir);
      config_get(Config_Params,CONFIG_PARAMLENGTH(Config_Params), CONFIG_SECTIONNAME );
    } else {
      fprintf(stderr,"[CONFIG] %s %d config module \"%s\" couldn't be loaded\n", __FILE__, __LINE__,cfgmode);
@@ -314,6 +344,8 @@ configmodule_interface_t *load_configmodule(int argc,
    cfgptr->end = (configmodule_endfunc_t)nooptfunc;
  }

+  printf("[CONFIG] debug flags: 0x%08x\n", cfgptr->rtflags);
+
  if (modeparams != NULL) free(modeparams);

  if (cfgmode != NULL) free(cfgmode);
@@ -326,10 +358,28 @@ configmodule_interface_t *load_configmodule(int argc,
  return cfgptr;
 }

+/* Possibly write config file, with parameters which have been read and  after command line parsing */
+void write_parsedcfg(void)
+{
+  if (cfgptr->status && (cfgptr->rtflags & CONFIG_SAVERUNCFG)) {
+    printf_params("[CONFIG] Runtime params creation status: %i null values, %i errors, %i empty list or array, %i successfull \n",
+                  cfgptr->status->num_err_nullvalue,
+                  cfgptr->status->num_err_write,
+                  cfgptr->status->emptyla,
+                  cfgptr->status->num_write);
+  }
+  if (cfgptr != NULL) {
+    if (cfgptr->write_parsedcfg != NULL) {
+      printf("[CONFIG] calling config module write_parsedcfg function...\n");
+      cfgptr->write_parsedcfg();
+    }
+  }
+}

 /* free memory allocated when reading parameters */
 /* config module could be initialized again after this call */
 void end_configmodule(void) {
+  write_parsedcfg();
  if (cfgptr != NULL) {
    if (cfgptr->end != NULL) {
      printf ("[CONFIG] calling config module end function...\n");
--- a/common/config/config_load_configmodule.h
+++ b/common/config/config_load_configmodule.h
@@ -54,6 +54,7 @@
 #define CONFIG_DEBUGPTR       (1<<1)            // print memory allocation/free debug messages
 #define CONFIG_DEBUGCMDLINE   (1<<2)            // print command line processing messages
 #define CONFIG_NOABORTONCHKF  (1<<4)            // disable abort execution when parameter checking function fails
+#define CONFIG_SAVERUNCFG (1 << 5) // create config file with running values, as after cfg file + command line processing
 #define CONFIG_NOEXITONHELP   (1<<19)           // do not exit after printing help
 #define CONFIG_HELP           (1<<20)           // print help message
 #define CONFIG_ABORT          (1<<21)           // config failed,abort execution 
@@ -61,8 +62,21 @@
 typedef int(*configmodule_initfunc_t)(char *cfgP[],int numP);
 typedef int(*configmodule_getfunc_t)(paramdef_t *,int numparams, char *prefix);
 typedef int(*configmodule_getlistfunc_t)(paramlist_def_t *, paramdef_t *,int numparams, char *prefix);
+typedef int (*configmodule_setfunc_t)(paramdef_t *cfgoptions, int numoptions, char *prefix);
 typedef void(*configmodule_endfunc_t)(void);

+typedef struct configmodule_status {
+  int num_paramgroups;
+  char **paramgroups_names;
+  int num_err_nullvalue;
+  int emptyla;
+  int num_err_read;
+  int num_err_write;
+  int num_read;
+  int num_write;
+  char *debug_cfgname;
+} configmodule_status_t;
+
 typedef struct oneBlock_s{
    void *ptrs;
    int sz;
@@ -80,11 +94,15 @@ typedef struct configmodule_interface {
  configmodule_initfunc_t         init;
  configmodule_getfunc_t          get;
  configmodule_getlistfunc_t      getlist;
+  configmodule_setfunc_t set;
  configmodule_endfunc_t          end;
  pthread_mutex_t  memBlocks_mutex;
+  configmodule_endfunc_t write_parsedcfg;
  uint32_t numptrs;
  uint32_t rtflags;
  oneBlock_t oneBlock[CONFIG_MAX_ALLOCATEDPTRS];
+  char *tmpdir;
+  configmodule_status_t *status; // allocated in debug mode only
 } configmodule_interface_t;

 #ifdef CONFIG_LOADCONFIG_MAIN
@@ -97,16 +115,19 @@ static char config_helpstr [] = "\n lte-softmodem -O [config mode]<:dbgl[debugfl
          incp parameter can be used to define the include path used for config files (@include directive)\n \
                         defaults is set to the path of the main config file.\n";

-#define CONFIG_SECTIONNAME "config"
-#define CONFIGPARAM_DEBUGFLAGS_IDX        0
+#define CONFIG_HELP_TMPDIR "<Repository to create temporary file>"

+#define CONFIG_SECTIONNAME "config"
+#define CONFIGP_DEBUGFLAGS "debugflags"
+#define CONFIGP_TMPDIR "tmpdir"

 static paramdef_t Config_Params[] = {
-  /*-----------------------------------------------------------------------------------------------------------------------*/
-  /*                                            config parameters for config module                                        */
-  /*   optname              helpstr           paramflags     XXXptr       defXXXval            type       numelt           */
-  /*-----------------------------------------------------------------------------------------------------------------------*/
-  {"debugflags",            config_helpstr,   0,             uptr:NULL,   defintval:0,        TYPE_MASK,  0},
+    /*--------------------------------------------------------------------------------------------------------------------------*/
+    /*                                            config parameters for config module                                           */
+    /*   optname              helpstr           paramflags         XXXptr                defXXXval            type       numelt */
+    /*--------------------------------------------------------------------------------------------------------------------------*/
+    {CONFIGP_DEBUGFLAGS, config_helpstr, 0, uptr : NULL, defintval : 0, TYPE_MASK, 0},
+    {CONFIGP_TMPDIR, CONFIG_HELP_TMPDIR, PARAMFLAG_NOFREE, strptr : NULL, defstrval : "/tmp", TYPE_STRING, 0},
 };

 #else
@@ -126,6 +147,8 @@ extern configmodule_interface_t *load_configmodule(int argc, char **argv, uint32
 * a new config module init
 */
 extern void end_configmodule(void);
+extern void write_parsedcfg(void);
+
 /* free all config module memory, to be used at end of program as
 * it will free parameters values even those specified with the PARAMFLAG_NOFREE flag */
 extern void free_configmodule(void);
--- a/common/config/config_paramdesc.h
+++ b/common/config/config_paramdesc.h
@@ -46,6 +46,7 @@
 #define PARAMFLAG_NOFREE                  (1 << 3)         // don't free parameter in end function
 #define PARAMFLAG_BOOL                    (1 << 4)         // integer param can be 0 or 1
 #define PARAMFLAG_CMDLINE_NOPREFIXENABLED (1 << 5)         // on the command line, allow a parameter to be specified without the prefix
+#define PARAMFLAG_CMDLINEONLY (1 << 6) // this parameter cannot be specified in config file

 /*   Flags used by config modules to return info to calling modules and/or to  for internal usage*/
 #define PARAMFLAG_MALLOCINCONFIG          (1 << 15)        // parameter allocated in config module
--- a/common/config/config_userapi.c
+++ b/common/config/config_userapi.c
@@ -275,6 +275,9 @@ int config_get(paramdef_t *params, int numparams, char *prefix) {

    if (ret >= 0) {
      config_process_cmdline(params, numparams, prefix);
+      if (cfgif->rtflags & CONFIG_SAVERUNCFG) {
+        config_get_if()->set(params, numparams, prefix);
+      }
      config_execcheck(params, numparams, prefix);
    }

@@ -312,6 +315,9 @@ int config_getlist(paramlist_def_t *ParamList, paramdef_t *params, int numparams
      // TODO config_process_cmdline?
      sprintf(cfgpath, "%s.[%i]", newprefix, i);
      config_process_cmdline(ParamList->paramarray[i],numparams,cfgpath);
+      if (config_get_if()->rtflags & CONFIG_SAVERUNCFG) {
+        config_get_if()->set(ParamList->paramarray[i], numparams, cfgpath);
+      }
      config_execcheck(ParamList->paramarray[i], numparams, cfgpath);
    }

--- a/common/config/libconfig/config_libconfig.c
+++ b/common/config/libconfig/config_libconfig.c
@@ -35,8 +35,11 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
- #include <libgen.h>
-
+#include <time.h>
+#include <libgen.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <netdb.h>

 #include "config_libconfig.h"
 #include "config_libconfig_private.h"
@@ -91,9 +94,219 @@ int read_intarray(paramdef_t *cfgoptions,config_setting_t *setting, char *cfgpat

  return cfgoptions->numelt;
 }
+int config_libconfig_setparams(paramdef_t *cfgoptions, int numoptions, config_setting_t *asetting, char *prefix)
+{
+  int status;
+  int errors = 0;
+  int notused = 0;
+  int emptyla = 0;
+#define LIBCONFIG_NOTUSED_PARAMS "Not used? (NULL value ptr)"
+  char *secprefix = (prefix == NULL) ? "" : prefix;

+  for (int i = 0; i < numoptions; i++) {
+    if (cfgoptions[i].paramflags & PARAMFLAG_CMDLINEONLY) {
+      continue;
+      printf_params("[LIBCONFIG] setting %s.%s skipped (command line only) \n", secprefix, cfgoptions[i].optname);
+    }
+    status = CONFIG_FALSE;
+    config_setting_t *psetting;
+    char *spath = malloc(((prefix == NULL) ? 0 : strlen(prefix)) + strlen(cfgoptions[i].optname) + 10);
+    sprintf(spath, "%s%s%s", secprefix, (prefix == NULL) ? "" : ".", cfgoptions[i].optname);
+    psetting = config_lookup(&(libconfig_privdata.runtcfg), spath);
+    free(spath);
+    if (psetting != NULL) {
+      printf_params("[LIBCONFIG] setting %s.%s already created \n", secprefix, cfgoptions[i].optname);
+      continue;
+    }
+    switch (cfgoptions[i].type) {
+      case TYPE_STRING:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_STRING);
+        if (psetting != NULL) {
+          char *value;
+          if (cfgoptions[i].strptr == NULL) {
+            notused++;
+            value = LIBCONFIG_NOTUSED_PARAMS;
+          } else {
+            value = *(cfgoptions[i].strptr);
+          }
+          status = config_setting_set_string(psetting, value);
+        }
+        break;
+      case TYPE_STRINGLIST:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_LIST);
+        if (psetting != NULL) {
+          if (cfgoptions[i].numelt <= 0) {
+            emptyla++;
+            printf_params("[LIBCONFIG], no element in list %s\n", cfgoptions[i].optname);
+            status = CONFIG_TRUE;
+          }
+          for (int j = 0; j < cfgoptions[i].numelt; j++) {
+            config_setting_t *elemsetting = config_setting_set_string_elem(psetting, -1, cfgoptions[i].strptr[j]);
+            if (elemsetting == NULL) {
+              fprintf(stderr, "[LIBCONFIG] Error: Creating list %s element  %i value %s\n", cfgoptions[i].optname, j, cfgoptions[i].strptr[j]);
+              break;
+            } else
+              status = CONFIG_TRUE;
+          }
+        }
+        break;

+      case TYPE_UINT8:
+      case TYPE_INT8:
+      case TYPE_UINT16:
+      case TYPE_INT16:
+      case TYPE_UINT32:
+      case TYPE_INT32:
+      case TYPE_MASK:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_INT);
+        if (psetting != NULL)
+          status = config_setting_set_int(psetting, (int)*(cfgoptions[i].iptr));
+        break;

+      case TYPE_UINT64:
+      case TYPE_INT64:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_INT64);
+        if (psetting != NULL)
+          status = config_setting_set_int64(psetting, (int64_t) * (cfgoptions[i].i64ptr));
+        break;
+
+      case TYPE_UINTARRAY:
+      case TYPE_INTARRAY:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_ARRAY);
+        if (psetting != NULL) {
+          if (cfgoptions[i].numelt <= 0) {
+            emptyla++;
+            printf_params("[LIBCONFIG], no element in array %s.%s\n", secprefix, cfgoptions[i].optname);
+            status = CONFIG_TRUE;
+          }
+          for (int j = 0; j < cfgoptions[i].numelt; j++) {
+            config_setting_t *elemsetting = config_setting_set_int_elem(psetting, -1, (int)(cfgoptions[i].iptr[j]));
+            if (elemsetting == NULL) {
+              fprintf(stderr, "[LIBCONFIG] Error: Creating array %s.%s, at index %i value %i\n", secprefix, cfgoptions[i].optname, j, (int)(cfgoptions[i].iptr[j]));
+              break;
+            } else
+              status = CONFIG_TRUE;
+          }
+        }
+        break;
+
+      case TYPE_DOUBLE:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_FLOAT);
+        if (psetting != NULL)
+          status = config_setting_set_float(psetting, (double)*(cfgoptions[i].dblptr));
+        break;
+
+      case TYPE_IPV4ADDR:
+        psetting = config_setting_add(asetting, cfgoptions[i].optname, CONFIG_TYPE_STRING);
+        if (psetting != NULL) {
+          char ipstr[INET_ADDRSTRLEN];
+          if (inet_ntop(AF_INET, cfgoptions[i].uptr, ipstr, INET_ADDRSTRLEN) == NULL) {
+            notused++;
+            sprintf(ipstr, "undef");
+          } else {
+            status = config_setting_set_string(psetting, ipstr);
+          }
+        }
+        break;
+
+      case TYPE_LIST:
+        break;
+
+      default:
+        fprintf(stderr, "[LIBCONFIG] %s.%s type %i  not supported\n", secprefix, cfgoptions[i].optname, cfgoptions[i].type);
+        status = CONFIG_FALSE;
+        break;
+    } /* switch on param type */
+    if (status != CONFIG_TRUE) {
+      errors++;
+      fprintf(stderr, "[LIBCONFIG] Error creating setting %i: %s.%s type %i\n", i, secprefix, cfgoptions[i].optname, cfgoptions[i].type);
+    }
+  }
+  printf_params("[LIBCONFIG], in group \"%s\" %i settings \n", secprefix, numoptions);
+  if (notused > 0)
+    printf_params("[LIBCONFIG], ..... %i settings with NULL value pointer\n", notused);
+  if (errors > 0)
+    fprintf(stderr, "[LIBCONFIG] .....%i settings creation errors \n", errors);
+  if (emptyla > 0)
+    fprintf(stderr, "[LIBCONFIG] .....%i empty lists or arrays settings \n", emptyla);
+
+  if (cfgptr->status) {
+    cfgptr->status->num_err_nullvalue += notused;
+    cfgptr->status->num_err_write += errors;
+    cfgptr->status->num_write += numoptions;
+    cfgptr->status->emptyla += emptyla;
+  }
+  return errors;
+}
+
+int config_libconfig_set(paramdef_t *cfgoptions, int numoptions, char *prefix)
+{
+  char *tokctx1 = NULL;
+  int listidx = -1;
+  char *prefixbck = NULL;
+  char *prefix_elem1 = NULL;
+  config_setting_t *asetting = config_root_setting(&(libconfig_privdata.runtcfg));
+  if (prefix != NULL) {
+    prefixbck = strdup(prefix);
+    prefix_elem1 = strtok_r(prefixbck, ".", &tokctx1);
+  }
+  printf_params("[LIBCONFIG], processing prefix %s\n", (prefix == NULL) ? "NULL" : prefix);
+
+  /* parse the prefix , possibly creating groups, lists and list elements */
+  while (prefix_elem1 != NULL) {
+    int n1 = strlen(prefix_elem1);
+    char *prefix_elem2 = prefix_elem1 + n1 + 1;
+    printf_params("[LIBCONFIG], processing elem1 %s elem2 %s\n", prefix_elem1, prefix_elem2);
+    /* prefix (the path to the parameter name) may contain groups and elements from a list, which are specified with [] */
+    if (prefix_elem2[0] != '[') { // not a list
+
+      config_setting_t *tmpset = config_setting_lookup(asetting, prefix_elem1);
+      if (tmpset == NULL)
+        asetting = config_setting_add(asetting, prefix_elem1, CONFIG_TYPE_GROUP);
+      else
+        asetting = tmpset;
+      printf_params("[LIBCONFIG], creating or looking for group %s: %s\n", prefix_elem1, (asetting == NULL) ? "NOK" : "OK");
+    } else { // a list
+      listidx = (int)strtol(prefix_elem2 + 1, NULL, 10);
+      if (errno == EINVAL || errno == ERANGE) {
+        printf_params("[LIBCONFIG], Error %s looking for list index in  %s \n", strerror(errno), prefix_elem2);
+        break;
+      }
+      config_setting_t *tmpset = config_setting_lookup(asetting, prefix_elem1);
+      if (tmpset == NULL)
+        asetting = config_setting_add(asetting, prefix_elem1, CONFIG_TYPE_LIST);
+      else
+        asetting = tmpset;
+      printf_params("[LIBCONFIG], creating or looking for list %s: %s\n", prefix_elem1, (asetting == NULL) ? "NOK" : "OK");
+      if (asetting != NULL) {
+        tmpset = config_setting_get_elem(asetting, listidx);
+        if (tmpset == NULL)
+          asetting = config_setting_add(asetting, NULL, CONFIG_TYPE_GROUP);
+        else
+          asetting = tmpset;
+        printf_params("[LIBCONFIG], creating or looking for list element %i: %s\n", listidx, (asetting == NULL) ? "NOK" : "OK");
+      }
+      prefix_elem1 = strtok_r(NULL, ".", &tokctx1); // skip the [x] elements we already took care of it
+      if (prefix_elem1 == NULL) {
+        fprintf(stderr, "[LICONFIG] End of parsing %s \n", prefix);
+        break;
+      }
+    }
+    if (asetting == NULL) {
+      fprintf(stderr, "[LIBCONFIG] Error creating setting %s %s %i\n", prefix_elem1, prefix_elem2, listidx);
+    }
+    prefix_elem1 = strtok_r(NULL, ".", &tokctx1);
+  }
+  free(prefixbck);
+  if (asetting != NULL) {
+    config_libconfig_setparams(cfgoptions, numoptions, asetting, prefix);
+    printf_params("[LIBCONFIG] %i settings added in group %s\n", numoptions, (prefix == NULL) ? "" : prefix);
+    return 0;
+  } else {
+    fprintf(stderr, "[LIBCONFIG] Error parsing %s params, skipped...\n", (prefix == NULL) ? "" : prefix);
+    return -1;
+  }
+}

 int config_libconfig_get(paramdef_t *cfgoptions,int numoptions, char *prefix ) {
  config_setting_t *setting;
@@ -354,14 +567,47 @@ int config_libconfig_init(char *cfgP[], int numP) {
    free(tmppath);
    return -1;
  }
+
+  /* possibly init a libconfig struct for saving really used params */
+  if (cfgptr->rtflags & CONFIG_SAVERUNCFG) {
+    config_init(&(libconfig_privdata.runtcfg));
+    //	  config_set_options (&(libconfig_privdata.runtcfg), CONFIG_OPTION_ALLOW_OVERRIDES, CONFIG_TRUE);
+  }
  free(tmppath);
  return 0;
 }

+void config_libconfig_write_parsedcfg(void)
+{
+  if (cfgptr->rtflags & CONFIG_SAVERUNCFG) {
+    char *fname = strdup(libconfig_privdata.configfile);
+    int newcfgflen = strlen(libconfig_privdata.configfile) + strlen(cfgptr->tmpdir) + 20;
+    cfgptr->status->debug_cfgname = realloc(cfgptr->status->debug_cfgname, newcfgflen);
+    time_t t = time(NULL);
+    struct tm tm = *localtime(&t);
+    snprintf(cfgptr->status->debug_cfgname, newcfgflen, "%s/%s-run%d_%02d_%02d_%02d%02d", cfgptr->tmpdir, basename(fname), tm.tm_year + 1900, tm.tm_mon + 1, tm.tm_mday, tm.tm_hour, tm.tm_min);
+    if (config_write_file(&(libconfig_privdata.runtcfg), cfgptr->status->debug_cfgname) != CONFIG_TRUE) {
+      fprintf(stderr,
+              "[LIBCONFIG] %s %d file %s - line %d: %s\n",
+              __FILE__,
+              __LINE__,
+              cfgptr->status->debug_cfgname,
+              config_error_line(&(libconfig_privdata.runtcfg)),
+              config_error_text(&(libconfig_privdata.runtcfg)));
+    } else {
+      printf("[LIBCONFIG] file %s created successfully\n", cfgptr->status->debug_cfgname);
+    }
+    free(fname);
+  } else {
+    printf("[LIBCONFIG] Cannot create config file after parsing: CONFIG_SAVERUNCFG flag not specified\n");
+  }
+}

 void config_libconfig_end(void ) {
  config_destroy(&(libconfig_privdata.cfg));
-
+  if (cfgptr->rtflags & CONFIG_SAVERUNCFG) {
+    config_destroy(&(libconfig_privdata.runtcfg));
+  }
  if ( libconfig_privdata.configfile != NULL ) {
    free(libconfig_privdata.configfile);
    libconfig_privdata.configfile=NULL;
--- a/common/config/libconfig/config_libconfig.h
+++ b/common/config/libconfig/config_libconfig.h
@@ -46,6 +46,7 @@ extern "C"
 typedef struct libconfig_privatedata {
      char *configfile;
      config_t cfg;
+      config_t runtcfg;
 } libconfig_privatedata_t;
 
 #ifdef __cplusplus
--- a/common/openairinterface5g_limits.h
+++ b/common/openairinterface5g_limits.h
@@ -27,7 +27,6 @@
 #        ifndef PHYSIM
 #            ifndef UE_EXPANSION
 #                    define NUMBER_OF_UE_MAX 40
-#                    define NUMBER_OF_NR_UE_MAX 4
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 1
 #            else
@@ -37,7 +36,6 @@
 #            endif
 #        else
 #                    define NUMBER_OF_UE_MAX 4
-#                    define NUMBER_OF_NR_UE_MAX 4
 #                    define NUMBER_OF_CONNECTED_eNB_MAX 1
 #                    define NUMBER_OF_CONNECTED_gNB_MAX 1
 #        endif
--- a/common/ran_context.h
+++ b/common/ran_context.h
@@ -43,7 +43,7 @@
 #include "RRC/LTE/defs_NB_IoT.h"
 #include "RRC/LTE/rrc_defs.h"
 #include "RRC/NR/nr_rrc_defs.h"
-#include <openair3/ocp-gtpu/gtpv1u_eNB_task.h>
+#include <openair3/ocp-gtpu/gtp_itf.h>


 typedef struct {
@@ -110,4 +110,5 @@ typedef struct {
 } RAN_CONTEXT_t;

 extern RAN_CONTEXT_t RC;
+
 #endif
--- a/common/utils/T/tracer/hacks/multi-rru-clean.c
+++ b/common/utils/T/tracer/hacks/multi-rru-clean.c
@@ -152,7 +152,7 @@ int main(int n, char **v)
    int32_t length;
    char *v;
    int vpos = 0;
-    struct timespec t;
+    struct timespec t = { 0, 0};
    char *buf;

    /* read event from file */
--- a/common/utils/load_module_shlib.c
+++ b/common/utils/load_module_shlib.c
@@ -150,7 +150,7 @@ int load_module_version_shlib(char *modname, char *version, loader_shlibfunc_t *
    lib_idx = loader_data.numshlibs;
    ++loader_data.numshlibs;
    if (loader_data.numshlibs > loader_data.maxshlibs) {
-      fprintf(stderr, "[LOADER] can not load more than %d shlibs\n",
+      fprintf(stderr, "[LOADER] can not load more than %u shlibs\n",
              loader_data.maxshlibs);
      ret = -1;
      goto load_module_shlib_exit;
--- a/common/utils/nr/nr_common.c
+++ b/common/utils/nr/nr_common.c
@@ -135,7 +135,7 @@ uint16_t get_band(uint64_t downlink_frequency, int32_t delta_duplex)
  const uint64_t dl_freq_khz = downlink_frequency / 1000;
  const int32_t  delta_duplex_khz = delta_duplex / 1000;

-  uint64_t center_freq_diff_khz = 999999999999999999; // 2^64
+  uint64_t center_freq_diff_khz = UINT64_MAX; // 2^64
  uint16_t current_band = 0;

  for (int ind = 0; ind < sizeofArray(nr_bandtable); ind++) {
@@ -227,7 +227,8 @@ void get_coreset_rballoc(uint8_t *FreqDomainResource,int *n_rb,int *rb_offset) {
  *n_rb = 6*count;
 }

-int get_nb_periods_per_frame(uint8_t tdd_period) {
+int get_nb_periods_per_frame(uint8_t tdd_period)
+{

  int nb_periods_per_frame;
  switch(tdd_period) {
@@ -270,7 +271,13 @@ int get_nb_periods_per_frame(uint8_t tdd_period) {
 }


-int get_dmrs_port(int nl, uint16_t dmrs_ports) {
+int get_first_ul_slot(int nrofDownlinkSlots, int nrofDownlinkSymbols, int nrofUplinkSymbols)
+{
+  return (nrofDownlinkSlots + (nrofDownlinkSymbols != 0 && nrofUplinkSymbols == 0));
+}
+
+int get_dmrs_port(int nl, uint16_t dmrs_ports)
+{

  if (dmrs_ports == 0) return 0; // dci 1_0
  int p = -1;
--- a/common/utils/nr/nr_common.h
+++ b/common/utils/nr/nr_common.h
@@ -37,7 +37,9 @@
 #include "assertions.h"
 #include "PHY/defs_common.h"

-#define MAX_BWP_SIZE          275
+#define MAX_BWP_SIZE 275
+#define NR_MAX_NUM_BWP 4
+#define NR_MAX_HARQ_PROCESSES 16

 typedef struct nr_bandentry_s {
  int16_t band;
@@ -63,6 +65,7 @@ static inline int get_num_dmrs(uint16_t dmrs_mask ) {
  return(num_dmrs);
 }

+int get_first_ul_slot(int nrofDownlinkSlots, int nrofDownlinkSymbols, int nrofUplinkSymbols);
 int cce_to_reg_interleaving(const int R, int k, int n_shift, const int C, int L, const int N_regs);
 int get_SLIV(uint8_t S, uint8_t L);
 void get_coreset_rballoc(uint8_t *FreqDomainResource,int *n_rb,int *rb_offset);
@@ -81,7 +84,7 @@ int get_dmrs_port(int nl, uint16_t dmrs_ports);
 uint16_t SL_to_bitmap(int startSymbolIndex, int nrOfSymbols);
 int get_nb_periods_per_frame(uint8_t tdd_period);
 int get_supported_band_index(int scs, int band, int n_rbs);
-long rrc_get_max_nr_csrs(uint8_t max_rbs, long b_SRS);
+long rrc_get_max_nr_csrs(const int max_rbs, long b_SRS);
 void get_samplerate_and_bw(int mu,
                           int n_rb,
                           int8_t threequarter_fs,
--- a/common/utils/asn1_conversions.h
+++ b/common/utils/asn1_conversions.h
@@ -71,12 +71,11 @@ static inline uint16_t BIT_STRING_to_uint16(BIT_STRING_t *asn) {
 */
 static inline uint32_t BIT_STRING_to_uint32(BIT_STRING_t *asn) {
  uint32_t result = 0;
-  int index;
-  int shift;
+  size_t index;

  DevCheck ((asn->size > 0) && (asn->size <= 4), asn->size, 0, 0);

-  shift = ((asn->size - 1) * 8) - asn->bits_unused;
+  int shift = ((asn->size - 1) * 8) - asn->bits_unused;
  for (index = 0; index < (asn->size - 1); index++) {
    result |= asn->buf[index] << shift;
    shift -= 8;
@@ -94,7 +93,7 @@ static inline uint32_t BIT_STRING_to_uint32(BIT_STRING_t *asn) {
 */
 static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
  uint64_t result = 0;
-  int index;
+  size_t index;
  int shift;

  DevCheck ((asn->size > 0) && (asn->size <= 8), asn->size, 0, 0);
@@ -110,4 +109,13 @@ static inline uint64_t BIT_STRING_to_uint64(BIT_STRING_t *asn) {
  return result;
 }

+#define asn1cSeqAdd(VaR, PtR) if (ASN_SEQUENCE_ADD(VaR,PtR)!=0) AssertFatal(false, "ASN.1 encoding error " #VaR "\n")
+#define asn1cCallocOne(VaR, VaLue) \
+  VaR = calloc(1,sizeof(*VaR)); *VaR=VaLue
+#define asn1cCalloc(VaR, lOcPtr) \
+  typeof(VaR) lOcPtr = VaR = calloc(1,sizeof(*VaR))
+#define asn1cSequenceAdd(VaR, TyPe, lOcPtr) \
+  TyPe *lOcPtr= calloc(1,sizeof(TyPe)); \
+  asn1cSeqAdd(&VaR,lOcPtr)
+
 #endif
--- a/common/utils/ocp_itti/intertask_interface.h
+++ b/common/utils/ocp_itti/intertask_interface.h
@@ -256,8 +256,6 @@ typedef struct IttiMsgText_s {
 #include <openair3/MME_APP/mme_app.h>
 //#include <proto.h>

-#include <openair3/ocp-gtpu/gtpv1u_eNB_task.h>
-#include <openair3/ocp-gtpu/gtpv1u_gNB_task.h>
 void *rrc_enb_process_itti_msg(void *);
 #include <openair3/SCTP/sctp_eNB_task.h>
 #include <openair3/NGAP/ngap_gNB.h>
--- a/common/utils/system.c
+++ b/common/utils/system.c
@@ -366,9 +366,14 @@ void set_latency_target(void) {
    LOG_E(HW,"Can't set /dev/cpu_dma_latency to %u us\n", latency_target_value);

  // Set CPU frequency to it's maximum
-  if ( 0 != system("for d in /sys/devices/system/cpu/cpu[0-9]*; do cat $d/cpufreq/cpuinfo_max_freq > $d/cpufreq/scaling_min_freq; done"))
-	  LOG_E(HW,"Can't set cpu frequency\n");
-
+  int system_ret = system("for d in /sys/devices/system/cpu/cpu[0-9]*; do cat $d/cpufreq/cpuinfo_max_freq > $d/cpufreq/scaling_min_freq; done");
+  if (system_ret == -1) {
+    LOG_E(HW, "Can't set cpu frequency: [%d]  %s\n", errno, strerror(errno));
+    return;
+  }
+  if (!((WIFEXITED(system_ret)) && (WEXITSTATUS(system_ret) == 0))) {
+    LOG_E(HW, "Can't set cpu frequency\n");
+  }
  mlockall(MCL_CURRENT | MCL_FUTURE);

 }
--- a/common/utils/telnetsrv/DOC/telnetaddcmd.md
+++ b/common/utils/telnetsrv/DOC/telnetaddcmd.md
@@ -19,8 +19,8 @@ in `telnetsrv.h`
 */
 static int coding_setmod_cmd(char *buff, int debug, telnet_printfunc_t prnt);
 static telnetshell_cmddef_t coding_cmdarray[] = {
-   {"mode","[sse,avx2,stdc,none]",coding_setmod_cmd},
-   {"","",NULL},
+    {"mode", "[sse,avx2,stdc,none]", coding_setmod_cmd, {NULL}, 0, NULL},
+    {"", "", NULL, {NULL}, 0, NULL},
 };

 /*
@@ -109,8 +109,24 @@ The telnet server is dynamically loaded, to use  the `add_telnetcmd` function, t

 | Fields     | type |Description                                                       |
 |:-----------|:------:|:-----------------------|
-| `cmdname`    | `char[TELNET_CMD_MAXSIZE]`  | command name, as tested by the telnet server to check it should call the `cmdfunc` function  |
-| `helpstr`     | `char[TELNET_HELPSTR_SIZE]` |  character string to print when the elp`command is received from the telnet client |
-| `cmdfunc`     | `cmdfunc_t` |  pointer to the function implementing the `cmdname` sub command. |
+| `cmdname`    | `char[TELNET_CMD_MAXSIZE]`  | command name, as tested by the telnet server or web server to check it should call the `cmdfunc` or `webfunc` function  |
+| `helpstr`     | `char[TELNET_HELPSTR_SIZE]` |  character string to print when the help`command is received from the telnet client |
+| `cmdfunc`     | `cmdfunc_t` |  pointer to the function implementing the `cmdname` telnet or web server sub command. |
+| `webfunc`     | `webfunc_t` or `webfunc_getdata_t` |  pointer to the function implementing the `cmdname` web server sub command. |
+| `cmdflags`     | unsigned int bit mask | possible bits are defined in the next table |
+| `qptr`     | pointer to a thread pool queue |  when `TELNETSRV_CMDFLAG_PUSHINTPOOLQ` bit is set in `cmdflags` , contains the queue where the command is pushed|

+### `cmdflags ` bit definitions
+ These flags possibly modify the way the  `telnetshell_cmddef_t` structure is used by the telnet server and/or  the web server
+
+| Fields     | Description                                                       |
+|:------------------------------------:|:-----------------------|
+| TELNETSRV_CMDFLAG_PUSHINTPOOLQ | function defined in `cmdfunc` field is pushed in a thread pool queue instead of beeing executed synchronously. The queue is created by the telnet server code in the  `add_telnetcmd` function|
+| TELNETSRV_CMDFLAG_GETWEBTBLDATA | web server will use the `webfunc_getdata_t` version of the `webfunc` union. command results are written in a `webdatadef_t` structure instead of being printed |
+| TELNETSRV_CMDFLAG_TELNETONLY | this command definition is only for the telnet server, web server is ignoring it |
+| TELNETSRV_CMDFLAG_WEBSRVONLY | this command definition is only for the web server, telnet server is ignoring it |
+| TELNETSRV_CMDFLAG_CONFEXEC  | Currently only used by the web server, command execution has to be confirmed by user |
+| TELNETSRV_CMDFLAG_NEEDPARAM  | Currently only used by the web server, user must provide a parameter before command execution |
+| TELNETSRV_CMDFLAG_WEBSRV_SETRETURNTBL  | Currently only used by the web server, when a parameter modification requires a new page |
+| TELNETSRV_CMDFLAG_AUTOUPDATE |  Currently only used by the web server, the command can be rescheduled for result update |
 [oai telnet server home](telnetsrv.md)
--- a/common/utils/telnetsrv/telnetsrv.c
+++ b/common/utils/telnetsrv/telnetsrv.c
@@ -67,51 +67,53 @@ static telnetsrv_params_t telnetparams;
 #define TELNETSRV_OPTNAME_SHRMOD      "shrmod"

 paramdef_t telnetoptions[] = {
-  /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
-  /*                                            configuration parameters for telnet utility                                                                                      */
-  /*   optname                              helpstr                paramflags           XXXptr                               defXXXval               type                 numelt */
-  /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
-  {"listenaddr",                   "<listen ip address>\n",         0,                 uptr:&telnetparams.listenaddr,        defstrval:"0.0.0.0",            TYPE_IPV4ADDR,  0 },
-  {"listenport",                   "<local port>\n",                0,                 uptr:&(telnetparams.listenport),      defuintval:9090,                TYPE_UINT,      0 },
-  {"listenstdin",                  "enable input from stdin\n",     PARAMFLAG_BOOL,    uptr:&(telnetparams.listenstdin),     defuintval:0,                   TYPE_UINT,      0 },
-  {"priority",                     "<scheduling policy (0-99)\n",   0,                 iptr:&telnetparams.priority,          defuintval:0,                   TYPE_INT,       0 },
-  {"debug",                        "<debug level>\n",               0,                 uptr:NULL,                            defuintval:0,                   TYPE_UINT,      0 },
-  {"loopcount",                    "<loop command iterations>\n",   0,                 uptr:&(telnetparams.loopcount),       defuintval:10,                  TYPE_UINT,      0 },
-  {"loopdelay",                    "<loop command delay (ms)>\n",   0,                 uptr:&(telnetparams.loopdelay),       defuintval:5000,                TYPE_UINT,      0 },
-  {"histfile",                     "<history file name>\n",         PARAMFLAG_NOFREE,  strptr:&(telnetparams.histfile),      defstrval:"oaitelnet.history",  TYPE_STRING,    0 },
-  {"histsize",                     "<history sizes>\n",             0,                 iptr:&(telnetparams.histsize),        defuintval:50,                  TYPE_INT,       0 },
-  {"phypbsize",                    "<phy dump buff size (bytes)>\n",0,                 uptr:&(telnetparams.phyprntbuff_size),defuintval:65000,               TYPE_UINT,      0 },
-  {TELNETSRV_OPTNAME_STATICMOD,    "<static modules selection>\n",  0,                 strlistptr:NULL,                      defstrlistval:telnet_defstatmod,TYPE_STRINGLIST,(sizeof(telnet_defstatmod)/sizeof(char *))},
-  {TELNETSRV_OPTNAME_SHRMOD,       "<dynamic modules selection>\n", 0,                 strlistptr:NULL,                      defstrlistval:NULL,TYPE_STRINGLIST,0 }
-};
+    /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+    /*                                            configuration parameters for telnet utility                                                                                      */
+    /*   optname                              helpstr                paramflags           XXXptr                               defXXXval               type                 numelt */
+    /*-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------*/
+    {"listenaddr", "<listen ip address>\n", 0, uptr : &telnetparams.listenaddr, defstrval : "0.0.0.0", TYPE_IPV4ADDR, 0},
+    {"listenport", "<local port>\n", 0, uptr : &(telnetparams.listenport), defuintval : 9090, TYPE_UINT, 0},
+    {"listenstdin", "enable input from stdin\n", PARAMFLAG_BOOL, uptr : &(telnetparams.listenstdin), defuintval : 0, TYPE_UINT, 0},
+    {"priority", "<scheduling policy (0-99)\n", 0, iptr : &telnetparams.priority, defuintval : 0, TYPE_INT, 0},
+    {"debug", "<debug level>\n", 0, uptr : NULL, defuintval : 0, TYPE_UINT, 0},
+    {"loopcount", "<loop command iterations>\n", 0, uptr : &(telnetparams.loopcount), defuintval : 10, TYPE_UINT, 0},
+    {"loopdelay", "<loop command delay (ms)>\n", 0, uptr : &(telnetparams.loopdelay), defuintval : 5000, TYPE_UINT, 0},
+    {"histfile", "<history file name>\n", PARAMFLAG_NOFREE, strptr : &(telnetparams.histfile), defstrval : "oaitelnet.history", TYPE_STRING, 0},
+    {"histsize", "<history sizes>\n", 0, iptr : &(telnetparams.histsize), defuintval : 50, TYPE_INT, 0},
+    {"logfile", "log file when redirecting", PARAMFLAG_NOFREE, strptr : &(telnetparams.logfile), defstrval : "oaisoftmodem.log", TYPE_STRING, 0},
+    {"phypbsize", "<phy dump buff size (bytes)>\n", 0, uptr : &(telnetparams.phyprntbuff_size), defuintval : 65000, TYPE_UINT, 0},
+    {TELNETSRV_OPTNAME_STATICMOD, "<static modules selection>\n", 0, strlistptr : NULL, defstrlistval : telnet_defstatmod, TYPE_STRINGLIST, (sizeof(telnet_defstatmod) / sizeof(char *))},
+    {TELNETSRV_OPTNAME_SHRMOD, "<dynamic modules selection>\n", 0, strlistptr : NULL, defstrlistval : NULL, TYPE_STRINGLIST, 0}};

 int get_phybsize(void) {
  return telnetparams.phyprntbuff_size;
 };
 int add_telnetcmd(char *modulename,telnetshell_vardef_t *var, telnetshell_cmddef_t *cmd );
 int setoutput(char *buff, int debug, telnet_printfunc_t prnt);
+int wsetoutput(char *buff, int debug, telnet_printfunc_t prnt, ...);
 int setparam(char *buff, int debug, telnet_printfunc_t prnt);
+int wsetparam(char *buff, int debug, telnet_printfunc_t prnt, ...);
 int history_cmd(char *buff, int debug, telnet_printfunc_t prnt);

-telnetshell_vardef_t telnet_vardef[] = {
-  {"debug",TELNET_VARTYPE_INT32,&telnetparams.telnetdbg},
-  {"prio",TELNET_VARTYPE_INT32,&telnetparams.priority},
-  {"loopc",TELNET_VARTYPE_INT32,&telnetparams.loopcount},
-  {"loopd",TELNET_VARTYPE_INT32,&telnetparams.loopdelay},
-  {"phypb",TELNET_VARTYPE_INT32,&telnetparams.phyprntbuff_size},
-  {"hsize",TELNET_VARTYPE_INT32,&telnetparams.histsize},
-  {"hfile",TELNET_VARTYPE_STRING,&telnetparams.histfile},
-  {"",0,NULL}
-};
+telnetshell_vardef_t telnet_vardef[] = {{"debug", TELNET_VARTYPE_INT32, 0, &telnetparams.telnetdbg},
+                                        {"prio", TELNET_VARTYPE_INT32, 0, &telnetparams.priority},
+                                        {"loopc", TELNET_VARTYPE_INT32, 0, &telnetparams.loopcount},
+                                        {"loopd", TELNET_VARTYPE_INT32, 0, &telnetparams.loopdelay},
+                                        {"phypb", TELNET_VARTYPE_INT32, 0, &telnetparams.phyprntbuff_size},
+                                        {"hsize", TELNET_VARTYPE_INT32, 0, &telnetparams.histsize},
+                                        {"hfile", TELNET_VARTYPE_STRING, TELNET_CHECKVAL_RDONLY, &telnetparams.histfile},
+                                        {"logfile", TELNET_VARTYPE_STRING, 0, &telnetparams.logfile},
+                                        {"", 0, 0, NULL}};

-telnetshell_cmddef_t  telnet_cmdarray[] = {
-  {"redirlog","[here,file,off]",setoutput},
-  {"param","[prio]",setparam},
-  {"history","[list,reset]",history_cmd},
-  {"","",NULL},
+telnetshell_cmddef_t telnet_cmdarray[] = {
+    {"redirlog", "[here,file,off]", setoutput, {NULL}, TELNETSRV_CMDFLAG_TELNETONLY, NULL},
+    {"redirlog file", "", setoutput, {NULL}, TELNETSRV_CMDFLAG_WEBSRVONLY, NULL},
+    {"redirlog off", "", setoutput, {NULL}, TELNETSRV_CMDFLAG_WEBSRVONLY, NULL},
+    {"param", "[prio]", setparam, {wsetparam}, 0, NULL},
+    {"history", "[list,reset]", history_cmd, {NULL}, TELNETSRV_CMDFLAG_TELNETONLY, NULL},
+    {"", "", NULL, {NULL}, 0, NULL},
 };

-
 void client_printf(const char *message, ...) {
  va_list va_args;
  va_start(va_args, message);
@@ -127,36 +129,39 @@ void client_printf(const char *message, ...) {
  return ;
 }

-#define NICE_MAX 19
-#define NICE_MIN -20
 void set_sched(pthread_t tid, int pid, int priority) {
  int rt;
  struct sched_param schedp;
  int policy;
  char strpolicy[10];
+  int niceval = 0;

-  //sched_get_priority_max(SCHED_FIFO)
-  if (priority < NICE_MIN) {
+  if (priority < -100 && priority > -200) { // RR priority 1 to 99 (high) mapped to oai priority -101 to -199 (high)
+    policy = SCHED_RR;
+    sprintf(strpolicy, "%s", "RR");
+    schedp.sched_priority = -(priority + 100);
+  } else if (priority < 0 && priority > -100) {
    policy=SCHED_FIFO;
    sprintf(strpolicy,"%s","fifo");
-    schedp.sched_priority= NICE_MIN - priority ;
-
-    if (   (schedp.sched_priority < sched_get_priority_min(SCHED_FIFO)) ||
-           (schedp.sched_priority > sched_get_priority_max(SCHED_FIFO)) ) {
-      client_printf("Error: %i invalid prio, should be %i to %i, \n",
-                    priority, NICE_MIN -sched_get_priority_min(SCHED_FIFO),
-                    NICE_MIN - sched_get_priority_max(SCHED_FIFO) );
-    }
-  } else if (priority > NICE_MAX) {
+    schedp.sched_priority = -priority; // fifo priority 1 to 99 (high) mapped to oai priority -1 to -99 (high)
+  } else if (priority >= 0 && priority <= (NICE_MAX - NICE_MIN)) { // other (normal) nice value -20 to 19 mapped to oai priority 0 to 39
+    policy = SCHED_OTHER;
+    sprintf(strpolicy, "%s", "other");
+    schedp.sched_priority = 0;
+    niceval = priority + NICE_MIN;
+  } else if (priority > NICE_MAX - NICE_MIN && priority <= (2 * (NICE_MAX - NICE_MIN) + 1)) { // batch (normal) nice value -20 to 19 mapped to oai priority 40 to 79
+    policy = SCHED_BATCH;
+    sprintf(strpolicy, "%s", "batch");
+    niceval = priority + NICE_MIN - (NICE_MAX - NICE_MIN + 1);
+    schedp.sched_priority = 0;
+  } else if (priority > (2 * (NICE_MAX - NICE_MIN) + 1)) { // idle  mapped to oai priority >79
    policy=SCHED_IDLE;
    sprintf(strpolicy,"%s","idle");
    schedp.sched_priority=0;
  } else {
-    policy=SCHED_OTHER;
-    sprintf(strpolicy,"%s","other");
-    schedp.sched_priority=0;
+    client_printf("Error: %i invalid priority \n", priority);
+    return;
  }
-
  if( tid != 0) {
    rt = pthread_setschedparam(tid, policy, &schedp);
  } else if(pid > 0)  {
@@ -172,15 +177,14 @@ void set_sched(pthread_t tid, int pid, int priority) {
  } else  {
    client_printf("policy set to %s, priority %i\n",strpolicy,schedp.sched_priority);

-    if ( policy==SCHED_OTHER) {
+    if (policy == SCHED_OTHER || policy == SCHED_BATCH) {
      rt = getpriority(PRIO_PROCESS,tid);

      if (rt != -1) {
-        rt = setpriority(PRIO_PROCESS,tid,priority);
+        rt = setpriority(PRIO_PROCESS, tid, niceval);

        if (rt < 0) {
-          client_printf("Error %i: %s trying to set nice value of thread %u to %i\n",
-                        errno,strerror(errno),tid,priority);
+          client_printf("Error %i: %s trying to set nice value of thread %u to %i\n", errno, strerror(errno), tid, niceval);
        }
      } else {
        client_printf("Error %i: %s trying to get nice value of thread %u \n",
@@ -189,17 +193,17 @@ void set_sched(pthread_t tid, int pid, int priority) {
    }
  }

-  if ( policy == SCHED_OTHER) {
+  if (policy == SCHED_OTHER || policy == SCHED_BATCH) {
    if ( tid > 0 && tid != pthread_self()) {
      client_printf("setting nice value using a thread id not implemented....\n");
    } else if (pid > 0) {
      errno=0;
-      rt = setpriority(PRIO_PROCESS,pid,priority);
+      rt = setpriority(PRIO_PROCESS, pid, niceval);

      if (rt != 0) {
        client_printf("Error %i: %s calling setpriority, \n",errno,strerror(errno));
      } else {
-        client_printf("nice value set to %i\n",priority);
+        client_printf("nice value set to %i\n", niceval);
      }
    }
  }
@@ -236,20 +240,30 @@ void redirstd(char *newfname,telnet_printfunc_t prnt ) {
  fd=freopen(newfname, "w", stdout);

  if (fd == NULL) {
-    prnt("ERROR: stdout redir to %s error %s",strerror(errno));
+    prnt("ERROR: stdout redir to %s error %s\n", strerror(errno));
+  } else {
+    prnt("stdout redirected to %s\n", newfname);
  }

  fd=freopen(newfname, "w", stderr);

  if (fd == NULL) {
-    prnt("ERROR: stderr redir to %s error %s",strerror(errno));
+    prnt("ERROR: stderr redir to %s error %s\n", strerror(errno));
+  } else {
+    prnt("stderr redirected to %s\n", newfname);
  }
 }
+
+int wsetoutput(char *buffer, int debug, telnet_printfunc_t prnt, ...)
+{
+  return 0;
+}
+
 int setoutput(char *buff, int debug, telnet_printfunc_t prnt) {
  char cmds[TELNET_MAX_MSGLENGTH/TELNET_CMD_MAXSIZE][TELNET_CMD_MAXSIZE];
  char *logfname;
  char stdout_str[64];
-#define LOGFILE "logfile.log"
+
  memset(cmds,0,sizeof(cmds));
  sscanf(buff,"%9s %32s %9s %9s %9s", cmds[0],cmds[1],cmds[2],cmds[3],cmds[4]  );

@@ -265,10 +279,10 @@ int setoutput(char *buff, int debug, telnet_printfunc_t prnt) {

  if (strncasecmp(cmds[0],"file",4) == 0) {
    if (cmds[1][0] == 0)
-      logfname=LOGFILE;
+      logfname = telnetparams.logfile;
    else
      logfname=cmds[1];
-
+    prnt("Log output redirected to (%s)\n", logfname);
    fflush(stdout);
    redirstd(logfname,prnt);
  }
@@ -281,6 +295,11 @@ int setoutput(char *buff, int debug, telnet_printfunc_t prnt) {
  return CMDSTATUS_FOUND;
 } /* setoutput */

+int wsetparam(char *buff, int debug, telnet_printfunc_t prnt, ...)
+{
+  return 0;
+}
+
 int setparam(char *buff, int debug, telnet_printfunc_t prnt) {
  char cmds[TELNET_MAX_MSGLENGTH/TELNET_CMD_MAXSIZE][TELNET_CMD_MAXSIZE];
  memset(cmds,0,sizeof(cmds));
@@ -344,94 +363,120 @@ int history_cmd(char *buff, int debug, telnet_printfunc_t prnt) {
 /*
 generic commands available for all modules loaded by the server
 */
+char *telnet_getvarvalue(telnetshell_vardef_t *var, int varindex)
+{
+  char *val;
+  switch (var[varindex].vartype) {
+    case TELNET_VARTYPE_INT32:
+      val = malloc(64);
+      snprintf(val, 64, "%i", *(int32_t *)(var[varindex].varvalptr));
+      break;

-int setgetvar(int moduleindex,char getorset,char *params) {
-  int n,i;
+    case TELNET_VARTYPE_INT64:
+      val = malloc(128);
+      snprintf(val, 128, "%lli", (long long)*(int64_t *)(var[varindex].varvalptr));
+      break;
+
+    case TELNET_VARTYPE_INT16:
+      val = malloc(16);
+      snprintf(val, 16, "%hi", *(short *)(var[varindex].varvalptr));
+      break;
+
+    case TELNET_VARTYPE_INT8:
+      val = malloc(16);
+      snprintf(val, 16, "%i", (int)(*(int8_t *)(var[varindex].varvalptr)));
+      break;
+
+    case TELNET_VARTYPE_UINT:
+      val = malloc(64);
+      snprintf(val, 64, "%u", *(unsigned int *)(var[varindex].varvalptr));
+      break;
+
+    case TELNET_VARTYPE_DOUBLE:
+      val = malloc(32);
+      snprintf(val, 32, "%g\n", *(double *)(var[varindex].varvalptr));
+      break;
+
+    case TELNET_VARTYPE_STRING:
+      val = strdup(*(char **)(var[varindex].varvalptr));
+      break;
+
+    default:
+      val = malloc(64);
+      snprintf(val, 64, "ERR:var %i unknown type", varindex);
+      break;
+  }
+  return val;
+}
+
+int telnet_setvarvalue(telnetshell_vardef_t *var, char *strval, telnet_printfunc_t prnt)
+{
+  int st = 0;
+  switch (var->vartype) {
+    case TELNET_VARTYPE_INT32:
+      *(int *)(var->varvalptr) = (int)strtol(strval, NULL, 0);
+      if (prnt != NULL)
+        prnt("%i\n", *(int *)(var->varvalptr));
+      break;
+
+    case TELNET_VARTYPE_INT16:
+      *(short *)(var->varvalptr) = (short)strtol(strval, NULL, 0);
+      if (prnt != NULL)
+        prnt("%hi\n", *(short *)(var->varvalptr));
+      break;
+
+    case TELNET_VARTYPE_INT8:
+      *(char *)(var->varvalptr) = (char)strtol(strval, NULL, 0);
+      if (prnt != NULL)
+        prnt("%i\n", *(int *)(var->varvalptr));
+      break;
+
+    case TELNET_VARTYPE_UINT:
+      *(unsigned int *)(var->varvalptr) = (unsigned int)strtol(strval, NULL, 0);
+      if (prnt != NULL)
+        prnt("%u\n", *(unsigned int *)(var->varvalptr));
+      break;
+
+    case TELNET_VARTYPE_DOUBLE:
+      *(double *)(var->varvalptr) = strtod(strval, NULL);
+      if (prnt != NULL)
+        prnt("%g\n", *(double *)(var->varvalptr));
+      break;
+
+    case TELNET_VARTYPE_STRING:
+      sprintf(*(char **)(var->varvalptr), "%s", strval);
+      if (prnt != NULL)
+        prnt("\"%s\"\n", *(char **)(var->varvalptr));
+      break;
+
+    default:
+      if (prnt != NULL)
+        prnt("unknown type\n");
+      st = -1;
+      break;
+  }
+  return st;
+}
+
+int setgetvar(int moduleindex, char getorset, char *params)
+{
+  int n, i;
  char varname[TELNET_CMD_MAXSIZE];
-  char *varval=NULL;
-  memset(varname,0,sizeof(varname));
-  n = sscanf(params,"%9s %ms",varname,&varval);
+  char *varval = NULL;
+  memset(varname, 0, sizeof(varname));
+  n = sscanf(params, "%9s %ms", varname, &varval);

-  for ( i=0 ; telnetparams.CmdParsers[moduleindex].var[i].varvalptr != NULL ; i++) {
-    if ( strncasecmp(telnetparams.CmdParsers[moduleindex].var[i].varname,varname,strlen(telnetparams.CmdParsers[moduleindex].var[i].varname)) == 0) {
+  for (i = 0; telnetparams.CmdParsers[moduleindex].var[i].varvalptr != NULL; i++) {
+    if (strncasecmp(telnetparams.CmdParsers[moduleindex].var[i].varname, varname, strlen(telnetparams.CmdParsers[moduleindex].var[i].varname)) == 0) {
      if (n > 0 && (getorset == 'g' || getorset == 'G')) {
-        client_printf("%s, %s = ", telnetparams.CmdParsers[moduleindex].module,
-                      telnetparams.CmdParsers[moduleindex].var[i].varname );
-
-        switch(telnetparams.CmdParsers[moduleindex].var[i].vartype) {
-          case TELNET_VARTYPE_INT32:
-            client_printf("%i\n",*(int32_t *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          case TELNET_VARTYPE_INT64:
-            client_printf("%lli\n",*(int64_t *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          case TELNET_VARTYPE_INT16:
-            client_printf("%hi\n",*(short *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          case TELNET_VARTYPE_INT8:
-            client_printf("%i\n",(int)(*(int8_t *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr)));
-            break;
-            
-          case TELNET_VARTYPE_UINT:
-            client_printf("%u\n",*(unsigned int *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-            
-          case TELNET_VARTYPE_DOUBLE:
-            client_printf("%g\n",*(double *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          case TELNET_VARTYPE_STRING:
-            client_printf("\"%s\"\n",*(char **)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          default:
-            client_printf("unknown type\n");
-            break;
-        }
+        client_printf("%s, %s = ", telnetparams.CmdParsers[moduleindex].module, telnetparams.CmdParsers[moduleindex].var[i].varname);
+        char *strval = telnet_getvarvalue(telnetparams.CmdParsers[moduleindex].var, i);
+        client_printf("%s\n", strval);
+        free(strval);
      }
-
      if (n > 1 && (getorset == 's' || getorset == 'S')) {
-        client_printf("%s, %s set to \n", telnetparams.CmdParsers[moduleindex].module,
-                      telnetparams.CmdParsers[moduleindex].var[i].varname);
-
-        switch(telnetparams.CmdParsers[moduleindex].var[i].vartype) {
-          case TELNET_VARTYPE_INT32:
-            *(int *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr) = (int)strtol(varval,NULL,0);
-            client_printf("%i\n",*(int *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          case TELNET_VARTYPE_INT16:
-            *(short *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr) = (short)strtol(varval,NULL,0);
-            client_printf("%hi\n",*(short *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-            
-          case TELNET_VARTYPE_INT8:
-            *(char *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr) = (char)strtol(varval,NULL,0);
-            client_printf("%i\n",*(int *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-            
-          case TELNET_VARTYPE_UINT:
-            *(unsigned int *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr) = (unsigned int)strtol(varval,NULL,0);
-            client_printf("%u\n",*(unsigned int *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
- 
-          case TELNET_VARTYPE_DOUBLE:
-            *(double *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr) = strtod(varval,NULL);
-            client_printf("%g\n",*(double *)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          case TELNET_VARTYPE_STRING:
-            sprintf(*(char **)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr),"%s", varval);
-            client_printf("\"%s\"\n",*(char **)(telnetparams.CmdParsers[moduleindex].var[i].varvalptr));
-            break;
-
-          default:
-            client_printf("unknown type\n");
-            break;
-        }
+        client_printf("%s, %s set to \n", telnetparams.CmdParsers[moduleindex].module, telnetparams.CmdParsers[moduleindex].var[i].varname);
+        telnet_setvarvalue(&(telnetparams.CmdParsers[moduleindex].var[i]), varval, client_printf);
      }
    }
  }
@@ -442,6 +487,14 @@ int setgetvar(int moduleindex,char getorset,char *params) {

  return CMDSTATUS_VARNOTFOUND;
 }
+
+void telnetsrv_freetbldata(webdatadef_t *wdata)
+{
+  for (int i = 0; i < wdata->numlines; i++)
+    for (int j = 0; j < wdata->numcols; j++)
+      if (wdata->columns[j].coltype & TELNET_VAR_NEEDFREE)
+        free(wdata->lines[i].val[j]);
+}
 /*----------------------------------------------------------------------------------------------------*/
 char *get_time(char *buff,int bufflen) {
  struct tm  tmstruct;
@@ -449,17 +502,28 @@ char *get_time(char *buff,int bufflen) {
  strftime (buff, bufflen, "%Y-%m-%d %H:%M:%S.000", localtime_r(&now,&tmstruct));
  return buff;
 }
+void telnet_pushcmd(telnetshell_cmddef_t *cmd, char *cmdbuff, telnet_printfunc_t prnt)
+{
+  notifiedFIFO_elt_t *msg = newNotifiedFIFO_elt(sizeof(telnetsrv_qmsg_t), 0, NULL, NULL);
+  telnetsrv_qmsg_t *cmddata = NotifiedFifoData(msg);
+  cmddata->cmdfunc = (qcmdfunc_t)cmd->cmdfunc;
+  cmddata->prnt = prnt;
+  cmddata->debug = telnetparams.telnetdbg;
+  if (cmdbuff != NULL)
+    cmddata->cmdbuff = strdup(cmdbuff);
+  pushNotifiedFIFO(cmd->qptr, msg);
+}

-int process_command(char *buf) {
+int process_command(char *buf, int iteration)
+{
  int i,j,k;
  char modulename[TELNET_CMD_MAXSIZE];
  char cmd[TELNET_CMD_MAXSIZE];
  char *cmdb=NULL;
-  char *bufbck;
  int rt;
  memset(modulename,0,sizeof(modulename));
  memset(cmd,0,sizeof(cmd));
-  
+

  if (strncasecmp(buf,"ex",2) == 0)
    return CMDSTATUS_EXIT;
@@ -474,6 +538,8 @@ int process_command(char *buf) {
      }

      for(j=0; telnetparams.CmdParsers[i].cmd[j].cmdfunc != NULL ; j++) {
+        if (telnetparams.CmdParsers[i].cmd[j].cmdflags & TELNETSRV_CMDFLAG_WEBSRVONLY)
+          continue;
        client_printf("      %s %s %s\n",
                      telnetparams.CmdParsers[i].module,telnetparams.CmdParsers[i].cmd[j].cmdname,
                      telnetparams.CmdParsers[i].cmd[j].helpstr);
@@ -483,13 +549,11 @@ int process_command(char *buf) {
    return CMDSTATUS_FOUND;
  }

-  
-  bufbck=strdup(buf);
  rt=CMDSTATUS_NOTFOUND;
  j = sscanf(buf,"%19s %19s %m[^\t\n]",modulename,cmd,&cmdb);

  if (telnetparams.telnetdbg > 0)
-    printf("process_command: %i words, module=%s cmd=%s, parameters= %s\n",j,modulename,cmd,cmdb);
+    printf("process_command: %i words, module=%s cmd=%s, parameters= %s\n", j, modulename, cmd, (cmdb == NULL) ? "" : cmdb);

  for (i=0; j>=2 && telnetparams.CmdParsers[i].var != NULL && telnetparams.CmdParsers[i].cmd != NULL; i++) {
    if ( (strncasecmp(telnetparams.CmdParsers[i].module,modulename,strlen(telnetparams.CmdParsers[i].module)) == 0)) {
@@ -504,15 +568,11 @@ int process_command(char *buf) {
      } else {
        for (k=0 ; telnetparams.CmdParsers[i].cmd[k].cmdfunc != NULL ; k++) {
          if (strncasecmp(cmd, telnetparams.CmdParsers[i].cmd[k].cmdname,sizeof(telnetparams.CmdParsers[i].cmd[k].cmdname)) == 0) {
-          	if (telnetparams.CmdParsers[i].cmd[k].qptr != NULL) {
-          		notifiedFIFO_elt_t *msg =newNotifiedFIFO_elt(sizeof(telnetsrv_qmsg_t),0,NULL,NULL);
-          		telnetsrv_qmsg_t *cmddata=NotifiedFifoData(msg);
-          		cmddata->cmdfunc=(qcmdfunc_t)telnetparams.CmdParsers[i].cmd[k].cmdfunc;
-          	    cmddata->prnt=client_printf;
-          	    cmddata->debug=telnetparams.telnetdbg;
-                    cmddata->cmdbuff=cmdb ? strdup(cmdb) : NULL;
-          		pushNotifiedFIFO(telnetparams.CmdParsers[i].cmd[k].qptr, msg);
-          	} else {
+            if (telnetparams.CmdParsers[i].cmd[k].cmdflags & TELNETSRV_CMDFLAG_WEBSRVONLY)
+              continue;
+            if (telnetparams.CmdParsers[i].cmd[k].qptr != NULL) {
+              telnet_pushcmd(&(telnetparams.CmdParsers[i].cmd[k]), (cmdb != NULL) ? strdup(cmdb) : NULL, client_printf);
+            } else {
              telnetparams.CmdParsers[i].cmd[k].cmdfunc(cmdb, telnetparams.telnetdbg, client_printf);
            }
            rt= CMDSTATUS_FOUND;
@@ -533,7 +593,7 @@ int process_command(char *buf) {
        char tbuff[64];
        client_printf(CSI "1J" CSI "1;10H         " STDFMT "%s %i/%i\n",
                      get_time(tbuff,sizeof(tbuff)),lc,telnetparams.loopcount );
-        process_command(bufbck+strlen("loop")+1);
+        process_command(buf + strlen("loop") + 1, lc);
        errno=0;
        int rs = read(telnetparams.new_socket,dummybuff,sizeof(dummybuff));

@@ -554,7 +614,6 @@ int process_command(char *buf) {
    } /* loop */
  } /* for i */
  free(cmdb);
-  free(bufbck);
  return rt;
 }

@@ -645,7 +704,7 @@ void run_telnetsrv(void) {
      }

      if (strlen(buf) > 2 ) {
-        status=process_command(buf);
+        status = process_command(buf, 0);
      } else
        status=CMDSTATUS_NOCMD;

@@ -847,44 +906,35 @@ int telnetsrv_autoinit(void) {
 */
 int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmddef_t *cmd)
 {
+  notifiedFIFO_t *afifo = NULL;
+
  if( modulename == NULL || var == NULL || cmd == NULL) {
    fprintf(stderr,"[TELNETSRV] Telnet server, add_telnetcmd: invalid parameters\n");
    return -1;
  }

-  int i;
-  for (i=0; i<TELNET_MAXCMD ; i++) {
-    cmdparser_t *CmdParser = &telnetparams.CmdParsers[i];
-    if (CmdParser->var == NULL) {
-      strncpy(CmdParser->module, modulename, sizeof(CmdParser->module) - 1);
-      CmdParser->cmd = cmd;
-      CmdParser->var = var;
-      printf("[TELNETSRV] Telnet server: module %i = %s added to shell\n",
-             i, CmdParser->module);
-      break;
-    }
-  }
-
-  if (i == TELNET_MAXCMD) {
-    fprintf(stderr, "[TELNETSRV] TELNET_MAXCMD reached, cannot add new module %s\n", modulename);
-    return -1;
-  }
-
-  notifiedFIFO_t *afifo = NULL;
-  for (int k = 0; cmd[k].cmdfunc != NULL ; k++) {
-    if (cmd[k].cmdflags & TELNETSRV_CMDFLAG_PUSHINTPOOLQ) {
-      if (afifo == NULL) {
-        afifo = malloc(sizeof(notifiedFIFO_t));
-        initNotifiedFIFO(afifo);
+  for (int i = 0; i < TELNET_MAXCMD; i++) {
+    if (telnetparams.CmdParsers[i].var == NULL) {
+      strncpy(telnetparams.CmdParsers[i].module, modulename, sizeof(telnetparams.CmdParsers[i].module) - 1);
+      telnetparams.CmdParsers[i].cmd = cmd;
+      telnetparams.CmdParsers[i].var = var;
+      for (int j = 0; cmd[j].cmdfunc != NULL; j++) {
+        if (cmd[j].cmdflags & TELNETSRV_CMDFLAG_PUSHINTPOOLQ) {
+          if (afifo == NULL) {
+            afifo = malloc(sizeof(notifiedFIFO_t));
+            initNotifiedFIFO(afifo);
+          }
+          cmd[j].qptr = afifo;
+        }
      }
-      cmd[k].qptr = afifo;
+      printf("[TELNETSRV] Telnet server: module %i = %s added to shell\n", i, telnetparams.CmdParsers[i].module);
+      break;
    }
  }

  return 0;
 }

-
 /* function which will be called by the shared lib loader, to check shared lib version
   against main exec version. version mismatch not considered as fatal (interfaces not supposed to change)
 */
@@ -903,10 +953,18 @@ int  telnetsrv_checkbuildver(char *mainexec_buildversion, char **shlib_buildvers
 }

 int telnetsrv_getfarray(loader_shlibfunc_t  **farray) {
-  *farray=malloc(sizeof(loader_shlibfunc_t)*2);
+  int const num_func_tln_srv = 3;	
+  *farray = malloc(sizeof(loader_shlibfunc_t) * num_func_tln_srv);
  (*farray)[0].fname=TELNET_ADDCMD_FNAME;
  (*farray)[0].fptr=(int (*)(void) )add_telnetcmd;
  (*farray)[1].fname=TELNET_POLLCMDQ_FNAME;
-  (*farray)[1].fptr=(int (*)(void) )poll_telnetcmdq; 
-  return ( 2);
+  (*farray)[1].fptr = (int (*)(void))poll_telnetcmdq;
+  (*farray)[2].fname = TELNET_PUSHCMD_FNAME;
+  (*farray)[2].fptr = (int (*)(void))telnet_pushcmd;
+  return (3);
+}
+/* for webserver interface, needs access to some telnet server paramaters */
+telnetsrv_params_t *get_telnetsrv_params(void)
+{
+  return &telnetparams;
 }
--- a/common/utils/telnetsrv/telnetsrv.h
+++ b/common/utils/telnetsrv/telnetsrv.h
@@ -48,19 +48,54 @@
 #define CMDSTATUS_VARNOTFOUND 3
 #define CMDSTATUS_NOTFOUND    4

+/* definitions to store 2 dim table, used to store command results before */
+/* displaying them either on console or web page */
+#define TELNET_MAXLINE_NUM 100
+#define TELNET_MAXCOL_NUM 10
+
+typedef struct col {
+  char coltitle[TELNET_CMD_MAXSIZE];
+  unsigned int coltype;
+} acol_t;
+
+typedef struct line {
+  char *val[TELNET_MAXCOL_NUM];
+} aline_t;
+
+typedef struct webdatadef {
+  char tblname[TELNET_HELPSTR_SIZE];
+  int numlines;
+  int numcols;
+  acol_t columns[TELNET_MAXCOL_NUM];
+  aline_t lines[TELNET_MAXLINE_NUM];
+} webdatadef_t;
 /*----------------------------------------------------------------------------*/
 /* structure to be used when adding a module to the telnet server */
 /* This is the second parameter of the add_telnetcmd function, which can be used   */
 /* to add a set of new command to the telnet server shell */
 typedef void(*telnet_printfunc_t)(const char* format, ...);
 typedef int(*cmdfunc_t)(char*, int, telnet_printfunc_t prnt);
+typedef int (*webfunc_t)(char *cmdbuff, int debug, telnet_printfunc_t prnt, ...);
+typedef int (*webfunc_getdata_t)(char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt);
 typedef int(*qcmdfunc_t)(char*, int, telnet_printfunc_t prnt,void *arg);

-#define TELNETSRV_CMDFLAG_PUSHINTPOOLQ   (1<<0)    // ask the telnet server to push the command in a thread pool queue
+#define TELNETSRV_CMDFLAG_PUSHINTPOOLQ (1 << 0) // ask the telnet server to push the command in a thread pool queue
+#define TELNETSRV_CMDFLAG_GETWEBDATA (1 << 1) // When called from web server, use the getdata variant of the function
+#define TELNETSRV_CMDFLAG_TELNETONLY (1 << 2) // Command only for telnet client connections
+#define TELNETSRV_CMDFLAG_WEBSRVONLY (1 << 3) // Command only for web server connections
+#define TELNETSRV_CMDFLAG_CONFEXEC (1 << 4) // Ask for confirm before exec
+#define TELNETSRV_CMDFLAG_GETWEBTBLDATA (1 << 8) // When called from web server, use the get table data variant of the function
+#define TELNETSRV_CMDFLAG_NEEDPARAM (1 << 10) // websrv: The command needs a parameter
+#define TELNETSRV_CMDFLAG_WEBSRV_SETRETURNTBL (1 << 11) // websrv: set callback returns a new table
+#define TELNETSRV_CMDFLAG_AUTOUPDATE (1 << 12) // command can be re-submitted automatically for result update
 typedef struct cmddef {
    char cmdname[TELNET_CMD_MAXSIZE];
    char helpstr[TELNET_HELPSTR_SIZE];
-    cmdfunc_t cmdfunc; 
+    cmdfunc_t cmdfunc;
+    union {
+      webfunc_t webfunc;
+      webfunc_getdata_t webfunc_getdata;
+    };
    unsigned int cmdflags;
    void *qptr;
 } telnetshell_cmddef_t;
@@ -78,6 +113,8 @@ typedef struct telnetsrv_qmsg {
 /*structure to be used when adding a module to the telnet server */
 /* This is the first parameter of the add_telnetcmd function, which can be used   */
 /* to add a set of new variables which can be got/set from the telnet server shell */
+/* var type: bits 0-3, type value (1 to 15)
+ * type modifier, bits 4-31 */
 #define TELNET_VARTYPE_INT32  1
 #define TELNET_VARTYPE_INT16  2
 #define TELNET_VARTYPE_INT64  3
@@ -85,9 +122,16 @@ typedef struct telnetsrv_qmsg {
 #define TELNET_VARTYPE_DOUBLE 5
 #define TELNET_VARTYPE_INT8   6
 #define TELNET_VARTYPE_UINT   7
+
+#define TELNET_CHECKVAL_RDONLY 16
+#define TELNET_CHECKVAL_BOOL 32
+#define TELNET_VAR_NEEDFREE 64
+#define TELNET_CHECKVAL_LOGLVL 128
+#define TELNET_CHECKVAL_SIMALGO 256
 typedef struct variabledef {
    char varname[TELNET_CMD_MAXSIZE];
    char vartype;
+    char checkval;
    void *varvalptr;
 } telnetshell_vardef_t;

@@ -113,6 +157,7 @@ typedef struct {
     int priority;                   // server running priority
     char *histfile;                 // command history
     int histsize;                   // command history length
+     char *logfile; // filename to use when redirecting output to file
     int new_socket;                 // socket of the client connection
     int logfilefd;                  // file id of the log file when log output is redirected to a file
     int  saved_stdout;              // file id of the previous stdout, used to be able to restore original stdout 
@@ -145,14 +190,25 @@ VT escape sequence definition, for smarter display....
 #define STDFMT   "\x1b[0m"

 /*---------------------------------------------------------------------------------------------*/
+#define NICE_MAX 19
+#define NICE_MIN -20
 #define TELNET_ADDCMD_FNAME "add_telnetcmd"
 #define TELNET_POLLCMDQ_FNAME "poll_telnetcmdq"
+#define TELNET_PUSHCMD_FNAME "telnet_pushcmd"
 typedef int(*add_telnetcmd_func_t)(char *, telnetshell_vardef_t *, telnetshell_cmddef_t *);
 typedef void(*poll_telnetcmdq_func_t)(void *qid,void *arg);
+typedef void (*push_telnetcmd_func_t)(telnetshell_cmddef_t *cmd, char *cmdbuff, telnet_printfunc_t prnt);
 #ifdef TELNETSERVERCODE
 int add_telnetcmd(char *modulename, telnetshell_vardef_t *var, telnetshell_cmddef_t *cmd);
 void set_sched(pthread_t tid, int pid,int priority);
 void set_affinity(pthread_t tid, int pid, int coreid);
 extern int get_phybsize(void); 
 #endif
+#ifdef WEBSERVERCODE
+extern void telnet_pushcmd(telnetshell_cmddef_t *cmd, char *cmdbuff, telnet_printfunc_t prnt);
+extern telnetsrv_params_t *get_telnetsrv_params(void);
+extern char *telnet_getvarvalue(telnetshell_vardef_t *var, int varindex);
+extern int telnet_setvarvalue(telnetshell_vardef_t *var, char *strval, telnet_printfunc_t prnt);
+extern void telnetsrv_freetbldata(webdatadef_t *wdata);
+#endif
 #endif
--- a/common/utils/telnetsrv/telnetsrv_CMakeLists.txt
+++ b/common/utils/telnetsrv/telnetsrv_CMakeLists.txt
@@ -9,6 +9,7 @@ set(TELNETSRV_SOURCE
    
 add_library(telnetsrv MODULE ${TELNETSRV_SOURCE} )
 target_link_libraries(telnetsrv PRIVATE history ncurses form )
+target_link_libraries(telnetsrv PRIVATE asn1_nr_rrc asn1_lte_rrc)

 foreach(TELNETLIB enb gnb 4Gue 5Gue)
    set(TELNETLIB_SRCS "")
@@ -22,6 +23,7 @@ foreach(TELNETLIB enb gnb 4Gue 5Gue)
       message("Add ${TELNETLIB} specific telnet functions in libtelnetsrv_${TELNETLIB}.so")
       add_library(telnetsrv_${TELNETLIB} MODULE ${TELNETLIB_SRCS} )
       add_dependencies(telnetsrv telnetsrv_${TELNETLIB})
+       target_link_libraries(telnetsrv_${TELNETLIB} PRIVATE asn1_nr_rrc asn1_lte_rrc)
       install(TARGETS  telnetsrv_${TELNETLIB} DESTINATION bin)
    else()
       message("No specific telnet functions for ${TELNETLIB}")
@@ -30,6 +32,6 @@ endforeach()

 install(TARGETS telnetsrv DESTINATION bin)

-if (EXISTS "${OPENAIR_BUILD_DIR}/ran_build/build" AND IS_DIRECTORY "${OPENAIR_BUILD_DIR}/ran_build/build")
-     install(TARGETS telnetsrv DESTINATION ${OPENAIR_BUILD_DIR}/ran_build/build)
-endif (EXISTS "${OPENAIR_BUILD_DIR}/ran_build/build" AND IS_DIRECTORY "${OPENAIR_BUILD_DIR}/ran_build/build")
+if (EXISTS "${OPENAIR_CMAKE}/ran_build/build" AND IS_DIRECTORY "${OPENAIR_CMAKE}/ran_build/build")
+     install(TARGETS telnetsrv DESTINATION ${OPENAIR_CMAKE}/ran_build/build)
+endif (EXISTS "${OPENAIR_CMAKE}/ran_build/build" AND IS_DIRECTORY "${OPENAIR_CMAKE}/ran_build/build")
--- a/common/utils/telnetsrv/telnetsrv_loader.c
+++ b/common/utils/telnetsrv/telnetsrv_loader.c
@@ -42,14 +42,17 @@

 int loader_show_cmd(char *buff, int debug, telnet_printfunc_t prnt);
 telnetshell_cmddef_t loader_cmdarray[] = {
-   {"show","[params,modules]",loader_show_cmd},
-   {"","",NULL},
+    {"show", "[params,modules]", loader_show_cmd, {(webfunc_t)loader_show_cmd}, 0, NULL},
+    {"", "", NULL, {NULL}, 0, NULL},
 };

-
 /*-------------------------------------------------------------------------------------*/
 int loader_show_cmd(char *buff, int debug, telnet_printfunc_t prnt)
 {
+  if (buff == NULL) {
+    prnt("ERROR wrong loader SHOW command...\n");
+    return 0;
+  }
   if (debug > 0)
       prnt( "loader_show_cmd received %s\n",buff);

@@ -58,21 +61,19 @@ int loader_show_cmd(char *buff, int debug, telnet_printfunc_t prnt)
          prnt( "   Main executable build version: \"%s\"\n", loader_data.mainexec_buildversion);
          prnt( "   Default shared lib path: \"%s\"\n", loader_data.shlibpath);
          prnt( "   Max number of shared lib : %i\n", loader_data.maxshlibs);
-      }
-      else if (strcasestr(buff,"modules") != NULL) {
-          prnt( "%i shared lib have been dynamicaly loaded by the oai loader\n", loader_data.numshlibs);
-          for (int i=0 ; i<loader_data.numshlibs ; i++) {
-              prnt( "   Module %i: %s\n", i,loader_data.shlibs[i].name);
-              prnt( "       Shared library build version: \"%s\"\n",((loader_data.shlibs[i].shlib_buildversion == NULL )?"":loader_data.shlibs[i].shlib_buildversion));
-              prnt( "       Shared library path: \"%s\"\n", loader_data.shlibs[i].thisshlib_path);
-              prnt( "       %i function pointers registered:\n", loader_data.shlibs[i].numfunc);
-              for(int j=0 ; j<loader_data.shlibs[i].numfunc;j++) {
-                     prnt( "          function %i %s at %p\n",j,
-                           loader_data.shlibs[i].funcarray[j].fname, loader_data.shlibs[i].funcarray[j].fptr);
-              }
+      } else if (strcasestr(buff, "modules") != NULL || buff[0] == 0 || strcasestr(buff, "show") != NULL) {
+        prnt("%i shared lib have been dynamicaly loaded by the oai loader\n", loader_data.numshlibs);
+        for (int i = 0; i < loader_data.numshlibs; i++) {
+          prnt("   Module %i: %s\n", i, loader_data.shlibs[i].name);
+          prnt("       Shared library build version: \"%s\"\n", ((loader_data.shlibs[i].shlib_buildversion == NULL) ? "" : loader_data.shlibs[i].shlib_buildversion));
+          prnt("       Shared library path: \"%s\"\n", loader_data.shlibs[i].thisshlib_path);
+          prnt("       %i function pointers registered:\n", loader_data.shlibs[i].numfunc);
+          for (int j = 0; j < loader_data.shlibs[i].numfunc; j++) {
+            prnt("          function %i %s at %p\n", j, loader_data.shlibs[i].funcarray[j].fname, loader_data.shlibs[i].funcarray[j].fptr);
          }
+        }
      } else {
-          prnt("%s: wrong loader command...\n",buff);
+        prnt("%s: wrong loader command...\n", buff);
      }
   return 0;
 }
--- a/common/utils/telnetsrv/telnetsrv_loader.h
+++ b/common/utils/telnetsrv/telnetsrv_loader.h
@@ -37,14 +37,11 @@

 #include "common/utils/load_module_shlib.h"

-
-telnetshell_vardef_t loader_globalvardef[] = {
-{"mainversion",TELNET_VARTYPE_STRING,&(loader_data.mainexec_buildversion)},
-{"defpath",TELNET_VARTYPE_STRING,&(loader_data.shlibpath)},
-{"maxshlibs",TELNET_VARTYPE_INT32,&(loader_data.maxshlibs)},
-{"numshlibs",TELNET_VARTYPE_INT32,&(loader_data.numshlibs)},
-{"",0,NULL}
-};
+telnetshell_vardef_t loader_globalvardef[] = {{"mainversion", TELNET_VARTYPE_STRING, TELNET_CHECKVAL_RDONLY, &(loader_data.mainexec_buildversion)},
+                                              {"defpath", TELNET_VARTYPE_STRING, TELNET_CHECKVAL_RDONLY, &(loader_data.shlibpath)},
+                                              {"maxshlibs", TELNET_VARTYPE_INT32, TELNET_CHECKVAL_RDONLY, &(loader_data.maxshlibs)},
+                                              {"numshlibs", TELNET_VARTYPE_INT32, TELNET_CHECKVAL_RDONLY, &(loader_data.numshlibs)},
+                                              {"", 0, 0, NULL}};
 telnetshell_vardef_t *loader_modulesvardef;

 extern void add_loader_cmds(void);
--- a/common/utils/telnetsrv/telnetsrv_measurements.h
+++ b/common/utils/telnetsrv/telnetsrv_measurements.h
@@ -91,9 +91,7 @@ telnetshell_cmddef_t measur_cmdarray[] = {
  {"","",NULL}
 };

-telnetshell_vardef_t measur_vardef[] = {
-  {"",0,NULL}
-};
+telnetshell_vardef_t measur_vardef[] = {{"", 0, 0, NULL}};
 /* function to be implemented in any telnetsrv_xxx_measurements.c sources
   to allow common measurment code to access measurments data             */
 extern int get_measurgroups(telnet_measurgroupdef_t **measurgroups);
--- a/common/utils/telnetsrv/telnetsrv_phycmd.h
+++ b/common/utils/telnetsrv/telnetsrv_phycmd.h
@@ -44,17 +44,7 @@
 #define TELNETVAR_PHYCC0    0
 #define TELNETVAR_PHYCC1    1

-telnetshell_vardef_t phy_vardef[] = {
-//{"iqmax",TELNET_VARTYPE_INT16,NULL},
-//{"iqmin",TELNET_VARTYPE_INT16,NULL},
-//{"loglvl",TELNET_VARTYPE_INT32,NULL},
-//{"sndslp",TELNET_VARTYPE_INT32,NULL},
-//{"rxrescale",TELNET_VARTYPE_INT32,NULL},
-//{"txshift",TELNET_VARTYPE_INT32,NULL},
-//{"rachemin",TELNET_VARTYPE_INT32,NULL},
-//{"rachdmax",TELNET_VARTYPE_INT32,NULL},
-{"",0,NULL}
-};
+telnetshell_vardef_t phy_vardef[] = {{"", 0, 0, NULL}};

 #else

--- a/common/utils/telnetsrv/telnetsrv_proccmd.c
+++ b/common/utils/telnetsrv/telnetsrv_proccmd.c
@@ -57,84 +57,119 @@
 #include "openair1/PHY/phy_extern.h"
 #include "telnetsrv_proccmd.h"

-void decode_procstat(char *record, int debug, telnet_printfunc_t prnt)
+void decode_procstat(char *record, int debug, telnet_printfunc_t prnt, webdatadef_t *tdata)
 {
 char prntline[160];
-char *procfile_fiels;
+char *procfile_fields;
 char *strtokptr;
 char *lptr;
 int fieldcnt;
 char toksep[2];

-  fieldcnt=0;	  
-  procfile_fiels =strtok_r(record," ",&strtokptr);
-  lptr= prntline;
+fieldcnt = 0;
+procfile_fields = strtok_r(record, " ", &strtokptr);
+lptr = prntline;
 /*http://man7.org/linux/man-pages/man5/proc.5.html gives the structure of the stat file */
- 
-  while( 	procfile_fiels != NULL && fieldcnt < 42) {
-    long int policy;
-    if (strlen(procfile_fiels) == 0)
-       continue;
-    fieldcnt++;
-    sprintf(toksep," ");
-    switch(fieldcnt) {
-       case 1: /* id */
-           lptr+=sprintf(lptr,"%9.9s ",procfile_fiels);
-           sprintf(toksep,")");
-       break;  
-       case 2: /* name */
-	   lptr+=sprintf(lptr,"%20.20s ",procfile_fiels+1);
-       break;              
-       case 3:   //thread state
-           lptr+=sprintf(lptr,"  %c   ",procfile_fiels[0]);
-       break;
-       case 14:   //time in user mode
-       case 15:   //time in kernel mode
-           lptr+=sprintf(lptr,"%9.9s ",procfile_fiels);
-       break;
-       case 18:   //priority
-       case 19:   //nice	       
-           lptr+=sprintf(lptr,"%3.3s ",procfile_fiels);
-       break;
-       case 23:   //vsize	       
-           lptr+=sprintf(lptr,"%9.9s ",procfile_fiels);
-       break;
-       case 39:   //processor	       
-           lptr+=sprintf(lptr," %2.2s  ",procfile_fiels);
-       break;
-       case 41:   //policy	       
-           lptr+=sprintf(lptr,"%3.3s ",procfile_fiels);
-           policy=strtol(procfile_fiels,NULL,0);
-           switch(policy) {
-              case SCHED_FIFO:
-                   lptr+=sprintf(lptr,"%s ","rt: fifo");
-              break;
-              case SCHED_OTHER:
-                   lptr+=sprintf(lptr,"%s ","other");
-              break;
-              case SCHED_IDLE:
-                   lptr+=sprintf(lptr,"%s ","idle");
-              break;
-              case SCHED_BATCH:
-                   lptr+=sprintf(lptr,"%s ","batch");
-              break;
-              case SCHED_RR:
-                   lptr+=sprintf(lptr,"%s ","rt: rr");
-              break;
-              default:
-                   lptr+=sprintf(lptr,"%s ","????");
-              break;
-           }
-       break;
-       default:
-       break;	       	       	       	       	       
-    }/* switch on fieldcnr */  
-    procfile_fiels =strtok_r(NULL,toksep,&strtokptr); 
-  } /* while on proc_fields != NULL */
-  prnt("%s\n",prntline); 
+int priority = 0;
+int nice = 0;
+while (procfile_fields != NULL && fieldcnt < 42) {
+  long int policy;
+  if (strlen(procfile_fields) == 0)
+    continue;
+  fieldcnt++;
+  sprintf(toksep, " ");
+  switch (fieldcnt) {
+    case 1: /* id */
+      if (tdata != NULL) {
+        tdata->lines[tdata->numlines].val[0] = strdup(procfile_fields);
+      }
+      lptr += sprintf(lptr, "%9.9s ", procfile_fields);
+      sprintf(toksep, ")");
+      break;
+    case 2: /* name */
+      if (tdata != NULL) {
+        tdata->lines[tdata->numlines].val[1] = strdup(procfile_fields);
+      }
+      lptr += sprintf(lptr, "%20.20s ", procfile_fields + 1);
+      break;
+    case 3: // thread state
+      lptr += sprintf(lptr, "  %c   ", procfile_fields[0]);
+      break;
+    case 14: // time in user mode
+    case 15: // time in kernel mode
+      lptr += sprintf(lptr, "%9.9s ", procfile_fields);
+      break;
+    case 18: // priority column index 2 in tdata, -2 to -100 (1, min to 99, highest prio)
+      priority = strtol(procfile_fields, NULL, 0);
+    case 19: // nice	  column index 3 in tdata  0 to 39 (-20, highest prio, to 19)
+      if (tdata != NULL) {
+        tdata->lines[tdata->numlines].val[fieldcnt - 16] = strdup(procfile_fields);
+      }
+      lptr += sprintf(lptr, "%3.3s ", procfile_fields);
+      nice = strtol(procfile_fields, NULL, 0);
+      break;
+    case 23: // vsize
+      lptr += sprintf(lptr, "%9.9s ", procfile_fields);
+      break;
+    case 39: // processor
+      if (tdata != NULL) {
+        tdata->lines[tdata->numlines].val[4] = strdup(procfile_fields);
+      }
+      lptr += sprintf(lptr, " %2.2s  ", procfile_fields);
+      break;
+    case 41: // policy
+      lptr += sprintf(lptr, "%3.3s ", procfile_fields);
+      policy = strtol(procfile_fields, NULL, 0);
+      char strschedp[64];
+      switch (policy) {
+        case SCHED_FIFO:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "rt:fifo");
+          priority = priority + 1; // in /proc file system priority 1 to 99 mapped to -2 to -100
+          break;
+        case SCHED_OTHER:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "other");
+          priority = nice - NICE_MIN; // linux nice is -20 to 19
+          break;
+        case SCHED_IDLE:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "idle");
+          priority = 2 * (NICE_MAX - NICE_MIN + 1);
+          break;
+        case SCHED_BATCH:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "batch");
+          priority = (NICE_MAX - NICE_MIN + 1) + nice - NICE_MIN;
+          break;
+        case SCHED_RR:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "rt:rr");
+          priority = priority - 99;
+          break;
+#ifdef SCHED_DEADLINE
+        case SCHED_DEADLINE:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "rt:deadline");
+          break;
+#endif
+        default:
+          snprintf(strschedp, sizeof(strschedp), "%s ", "????");
+          break;
+      }
+      lptr += sprintf(lptr, "%s ", strschedp);
+      if (tdata != NULL) {
+        tdata->lines[tdata->numlines].val[5] = strdup(strschedp);
+        tdata->lines[tdata->numlines].val[6] = malloc(10);
+        snprintf(tdata->lines[tdata->numlines].val[6], 9, "%i", priority);
+      }
+      break;
+    default:
+      break;
+  } /* switch on fieldcnr */
+  procfile_fields = strtok_r(NULL, toksep, &strtokptr);
+} /* while on proc_fields != NULL */
+prnt("%s\n", prntline);
+if (tdata != NULL) {
+  tdata->numlines++;
+}
 } /*decode_procstat */

-void read_statfile(char *fname,int debug, telnet_printfunc_t prnt)
+void read_statfile(char *fname, int debug, telnet_printfunc_t prnt, webdatadef_t *tdata)
 {
 FILE *procfile;
 char arecord[1024];
@@ -152,44 +187,207 @@ char arecord[1024];
       return;
       }    
    fclose(procfile);
-    decode_procstat(arecord, debug, prnt);
+    decode_procstat(arecord, debug, prnt, tdata);
 }

-void print_threads(char *buf, int debug, telnet_printfunc_t prnt)
+int nullprnt(char *fmt, ...)
+{
+  return 0;
+}
+
+void proccmd_get_threaddata(char *buf, int debug, telnet_printfunc_t fprnt, webdatadef_t *tdata)
 {
 char aname[256];

-DIR *proc_dir;
-struct dirent *entry;
+  DIR *proc_dir;
+  struct dirent *entry;
+  telnet_printfunc_t prnt = (fprnt != NULL) ? fprnt : (telnet_printfunc_t)nullprnt;
+  if (tdata != NULL) {
+    tdata->numcols = 7;
+    snprintf(tdata->columns[0].coltitle, sizeof(tdata->columns[0].coltitle), "thread id");
+    tdata->columns[0].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[1].coltitle, sizeof(tdata->columns[1].coltitle), "thread name");
+    tdata->columns[1].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[2].coltitle, sizeof(tdata->columns[2].coltitle), "priority");
+    tdata->columns[2].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[3].coltitle, sizeof(tdata->columns[3].coltitle), "nice");
+    tdata->columns[3].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[4].coltitle, sizeof(tdata->columns[4].coltitle), "core");
+    tdata->columns[4].coltype = TELNET_VARTYPE_STRING | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[5].coltitle, sizeof(tdata->columns[5].coltitle), "sched policy");
+    tdata->columns[5].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[5].coltitle, sizeof(tdata->columns[5].coltitle), "sched policy");
+    tdata->columns[6].coltype = TELNET_VARTYPE_STRING | TELNET_VAR_NEEDFREE;
+    snprintf(tdata->columns[6].coltitle, sizeof(tdata->columns[6].coltitle), "oai priority");
+    tdata->numlines = 0;
+  }

+  unsigned int eax = 11, ebx = 0, ecx = 1, edx = 0;

+  asm volatile("cpuid" : "=a"(eax), "=b"(ebx), "=c"(ecx), "=d"(edx) : "0"(eax), "2"(ecx) :);

-    prnt("  id          name            state   USRmod    KRNmod  prio nice   vsize   proc pol \n\n");
-    snprintf(aname, sizeof(aname), "/proc/%d/stat", getpid());
-    read_statfile(aname,debug,prnt);
-    prnt("\n");
-    snprintf(aname, sizeof(aname), "/proc/%d/task", getpid());
-    proc_dir = opendir(aname);
-    if (proc_dir == NULL)
-       {
-       prnt("Error: Couldn't open %s %i %s\n",aname,errno,strerror(errno));
-       return;
-       }
-    
-    while ((entry = readdir(proc_dir)) != NULL)
-        {
-        if(entry->d_name[0] == '.')
-            continue;
-	snprintf(aname, sizeof(aname), "/proc/%d/task/%.*s/stat", getpid(),(int)(sizeof(aname)-24),entry->d_name);    
-        read_statfile(aname,debug,prnt);      
-        } /* while entry != NULL */
-	closedir(proc_dir);
-} /* print_threads */
+  prnt("System has %d cores %d threads %d Actual threads", eax, ebx, edx);

+  prnt("\n  id          name            state   USRmod    KRNmod  prio nice   vsize   proc pol \n\n");
+  snprintf(aname, sizeof(aname), "/proc/%d/stat", getpid());
+  read_statfile(aname, debug, prnt, NULL);
+  prnt("\n");
+  snprintf(aname, sizeof(aname), "/proc/%d/task", getpid());
+  proc_dir = opendir(aname);
+  if (proc_dir == NULL) {
+    prnt("Error: Couldn't open %s %i %s\n", aname, errno, strerror(errno));
+    return;
+  }
+
+  while ((entry = readdir(proc_dir)) != NULL) {
+    if (entry->d_name[0] != '.') {
+      snprintf(aname, sizeof(aname), "/proc/%d/task/%.*s/stat", getpid(), (int)(sizeof(aname) - 24), entry->d_name);
+      read_statfile(aname, debug, prnt, tdata);
+    }
+  } /* while entry != NULL */
+  closedir(proc_dir);
+} /* proccmd_get_threaddata */
+
+void print_threads(char *buf, int debug, telnet_printfunc_t prnt)
+{
+  proccmd_get_threaddata(buf, debug, prnt, NULL);
+}
+
+int proccmd_websrv_getdata(char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt)
+{
+  webdatadef_t *logsdata = (webdatadef_t *)data;
+  if (strncmp(cmdbuff, "set", 3) == 0) {
+    telnet_printfunc_t printfunc = (prnt != NULL) ? prnt : (telnet_printfunc_t)printf;
+    if (strcasestr(cmdbuff, "loglvl") != NULL) {
+      int level = map_str_to_int(log_level_names, logsdata->lines[0].val[1]);
+      int enabled = (strcmp(logsdata->lines[0].val[2], "true") == 0) ? 1 : 0;
+      int loginfile = (strcmp(logsdata->lines[0].val[3], "true") == 0) ? 1 : 0;
+      set_log(logsdata->numlines, level);
+      if (enabled == 0)
+        set_log(logsdata->numlines, OAILOG_DISABLE);
+      if (loginfile == 1) {
+        set_component_filelog(logsdata->numlines);
+      } else {
+        close_component_filelog(logsdata->numlines);
+      }
+      printfunc("%s log level %s is %s, output to %s\n",
+                logsdata->lines[0].val[0],
+                logsdata->lines[0].val[1],
+                enabled ? "enabled" : "disabled",
+                loginfile ? g_log->log_component[logsdata->numlines].filelog_name : "stdout");
+    }
+    if (strcasestr(cmdbuff, "logopt") != NULL) {
+      int optbit = map_str_to_int(log_options, logsdata->lines[0].val[0]);
+      if (optbit < 0) {
+        printfunc("option %s unknown\n", logsdata->lines[0].val[0]);
+      } else {
+        if (strcmp(logsdata->lines[0].val[1], "true") == 0) {
+          SET_LOG_OPTION(optbit);
+        } else {
+          CLEAR_LOG_OPTION(optbit);
+        }
+        printfunc("%s log option %s\n", logsdata->lines[0].val[0], (strcmp(logsdata->lines[0].val[1], "true") == 0) ? "enabled" : "disabled");
+      }
+    }
+    if (strcasestr(cmdbuff, "dbgopt") != NULL) {
+      int optbit = map_str_to_int(log_maskmap, logsdata->lines[0].val[0]);
+      if (optbit < 0) {
+        printfunc("debug option %s unknown\n", logsdata->lines[0].val[0]);
+      } else {
+        if (strcmp(logsdata->lines[0].val[1], "true") == 0)
+          SET_LOG_DEBUG(optbit);
+        else
+          CLEAR_LOG_DEBUG(optbit);
+        if (strcmp(logsdata->lines[0].val[2], "true") == 0)
+          SET_LOG_DUMP(optbit);
+        else
+          CLEAR_LOG_DUMP(optbit);
+        printfunc("%s debug %s dump %s\n",
+                  logsdata->lines[0].val[0],
+                  (strcmp(logsdata->lines[0].val[1], "true") == 0) ? "enabled" : "disabled",
+                  (strcmp(logsdata->lines[0].val[2], "true") == 0) ? "enabled" : "disabled");
+      }
+    }
+    if (strcasestr(cmdbuff, "threadsched") != NULL) {
+      unsigned int tid = strtoll(logsdata->lines[0].val[0], NULL, 0);
+      unsigned int core = strtoll(logsdata->lines[0].val[4], NULL, 0);
+      int priority = strtoll(logsdata->lines[0].val[6], NULL, 0);
+      printfunc("Thread %s id %u set affinity to core %u\n", logsdata->lines[0].val[0], tid, core);
+      set_affinity(0, (pid_t)tid, core);
+      set_sched(0, (pid_t)tid, priority);
+    }
+  } else { /* end of set, => show */
+    if (strcasestr(cmdbuff, "loglvl") != NULL) {
+      logsdata->numcols = 4;
+      logsdata->numlines = 0;
+      snprintf(logsdata->columns[0].coltitle, TELNET_CMD_MAXSIZE, "component");
+      logsdata->columns[0].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY;
+      snprintf(logsdata->columns[1].coltitle, TELNET_CMD_MAXSIZE, "level");
+      logsdata->columns[1].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_LOGLVL;
+      snprintf(logsdata->columns[2].coltitle, TELNET_CMD_MAXSIZE, "enabled");
+      logsdata->columns[2].coltype = TELNET_CHECKVAL_BOOL;
+      snprintf(logsdata->columns[3].coltitle, TELNET_CMD_MAXSIZE, "in file");
+      logsdata->columns[3].coltype = TELNET_CHECKVAL_BOOL;
+
+      for (int i = MIN_LOG_COMPONENTS; i < MAX_LOG_COMPONENTS; i++) {
+        if (g_log->log_component[i].name != NULL) {
+          logsdata->numlines++;
+          logsdata->lines[i].val[0] = (char *)(g_log->log_component[i].name);
+
+          logsdata->lines[i].val[1] = map_int_to_str(log_level_names, (g_log->log_component[i].level >= 0) ? g_log->log_component[i].level : g_log->log_component[i].savedlevel);
+          logsdata->lines[i].val[2] = (g_log->log_component[i].level >= 0) ? "true" : "false";
+          logsdata->lines[i].val[3] = (g_log->log_component[i].filelog > 0) ? "true" : "false";
+        }
+      }
+    }
+    if (strcasestr(cmdbuff, "dbgopt") != NULL) {
+      webdatadef_t *logsdata = (webdatadef_t *)data;
+      logsdata->numcols = 3;
+      logsdata->numlines = 0;
+      snprintf(logsdata->columns[0].coltitle, TELNET_CMD_MAXSIZE, "module");
+      logsdata->columns[0].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY;
+      snprintf(logsdata->columns[1].coltitle, TELNET_CMD_MAXSIZE, "debug");
+      logsdata->columns[1].coltype = TELNET_CHECKVAL_BOOL;
+      snprintf(logsdata->columns[2].coltitle, TELNET_CMD_MAXSIZE, "dump");
+      logsdata->columns[2].coltype = TELNET_CHECKVAL_BOOL;
+
+      for (int i = 0; log_maskmap[i].name != NULL; i++) {
+        logsdata->numlines++;
+        logsdata->lines[i].val[0] = log_maskmap[i].name;
+        logsdata->lines[i].val[1] = (g_log->debug_mask & log_maskmap[i].value) ? "true" : "false";
+        logsdata->lines[i].val[2] = (g_log->dump_mask & log_maskmap[i].value) ? "true" : "false";
+      }
+    }
+
+    if (strcasestr(cmdbuff, "logopt") != NULL) {
+      webdatadef_t *logsdata = (webdatadef_t *)data;
+      logsdata->numcols = 2;
+      logsdata->numlines = 0;
+      snprintf(logsdata->columns[0].coltitle, TELNET_CMD_MAXSIZE, "option");
+      logsdata->columns[0].coltype = TELNET_VARTYPE_STRING | TELNET_CHECKVAL_RDONLY;
+      snprintf(logsdata->columns[1].coltitle, TELNET_CMD_MAXSIZE, "enabled");
+      logsdata->columns[1].coltype = TELNET_CHECKVAL_BOOL;
+
+      for (int i = 0; log_options[i].name != NULL; i++) {
+        logsdata->numlines++;
+        logsdata->lines[i].val[0] = log_options[i].name;
+        logsdata->lines[i].val[1] = (g_log->flag & log_options[i].value) ? "true" : "false";
+      }
+    }
+    if (strcasestr(cmdbuff, "threadsched") != NULL) {
+      proccmd_get_threaddata(cmdbuff, debug, prnt, (webdatadef_t *)data);
+    }
+  } // show
+
+  return 0;
+}

 int proccmd_show(char *buf, int debug, telnet_printfunc_t prnt)
 {
-   
+  if (buf == NULL) {
+    prnt("ERROR wrong softmodem SHOW command...\n");
+    return 0;
+  }
   if (debug > 0)
       prnt(" proccmd_show received %s\n",buf);
   if (strcasestr(buf,"thread") != NULL) {
@@ -263,8 +461,12 @@ int proccmd_thread(char *buf, int debug, telnet_printfunc_t prnt)
 {
 int bv1,bv2;   
 int res;
-char sv1[64]; 
- 
+char sv1[64];
+
+if (buf == NULL) {
+  prnt("ERROR wrong thread command...\n");
+  return 0;
+}
   bv1=0;
   bv2=0;
   sv1[0]=0;
@@ -279,7 +481,7 @@ char sv1[64];
       prnt(" proccmd_thread: %i params = %i,%s,%i\n",res,bv1,sv1,bv2);   
   if(res != 3)
     {
-     prnt("softmodem thread needs 3 params, %i received\n",res);
+     print_threads(buf, debug, prnt);
     return 0;
     }

@@ -302,11 +504,20 @@ int proccmd_exit(char *buf, int debug, telnet_printfunc_t prnt)
 {
   if (debug > 0)
       prnt("process module received %s\n",buf);
-
+   end_configmodule();
   exit_fun("telnet server received exit command\n");
   return 0;
 }
- 
+
+int proccmd_restart(char *buf, int debug, telnet_printfunc_t prnt)
+{
+  if (debug > 0)
+    prnt("process module received %s\n", buf);
+  end_configmodule();
+  configmodule_interface_t *cfg = config_get_if();
+  execvpe(cfg->argv[0], cfg->argv, environ);
+  return 0;
+}

 int proccmd_log(char *buf, int debug, telnet_printfunc_t prnt)
 {
@@ -391,7 +602,7 @@ int s = sscanf(buf,"%ms %i-%i\n",&logsubcmd, &idx1,&idx2);
                SET_LOG_DUMP(optbit);
            else
                CLEAR_LOG_DUMP(optbit);
-            proccmd_show("dbgopt",debug,prnt);
+            proccmd_show("dump", debug, prnt);
         }
      }       
      if (logparam != NULL) free(logparam);
@@ -431,7 +642,8 @@ int s = sscanf(buf,"%ms %i-%i\n",&logsubcmd, &idx1,&idx2);
             prnt("%s%s unknown log sub command \n",logparam, tmpstr);
         }
      } else {
-          prnt("%s unknown log sub command \n",logsubcmd); 
+        level = map_str_to_int(log_level_names, tmpstr);
+        prnt("%s unknown log sub command \n", logsubcmd);
      }
      if (logparam != NULL) free(logparam);
      if (tmpstr != NULL)   free(tmpstr);
--- a/common/utils/telnetsrv/telnetsrv_proccmd.h
+++ b/common/utils/telnetsrv/telnetsrv_proccmd.h
@@ -44,11 +44,12 @@
 extern int proccmd_show(char *buf, int debug, telnet_printfunc_t prnt);
 extern int proccmd_thread(char *buf, int debug, telnet_printfunc_t prnt);
 extern int proccmd_exit(char *buf, int debug, telnet_printfunc_t prnt);
+extern int proccmd_restart(char *buf, int debug, telnet_printfunc_t prnt);
 extern int proccmd_log(char *buf, int debug, telnet_printfunc_t prnt);
-telnetshell_vardef_t proc_vardef[] = {
-{"",0,NULL}
-};
-#define PROCCMD_LOG_HELP_STRING " log sub commands: \n\
+extern int proccmd_websrv_getdata(char *cmdbuff, int debug, void *data, telnet_printfunc_t prnt);
+telnetshell_vardef_t proc_vardef[] = {{"", 0, 0, NULL}};
+#define PROCCMD_LOG_HELP_STRING \
+  " log sub commands: \n\
 show:  		     display current log configuration \n\
 online, noonline:	     enable or disable console logs \n\
 enable, disable id1-id2:    enable or disable logs for components index id1 to id2 \n\
@@ -60,24 +61,32 @@ telnetshell_vardef_t proc_vardef[] = {
 print_<opt> <0|1>           disable or enable the \"opt\" log option, use the show command to get \
                             the available options\n\
 dump_<mod> debug_<mod >     disable or enable the debug file generation or debug code\
-                             for \"mod\" module. use the show command to get the available modules\n"  
+                             for \"mod\" module. use the show command to get the available modules\n"

-#define PROCCMD_THREAD_HELP_STRING " thread sub commands: \n\
+#define PROCCMD_THREAD_HELP_STRING \
+  " thread sub commands: \n\
 <thread id> aff <core>  :    set affinity of thread <thread id> to core <core> \n\
 <thread id> prio <prio> :    set scheduling parameters for thread <thread id>  \n\
-                   if prio < -20: linux scheduling policy set to FIFO, \n\
-                                  with priority = -20 - prio \n\
-                   if prio > 19: linux scheduling policy set to OTHER, \n\
-                                  with priority (nice value) =  prio \n\
+                  -100 < prio < 0:    linux scheduling policy set to FIFO, priority -prio, \n\
+                  -200 < prio < -100: linux scheduling policy set to RR, priority -(prio+100), \n\
+                   0 <= prio < 40:    linux scheduling policy set to NORMAL, nice value prio-20 \n\
+                   40 <= prio < 80:   linux scheduling policy set to BATCH, nice value prio-60 \n\
+                   prio >=80:         linux scheduling policy set to IDLE \n\
  use \"softmodem show thread\" to get <thread id> \n"
- 

 telnetshell_cmddef_t proc_cmdarray[] = {
-   {"show","loglvl|thread|config", proccmd_show},
-   {"log","(enter help for details)", proccmd_log},
-   {"thread","(enter help for details)", proccmd_thread},
-   {"exit","", proccmd_exit},
-   {"","",NULL},
+    {"show", "loglvl|thread|config", proccmd_show, {(webfunc_t)proccmd_websrv_getdata}, TELNETSRV_CMDFLAG_TELNETONLY, NULL},
+    {"log", "(enter help for details)", proccmd_log, {NULL}, TELNETSRV_CMDFLAG_TELNETONLY, NULL},
+    {"show loglvl", "", proccmd_log, {(webfunc_t)proccmd_websrv_getdata}, TELNETSRV_CMDFLAG_WEBSRVONLY | TELNETSRV_CMDFLAG_GETWEBTBLDATA, NULL},
+    {"show logopt", "", proccmd_log, {(webfunc_t)proccmd_websrv_getdata}, TELNETSRV_CMDFLAG_WEBSRVONLY | TELNETSRV_CMDFLAG_GETWEBTBLDATA, NULL},
+    {"show dbgopt", "", proccmd_log, {(webfunc_t)proccmd_websrv_getdata}, TELNETSRV_CMDFLAG_WEBSRVONLY | TELNETSRV_CMDFLAG_GETWEBTBLDATA, NULL},
+    {"show config", "", proccmd_show, {(webfunc_t)proccmd_show}, TELNETSRV_CMDFLAG_WEBSRVONLY, NULL},
+    {"show thread", "", proccmd_thread, {(webfunc_t)proccmd_show}, TELNETSRV_CMDFLAG_WEBSRVONLY | TELNETSRV_CMDFLAG_AUTOUPDATE, NULL},
+    {"thread", "(enter help for details)", proccmd_thread, {NULL}, TELNETSRV_CMDFLAG_TELNETONLY, NULL},
+    {"show threadsched", "", proccmd_show, {(webfunc_t)proccmd_websrv_getdata}, TELNETSRV_CMDFLAG_WEBSRVONLY | TELNETSRV_CMDFLAG_GETWEBTBLDATA, NULL},
+    {"exit", "", proccmd_exit, {NULL}, TELNETSRV_CMDFLAG_CONFEXEC, NULL},
+    {"restart", "", proccmd_restart, {NULL}, TELNETSRV_CMDFLAG_CONFEXEC, NULL},
+    {"", "", NULL},
 };
 #else
 extern void add_proccmd_cmds(void);
--- a/common/utils/websrv/DOC/websrv.md
+++ b/common/utils/websrv/DOC/websrv.md
@@ -0,0 +1,7 @@
+The oai web server is an optional monitoring and debugging tool. Purpose is to give access to oai softmodems functionalities  via a web interface. In this first release interface to the telnet server commands  and to the softscope are delivered.
+
+* [Using the web server](webserverusage.md)
+* [enhancing the webserver](webserverdevcmd.md)
+* [web server architecture ](webserverarch.md)
+
+[oai Wikis home](https://gitlab.eurecom.fr/oai/openairinterface5g/wikis/home)
--- a/common/utils/websrv/DOC/websrvarch.md
+++ b/common/utils/websrv/DOC/websrvarch.md
@@ -0,0 +1,21 @@
+# web server interface principles
+
+The web server interface is implemented in two parts: a back-end, included in the softmodem process and a front-end which is a browser application. 
+
+The oai web server back-end is implemented in a shared library to be loaded by the [oai shared library loader](loader) when `--websrv` option is specified on the command line. `libwebsrv.so `  code is common to all oai softmodem executables, the current release has been tested with the nr UE and the gNB. 
+
+The front-end is an [angular](https://angular.io/docs) application. After being built and installed it is delivered to browsers by the back-end at connection time.
+
+Front-end and back-end communicate via http request - http response transactions, including `json` body. these `json` interfaces are defined in the [frontend/src/app/api/XXXX.api.ts](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/websrv/src/frontend/src/app/api/) files. Back-end decapsulates the http requests it receives, looking for the `json`body to determine the requested information or command. Then the back-end builds a http response, with a `json`body encapsulating the requested information or the requested command result.
+
+When unsolicited communication, from back-end to front-end is necessary, a [websocket](https://www.rfc-editor.org/rfc/rfc6455) link is opened. This is the case for the softscope interface.
+
+# web server interface  source files
+
+web server source files are located in [common/utils/websrv](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/websrv)
+
+1. back-end files are directly located in the `websrv` repository
+1.  The [frontend/src](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/websrv/src/frontend) sub-directory contains the angular front-end source tree. 
+1.  [common/utils/websrv/helpfiles](https://gitlab.eurecom.fr/oai/openairinterface5g/tree/develop/common/utils/websrv/helpfiles) contains files delivered to the front-end to respond to help requests. 
+
+[oai web server interface home](websrv.md)
--- a/common/utils/websrv/DOC/websrvuse.md
+++ b/common/utils/websrv/DOC/websrvuse.md
@@ -0,0 +1,212 @@
+
+
+When all dependencies are met, you can build the all the web server interface components using the build_oai script with the `--build-lib all` option . As the web interface is an optional component, if it's dependencies are not found it won't stop the build. Web interface components (back-end or front-end) which cannot be built are just skipped.
+
+###### build example when missing back-end dependencies 
+
+```
+./build_oai --build-lib all --nrUE
+  websrv optional build not included in build-lib option  as dependencies requirements not met 
+Enabling build of all optional shared libraries (telnetsrv enbscope uescope nrscope)
+Will compile NR UE
+RF HW set to None
+2. Setting the OAI PATHS ...
+OPENAIR_DIR    = /usr/local/oai/oai-develop/openairinterface5g
+FreeDiameter prefix not found, install freeDiameter if EPC, HSS
+3. building the compilation directives ...
+running cmake ../../..
+NETTLE VERSION_INSTALLED  = 3.5.1
+NETTLE_VERSION_MAJOR = 3
+NETTLE_VERSION_MINOR = 5
+cuda include /usr/include
+cuda library 
+-- CMAKE_BUILD_TYPE is RelWithDebInfo
+-- CPUARCH x86_64
+-- AVX512 intrinsics are OFF
+-- AVX2 intrinsics are ON
+-- No T1 Offload support detected
+calling protoc_call=/usr/local/oai/oai-develop/openairinterface5g/cmake_targets/tools/generate_protobuf FSPT_C_DIR=/usr/local/oai/oai-develop/openairinterface5g/cmake_targets/ran_build/build/CMakeFiles/FSPT_V2 FSPT_MSG_DIR=/usr/local/oai/oai-develop/openairinterface5g/targets/COMMON/MESSAGES/V2 FSPT_MSG_FILES=/usr/local/oai/oai-develop/openairinterface5g/targets/COMMON/MESSAGES/V2/flexsplit.proto
+[libprotobuf WARNING google/protobuf/compiler/parser.cc:546] No syntax specified for the proto file: flexsplit.proto. Please use 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. (Defaulted to proto2 syntax.)
+fspt c dir is : /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/ran_build/build/CMakeFiles/FSPT_V2
+gcc -Wall -I. -I.. -I../itti -I../../../openair2/COMMON -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
+./_check_vcd || (rm -f ./_check_vcd ./T_IDs.h ./T_messages.txt.h && false)
+rm -f ./_check_vcd
+Add enb specific telnet functions in libtelnetsrv_enb.so
+No specific telnet functions for gnb
+No specific telnet functions for 4Gue
+Add 5Gue specific telnet functions in libtelnetsrv_5Gue.so
+CMake Warning at common/utils/websrv/websrv_CMakeLists.txt:12 (message):
+  ulfius library (https://github.com/babelouest/ulfius) not found, install
+  libulfius-dev (ubuntu) if you need to build websrv back-end
+Call Stack (most recent call first):
+  CMakeLists.txt:3189 (include)
+
+
+-- websrv backend build skipped, dependencies not found
+..........
+.............
+
+```
+
+######  build example when missing back-end dependencies 
+
+```
+  ./build_oai --build-lib all --nrUE
+  Enabling build of all optional shared libraries (telnetsrv enbscope uescope nrscope websrv)
+  Will compile NR UE
+  RF HW set to None
+  
+  2. Setting the OAI PATHS ...
+     OPENAIR_DIR    = /usr/local/oai/oai-develop/openairinterface5g
+     FreeDiameter prefix not found, install freeDiameter if EPC, HSS
+  3. building the compilation directives ...
+     running cmake ../../..
+     NETTLE VERSION_INSTALLED  = 3.5.1
+     NETTLE_VERSION_MAJOR = 3
+     NETTLE_VERSION_MINOR = 5
+     cuda include /usr/include
+     cuda library 
+     -- CMAKE_BUILD_TYPE is RelWithDebInfo
+     -- CPUARCH x86_64
+     -- AVX512 intrinsics are OFF
+     -- AVX2 intrinsics are ON
+     -- No T1 Offload support detected
+     calling protoc_call=/usr/local/oai/oai-develop/openairinterface5g/cmake_targets/tools/generate_protobuf FSPT_C_DIR=/usr/local/oai/oai-develop/openairinterface5g/cmake_targets/ran_build/build/CMakeFiles/FSPT_V2 FSPT_MSG_DIR=/usr/local/oai/oai-develop/openairinterface5g/targets/COMMON/MESSAGES/V2 FSPT_MSG_FILES=/usr/local/oai/oai-develop/openairinterface5g/targets/COMMON/MESSAGES/V2/flexsplit.proto
+     [libprotobuf WARNING google/protobuf/compiler/parser.cc:546] No syntax specified for the proto file: flexsplit.proto. Please use 'syntax = "proto2";' or 'syntax = "proto3";' to specify a syntax version. (Defaulted to proto2 syntax.)
+     fspt c dir is : /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/ran_build/build/CMakeFiles/FSPT_V2
+     gcc -Wall -I. -I.. -I../itti -I../../../openair2/COMMON -Itracer -o _check_vcd check_vcd.c tracer/database.c tracer/utils.c -lm -pthread
+     ./_check_vcd || (rm -f ./_check_vcd ./T_IDs.h ./T_messages.txt.h && false)
+     rm -f ./_check_vcd
+     Add enb specific telnet functions in libtelnetsrv_enb.so
+     No specific telnet functions for gnb
+     No specific telnet functions for 4Gue
+     Add 5Gue specific telnet functions in libtelnetsrv_5Gue.so
+     -- websrv backend can be built
+     -- websrv frontend can be built
+     -- Configuring done
+     -- Generating done
+     -- Build files have been written to: /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/ran_build/build
+............
+.............
+Log file for compilation is being written to: /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/log/websrv.txt
+websrv compiled
+Build of websrv frontend enabled
+Log file for compilation is being written to: /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/log/websrvfront.txt
+websrvfront compiled
+Compiling rfsimulator
+Log file for compilation is being written to: /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/log/rfsimulator.txt  
+.............
+..............
+```
+
+  
+
+# building and installing the front-end
+
+Before building the front-end you need to install the npm node.js installer:
+
+`apt-get install npm` for ubuntu or `dnf install npm`for fedora
+
+then to build and install the frontend:
+
+``` bash
+cd \<oai repository\>/openairinterface5g/cmake_targets/ran_build/build
+make websrvfront
+up to date, audited 1099 packages in 3s
+
+142 packages are looking for funding
+  run `npm fund` for details
+
+3 moderate severity vulnerabilities
+
+Some issues need review, and may require choosing
+a different dependency.
+
+Run `npm audit` for details.
+Built target websrvfront_installjsdep
+
+> softmodemngx@2.0.0 build
+> ng build
+
+✔ Browser application bundle generation complete.
+✔ Copying assets complete.
+✔ Index html generation complete.
+
+Initial Chunk Files           | Names         |  Raw Size | Estimated Transfer Size
+main.1917944d43411293.js      | main          | 996.88 kB |               231.03 kB
+styles.ca83009174c6585f.css   | styles        |  74.33 kB |                 7.70 kB
+polyfills.36a0bc8cdfe2cb81.js | polyfills     |  45.10 kB |                13.82 kB
+runtime.bf8117e4a18c7212.js   | runtime       |   1.06 kB |               606 bytes
+
+                              | Initial Total |   1.09 MB |               253.14 kB
+
+Build at: 2022-10-17T16:52:42.517Z - Hash: 3b6b647cfcb0dac9 - Time: 8651ms
+Moving frontend files to:
+    /usr/local/oai/oai-develop/openairinterface5g/cmake_targets/ran_build/build/websrv
+    /usr/local/oai/oai-develop/openairinterface5g/targets/bin/websrv
+Built target websrvfront
+```
+
+
+
+# Building and installing  the web server back-end
+The back-end has two dependencies:
+
+1. the [ulfius library](https://github.com/babelouest/ulfius) and the corresponding include files which are provided by the ubuntu libulfius-dev package: `sudo apt-get install -y libulfius-dev`
+2. the [jansson](https://github.com/akheron/jansson-debian) library and the corresponding include files which are provided by the ubuntu libjansson-dev package: `sudo apt-get install -y libjansson-dev`
+
+Dependencies can also be installed on fedora distribution, the jansson package is `jansson-devel`, ulfius has to be installed as explained [here](https://github.com/babelouest/ulfius/blob/master/INSTALL.md#pre-compiled-packages). 
+
+By default the embedded web server back-end , which is implemented in a shared library, is not built. It can be built after compiling the softmodem executable using the `build_oai` script:
+
+```bash
+ cd \<oai repository\>/openairinterface5g
+ source oaienv
+ cd cmake_targets
+ ./build_oai  --build-lib websrv
+```
+
+This will create the `libwebsrv.so`  file in the `targets/bin` and `cmake_targets/ran_build/build` sub directories of the oai repository.
+
+When starting the softmodem, you must specify the **_\-\-websrv_** option to load and start the web server. The web server is loaded via the [oai shared library loader](loader).
+
+# Testing the web server interface
+
+
+## web server parameters
+The web server back-end is using the [oai configuration module](Config/Rtusage). web server parameters must be specified in the websrv section. 
+
+| name | type | default | description |
+|:---:|:---:|:---:|:----|
+| `listenaddr` | `ipV4 address, ascii format` | "0.0.0.0" | local address the back-end  is listening on |
+| `listenport` | `integer` | 8090 | port number the server is listening on |
+| debug | `integer` | 0 | When not 0, http  requests headers and json objects dump are added to back-end traces |
+| fpath | character string | websrv | The path to on-disk http server resources . The default value matches the front-end installation when running  the softmodem from the executables repository. |
+| cert, key, rootca | `character string` | null | certificates and key used to trigger https protocol (not tested) |
+|                   |                              |                   |                                                              |
+
+## running the back-end
+To trigger the back-end use the `--websrv` option, possibly modifying the parameters as explained in the previous chapter.  The two following commands allow starting the oai gNB and the oai 5G UE on the same computer, starting the telnet server and the web interface on both executables.
+
+`./nr-softmodem -O  /usr/local/oai/conf/gnb.band78.sa.fr1.106PRB.usrpb210.conf --rfsim --rfsimulator.serveraddr server --telnetsrv  --telnetsrv.listenstdin --websrv   --rfsimulator.options chanmod` 
+
+.`/nr-uesoftmodem -O /usr/local/oai/conf/nrue_sim.conf --sa --numerology 1 -r 106 -C 3649440000 --rfsim --rfsimulator.serveraddr 127.0.0.1 --websrv --telnetsrv --websrv.listenport 8092 --nokrnmod --telnetsrv.listenport 8091`
+
+
+
+## Connecting from a browser to the oai softmodem's
+
+Assuming that the previous commands run successfully and that you also run your browser on the same host, you should be able to connect to the gNB and UE web interface using respectively the following url's:
+
+http://127.0.0.1:8090/websrv/index.html
+http://127.0.0.1:8092/websrv/index.html
+
+The interface should be intuitive enough, keeping in mind the following restrictions:
+
+- The command tab is not available if the telnet server is not enabled
+- The softscope tab is not available if the xforms scope is started `(-d` option)
+- Only one connection is supported to a back-end, especially for the scope interface
+
+Some front-end  objects, which usage are less intuitive  provide a tooltip to help interface usage.
+
+[oai web serverinterface  home](websrv.md)
--- a/common/utils/websrv/frontend/.browserslistrc
+++ b/common/utils/websrv/frontend/.browserslistrc
@@ -0,0 +1,17 @@
+# This file is used by the build system to adjust CSS and JS output to support the specified browsers below.
+# For additional information regarding the format and rule options, please see:
+# https://github.com/browserslist/browserslist#queries
+
+# For the full list of supported browsers by the Angular framework, please see:
+# https://angular.io/guide/browser-support
+
+# You can see what browsers were selected by your queries by running:
+#   npx browserslist
+
+last 1 Chrome version
+last 1 Firefox version
+last 2 Edge major versions
+last 2 Safari major versions
+last 2 iOS major versions
+Firefox ESR
+not IE 11 # Angular supports IE 11 only as an opt-in. To opt-in, remove the 'not' prefix on this line.
--- a/Show More
+++ b/Show More