feat: 脚本替换版本号

.gitignore

@@ -12,9 +12,21 @@
 # Run temp file and dir
 docs/temp/
 
-
 # Built Visual Studio Code Extensions
 *.vsix
 *.bak
 
+# build and release package
+build/
+debbuild/etc
+debbuild/usr
+debbuild/lib
+debbuild/22.04/etc
+debbuild/22.04/usr
+debbuild/22.04/lib
+# !debbuild/DEBIAN
+# !debbuild/22.04/DEBIAN
 
+# --> release
+release/*
+# --> debbuild

README.md

@@ -6,21 +6,31 @@ OS: Ubuntu 18.04 / 22.04 (Recommendation)
 
 Arch: amd64
 
-Golang:  go1.22.1 linux/amd64
-
 Database: 10.6.16-MariaDB, Redis server v=5.0.5 (or above)
 
-node.js: v18.16.0 (or above)
+- Golang:  go1.24.2 linux/amd64
+- node.js: v20.18.0 (or above)
 
 ## Build Guide
 
 ```bash
-git clone https://xxx@bitbucket.org/bluearcuscom/ems.git local.git
-cd local.git
-git pull
-cd fe.ems.vue3
-npm install
-npm run build
-cd ../build.ems
-./build.sh deb
+# pwd
+cd /root/omc.git
+# ls
+# be.ems  build.ems  fe.ems.vue3
+cp build.ems/pkg.sh .
+bash pkg.sh --web --api -v 2.2508.1
+```
+
+Encountered character error
+
+error: `sed: -e expression #1, char 46: Invalid collation character`
+
+```bash
+sudo apt-get update
+sudo apt-get install locales
+sudo locale-gen en_US.UTF-8
+sudo update-locale LANG=en_US.UTF-8
+source /etc/default/locale
+locale
 ```

bin/build.sh

@@ -1,12 +1,13 @@
 #!/bin/bash
 
 usage() {
-    echo "Usage: $0 [OPTION] deb|rpm"
+    echo "Usage: $0 [OPTION] deb|badeb|rpm"
     echo 
     echo "Build omc package, option as follow:"
-    echo "  deb|rpm,                    deb: ubuntu|debian package build by dpkg"
+    echo "  deb|badeb|rpm,              deb: ubuntu|debian package build by dpkg"
+    echo "                              badeb: ubuntu|debian package build by dpkg"
     echo "                              rpm: centos/redhat package, build by rpmbuild"
-    echo "  -r, =build root directory   build root directory, default directory is $HOME/local.git"
+    echo "  -r, =build root directory   build root directory, default directory is $HOME/omc.git"
     echo "  -d                          dump SQL from database"
     echo  
 }
@@ -15,7 +16,7 @@ pkgtype=""
 new_args=()
 # Traverse all parameters
 for arg in "$@"; do
-    if [[ "$arg" == "deb" || "$arg" == "rpm" ]]; then
+    if [[ "$arg" == "deb" || "$arg" == "badeb" || "$arg" == "rpm" ]]; then
         pkgtype=$arg
     else
         new_args+=("$arg") # Add non pkgtype parameters to a new parameter list
@@ -30,7 +31,8 @@ fi
 # Use a new parameter list
 set -- "${new_args[@]}"
 
-GitLocalRoot=${HOME}/local.git
+RootDir=$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)
+GitLocalRoot=$(dirname $(dirname "$RootDir"))
 while getopts "r:d" option; do
     case $option in
         r)
@@ -55,9 +57,9 @@ fi
 ProjectL=omc
 ProjectU=OMC
 PROJECT=${ProjectL}
-VERSION=2.2410.1
+VERSION=2.2508.1
 RelDate=`date +%Y%m%d`
-RelVer=${VERSION}-${RelDate}
+RelVer=${VERSION}-${RelDate}-mt
 Ky10Arch=ky10.aarch64
 RpmPkgName=${ProjectL}-${RelVer}.ky10.aarch64.rpm
 RpmPkgRename=${ProjectL}-r${RelVer}-ky10.rpm
@@ -68,17 +70,20 @@ RpmArch=`arch`
 RpmsDir=${EmsBuildRoot}/rpmbuild/RPMS/
 ReleaseDir=${EmsBuildRoot}/release
 DumpToolDir=${EmsBEDir}/tools/misc
-ProjectTag=multi-tenancy
+ProjectTag=""
 
 BuildDir=${EmsBuildRoot}/build
+CustomizedDir=${EmsBuildRoot}/customized
 BuildOMCDir=${BuildDir}/usr/local/omc
 BuildOMCBinDir=${BuildOMCDir}/bin
 BuildOMCEtcDir=${BuildOMCDir}/etc
 BuildLibDir=${BuildDir}/lib
 BuildLibSystemDir=${BuildLibDir}/systemd/system
 DebBuildDir=${EmsBuildRoot}/debbuild
+DebBuildOMCDir=${EmsBuildRoot}/debbuild/usr/local/omc
 DebFEBuildDir=${EmsBuildRoot}/debbuild/usr/local/omc/htdocs
 DebBuild2204Dir=${EmsBuildRoot}/debbuild/22.04
+DebBuild2204OMCDir=${EmsBuildRoot}/debbuild/22.04/usr/local/omc
 DebFEBuild2204Dir=${EmsBuildRoot}/debbuild/22.04/usr/local/omc/htdocs
 RpmBuildDir=${EmsBuildRoot}/rpmbuild
 RpmFEBuildDir=${RpmBuildDir}/BUILD/usr/local/omc/htdocs
@@ -89,24 +94,13 @@ EmsFEDir=${GitLocalRoot}/fe.ems
 EmsFEVue3Dir=${GitLocalRoot}/fe.ems.vue3/dist
 LibDir=${EmsBEDir}/lib
 RESTAGENT=restagent
-CRONTASK=crontask
 SshSvcBin=sshsvc
-CapTraceBin=captrace
-Data2htmlBin=data2html
-NBI_ALARM=nbi_alarm
-NBI_AGENT=nbi_agent
-AAAA_AGENT=4a_agent
 RestagentDir=${EmsBEDir}/${RESTAGENT}
-CrontaskDir=${EmsBEDir}/${CRONTASK}
 SshSvcDir=${EmsBEDir}/${SshSvcBin}
-CapTraceDir=${EmsBEDir}/${CapTraceBin}
-Data2htmlDir=${EmsBEDir}/${Data2htmlBin}
 DBSQLSrcDir=${EmsBEDir}/database
 MiscDir=${EmsBEDir}/misc
 FrontBuildDir=${BuildOMCDir}/htdocs
 FrontSrcDir=${EmsBEDir}/front
-CrontaskSize=27788951
-RestagentSize=29525312
 BinWriterDir=${HOME}/bin
 
 if [[ ${RpmArch} =~ "x86_64" ]];then
@@ -114,18 +108,11 @@ if [[ ${RpmArch} =~ "x86_64" ]];then
 elif [[ ${RpmArch} =~ "aarch64" ]];then
     RelArch=arm64
 fi
-ReleasePkgDir=${ReleaseDir}/"${pkgtype}"s/${RelArch}
 
 case "${pkgtype}" in
     rpm)
-        ProcList="restagent crontask sshsvc captrace data2html"
-        cd $EmsBEDir
-        for procName in $ProcList;do
-            cd $EmsBEDir/$procName
-            echo "Make $procName ..."
-            make
-        done
-        
+        echo "Begin to make ${pkgtype} package ======>"
+
         cd $EmsBEDir
         # make rpm
         # clear build cache
@@ -134,24 +121,14 @@ case "${pkgtype}" in
         rm -rf ${RpmBuildDir}/BUILD/usr/local/omc/etc/db/*
 
         cp -rf ${RestagentDir}/${RESTAGENT} ${BuildOMCBinDir}
-        cp -rf ${CrontaskDir}/${CRONTASK} ${BuildOMCBinDir}
-        cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir}
-        cp -rf ${CapTraceDir}/${CapTraceBin} ${BuildOMCBinDir}
-        cp -rf ${Data2htmlDir}/${Data2htmlBin} ${BuildOMCBinDir}		
-        #   ${BinWriterDir}/binWriter ${BuildOMCBinDir}/${RESTAGENT} ${RestagentSize}
-        #	${BinWriterDir}/binWriter ${BuildOMCBinDir}/${CRONTASK} ${CrontaskSize}
-        #	cp -rf ${MiscDir}/ne-hosts ${BuildOMCBinDir}
-        #	cp -rf ./nbi/${NBI_ALARM}/bin/${NBI_ALARM} ${BinDir2}
-        #	cp -rf ./nbi/${NBI_AGENT}/bin/${NBI_AGENT} ${BinDir2}
-        #	cp -rf ./${4A_AGENT}/bin/${4A_AGENT} ${BinDir2}
+        cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir}	
         cp -rf ${MiscDir}/* ${BuildOMCBinDir}
         #	rm -rf ${BinDir2}/ne-hosts
         cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir}
-        rm -rf ${BuildOMCEtcDir}/db/*
+        rm -rf ${BuildOMCEtcDir}/db && mkdir -p ${BuildOMCEtcDir}/db
         cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/
         cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/install
-        cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade
-        cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgvue3        
+        cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade      
         #Get SQL from database, overwrite from git
         if [ "$dumpdb" = "yes" ]; then
             cd ${DumpToolDir}
@@ -169,35 +146,40 @@ case "${pkgtype}" in
         #cp -rf ${BuildDir}/systemd ${RpmBuildDir}/BUILD/lib/
         cd ${RpmBuildDir}
         rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec        
-    
+        
+        ReleasePkgDir=${ReleaseDir}/rpms/${RelArch}
         mv -f $RpmsDir/$RpmArch/$RpmPkgName ${ReleasePkgDir}/$RpmPkgRename
         cd ${ReleasePkgDir}
         rm -f omc-md5sum.txt
 #        rpm --addsign *.rpm
         md5sum $RpmPkgRename >omc-md5sum.txt
+        echo "Finish to make ${pkgtype} package <======"        
     ;;
     deb)
-        ProcList="restagent crontask sshsvc captrace data2html"
-        cd $EmsBEDir
-        for procName in $ProcList;do
-            cd $EmsBEDir/$procName
-            echo "Make $procName ..."
-            make
-        done
+        echo "Begin to make ${pkgtype} package ======>"
         
         VersionID=`grep VERSION_ID /etc/os-release`
         if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
             DebBuildDir=${DebBuild2204Dir}
+            DebBuildOMCDir=${DebBuild2204OMCDir}
             DebFEBuildDir=${DebFEBuild2204Dir}
             #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
-            DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22.deb
+            DebPkgFile=${PROJECT}-r${RelVer}-ub22.deb
             if [ ! $ProjectTag = "" ]; then
-                DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-${ProjectTag}.deb
+                DebPkgFile=${ProjectL}-r${RelVer}-ub22-${ProjectTag}.deb
+            fi
+        elif [[ ${VersionID} =~ 'VERSION_ID="24.04"' ]]; then
+            DebBuildDir=${DebBuild2204Dir}
+            DebBuildOMCDir=${DebBuild2204OMCDir}
+            DebFEBuildDir=${DebFEBuild2204Dir}
+            DebPkgFile=${PROJECT}-r${RelVer}-ub24.deb
+            if [ ! $ProjectTag = "" ]; then
+                DebPkgFile=${ProjectL}-r${RelVer}-ub24-${ProjectTag}.deb
             fi
         elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
-            DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18.deb
+            DebPkgFile=${ProjectL}-r${RelVer}-ub18.deb
             if [ ! $ProjectTag = "" ]; then
-                DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18-${ProjectTag}.deb
+                DebPkgFile=${ProjectL}-r${RelVer}-ub18-${ProjectTag}.deb
             fi            
         else 
             echo "Invalid OS release: ${VersionID}"
@@ -211,19 +193,16 @@ case "${pkgtype}" in
         rm -rf ${FrontBuildDir}/front/*
         rm -rf ${DebFEBuildDir}/front/*
         rm -rf ${DebBuildDir}/usr/local/omc/etc/db/*
+        rm -rf ${DebBuildOMCDir}/static/*
 
         cp -rf ${RestagentDir}/${RESTAGENT} ${BuildOMCBinDir}
-        cp -rf ${CrontaskDir}/${CRONTASK} ${BuildOMCBinDir}
         cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir}
-        cp -rf ${CapTraceDir}/${CapTraceBin} ${BuildOMCBinDir}
-        cp -rf ${Data2htmlDir}/${Data2htmlBin} ${BuildOMCBinDir}	
         cp -rf ${MiscDir}/* ${BuildOMCBinDir}
         cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir}
-        rm -rf ${BuildOMCEtcDir}/db/*
+        rm -rf ${BuildOMCEtcDir}/db && mkdir -p ${BuildOMCEtcDir}/db
         cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/
         cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/install
         cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade
-        cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgvue3
         #Get SQL from database, overwrite from git
         if [ "${dumpdb}" = "yes" ]; then
             cd ${DumpToolDir}
@@ -237,18 +216,91 @@ case "${pkgtype}" in
         chmod 755 ${DebBuildDir}/DEBIAN/postinst
         chmod 755 ${DebBuildDir}/DEBIAN/postrm
         cp -rf ${BuildDir}/*  ${DebBuildDir}/
+        cp -rf ${CustomizedDir}/agt.d ${DebBuildOMCDir}/static
+	    cp -rf ${CustomizedDir}/omc.d ${DebBuildOMCDir}/static
+        cp -rf ${CustomizedDir}/ba.d ${DebBuildOMCDir}/static        
         #cp -rf ${BuildDir}/nginx/*  ${DebBuildDir}/etc/nginx/conf.d
         #cp -rf ${BuildDir}/systemd/*.service  ${DebBuildDir}/lib/systemd/system/
         chmod +x ${DebBuildDir}/usr/local/omc/bin/*
         sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control
-        perl -0777 -i -pe 's/ne:\n  user: root/ne:\n  user: omcuser/g' ${DebBuildDir}/usr/local/omc/etc/default/restconf.yaml
+        ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
         dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile}
 
         cd ${ReleasePkgDir}
         rm -f omc-md5sum.txt
 #        rpm --addsign *.rpm
         md5sum ${DebPkgName} >omc-md5sum.txt        
+        echo "Finish to make ${pkgtype} package <======="        
     ;;
+    badeb)
+        echo "Begin to make ${pkgtype} package ======>"
+        
+        VersionID=`grep VERSION_ID /etc/os-release`
+        if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
+            DebBuildDir=${DebBuild2204Dir}
+            DebBuildOMCDir=${DebBuild2204OMCDir}
+            DebFEBuildDir=${DebFEBuild2204Dir}
+            #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
+            DebPkgFile=${ProjectL}-r${RelVer}-ub22-ba.deb
+        elif [[ ${VersionID} =~ 'VERSION_ID="24.04"' ]]; then
+            DebBuildDir=${DebBuild2204Dir}
+            DebBuildOMCDir=${DebBuild2204OMCDir}
+            DebFEBuildDir=${DebFEBuild2204Dir}
+            DebPkgFile=${PROJECT}-r${RelVer}-ub24.deb
+            if [ ! $ProjectTag = "" ]; then
+                DebPkgFile=${ProjectL}-r${RelVer}-ub24-${ProjectTag}.deb
+            fi
+        elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
+            DebPkgFile=${ProjectL}-r${RelVer}-ub18-ba.deb
+        else 
+            echo "Invalid OS release: ${VersionID}"
+            exit 1
+        fi
+
+        cd ${EmsBEDir}
+
+        #make deb
+        # clear build cache
+        rm -rf ${FrontBuildDir}/front/*
+        rm -rf ${DebFEBuildDir}/front/*
+        rm -rf ${DebBuildDir}/usr/local/omc/etc/db/*
+        rm -rf ${DebBuildOMCDir}/static/*
+
+        cp -rf ${RestagentDir}/${RESTAGENT} ${BuildOMCBinDir}
+        cp -rf ${SshSvcDir}/${SshSvcBin} ${BuildOMCBinDir}
+        cp -rf ${MiscDir}/* ${BuildOMCBinDir}
+        cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir}
+        rm -rf ${BuildOMCEtcDir}/db && mkdir -p ${BuildOMCEtcDir}/db
+        cp -rf ${DBSQLSrcDir}/* ${BuildOMCEtcDir}/db/
+        cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/install
+        cp -rf ${BuildOMCEtcDir}/db/common/* ${BuildOMCEtcDir}/db/upgrade
+        #Get SQL from database, overwrite from git
+        if [ "${dumpdb}" = "yes" ]; then
+            cd ${DumpToolDir}
+            chmod +x ${DumpToolDir}/dumpsql.sh
+            ${DumpToolDir}/dumpsql.sh
+        fi 
+        cp -rf ${ConfigSystemdDir}/* ${BuildLibSystemDir}
+        cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null
+        chmod 755 ${BuildOMCBinDir}/*
+        chmod 755 ${DebBuildDir}/DEBIAN/preinst	
+        chmod 755 ${DebBuildDir}/DEBIAN/postinst
+        chmod 755 ${DebBuildDir}/DEBIAN/postrm
+        cp -rf ${BuildDir}/*  ${DebBuildDir}/
+        cp -rf ${CustomizedDir}/ba.d ${DebBuildOMCDir}/static
+        # replace Chinese character
+        find "${DebBuildOMCDir}/etc/db" -type f -name '*.sql' -exec sed -i 's/[一-龥（）“”，。？！］～·]//g' {} +
+	    echo "Replace all chinese character."
+        chmod +x ${DebBuildDir}/usr/local/omc/bin
+        sed -i "s/YYYYMMDD/${RelDate}/g" ${DebBuildDir}/DEBIAN/control
+        ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
+        dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile}
+
+        cd ${ReleasePkgDir}
+        rm -f omc-md5sum.txt
+        md5sum ${DebPkgName} >omc-md5sum.txt        
+        echo "Finish to make ${pkgtype} package <======"        
+    ;;    
     *)
         usage
         exit 4

bin/makepkg.sh

@@ -0,0 +1,146 @@
+#!/bin/bash
+
+usage() {
+    echo "Usage: $0 deb|rpm [option]..."
+    echo 
+    echo "Make omc package, option as follow:"
+    echo "  deb|rpm,                    deb: ubuntu|debian package build by dpkg"
+    echo "                              rpm: centos/redhat package, build by rpmbuild"
+    echo "  -r, =build root directory   build root directory, default directory is $HOME/omc.git"
+    echo "  -d                          dump SQL from database"
+    echo "  -m, =be|fe|all              be: only process back-end code, default if non input"
+    echo "                              fe: only process front-end code"
+    echo "                              all: process all include be and fe" 
+    echo "  -c, =ba                     ba: customized for BA OMC"
+}
+
+pkgtype=""
+new_args=()
+be_args=()
+# Traverse all parameters
+for arg in "$@"; do
+    if [[ "$arg" == "deb" || "$arg" == "rpm" ]]; then
+        pkgtype=$arg
+        be_args+=("$arg")
+    else
+        new_args+=("$arg") # Add non pkgtype parameters to a new parameter list
+    fi  
+done
+
+if [ -z "$pkgtype" ]; then
+    usage
+    exit 1    
+fi
+
+# Use a new parameter list
+set -- "${new_args[@]}"
+
+rootdir=${HOME}/omc.git
+m_arg="*"
+while getopts "m:r:c:d" option; do
+    case $option in
+        m)
+            m_arg=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
+        ;;
+        r)
+            rootdir=$OPTARG
+            be_args+=("-r ${rootdir}")
+        ;;
+        d)
+            be_args+=("-d")
+        ;;
+        c)
+            c_arg=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
+            if [ "${c_arg}" == "ba" ]; then
+                pkgtype="badeb"
+                be_args+=("${pkgtype}")
+            fi        
+        ;;        
+        \?)
+            echo "Invalid option: -$OPTARG" >&2
+            usage
+            exit 2
+        ;;
+    esac
+done
+
+if [ ! -d ${rootdir} ]; then
+    echo "Not exist directory: ${rootdir}"
+    exit 3
+fi
+
+bedir=${rootdir}/be.ems
+
+builddir=${rootdir}/build.ems
+buildcustomized=${builddir}/customized
+customizeddir=${buildcustomized}/${c_arg}.d
+
+fedir=${rootdir}/fe.ems.vue3
+feassetsdir=${fedir}/public
+felocalesdir=${fedir}/src/i18n/locales
+feconstantsdir=${fedir}/src/constants
+fehooksdir=${fedir}/src/hooks
+
+makefe() {
+    cd ${fedir}
+    # git checkout ${feassetsdir}
+    # git checkout ${felocalesdir}
+    # git checkout ${feconstantsdir}
+    # git checkout ${fehooksdir}
+    git pull
+    if [ "${pkgtype}" == "badeb" ]; then
+        cp -rf ${customizeddir}/images/background_light.jpg ${feassetsdir}/background/light.jpg
+        cp -rf ${customizeddir}/images/background_dark.jpg ${feassetsdir}/background/dark.jpg
+        cp -rf ${customizeddir}/locales/zh-CN.ts ${felocalesdir}/zh-CN.ts
+        find "${feconstantsdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥（）“”，。？！］～·]//g' {} +
+        find "${fehooksdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥（）“”，。？！］～·]//g' {} +
+    fi     
+    # npm install --force --registry https://registry.npmmirror.com
+    npm install --registry https://registry.npmmirror.com
+    echo -n "Building front-end vue ... "
+    npm run build 1>/dev/null
+    if [ $? = 0 ]; then
+        echo "done"
+    fi
+    git checkout ${feassetsdir}
+    git checkout ${felocalesdir}    
+    git checkout ${feconstantsdir}
+    git checkout ${fehooksdir}
+}
+
+makebe() {
+    cd ${builddir}/bin
+    #chmod +x mkpkg.sh 
+    EmsBEDir=${rootdir}/be.ems
+    ProcList="restagent sshsvc"
+    cd $EmsBEDir
+    for procName in $ProcList;do
+        cd $EmsBEDir/$procName
+        echo "Make $procName ..."
+        make
+    done
+
+    chmod +x build.sh
+    ./build.sh ${be_args[@]}
+}
+
+post_makepkg() {
+    cd ${builddir}
+    git checkout debbuild/DEBIAN/
+    git checkout debbuild/22.04/DEBIAN/
+}
+
+case "${m_arg}" in
+    "fe")
+        makefe 
+        ;;
+    "all")
+        makefe 
+        makebe
+        post_makepkg 
+        ;;
+    "be" | "*")
+        makebe
+        post_makepkg 
+        ;;
+esac

bin/nodejs.sh

@@ -0,0 +1,5 @@
+# copy to /etc/profile.d/ to set the environment variables for all users
+# cp -f nodejs.sh /etc/profile.d/99-nodejs.sh
+
+export PATH=/usr/local/bin:$PATH
+export NODE_OPTIONS=--max-old-space-size=50000

build/usr/local/omc/etc/default/crontask.yaml

@@ -1,44 +0,0 @@
-# file: log file name
-# level: /trace/debug/info/warn/error/fatal, default: debug
-# duration: saved days, default is 30 days
-logger:
-  file: /usr/local/omc/log/crontask.log
-  level: trace
-  duration: 24
-  count: 90 
-
-omc:
-  name: RJ_OMC_S001
-  hosturi: http://127.0.0.1:3030
-  hostno: S001
-  province: BJ
-  netabbr: HX
-  vendor: RJ
-
-tasks:
-  file: /usr/local/omc/etc/tasks.yaml
-
-database:
-  type: mysql
-  user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
-  name: tenants_db
-  backup: /usr/local/omc/database
-
-# northbound interface, cm/pm
-# duration(day): saved days
-# zipPeriods(day): periods of zip pm data file 
-northbound:
-  cm: 
-    cfgfiledir: /usr/local/omc/etc/cm
-    xmlfiledir: /opt/omc/ftp/cm
-    version: V1.0.1
-    duration: 30
-  pm:
-    cfgfiledir: /usr/local/omc/etc/pm
-    xmlfiledir: /opt/omc/ftp/pm
-    version: V1.0.1
-    duration: 30
-    zipPeriods: 1

build/usr/local/omc/etc/default/restconf.yaml

@@ -1,111 +0,0 @@
-# file: log file name
-# level: /trace/debug/info/warn/error/fatal, default: debug
-# duration: rotation time with xx hours, example: 1/12/24 hours
-# count: rotation count of log, default is 30 rotation
-logger:
-  file: /usr/local/omc/log/restagent.log 
-  level: debug
-  duration: 24
-  count: 90   
-
-# rest agent listen ipv4/v6 and port, support multiple routines
-# ip: 0.0.0.0 or ::0, support IPv4/v6
-rest:
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port: 3030
-  - ipv4: 
-    ipv6: ::0
-    port: 6060
-
-database:
-  type: mysql
-  user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
-  name: tenants_db
-  backup: /usr/loal/omc/database
-
-mml:
-  port: 4100
-  sleep: 200
-  user: admin
-  password: admin
-
-ne:
-  user: root
-  etcdir: /usr/local/etc
-  bindir: /usr/local/bin
-  omcdir: /usr/local/omc
-  licensedir: /usr/local/etc/{neType}/license
-
-# chk2ne: true/false, if put OmcNeConfig parameters to NE
-omc:
-  uriPrefix: /api/rest/oam
-  neType: OMC
-  neId: 001
-  rmUID: 1100RJHX1OMC001
-  neName: OMC
-  province: BJ
-  vendor: RJ
-  dn: 4600
-  chk2ne: false
-  sn: 13750650
-  checksign: false
-  backup: /usr/local/omc/backup
-  upload: /usr/local/omc/upload
-  frontUpload: /usr/local/omc/htdocs/front/upload
-  software: /usr/local/omc/software
-  license: /usr/local/omc/license
-  gtpUri: gtp:192.168.2.119:2152 
-  checkContentType: false
-  testMode: true
-  rbacMode: true
-
-# Alarm module setting
-# Forward interface:
-# email/sms  
-alarm: 
-  forwardAlarm: true
-  email:
-    smtp: smtp@ruijie.com.cn
-    port: 25
-    user: smtpuser
-    password: smtpuser@omc
-  sms:
-    apiURL: http://smsc.ruijie.com.cn/
-    accessKeyID: xxxx
-    accessKeySecret: xxxx
-    signName: Ruijie SMSC
-    templateCode: 1000
-  
-#User authorized information
-# crypt: mysql/md5/bcrypt
-# token: true/false to check accessToken
-# expires for session, unit: second
-# Support single/multiple session of user
-auth:
-  crypt: bcrypt
-  token: true
-  expires: 1800
-  session: multiple
-
-# Parameter for limit number 
-# rmuid_maxnum: the max number of rmUID, default: 50
-# alarmid_maxnum: the max number of AlarmID, default: 50
-# pmid_maxnum: the max number of pmID, default: 50
-# subid_maxnum: the max number of subscription ID, default: 20
-# uri_maxlen: the max length of uri, default: 8192
-# rmuid_regexp: regexp pattern of rmUID
-params:
-  rmuidmaxnum: 50
-  alarmidmaxnum: 50
-  pmidmaxnum: 50
-  subidmaxnum: 20
-  urimaxlen: 2100000
-  rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
-
-testConfig:
-  enabled: true
-  file: /usr/local/omc/etc/testconfig.yaml

build/usr/local/omc/etc/default/sshsvc.yaml

@@ -1,50 +0,0 @@
-# file: log file name
-# level: /trace/debug/info/warn/error/fatal, default: debug
-# duration: rotation time with xx hours, example: 1/12/24 hours
-# count: rotation count of log, default is 30 rotation
-logger:
-  file: /usr/local/omc/log/sshsvc.log
-  level: debug
-  duration: 24
-  count: 30   
-
-# file: MML log file name
-# duration: rotation time with xx hours, example: 1/12/24 hours
-# count: rotation count of log, default is 30 rotation
-# level: cmd/ret log cmd/log cmd & result
-logmml:     
-  file: /usr/local/omc/mmllog/omcmml.log
-  duration: 24
-  count: 30
-  level: cmd
-
-# ssh service listen ipv4/v6 and port, support multiple routines
-# ip: 0.0.0.0 or ::0, support IPv4/v6
-# session: single/multiple session for one user
-sshd:
-  listenAddr: 0.0.0.0
-  listenPort: 2222
-  privateKey: /usr/local/omc/.ssh/id_rsa
-  maxConnNum: 20
-  timeout: 1800
-  session: multiple
-
-database:
-  type: mysql
-  user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
-  name: tenants_db
-
-omc:
-  httpUri: http://127.0.0.1:3030
-  userCrypt: bcrypt
-  
-ne:
-  port: 4100
-  sleep: 200
-  user: admin
-  password: admin
-
-

build/usr/local/omc/etc/default/tasks.yaml

@@ -1,171 +0,0 @@
-# example:
-# tasks:
-#  - name: test # task comment
-#    uri:  # restful uri
-#    params: # params of url
-#    interval: 30 # do sometion in the interval
-#    unit: Seconds   #Seconds/Minutes/Hours/Days/Weeks, Monday/Tuesday/.../Sunday, 
-#    at: 00:10:00   # do at time such as xx:xx:xx
-#    do: HelloWorldTask  # (Do what: callback function)
-#
-# Attention: must restart crontask after modified this file
-#
-tasks:
-  - name: test # task comment
-    status: Active #active/inactive  
-    uri:  # restful uri
-    params: # params of http url
-    body: # body of http request
-    interval: 60 # do sometion in the interval
-    unit: Seconds   #Seconds/Minutes/Hours/Days/Weeks, Monday/Tuesday/.../Sunday, 
-    at: 00:10:00   # do at time such as xx:xx:xx when unit such as Day/Days/Mondays...
-    do: TaskHelloWorld  # (Do what: callback function)
-  - name: clear expired history alarm
-    uri: /api/rest/databaseManagement/v1/tenants_db/alarm
-    params: WHERE=now()+>+ADDDATE(event_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='historyDuration')+day)+and+alarm_status='0'
-    interval: 1
-    unit: Days
-    at: 00:10:00
-    do: TaskDeleteExpiredRecord
-  - name: clear deleted custom pm kpi
-    uri: /api/rest/databaseManagement/v1/tenants_db/pm_custom_title
-    params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted'
-    interval: 1
-    unit: Days
-    at: 00:15:00
-    do: TaskDeleteExpiredRecord    
-  - name: update expired user session
-    uri: /api/rest/databaseManagement/v1/tenants_db/session
-    params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online'
-    body: '{"session":{"status":"offline"}}'
-    interval: 30
-    unit: Seconds
-    at: 
-    do: TaskUpdateTable     
-  - name: clear expired log
-    uri: 
-    params: 
-    interval: 1
-    unit: Days
-    at: 00:50:00
-    do: TaskDeleteExpiredRecord
-  - name: Backup measure data
-    uri: /api/rest/databaseManagement/v1/tenants_db/measure_data
-    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','date','task_id','ne_name','rm_uid','ne_type','granul_option','kpi_code','kpi_id','kpi_ext','start_time','end_time','value','timestamp'+union+select+id,date,task_id,ne_name,rm_uid,ne_type,granul_option,kpi_code,kpi_id,kpi_ext,start_time,end_time,value,timestamp+from+measure_data)+b
-    interval: 1
-    unit: Days
-    at: 00:20:00
-    do: TaskDBBackupCSVGetBySQL    
-  - name: Backup operation log
-    uri: /api/rest/databaseManagement/v1/tenants_db/operation_log
-    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'op_id','account_name','op_ip','subsys_tag','op_type','op_content','op_result','begin_time','end_time','vnf_flag','log_time'+union+select+op_id,account_name,op_ip,subsys_tag,op_type,op_content,op_result,begin_time,end_time,vnf_flag,log_time+from+operation_log)+b
-    interval: 1
-    unit: Days
-    at: 00:26:00
-    do: TaskDBBackupCSVGetBySQL    
-  - name: Backup security log
-    uri: /api/rest/databaseManagement/v1/tenants_db/security_log
-    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','account_name','account_type','op_ip','op_type','op_content','op_result','op_time'+union+select+id,account_name,account_type,op_ip,op_type,op_content,op_result,op_time+from+security_log)+b
-    interval: 1
-    unit: Days
-    at: 00:28:00
-    do: TaskDBBackupCSVGetBySQL    
-  - name: Backup alarm log
-    uri: /api/rest/databaseManagement/v1/tenants_db/alarm_log
-    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','ne_type','ne_id','alarm_seq','alarm_id','alarm_code','alarm_status','event_time','log_time'+union+select+id,ne_type,ne_id,alarm_seq,alarm_id,alarm_code,alarm_status,event_time,log_time+from+alarm_log)+b
-    interval: 1
-    unit: Days
-    at: 00:30:00
-    do: TaskDBBackupCSVGetBySQL        
-  - name: handshake to NF
-    status: Active
-    uri:  /api/rest/systemManagement/v1/elementType/%s/objectType/systemState
-    params: 
-    interval: 10
-    unit: Seconds
-    at: 
-    do: TaskHandShakeToNF
-  - name: Export CM from NF
-    uri:  /api/rest/systemManagement/v1/elementType/%s/objectType/cm
-    params: ne_id=%s
-    interval: 1
-    unit: Days
-    at: 00:15
-    do: TaskExportCmFromNF    
-  - name: Generate NRM xml file
-    uri: 
-    params: 
-    interval: 1
-    unit: Day
-    at: 00:00,06:00,12:00,18:00
-    do: GenCmXmlFile
-  - name: Task of Generate measure threshold alarm
-    status: Active
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms  
-    params: RJHXEMSPM10200
-    interval: 10
-    unit: Seconds
-    at: 
-    do: TaskGenMeasureThresholdAlarm    
-  - name: Task of Generate license alarm
-    status: Inactive
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
-    params: RJHXEMSCM10100
-    interval: 1
-    unit: Days
-    at: 00:30
-    do: TaskGenLicenseAlarm        
-  - name: Task of Generate NE system state alarm
-    status: Active
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSSM10000
-    interval: 5
-    unit: Seconds
-    at: 
-    do: TaskGenNeStateAlarm
-  - name: Task of Generate Measure Report Timeout
-    status: Active
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSPM10201
-    interval: 10
-    unit: Seconds
-    at: 
-    do: TaskGenMeasureReportTimeoutAlarm    
-  - name: Monitor proces list and write system log
-    uri: /api/rest/databaseManagement/v1/tenants_db/system_log
-    params:
-    body: 
-    interval: 10
-    unit: Seconds
-    at: 
-    do: TaskWriteSystemLog        
-  - name: Copy log to /opt/omc/ftp/log
-    uri: 
-    params: cp -rf /usr/local/omc/database/*.csv /opt/omc/ftp/log 
-    interval: 10
-    unit: Minutes
-    at: 
-    do: TaskRunShellCommand              
-#  - name: Import CM to NF
-#    uri: /api/rest/systemManagement/v1/elementType/udm/objectType/cm 
-#   params: ne_id=SZ_01
-#   interval: 15
-#   unit: Seconds
-#   at: 
-#   do: TaskImportCmToNF                
-crontab:
-#  - name: 每隔1分钟执行
-#    tab: 0 */1 * * * ?  // crontab: rule like linux crontab
-#    do: CronHelloWorldTask  // function name to call 
-#    params:     
-  - name: Generate PM xml file
-    status: Active
-    tab: 5,20,35,50 * * * * 
-    do: GenPmXmlFile
-    uri: this is uri
-    params: Generating PM xml file
-#  - name: Import CM to NF
-#   tab: 0 * * * * *
-#   do: TaskImportCmToNF
-#   uri: /api/rest/systemManagement/v1/elementType/udm/objectType/cm
-#   params: ne_id=SZ_01

build/usr/local/omc/etc/nginx/omc.conf

@@ -0,0 +1,71 @@
+server {
+    listen       44080;
+    listen       44443;
+    listen  [::]:44080;
+    listen  [::]:44443;
+    server_name  localhost;
+    
+    client_max_body_size 100M;
+    keepalive_timeout    180s;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    # ssl_certificate /usr/local/omc/etc/certs/omc-server.crt;
+    # ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key;
+    # ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt;
+    # ssl_verify_client on;
+    # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
+    # ssl_session_timeout  5m;
+    # ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
+    # ssl_prefer_server_ciphers on;
+
+    # OMC
+    location / {
+        root /usr/local/omc/htdocs/front;
+
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
+    }
+
+    location /omc-api/ {
+        proxy_pass http://127.0.0.1:33030/;
+        
+        proxy_connect_timeout  180s;
+        proxy_send_timeout     180s;
+        proxy_read_timeout     180s;
+        
+        proxy_cache_bypass                  $http_upgrade;
+        proxy_set_header Upgrade            $http_upgrade;
+        proxy_set_header Connection         "upgrade";
+        proxy_set_header Host               $host;
+        proxy_set_header X-Real-IP          $remote_addr;
+        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto  $scheme;
+        proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Port   $server_port;
+    }
+
+    location /api/rest/ {
+        proxy_pass http://127.0.0.1:33030/api/rest/;
+
+        proxy_cache_bypass  $http_upgrade;
+        proxy_set_header Upgrade            $http_upgrade;
+        proxy_set_header Connection         "upgrade";
+        proxy_set_header Host               $host;
+        proxy_set_header X-Real-IP          $remote_addr;
+        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto  $scheme;
+        proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Port   $server_port;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
+

build/usr/local/omc/etc/schema/pdml2html.xsl

@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<!-- This XSLT will convert a PDML file, saved by Wireshark, into
+     HTML. The HTML page should look similar to Wireshark. See
+     https://gitlab.com/wireshark/wireshark/-/wikis/PDML for information
+     on how to generate such a HTML file from PDML.
+     For questions contact Dirk Jagdmann (doj@cubic.org).
+
+     Version: 2010-06-09
+
+     Wireshark - Network traffic analyzer
+     By Gerald Combs <gerald@wireshark.org>
+     Copyright 1998 Gerald Combs
+
+     SPDX-License-Identifier: GPL-2.0-or-later
+     -->
+
+<!-- set parameters of the HTML output -->
+<xsl:output method="html" encoding="UTF-8" omit-xml-declaration="no" standalone="yes" indent="yes"/>
+
+<!-- this matches the "field" tag -->
+<xsl:template match="field">
+  &#160;&#160;&#160; <!-- indent with 3 non-breaking spaces -->
+
+  <!-- output either the "showname" or "show" attribute -->
+  <xsl:choose>
+    <xsl:when test="string-length(@showname)>0">
+      <xsl:value-of select="@showname"/><br/>
+    </xsl:when>
+    <xsl:otherwise>
+      <!--<xsl:value-of select="@name"/>:--> <xsl:value-of select="@show"/><br/>
+    </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:apply-templates/> <!-- we expect to match "field" tags -->
+</xsl:template>
+
+<!-- this matches the "packet" tag -->
+<xsl:template match="packet">
+
+  <!-- declare some variables for later use -->
+  <xsl:variable name="frame_num" select="proto[@name='frame']/field[@name='frame.number']/@show"/>
+  <xsl:variable name="frame_id"  select="concat('f',$frame_num)"/>
+  <xsl:variable name="frame_c"   select="concat($frame_id,'c')"/>
+
+  <!-- the "title" bar of the frame -->
+  <div width="100%" id="{$frame_id}">
+    <a href="javascript:toggle_node('{$frame_c}')">&#8658;</a> <!-- #8658 is a "rArr" (double right arrow) character -->
+    Frame <xsl:value-of select="$frame_num"/>:
+    <xsl:for-each select="proto[@name!='geninfo']">
+      <xsl:value-of select="@name"/>,
+    </xsl:for-each>
+    <small><a href="javascript:hide_node('{$frame_id}')">[X]</a></small>
+  </div>
+
+  <!-- the frame contents are stored in a div, so we can toggle it -->
+  <div width="100%" id="{$frame_c}" style="display:none">
+    <!-- loop through all proto tags, but skip the "geninfo" one -->
+    <xsl:for-each select="proto[@name!='geninfo']">
+
+      <xsl:variable name="proto" select="concat($frame_id,@name,count(preceding-sibling::proto)+1)"/>
+
+      <!-- the "title" bar of the proto -->
+      <div width="100%" style="background-color:#e5e5e5; margin-bottom: 2px">
+        &#160;<a href="javascript:toggle_node('{$proto}')">&#8658;</a>&#160;<xsl:value-of select="@showname"/>
+
+        <!-- print "proto" details inside another div -->
+        <div width="100%" id="{$proto}" style="display:none">
+         <xsl:apply-templates/> <!-- we expect to match "field" tags -->
+        </div>
+      </div>
+    </xsl:for-each>
+  </div>
+
+  <!-- use the javascript function set_node_color() to set the color
+       of the frame title bar. Defer colorization until the full page has
+       been loaded. If the browser would support the XPath function
+       replace() we could simply set the class attribute of the title bar div,
+       but for now we're stuck with class names from Wireshark's colorfilters
+       that contain spaces and we can't handle them in CSS. -->
+  <script type="text/javascript">
+    dojo.addOnLoad(function(){
+      set_node_color(
+        '<xsl:value-of select="$frame_id"/>',
+        '<xsl:value-of select="proto[@name='frame']/field[@name='frame.coloring_rule.name']/@show"/>'
+      );
+    });
+  </script>
+</xsl:template>
+
+<xsl:template match="pdml">
+  Capture Filename: <b><xsl:value-of select="@capture_file"/></b>
+  PDML created: <b><xsl:value-of select="@time"/></b>
+  <tt>
+    <xsl:apply-templates/> <!-- we expect to match the "packet" nodes -->
+  </tt>
+</xsl:template>
+
+<!-- this block matches the start of the PDML file -->
+<xsl:template match="/">
+  <html>
+  <head>
+    <title>poor man's Wireshark</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/dojo/1.4/dojo/dojo.xd.js" type="text/javascript"></script>
+    <script type="text/javascript">
+function set_node(node, str)
+{
+  if(dojo.isString(node))
+    node = dojo.byId(node);
+  if(!node) return;
+  node.style.display = str;
+}
+function toggle_node(node)
+{
+  if(dojo.isString(node))
+    node = dojo.byId(node);
+  if(!node) return;
+  set_node(node, (node.style.display != 'none') ? 'none' : 'block');
+}
+function hide_node(node)
+{
+  set_node(node, 'none');
+}
+// this function was generated by colorfilters2js.pl
+function set_node_color(node,colorname)
+{
+  if(dojo.isString(node))
+    node = dojo.byId(node);
+  if(!node) return;
+  var fg;
+  var bg;
+  if(colorname == 'Bad TCP') {
+    bg='#000000';
+    fg='#ff5f5f';
+  }
+  if(colorname == 'HSRP State Change') {
+    bg='#000000';
+    fg='#fff600';
+  }
+  if(colorname == 'Spanning Tree Topology  Change') {
+    bg='#000000';
+    fg='#fff600';
+  }
+  if(colorname == 'OSPF State Change') {
+    bg='#000000';
+    fg='#fff600';
+  }
+  if(colorname == 'ICMP errors') {
+    bg='#000000';
+    fg='#00ff0e';
+  }
+  if(colorname == 'ARP') {
+    bg='#d6e8ff';
+    fg='#000000';
+  }
+  if(colorname == 'ICMP') {
+    bg='#c2c2ff';
+    fg='#000000';
+  }
+  if(colorname == 'TCP RST') {
+    bg='#900000';
+    fg='#fff680';
+  }
+  if(colorname == 'TTL low or unexpected') {
+    bg='#900000';
+    fg='#ffffff';
+  }
+  if(colorname == 'Checksum Errors') {
+    bg='#000000';
+    fg='#ff5f5f';
+  }
+  if(colorname == 'SMB') {
+    bg='#fffa99';
+    fg='#000000';
+  }
+  if(colorname == 'HTTP') {
+    bg='#8dff7f';
+    fg='#000000';
+  }
+  if(colorname == 'IPX') {
+    bg='#ffe3e5';
+    fg='#000000';
+  }
+  if(colorname == 'DCERPC') {
+    bg='#c797ff';
+    fg='#000000';
+  }
+  if(colorname == 'Routing') {
+    bg='#fff3d6';
+    fg='#000000';
+  }
+  if(colorname == 'TCP SYN/FIN') {
+    bg='#a0a0a0';
+    fg='#000000';
+  }
+  if(colorname == 'TCP') {
+    bg='#e7e6ff';
+    fg='#000000';
+  }
+  if(colorname == 'UDP') {
+    bg='#70e0ff';
+    fg='#000000';
+  }
+  if(colorname == 'Broadcast') {
+    bg='#ffffff';
+    fg='#808080';
+  }
+  if(fg.length > 0)
+    node.style.color = fg;
+  if(bg.length > 0)
+    node.style.background = bg;
+}
+    </script>
+  </head>
+    <body>
+      <xsl:apply-templates/> <!-- we expect to match the "pdml" node -->
+    </body>
+  </html>
+</xsl:template>
+
+</xsl:stylesheet>

customized/agt.d/db/customized.sql

@@ -9,9 +9,9 @@ REPLACE INTO `sys_config` VALUES (109, 'config.sys.i18nDefault', 'sys.i18n.defau
 
 -- 
 REPLACE INTO `sys_dict_data` VALUES (1660, 1660, 'config.sys.titleValue', 'AGrand EMS', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1661, 1661, 'config.sys.copyrightValue', 'Copyright ©2023 千通科技', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1661, 1661, 'config.sys.copyrightValue', 'Copyright ©2025 千通科技', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3660, 3660, 'config.sys.titleValue', 'AGrand EMS', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (3661, 3661, 'config.sys.copyrightValue', 'Copyright ©2023 AGrandTech', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3661, 3661, 'config.sys.copyrightValue', 'Copyright ©2025 AGrandTech', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 
 -- set internationalization switching to ON
 -- REPLACE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2122);

customized/ba.d/db/customized.sql

@@ -9,9 +9,9 @@ REPLACE INTO `sys_config` VALUES (109, 'config.sys.i18nDefault', 'sys.i18n.defau
 
 -- 
 REPLACE INTO `sys_dict_data` VALUES (1660, 1660, 'config.sys.titleValue', 'BlueArcus EMS', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (1661, 1661, 'config.sys.copyrightValue', 'Copyright ©2023 BlueArcus', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1661, 1661, 'config.sys.copyrightValue', 'Copyright ©2025 BlueArcus', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 REPLACE INTO `sys_dict_data` VALUES (3660, 3660, 'config.sys.titleValue', 'BlueArcus EMS', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
-REPLACE INTO `sys_dict_data` VALUES (3661, 3661, 'config.sys.copyrightValue', 'Copyright ©2023 BlueArcus', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3661, 3661, 'config.sys.copyrightValue', 'Copyright ©2025 BlueArcus', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
 
 -- set internationalization switching to ON
 -- REPLACE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2122);

customized/ba.d/locales/zh-CN.ts

@@ -0,0 +1,2 @@
+export default {
+};

customized/omc.d/db/customized.sql

@@ -0,0 +1,20 @@
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- 
+REPLACE INTO `sys_config` VALUES (6, 'config.sys.officialUrl', 'sys.officialUrl', '#', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.officialUrlRemark');
+REPLACE INTO `sys_config` VALUES (106, 'config.sys.title', 'sys.title', 'config.sys.titleValue', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.titleRemark');
+REPLACE INTO `sys_config` VALUES (107, 'config.sys.copyright', 'sys.copyright', 'config.sys.copyrightValue', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.copyrightRemark');
+REPLACE INTO `sys_config` VALUES (108, 'config.sys.i18nOpen', 'sys.i18n.open', 'true', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nOpenRemark');
+REPLACE INTO `sys_config` VALUES (109, 'config.sys.i18nDefault', 'sys.i18n.default', 'en_US', 'Y', 'supervisor', 1700000000000, NULL, 0, 'config.sys.i18nDefaultRemark');
+
+-- 
+REPLACE INTO `sys_dict_data` VALUES (1660, 1660, 'config.sys.titleValue', 'OMC', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (1661, 1661, 'config.sys.copyrightValue', 'Copyright ©2025', 'i18n_zh', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3660, 3660, 'config.sys.titleValue', 'OMC', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+REPLACE INTO `sys_dict_data` VALUES (3661, 3661, 'config.sys.copyrightValue', 'Copyright ©2025', 'i18n_en', NULL, NULL, '1', 'supervisor', 1700000000000, NULL, 0, NULL);
+
+-- set internationalization switching to ON
+-- REPLACE INTO `omc_db`.`sys_role_menu` (`role_id`, `menu_id`) VALUES (2, 2122);
+UPDATE `sys_menu` SET `status` = '1' WHERE `menu_id` = 2122;
+
+SET FOREIGN_KEY_CHECKS = 1;

debbuild/22.04/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2410.1-YYYYMMDD
+Version: 2.2508.1-YYYYMMDD-mt
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/22.04/DEBIAN/postinst

@@ -1,39 +1,26 @@
-# !/bin/bash
+#!/bin/bash
 
 OMCRootDir=/usr/local/omc
 SystemdRootDir=/lib/systemd/system
 OMCEtcDir=${OMCRootDir}/etc
 FERootDir=${OMCRootDir}/htdocs/front
-X86Lib64Dir=/lib/x86_64-linux-gnu
 OMCBinDir=${OMCRootDir}/bin
 OMCStaticDir=${OMCRootDir}/static
 UsrLocalBinDir=/usr/local/bin
 OMCDaemon=omcd
 NginxEtcDir=/etc/nginx
 NginxConfDir=${NginxEtcDir}/conf.d
-CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf"
+CFileList="restconf.yaml sshsvc.yaml omc.conf"
 LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"
 
 echo ""
 echo "* To start/stop/restart/status omc service, please run:"
 echo "    sudo systemctl start/stop/restart/status restagent.service"
-echo "    sudo systemctl start/stop/restart/status crontask.service"
 echo "    sudo systemctl start/stop/restart/status sshsvc.service"
-echo "    sudo systemctl start/stop/restart/status captrace.service"
 echo "    or run: "
 echo "    sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status"
 echo ""
 
-cd ${X86Lib64Dir}
-chmod +rx libwireshark.so.15.0.12
-if [ ! -e libwireshark.so.15 ]; then  ln -s libwireshark.so.15.0.12 libwireshark.so.15; fi
-if [ ! -e libwireshark.so ]; then  ln -s libwireshark.so.15.0.12 libwireshark.so; fi
-chmod +rx libwiretap.so.12.0.12
-if [ ! -e libwiretap.so.12 ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so.12; fi
-if [ ! -e libwiretap.so ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so; fi
-chmod +rx libwsutil.so.13.1.0
-if [ ! -e libwsutil.so.13 ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi
-if [ ! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
 cd ${UsrLocalBinDir}
 if [ ! -e ${OMCDaemon} ]; then  ln -s ${OMCBinDir}/omcsvc.sh ${OMCDaemon}; fi
 
@@ -45,10 +32,10 @@ chmod -R 755 ${OMCRootDir}/htdocs/front
 for CFile in ${CFileList}; do
     if [ ! -e "${OMCEtcDir}/${CFile}" ]; then
         cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
-   else 
+    else 
         # mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak
         # cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
-        if [ -e "${OMCBinDir}/upgconf.sh" ]; then
+        if [ -e "${OMCBinDir}/upgconf.sh" ] && [ "${CFile}" = "restconf.yaml" ]; then
             ${OMCBinDir}/upgconf.sh
         fi
     fi                  
@@ -114,31 +101,31 @@ if [ ! -e "${FERootDir}/config.js" ]; then
     cp ${FERootDir}/default/config.js ${FERootDir}; 
 fi
 
-for LogoFile in ${LogoFileList}; do
-    if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
-        cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
-    fi                 
-done
+# for LogoFile in ${LogoFileList}; do
+#     if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
+#         cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+#     fi                 
+# done
 
-if ! id -u omc >/dev/null 2>&1 ; then     
-    useradd -d /opt/omc -m -s /bin/bash -pomc123 omc; 
-    mkdir -p /opt/omc/ftp
-else 
-    echo "user omc exist"; 
-fi
+# if ! id -u omc >/dev/null 2>&1 ; then     
+#     useradd -d /opt/omc -m -s /bin/bash -pomc123 omc; 
+#     mkdir -p /opt/omc/ftp
+# else 
+#     echo "user omc exist"; 
+# fi
 
 if [ ! -e "${NginxConfDir}/omc.conf" ]; then
     mkdir -p ${NginxConfDir}    
     cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
 fi
 
+systemctl daemon-reload
+
 # disable auto upgrade
 systemctl disable --now unattended-upgrades
 
 systemctl enable restagent.service
-systemctl enable crontask.service
 systemctl enable sshsvc.service
-systemctl enable captrace.service
 
 systemctl daemon-reload
 
@@ -159,8 +146,6 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
 fi
 
 echo -n "Starting OMC service ... "
-systemctl start crontask.service
 systemctl start sshsvc.service
-systemctl start captrace.service
 systemctl start restagent.service
 echo "done"

debbuild/22.04/DEBIAN/postrm

@@ -1,13 +1,5 @@
 # !/bin/bash
 
-X86Lib64Dir=/lib/x86_64-linux-gnu
-rm -rf ${X86Lib64Dir}/libwireshark.so.15
-rm -rf ${X86Lib64Dir}/libwireshark.so
-rm -rf ${X86Lib64Dir}/libwiretap.so.12
-rm -rf ${X86Lib64Dir}/libwiretap.so
-rm -rf ${X86Lib64Dir}/libwsutil.so.13
-rm -rf ${X86Lib64Dir}/libwsutil.so
-
 #rm -rf /usr/local/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 rm -f /usr/local/bin/omcd
@@ -17,15 +9,11 @@ systemctl daemon-reload
 if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
     echo -n "Stopping OMC service ... "
     systemctl stop restagent.service
-    systemctl stop crontask.service
     systemctl stop sshsvc.service
-    systemctl stop captrace.service
     echo "done"
 fi
 
 systemctl disable restagent.service
-systemctl disable crontask.service
 systemctl disable sshsvc.service
-systemctl disable captrace.service
 
 systemctl daemon-reload

debbuild/22.04/DEBIAN/preinst

@@ -4,9 +4,7 @@ systemctl daemon-reload
 if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
     echo -n "Stopping OMC service ... "
     systemctl stop restagent.service
-    systemctl stop crontask.service
     systemctl stop sshsvc.service
-    systemctl stop captrace.service
     echo "done"
 fi
 

debbuild/22.04/usr/local/omc/.ssh/id_rsa

@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-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
------END OPENSSH PRIVATE KEY-----

debbuild/22.04/usr/local/omc/.ssh/id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCjzE0MHy0P2sQmG1OKvArwLEzR77BwxPp+4N9NKBz8lEyNch4zoHvoLDaUJKPBMwTrScZnxhvRJNde6hz5Z0QVxZolVKV95fMfgb9YICzDfPF3Bphae5q/PBYUJNfrC9SAjQeHV4CCO6xk6LV8O/Nfw8uaXwtuN3yfpUWd5mRWKMc3GHV4vxerfKoIQZN6etLhIEYibAhCJ21P0uoWzZl7ceLmkG+6qrRSbyC0bCnrN3+wjN4bwtflrEFJk3XQGuRbVsYLzux+mMm9p22+CLPRl/FUPF3x4/wKCsqr7JDSxx80HSPhk4g/1nCTpDR9hAfF6A9ww2va/k8jMeYPBO8Owe7erLEZzvg5WQAR3Wj05eJpJD99BeC91S5KW6AFQDfDHxWWprSibd/Jj9dtct2pK2ZxW0ph9OJ49ftRhzT1iVi4UnJwnG5/qLfwl6Tnx+qnQ1If/9lY/99erCTATzFTMSImKrRz7CnuPlcw8WkzCYpWKKe0kJLkL2cRD5Qi4yk= simon@simonzhangsz

debbuild/22.04/usr/local/omc/.ssh/private_key.pem

@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-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
------END OPENSSH PRIVATE KEY-----

debbuild/22.04/usr/local/omc/etc/cm/cm-amf.yaml

@@ -0,0 +1,49 @@
+ManagedElement: 
+    Id: ""
+    UserLabel: ""
+    VendorName: ""
+    ManagedBy: ""
+    ManagementIpAddress: ""
+    SwVersion: ""
+    PatchInfo: ""
+    AdministrativeState: ""
+    OperationalState: ""
+
+AmfFunction: 
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+    SbiServiceList: ""
+    AmfGuamiList: ""
+    SnssaiList: ""
+    MaxUser: ""
+    RelativeCapacity: ""
+    MaxGnbNum: ""
+
+EpRpDynN8Amf: 
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: ""
+    FarIpSubnetworkList: ""
+
+EpRpDynN11Amf: 
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: "" 
+    FarIpSubnetworkList: "" 
+
+EpRpDynN12Amf: 
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: "" 
+    FarIpSubnetworkList: ""
+
+IPResource: 
+    Id: ""
+    UserLabel: ""
+    InterfaceType: ""
+    LocIpV4AddrList: ""
+    LocIpV6AddrList: ""

debbuild/22.04/usr/local/omc/etc/cm/cm-smf.yaml

@@ -0,0 +1,48 @@
+ManagedElement:
+    Id: ""
+    UserLabel: ""
+    VendorName: ""
+    ManagedBy: ""
+    ManagementIpAddress: ""
+    SwVersion: ""
+    PatchInfo: ""
+    AdministrativeState: ""
+    OperationalState: ""
+
+SmfFunction:
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+    SbiServiceList: ""
+    MaxPduSessions: ""
+    MaxQfi: ""
+    UpfList: ""
+
+AddrPool:
+    Id: ""
+    UserLabel: ""
+    AddrType: "Static"
+    IpVersion: ""
+    AddrSegList: ""
+
+EpRpDynN7Smf:
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: ""
+    FarIpSubnetworkList: ""
+
+EpRpDynN10Smf:
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: ""
+    FarIpSubnetworkList: ""
+
+IPResource:
+    Id: ""
+    UserLabel: ""
+    InterfaceType: ""
+    LocIpV4AddrList: ""
+    LocIpV6AddrList: ""

debbuild/22.04/usr/local/omc/etc/cm/cm-udm.yaml

@@ -0,0 +1,39 @@
+ManagedElement: 
+    Id: "" 
+    UserLabel: ""
+    VendorName: ""
+    ManagedBy: "" 
+    ManagementIpAddress: ""
+    SwVersion: ""
+    PatchInfo: ""
+    AdministrativeState: ""
+    OperationalState: ""
+
+UdmFunction: 
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+    SbiServiceList: ""
+
+UdrFunction: 
+    Id: ""
+    UserLabel: ""
+    AddrType: "Static"
+    IpVersion: ""
+    AddrSegList: ""
+
+AusfFunction: 
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: ""
+    FarIpSubnetworkList: ""
+
+IPResource: 
+    Id: ""
+    UserLabel: ""
+    InterfaceType: ""
+    LocIpV4AddrList: ""
+    LocIpV6AddrList: ""

debbuild/22.04/usr/local/omc/etc/cm/cm-upf.yaml

@@ -0,0 +1,141 @@
+ManagedElement:   
+    Id: ""
+    UserLabel: ""
+    VendorName: ""
+    ManagedBy: ""
+    ManagementIpAddress: ""  
+    SwVersion: ""  
+    PatchInfo: ""  
+    AdministrativeState: ""  
+    OperationalState: ""
+
+InventoryUnitRack:   
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""  
+    OperationalState: ""  
+    VnfInstanceId: ""
+    Fqdn: "" 
+    SbiServiceList: ""  
+    MaxPduSessions: ""  
+    MaxQfi: ""  
+    UpfList: ""
+
+InventoryUnitShelf:   
+    Id: ""  
+    UserLabel: ""  
+    VendorUnitFamilyType: ""  
+    VendorUnitTypeNumber: ""  
+    VendorName: ""  
+    SerialNumber: ""  
+    VersionNumber: ""  
+    DateOfManufacture: ""  
+    DateOfLastService: ""  
+    ManufacturerData: ""  
+    RackPosition: ""
+
+InventoryUnitPack:   
+    Id: ""
+    UserLabel: ""
+    VendorUnitFamilyType: ""
+    VendorUnitTypeNumber: ""
+    VendorName: ""
+    SerialNumber: ""
+    VersionNumber: ""
+    DateOfManufacture: ""
+    DateOfLastService: ""
+    ManufacturerData: ""
+    PortsInformation: ""
+    PackPosition: ""
+    SlotsOccupied: ""
+
+InventoryUnitHost:   
+    Id: ""
+    UserLabel: ""
+    VendorUnitFamilyType: ""
+    VendorUnitTypeNumber: ""
+    VendorName: ""
+    SerialNumber: ""
+    VersionNumber: ""
+    DateOfManufacture: ""
+    DateOfLastService: ""
+    ManufacturerData: ""
+    HostPosition: ""
+    NumberOfCpu: ""
+    MemSize: ""
+    HardDiskSize: ""
+
+InventoryUnitAccessory:   
+    Id: ""
+    UserLabel: ""
+    VendorUnitFamilyType: ""
+    VendorUnitTypeNumber: ""
+    VendorName: ""
+    SerialNumber: ""
+    VersionNumber: ""
+    DateOfManufacture: ""
+    DateOfLastService: ""
+    ManufacturerData: ""
+    AccessoryPosition: ""
+    AccessoryType: ""
+    AddtionalInformation: ""
+
+UpfFunction:   
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    MaxQosFlows: ""
+    MaxThroughput: ""
+
+EpRpDynN9Upf:   
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: ""
+    FarIpSubnetworkList: ""
+
+EpRpDynN3Upf:   
+    Id: ""
+    UserLabel: ""
+    LocIpAddrList: ""
+    FarIpSubnetworkList: ""
+
+AmfFunction:   
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+
+SmfFunction:   
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+
+UdrFunction:   
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+
+AusfFunction:   
+    Id: ""
+    UserLabel: ""
+    AdministrativeState: ""
+    OperationalState: ""
+    VnfInstanceId: ""
+    Fqdn: ""
+
+IPResource:   
+    Id: ""
+    UserLabel: ""
+    InterfaceType: ""  
+    LocIpV4AddrList: ""  
+    LocIpV6AddrList: ""

debbuild/22.04/usr/local/omc/etc/default/restconf.yaml

@@ -1,183 +0,0 @@
-# file: log file name
-# level: /trace/debug/info/warn/error/fatal, default: debug
-# duration: rotation time with xx hours, example: 1/12/24 hours
-# count: rotation count of log, default is 30 rotation
-logger:
-  file: /usr/local/omc/log/restagent.log 
-  level: warn
-  duration: 24
-  count: 90   
-
-# rest agent listen ipv4/v6 and port, support multiple routines
-# ip: 0.0.0.0 or ::0, support IPv4/v6
-# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, 
-#                 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
-rest:
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port: 33030
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port: 33443
-    schema: https
-    clientAuthType: 0
-    caFile: /usr/local/omc/etc/certs/omc-ca.crt
-    certFile: /usr/local/omc/etc/certs/omc-server.crt
-    keyFile: /usr/local/omc/etc/certs/omc-server.key
-
-webServer:
-  enabled: true
-  rootDir: /usr/local/omc/htdocs/front
-  listen: 
-    - addr: :80
-      schema: http
-    - addr: :443
-      schema: https
-      clientAuthType: 0
-      caFile: /usr/local/omc/etc/certs/omc-ca.crt
-      certFile: /usr/local/omc/etc/certs/omc-server.crt
-      keyFile: /usr/local/omc/etc/certs/omc-server.key
-
-database:
-  type: mysql
-  user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
-  name: tenants_db
-  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
-  backup: /usr/local/omc/database
-
-# Redis data cache
-redis:
-  dataSource:
-    # OMC system db
-    default:
-      port: 6379 # Redis port
-      host: "127.0.0.1" # Redis host
-      password: "helloearth"
-      db: 10 # Redis db_num
-    # UDM sub/auth db
-    udmuser:
-      port: 6379 # Redis port
-      host: "127.0.0.1"
-      password: "helloearth"
-      db: 0 # Redis db_num
-  # used to specify the default data source for multiple data resourece
-  defaultDataSourceName: "default"
-
-# sleep: time delay for after write buffer (millisecond)
-# deadLine: timeout for io read and write (second)
-mml:
-  port: 4100
-  port2: 5002
-  sleep: 200
-  deadLine: 10
-  sizeRow: 600
-  sizeCol: 128
-  bufferSize: 65535
-  user: admin
-  password: admin
-  mmlHome: ./mmlhome
-
-# NE config
-ne:
-  user: omcuser
-  etcdir: /usr/local/etc
-  bindir: /usr/local/bin
-  omcdir: /usr/local/omc
-  scpdir: /tmp
-  licensedir: /usr/local/etc/{neType}/license
-  # backup etc list of IMS, does not contain spaces
-  etcListIMS: '{*.yaml,mmtel,vars.cfg}'
-  etcListDefault: '{*.yaml,*.conf,*.cfg}'
-  # true/false to overwrite config file when dpkg ne software 
-  dpkgOverwrite: false
-  # dpkg timeout (second)
-  dpkgTimeout: 180
-
-# chk2ne: true/false, if put OmcNeConfig parameters to NE
-omc:
-  uriPrefix: "/omc/rest"
-  neType: OMC
-  neId: 001
-  rmUID: 4400HX101
-  neName: OMC
-  province: ""
-  vendor: ""
-  dn: ""
-  chk2ne: false
-  sn: "-"
-  checksign: false
-  rootDir: /usr/local/omc
-  binDir: /usr/local/omc/bin
-  backup: /usr/local/omc/backup
-  upload: /usr/local/omc/upload
-  frontUpload: /usr/local/omc/htdocs/front/upload
-  frontTraceDir: /usr/local/omc/htdocs/front/trace
-  software: /usr/local/omc/software
-  license: /usr/local/omc/license
-  gtpUri: gtp:192.168.2.119:32152 
-  checkContentType: false
-  testMode: false
-  rbacMode: true
-  runDir: /usr/local/omc/run
-  cmdTimeout: 120
-
-# Alarm module setting
-# Forward interface:
-# email/sms/smsc  
-alarm: 
-  forwardAlarm: true
-  email:
-    smtp: smtp.xxx.com
-    port: 25
-    user: smtpuser@xxx.com
-    password: xxxxxx
-    # TLS skip verify: true/false
-    tlsSkipVerify: true    
-  smProxy: smsc
-  sms:
-    apiURL: http://smsc.xxx.com
-    accessKeyID: xxx
-    accessKeySecret: xxx
-    signName: XXX SMSC
-    templateCode: 1000
-  smsc:
-    addr: "192.168.13.114:2775"
-    systemID: "alarmsmsfw"
-    password: "omc123"
-    systemType: ""
-  
-# User authorized information
-# crypt: mysql/md5/bcrypt
-# token: true/false to check accessToken
-# expires for session, unit: second
-# Support single/multiple session of user
-#
-auth:
-  crypt: bcrypt
-  token: true
-  expires: 1800
-  session: multiple
-  publicKey: /usr/local/omc/etc/certs/omc
-  privateKey: /usr/local/omc/etc/certs/omc
-
-# Parameter for limit number 
-# rmuid_maxnum: the max number of rmUID, default: 50
-# alarmid_maxnum: the max number of AlarmID, default: 50
-# pmid_maxnum: the max number of pmID, default: 50
-# subid_maxnum: the max number of subscription ID, default: 20
-# uri_maxlen: the max length of uri, default: 8192
-# rmuid_regexp: regexp pattern of rmUID
-params:
-  rmuidmaxnum: 50
-  alarmidmaxnum: 50
-  pmidmaxnum: 50
-  subidmaxnum: 20
-  urimaxlen: 2100000
-  rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
-
-testConfig:
-  enabled: false
-  file: /usr/local/omc/etc/testconfig.yaml

debbuild/22.04/usr/local/omc/etc/nginx/omc.conf

@@ -0,0 +1,71 @@
+server {
+    listen       44080;
+    listen       44443;
+    listen  [::]:44080;
+    listen  [::]:44443;
+    server_name  localhost;
+    
+    client_max_body_size 100M;
+    keepalive_timeout    180s;
+
+    #access_log  /var/log/nginx/host.access.log  main;
+
+    # ssl_certificate /usr/local/omc/etc/certs/omc-server.crt;
+    # ssl_certificate_key /usr/local/omc/etc/certs/omc-server.key;
+    # ssl_client_certificate /usr/local/omc/etc/certs/omc-ca.crt;
+    # ssl_verify_client on;
+    # ssl_protocols TLSv1.1 TLSv1.2 TLSv1.3;
+    # ssl_session_timeout  5m;
+    # ssl_ciphers EECDH+CHACHA20:EECDH+AES128:RSA+AES128:EECDH+AES256:RSA+AES256:EECDH+3DES:RSA+3DES:!MD5;
+    # ssl_prefer_server_ciphers on;
+
+    # OMC
+    location / {
+        root /usr/local/omc/htdocs/front;
+
+        try_files $uri $uri/ /index.html;
+        index  index.html index.htm;
+    }
+
+    location /omc-api/ {
+        proxy_pass http://127.0.0.1:33030/;
+        
+        proxy_connect_timeout  180s;
+        proxy_send_timeout     180s;
+        proxy_read_timeout     180s;
+        
+        proxy_cache_bypass                  $http_upgrade;
+        proxy_set_header Upgrade            $http_upgrade;
+        proxy_set_header Connection         "upgrade";
+        proxy_set_header Host               $host;
+        proxy_set_header X-Real-IP          $remote_addr;
+        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto  $scheme;
+        proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Port   $server_port;
+    }
+
+    location /api/rest/ {
+        proxy_pass http://127.0.0.1:33030/api/rest/;
+
+        proxy_cache_bypass  $http_upgrade;
+        proxy_set_header Upgrade            $http_upgrade;
+        proxy_set_header Connection         "upgrade";
+        proxy_set_header Host               $host;
+        proxy_set_header X-Real-IP          $remote_addr;
+        proxy_set_header X-Forwarded-For    $proxy_add_x_forwarded_for;
+        proxy_set_header X-Forwarded-Proto  $scheme;
+        proxy_set_header X-Forwarded-Host   $host;
+        proxy_set_header X-Forwarded-Port   $server_port;
+    }
+
+    #error_page  404              /404.html;
+
+    # redirect server error pages to the static page /50x.html
+    #
+    error_page   500 502 503 504  /50x.html;
+    location = /50x.html {
+        root   /usr/share/nginx/html;
+    }
+}
+

debbuild/22.04/usr/local/omc/etc/schema/cm-schema.xsd

@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="DataFile">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="FileHeader">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="TimeStamp" type="xs:dateTime"/>
+							<xs:element name="TimeZone" type="xs:string"/>
+							<xs:element name="VendorName" type="xs:string" minOccurs="0"/>
+							<xs:element name="ElementType" type="xs:string" minOccurs="0"/>
+							<xs:element name="CmVersion" type="xs:string" minOccurs="0"/>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Objects" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="ObjectType" type="xs:string"/>
+							<!--该字段必选-->
+							<xs:element name="FieldName">
+								<xs:complexType>
+									<xs:sequence minOccurs="0" maxOccurs="unbounded">
+										<xs:element name="N">
+											<xs:complexType>
+												<xs:simpleContent>
+													<xs:extension base="xs:string">
+														<xs:attribute name="i" type="xs:integer" use="required"/>
+													</xs:extension>
+												</xs:simpleContent>
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="FieldValue">
+								<xs:complexType>
+									<xs:sequence minOccurs="0" maxOccurs="unbounded">
+										<xs:element name="Object">
+											<xs:complexType>
+												<xs:sequence minOccurs="0" maxOccurs="unbounded">
+													<xs:element name="V">
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:string">
+																	<xs:attribute name="i" type="xs:integer" use="required"/>
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+												</xs:sequence>
+												<xs:attribute name="rmUID" type="xs:string" use="required"/>
+												<xs:attribute name="Dn" type="xs:string"/>
+												<!-- //无线、核心网专业该字段必选，传输、IP专业、业务系统无该字段-->
+												<xs:attribute name="UserLabel" type="xs:string"/>
+												<!-- //无线、核心网专业该字段必选，传输、IP专业、业务系统无该字段-->
+												<xs:attribute name="PVFlag" type="xs:string" use="required"/>
+												<!-- //必须-->
+												<xs:attribute name="VMID" type="xs:string"/>
+												<!-- //VNF网络或VNF和PNF混合组网：虚拟网元必选，物理网元无该字段-->
+												<xs:attribute name="VNFInstanceID" type="xs:string"/>
+												<!-- //VNF网络或VNF和PNF混合组网：虚拟网元必选，物理网元无该字段-->
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>
+

debbuild/22.04/usr/local/omc/etc/schema/pdml2html.xsl

@@ -0,0 +1,221 @@
+<?xml version="1.0"?>
+<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
+<!-- This XSLT will convert a PDML file, saved by Wireshark, into
+     HTML. The HTML page should look similar to Wireshark. See
+     https://gitlab.com/wireshark/wireshark/-/wikis/PDML for information
+     on how to generate such a HTML file from PDML.
+     For questions contact Dirk Jagdmann (doj@cubic.org).
+
+     Version: 2010-06-09
+
+     Wireshark - Network traffic analyzer
+     By Gerald Combs <gerald@wireshark.org>
+     Copyright 1998 Gerald Combs
+
+     SPDX-License-Identifier: GPL-2.0-or-later
+     -->
+
+<!-- set parameters of the HTML output -->
+<xsl:output method="html" encoding="UTF-8" omit-xml-declaration="no" standalone="yes" indent="yes"/>
+
+<!-- this matches the "field" tag -->
+<xsl:template match="field">
+  &#160;&#160;&#160; <!-- indent with 3 non-breaking spaces -->
+
+  <!-- output either the "showname" or "show" attribute -->
+  <xsl:choose>
+    <xsl:when test="string-length(@showname)>0">
+      <xsl:value-of select="@showname"/><br/>
+    </xsl:when>
+    <xsl:otherwise>
+      <!--<xsl:value-of select="@name"/>:--> <xsl:value-of select="@show"/><br/>
+    </xsl:otherwise>
+  </xsl:choose>
+
+  <xsl:apply-templates/> <!-- we expect to match "field" tags -->
+</xsl:template>
+
+<!-- this matches the "packet" tag -->
+<xsl:template match="packet">
+
+  <!-- declare some variables for later use -->
+  <xsl:variable name="frame_num" select="proto[@name='frame']/field[@name='frame.number']/@show"/>
+  <xsl:variable name="frame_id"  select="concat('f',$frame_num)"/>
+  <xsl:variable name="frame_c"   select="concat($frame_id,'c')"/>
+
+  <!-- the "title" bar of the frame -->
+  <div width="100%" id="{$frame_id}">
+    <a href="javascript:toggle_node('{$frame_c}')">&#8658;</a> <!-- #8658 is a "rArr" (double right arrow) character -->
+    Frame <xsl:value-of select="$frame_num"/>:
+    <xsl:for-each select="proto[@name!='geninfo']">
+      <xsl:value-of select="@name"/>,
+    </xsl:for-each>
+    <small><a href="javascript:hide_node('{$frame_id}')">[X]</a></small>
+  </div>
+
+  <!-- the frame contents are stored in a div, so we can toggle it -->
+  <div width="100%" id="{$frame_c}" style="display:none">
+    <!-- loop through all proto tags, but skip the "geninfo" one -->
+    <xsl:for-each select="proto[@name!='geninfo']">
+
+      <xsl:variable name="proto" select="concat($frame_id,@name,count(preceding-sibling::proto)+1)"/>
+
+      <!-- the "title" bar of the proto -->
+      <div width="100%" style="background-color:#e5e5e5; margin-bottom: 2px">
+        &#160;<a href="javascript:toggle_node('{$proto}')">&#8658;</a>&#160;<xsl:value-of select="@showname"/>
+
+        <!-- print "proto" details inside another div -->
+        <div width="100%" id="{$proto}" style="display:none">
+         <xsl:apply-templates/> <!-- we expect to match "field" tags -->
+        </div>
+      </div>
+    </xsl:for-each>
+  </div>
+
+  <!-- use the javascript function set_node_color() to set the color
+       of the frame title bar. Defer colorization until the full page has
+       been loaded. If the browser would support the XPath function
+       replace() we could simply set the class attribute of the title bar div,
+       but for now we're stuck with class names from Wireshark's colorfilters
+       that contain spaces and we can't handle them in CSS. -->
+  <script type="text/javascript">
+    dojo.addOnLoad(function(){
+      set_node_color(
+        '<xsl:value-of select="$frame_id"/>',
+        '<xsl:value-of select="proto[@name='frame']/field[@name='frame.coloring_rule.name']/@show"/>'
+      );
+    });
+  </script>
+</xsl:template>
+
+<xsl:template match="pdml">
+  Capture Filename: <b><xsl:value-of select="@capture_file"/></b>
+  PDML created: <b><xsl:value-of select="@time"/></b>
+  <tt>
+    <xsl:apply-templates/> <!-- we expect to match the "packet" nodes -->
+  </tt>
+</xsl:template>
+
+<!-- this block matches the start of the PDML file -->
+<xsl:template match="/">
+  <html>
+  <head>
+    <title>poor man's Wireshark</title>
+    <script src="https://ajax.googleapis.com/ajax/libs/dojo/1.4/dojo/dojo.xd.js" type="text/javascript"></script>
+    <script type="text/javascript">
+function set_node(node, str)
+{
+  if(dojo.isString(node))
+    node = dojo.byId(node);
+  if(!node) return;
+  node.style.display = str;
+}
+function toggle_node(node)
+{
+  if(dojo.isString(node))
+    node = dojo.byId(node);
+  if(!node) return;
+  set_node(node, (node.style.display != 'none') ? 'none' : 'block');
+}
+function hide_node(node)
+{
+  set_node(node, 'none');
+}
+// this function was generated by colorfilters2js.pl
+function set_node_color(node,colorname)
+{
+  if(dojo.isString(node))
+    node = dojo.byId(node);
+  if(!node) return;
+  var fg;
+  var bg;
+  if(colorname == 'Bad TCP') {
+    bg='#000000';
+    fg='#ff5f5f';
+  }
+  if(colorname == 'HSRP State Change') {
+    bg='#000000';
+    fg='#fff600';
+  }
+  if(colorname == 'Spanning Tree Topology  Change') {
+    bg='#000000';
+    fg='#fff600';
+  }
+  if(colorname == 'OSPF State Change') {
+    bg='#000000';
+    fg='#fff600';
+  }
+  if(colorname == 'ICMP errors') {
+    bg='#000000';
+    fg='#00ff0e';
+  }
+  if(colorname == 'ARP') {
+    bg='#d6e8ff';
+    fg='#000000';
+  }
+  if(colorname == 'ICMP') {
+    bg='#c2c2ff';
+    fg='#000000';
+  }
+  if(colorname == 'TCP RST') {
+    bg='#900000';
+    fg='#fff680';
+  }
+  if(colorname == 'TTL low or unexpected') {
+    bg='#900000';
+    fg='#ffffff';
+  }
+  if(colorname == 'Checksum Errors') {
+    bg='#000000';
+    fg='#ff5f5f';
+  }
+  if(colorname == 'SMB') {
+    bg='#fffa99';
+    fg='#000000';
+  }
+  if(colorname == 'HTTP') {
+    bg='#8dff7f';
+    fg='#000000';
+  }
+  if(colorname == 'IPX') {
+    bg='#ffe3e5';
+    fg='#000000';
+  }
+  if(colorname == 'DCERPC') {
+    bg='#c797ff';
+    fg='#000000';
+  }
+  if(colorname == 'Routing') {
+    bg='#fff3d6';
+    fg='#000000';
+  }
+  if(colorname == 'TCP SYN/FIN') {
+    bg='#a0a0a0';
+    fg='#000000';
+  }
+  if(colorname == 'TCP') {
+    bg='#e7e6ff';
+    fg='#000000';
+  }
+  if(colorname == 'UDP') {
+    bg='#70e0ff';
+    fg='#000000';
+  }
+  if(colorname == 'Broadcast') {
+    bg='#ffffff';
+    fg='#808080';
+  }
+  if(fg.length > 0)
+    node.style.color = fg;
+  if(bg.length > 0)
+    node.style.background = bg;
+}
+    </script>
+  </head>
+    <body>
+      <xsl:apply-templates/> <!-- we expect to match the "pdml" node -->
+    </body>
+  </html>
+</xsl:template>
+
+</xsl:stylesheet>

debbuild/22.04/usr/local/omc/etc/schema/pm-schema.xsd

@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	elementFormDefault="qualified" attributeFormDefault="unqualified">
+	<xs:element name="PmFile">
+		<xs:complexType>
+			<xs:sequence>
+				<xs:element name="FileHeader">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="TimeStamp" type="xs:dateTime" />
+							<xs:element name="TimeZone" type="xs:string" />
+							<xs:element name="Period" type="xs:integer" />
+							<xs:element name="VendorName" type="xs:string" />
+							<xs:element name="ElementType" type="xs:string" />
+							<xs:element name="PmVersion" type="xs:string" />
+							<xs:element name="StartTime" type="xs:dateTime" />
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+				<xs:element name="Measurements" minOccurs="0" maxOccurs="unbounded">
+					<xs:complexType>
+						<xs:sequence>
+							<xs:element name="ObjectType" type="xs:string" />
+							<xs:element name="PmName">
+								<xs:complexType>
+									<xs:sequence minOccurs="0" maxOccurs="unbounded">
+										<xs:element name="N">
+											<xs:complexType>
+												<xs:simpleContent>
+													<xs:extension base="xs:string">
+														<xs:attribute name="i" type="xs:integer" use="required" />
+													</xs:extension>
+												</xs:simpleContent>
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+							<xs:element name="PmData">
+								<xs:complexType>
+									<xs:sequence minOccurs="0" maxOccurs="unbounded">
+										<xs:element name="Object">
+											<xs:complexType>
+												<xs:choice minOccurs="0" maxOccurs="unbounded">
+													<xs:element name="V">
+														<xs:complexType>
+															<xs:simpleContent>
+																<xs:extension base="xs:string">
+																	<xs:attribute name="i" type="xs:integer" use="required" />
+																</xs:extension>
+															</xs:simpleContent>
+														</xs:complexType>
+													</xs:element>
+													<xs:element name="CV">
+														<xs:complexType>
+															<xs:sequence minOccurs="0" maxOccurs="unbounded">
+																<xs:element name="SN" type="xs:string" />
+																<xs:element name="SV" type="xs:string" />
+															</xs:sequence>
+															<xs:attribute name="i" type="xs:integer"
+																use="required" />
+														</xs:complexType>
+													</xs:element>
+												</xs:choice>
+												<xs:attribute name="rmUID" type="xs:string" use="required" />
+												<xs:attribute name="Dn" type="xs:string" use="required" />
+												<xs:attribute name="UserLabel" type="xs:string" use="required" />
+											</xs:complexType>
+										</xs:element>
+									</xs:sequence>
+								</xs:complexType>
+							</xs:element>
+						</xs:sequence>
+					</xs:complexType>
+				</xs:element>
+			</xs:sequence>
+		</xs:complexType>
+	</xs:element>
+</xs:schema>

debbuild/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2410.1-YYYYMMDD
+Version: 2.2508.1-YYYYMMDD-mt
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/DEBIAN/postinst

@@ -1,39 +1,26 @@
-# !/bin/bash
+#!/bin/bash
 
 OMCRootDir=/usr/local/omc
 SystemdRootDir=/lib/systemd/system
 OMCEtcDir=${OMCRootDir}/etc
 FERootDir=${OMCRootDir}/htdocs/front
-X86Lib64Dir=/lib/x86_64-linux-gnu
 OMCBinDir=${OMCRootDir}/bin
 OMCStaticDir=${OMCRootDir}/static
 UsrLocalBinDir=/usr/local/bin
 OMCDaemon=omcd
 NginxEtcDir=/etc/nginx
 NginxConfDir=${NginxEtcDir}/conf.d
-CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf"
+CFileList="restconf.yaml sshsvc.yaml omc.conf"
 LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"
 
 echo ""
 echo "* To start/stop/restart/status omc service, please run:"
 echo "    sudo systemctl start/stop/restart/status restagent.service"
-echo "    sudo systemctl start/stop/restart/status crontask.service"
 echo "    sudo systemctl start/stop/restart/status sshsvc.service"
-echo "    sudo systemctl start/stop/restart/status captrace.service"
 echo "    or run: "
 echo "    sudo /usr/local/omc/bin/omcsvc.sh start/stop/restart/status"
 echo ""
 
-cd ${X86Lib64Dir}
-chmod +rx libwireshark.so.15.0.12
-if [ ! -e libwireshark.so.15 ]; then  ln -s libwireshark.so.15.0.12 libwireshark.so.15; fi
-if [ ! -e libwireshark.so ]; then  ln -s libwireshark.so.15.0.12 libwireshark.so; fi
-chmod +rx libwiretap.so.12.0.12
-if [ ! -e libwiretap.so.12 ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so.12; fi
-if [ ! -e libwiretap.so ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so; fi
-chmod +rx libwsutil.so.13.1.0
-if [ ! -e libwsutil.so.13 ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi
-if [ ! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
 cd ${UsrLocalBinDir}
 if [ ! -e ${OMCDaemon} ]; then  ln -s ${OMCBinDir}/omcsvc.sh ${OMCDaemon}; fi
 
@@ -48,21 +35,21 @@ for CFile in ${CFileList}; do
     else 
         # mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak
         # cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
-        if [ -e "${OMCBinDir}/upgconf.sh" ]; then
+        if [ -e "${OMCBinDir}/upgconf.sh" ] && [ "${CFile}" = "restconf.yaml" ]; then
             ${OMCBinDir}/upgconf.sh
         fi
-    fi                  
+    fi
 done
 
 if [ ! -e "${FERootDir}/config.js" ]; then    
     cp ${FERootDir}/default/config.js ${FERootDir}; 
 fi
 
-for LogoFile in ${LogoFileList}; do
-    if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
-        cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
-    fi                 
-done
+# for LogoFile in ${LogoFileList}; do
+#     if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
+#         cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+#     fi                 
+# done
 
 if ! id -u omc >/dev/null 2>&1 ; then     
     useradd -d /opt/omc -m -s /bin/bash -pomc123 omc; 
@@ -76,13 +63,13 @@ if [ ! -e "${NginxConfDir}/omc.conf" ]; then
     cp -f ${OMCEtcDir}/nginx/omc.conf ${NginxConfDir}; 
 fi
 
+systemctl daemon-reload
+
 # disable auto upgrade
 systemctl disable --now unattended-upgrades
 
 systemctl enable restagent.service
-systemctl enable crontask.service
 systemctl enable sshsvc.service
-systemctl enable captrace.service
 
 systemctl daemon-reload
 
@@ -103,8 +90,6 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
 fi
 
 echo -n "Starting OMC service ... "
-systemctl start crontask.service
 systemctl start sshsvc.service
-systemctl start captrace.service
 systemctl start restagent.service
 echo "done"

debbuild/DEBIAN/postrm

@@ -1,13 +1,5 @@
 # !/bin/bash
 
-X86Lib64Dir=/lib/x86_64-linux-gnu
-rm -rf ${X86Lib64Dir}/libwireshark.so.15
-rm -rf ${X86Lib64Dir}/libwireshark.so
-rm -rf ${X86Lib64Dir}/libwiretap.so.12
-rm -rf ${X86Lib64Dir}/libwiretap.so
-rm -rf ${X86Lib64Dir}/libwsutil.so.13
-rm -rf ${X86Lib64Dir}/libwsutil.so
-
 #rm -rf /usr/local/omc
 rm -rf /etc/nginx/conf.d/omc.conf
 rm -f /usr/local/bin/omcd
@@ -17,15 +9,11 @@ systemctl daemon-reload
 if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
     echo -n "Stopping OMC service ... "
     systemctl stop restagent.service
-    systemctl stop crontask.service
     systemctl stop sshsvc.service
-    systemctl stop captrace.service
     echo "done"
 fi
 
 systemctl disable restagent.service
-systemctl disable crontask.service
 systemctl disable sshsvc.service
-systemctl disable captrace.service
 
 systemctl daemon-reload

debbuild/DEBIAN/preinst

@@ -4,9 +4,7 @@ systemctl daemon-reload
 if systemctl list-units --type=service --all | grep -q 'restagent.service'; then
     echo -n "Stopping OMC service ... "
     systemctl stop restagent.service
-    systemctl stop crontask.service
     systemctl stop sshsvc.service
-    systemctl stop captrace.service
     echo "done"
 fi
 

debbuild/usr/local/omc/.ssh/id_rsa

@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-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
------END OPENSSH PRIVATE KEY-----

debbuild/usr/local/omc/.ssh/id_rsa.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCjzE0MHy0P2sQmG1OKvArwLEzR77BwxPp+4N9NKBz8lEyNch4zoHvoLDaUJKPBMwTrScZnxhvRJNde6hz5Z0QVxZolVKV95fMfgb9YICzDfPF3Bphae5q/PBYUJNfrC9SAjQeHV4CCO6xk6LV8O/Nfw8uaXwtuN3yfpUWd5mRWKMc3GHV4vxerfKoIQZN6etLhIEYibAhCJ21P0uoWzZl7ceLmkG+6qrRSbyC0bCnrN3+wjN4bwtflrEFJk3XQGuRbVsYLzux+mMm9p22+CLPRl/FUPF3x4/wKCsqr7JDSxx80HSPhk4g/1nCTpDR9hAfF6A9ww2va/k8jMeYPBO8Owe7erLEZzvg5WQAR3Wj05eJpJD99BeC91S5KW6AFQDfDHxWWprSibd/Jj9dtct2pK2ZxW0ph9OJ49ftRhzT1iVi4UnJwnG5/qLfwl6Tnx+qnQ1If/9lY/99erCTATzFTMSImKrRz7CnuPlcw8WkzCYpWKKe0kJLkL2cRD5Qi4yk= simon@simonzhangsz

debbuild/usr/local/omc/.ssh/private_key.pem

@@ -1,38 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-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
------END OPENSSH PRIVATE KEY-----

debbuild/usr/local/omc/etc/default/restconf.yaml

@@ -1,182 +0,0 @@
-# file: log file name
-# level: /trace/debug/info/warn/error/fatal, default: debug
-# duration: rotation time with xx hours, example: 1/12/24 hours
-# count: rotation count of log, default is 30 rotation
-logger:
-  file: /usr/local/omc/log/restagent.log 
-  level: warn
-  duration: 24
-  count: 90   
-
-# rest agent listen ipv4/v6 and port, support multiple routines
-# ip: 0.0.0.0 or ::0, support IPv4/v6
-# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, 
-#                 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
-rest:
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port: 33030
-  - ipv4: 0.0.0.0
-    ipv6: 
-    port: 33443
-    schema: https
-    clientAuthType: 0
-    caFile: /usr/local/omc/etc/certs/omc-ca.crt
-    certFile: /usr/local/omc/etc/certs/omc-server.crt
-    keyFile: /usr/local/omc/etc/certs/omc-server.key
-
-webServer:
-  enabled: true
-  rootDir: /usr/local/omc/htdocs/front
-  listen: 
-    - addr: :80
-      schema: http
-    - addr: :443
-      schema: https
-      clientAuthType: 0
-      caFile: /usr/local/omc/etc/certs/omc-ca.crt
-      certFile: /usr/local/omc/etc/certs/omc-server.crt
-      keyFile: /usr/local/omc/etc/certs/omc-server.key
-
-database:
-  type: mysql
-  user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
-  port: 33066
-  name: tenants_db
-  backup: /usr/local/omc/database
-
-# Redis data cache
-redis:
-  dataSource:
-    # OMC system db
-    default:
-      port: 6379 # Redis port
-      host: "127.0.0.1" # Redis host
-      password: "helloearth"
-      db: 10 # Redis db_num
-    # UDM sub/auth db
-    udmuser:
-      port: 6379 # Redis port
-      host: "127.0.0.1"
-      password: "helloearth"
-      db: 0 # Redis db_num
-  # used to specify the default data source for multiple data resourece
-  defaultDataSourceName: "default"
-
-# sleep: time delay for after write buffer (millisecond)
-# deadLine: timeout for io read and write (second)
-mml:
-  port: 4100
-  port2: 5002
-  sleep: 200
-  deadLine: 10
-  sizeRow: 600
-  sizeCol: 128
-  bufferSize: 65535
-  user: admin
-  password: admin
-  mmlHome: ./mmlhome
-
-# NE config
-ne:
-  user: omcuser
-  etcdir: /usr/local/etc
-  bindir: /usr/local/bin
-  omcdir: /usr/local/omc
-  scpdir: /tmp
-  licensedir: /usr/local/etc/{neType}/license
-  # backup etc list of IMS, does not contain spaces
-  etcListIMS: '{*.yaml,mmtel,vars.cfg}'
-  etcListDefault: '{*.yaml,*.conf,*.cfg}'
-  # true/false to overwrite config file when dpkg ne software 
-  dpkgOverwrite: false
-  # dpkg timeout (second)
-  dpkgTimeout: 180
-
-# chk2ne: true/false, if put OmcNeConfig parameters to NE
-omc:
-  uriPrefix: "/omc/rest"
-  neType: OMC
-  neId: 001
-  rmUID: 4400HX101
-  neName: OMC
-  province: ""
-  vendor: ""
-  dn: ""
-  chk2ne: false
-  sn: "-"
-  checksign: false
-  rootDir: /usr/local/omc
-  binDir: /usr/local/omc/bin
-  backup: /usr/local/omc/backup
-  upload: /usr/local/omc/upload
-  frontUpload: /usr/local/omc/htdocs/front/upload
-  frontTraceDir: /usr/local/omc/htdocs/front/trace
-  software: /usr/local/omc/software
-  license: /usr/local/omc/license
-  gtpUri: gtp:192.168.2.119:32152 
-  checkContentType: false
-  testMode: false
-  rbacMode: true
-  runDir: /usr/local/omc/run
-  cmdTimeout: 120
-
-# Alarm module setting
-# Forward interface:
-# email/sms/smsc  
-alarm: 
-  forwardAlarm: true
-  email:
-    smtp: smtp.xxx.com
-    port: 25
-    user: smtpuser@xxx.com
-    password: xxxxxx
-    # TLS skip verify: true/false
-    tlsSkipVerify: true    
-  smProxy: smsc
-  sms:
-    apiURL: http://smsc.xxx.com
-    accessKeyID: xxx
-    accessKeySecret: xxx
-    signName: XXX SMSC
-    templateCode: 1000
-  smsc:
-    addr: "192.168.13.114:2775"
-    systemID: "alarmsmsfw"
-    password: "omc123"
-    systemType: ""
-  
-# User authorized information
-# crypt: mysql/md5/bcrypt
-# token: true/false to check accessToken
-# expires for session, unit: second
-# Support single/multiple session of user
-#
-auth:
-  crypt: bcrypt
-  token: true
-  expires: 1800
-  session: multiple
-  publicKey: /usr/local/omc/etc/certs/omc
-  privateKey: /usr/local/omc/etc/certs/omc
-
-# Parameter for limit number 
-# rmuid_maxnum: the max number of rmUID, default: 50
-# alarmid_maxnum: the max number of AlarmID, default: 50
-# pmid_maxnum: the max number of pmID, default: 50
-# subid_maxnum: the max number of subscription ID, default: 20
-# uri_maxlen: the max length of uri, default: 8192
-# rmuid_regexp: regexp pattern of rmUID
-params:
-  rmuidmaxnum: 50
-  alarmidmaxnum: 50
-  pmidmaxnum: 50
-  subidmaxnum: 20
-  urimaxlen: 2100000
-  rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
-
-testConfig:
-  enabled: false
-  file: /usr/local/omc/etc/testconfig.yaml

docs/reference/omc-tips.sql

@@ -0,0 +1,182 @@
+select count(*) from kpi_report_upf
+
+
+CREATE VIEW kpi_report_all AS
+SELECT * FROM kpi_report_udm
+UNION ALL
+SELECT * FROM kpi_report_amf
+UNION ALL
+SELECT * FROM kpi_report_upf;
+
+
+select DISTINCT(ne_type) from kpi_title 
+
+SELECT DISTINCT LOWER(ne_type) FROM kpi_title
+
+SELECT JSON_EXTRACT(kpi_values, CONCAT('$[', @path, '].', @key_to_search)) AS value FROM kpi_report_upf where `date`="2024-04-26";
+
+
+SELECT JSON_EXTRACT(JSON_CONTAINS(kpi_values, '{"kpi_id": "UPF.01"}') FROM kpi_report_upf where `date`="2024-04-26";
+
+
+SELECT
+JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.01')), '].value')) AS value_UPF01,
+JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.03')), '].value')) AS value_UPF03
+FROM
+kpi_report_upf
+WHERE
+JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.01') IS NOT NULL
+AND JSON_SEARCH(kpi_values, 'kpi_id', 'UPF.03') IS NOT NULL;
+
+
+SELECT
+JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'all', 'UPF.01')), '].value')) AS value_UPF01
+FROM
+kpi_report_upf
+WHERE
+JSON_CONTAINS(kpi_values, '{"kpi_id": "UPF.01"}');
+
+
+SELECT
+COALESCE(JSON_EXTRACT(kpi_values, CONCAT('$[', JSON_UNQUOTE(JSON_SEARCH(kpi_values, 'all', 'UPF.01')), '].value')), 0) AS value_UPF01
+FROM
+kpi_report_upf
+WHERE
+JSON_CONTAINS(kpi_values, '{"kpi_id": "UPF.01"}');
+
+SELECT
+	CONCAT(
+		DATE_FORMAT( gk.start_time, '%H:' ),
+		LPAD( FLOOR( MINUTE ( gk.start_time ) / 15 ) * 15, 2, '0' ) 
+	) AS timeGroup,
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	sum( CASE WHEN JSON_CONTAINS(kpi_values,JSON_OBJECT('kpi_id', "UPF.01")) THEN gk.kpi_values->'$[*].value ELSE 0 END ) AS 'UPF.01',
+	sum( CASE WHEN JSON_CONTAINS(kpi_values,JSON_OBJECT('kpi_id', "UPF.02")) THEN gk.kpi_values->'$[*].value ELSE 0 END ) AS 'UPF.02',
+	sum( CASE WHEN gk.kpi_id = 'UPF.03' THEN gk.VALUE ELSE 0 END ) AS 'UPF.03',
+	sum( CASE WHEN gk.kpi_id = 'UPF.04' THEN gk.VALUE ELSE 0 END ) AS 'UPF.04',
+	sum( CASE WHEN gk.kpi_id = 'UPF.05' THEN gk.VALUE ELSE 0 END ) AS 'UPF.05',
+	sum( CASE WHEN gk.kpi_id = 'UPF.06' THEN gk.VALUE ELSE 0 END ) AS 'UPF.06',
+	sum( CASE WHEN gk.kpi_id = 'UPF.07' THEN gk.VALUE ELSE 0 END ) AS 'UPF.07',
+	sum( CASE WHEN gk.kpi_id = 'UPF.08' THEN gk.VALUE ELSE 0 END ) AS 'UPF.08',
+	sum( CASE WHEN gk.kpi_id = 'UPF.09' THEN gk.VALUE ELSE 0 END ) AS 'UPF.09',
+	sum( CASE WHEN gk.kpi_id = 'UPF.10' THEN gk.VALUE ELSE 0 END ) AS 'UPF.10',
+	sum( CASE WHEN gk.kpi_id = 'UPF.14' THEN gk.VALUE ELSE 0 END ) AS 'UPF.14',
+	sum( CASE WHEN gk.kpi_id = 'UPF.11' THEN gk.VALUE ELSE 0 END ) AS 'UPF.11',
+	sum( CASE WHEN gk.kpi_id = 'UPF.12' THEN gk.VALUE ELSE 0 END ) AS 'UPF.12',
+	sum( CASE WHEN gk.kpi_id = 'UPF.13' THEN gk.VALUE ELSE 0 END ) AS 'UPF.13',
+	sum( CASE WHEN gk.kpi_id = 'UPF.15' THEN gk.VALUE ELSE 0 END ) AS 'UPF.15' 
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-04-26"
+	AND gk.start_time >= '00:00:00' 
+	AND gk.start_time <= '23:59:59' 
+GROUP BY
+	timeGroup 
+ORDER BY
+	timeGroup DESC
+
+
+
+SELECT
+	CONCAT(
+		DATE_FORMAT( gk.start_time, '%H:' ),
+		LPAD( FLOOR( MINUTE ( gk.start_time ) / 15 ) * 15, 2, '0' ) 
+	) AS timeGroup,
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[0].kpi_id') = "UPF.01" THEN JSON_EXTRACT(gk.kpi_values, '$[0].value') ELSE 0 END) AS 'UPF.01',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[1].kpi_id') = "UPF.02" THEN JSON_EXTRACT(gk.kpi_values, '$[1].value') ELSE 0 END) AS 'UPF.02',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[2].kpi_id') = "UPF.03" THEN JSON_EXTRACT(gk.kpi_values, '$[2].value') ELSE 0 END) AS 'UPF.03'
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-05-08"
+	AND gk.start_time >= '10:55:00' 
+	AND gk.start_time <= '23:59:59' 
+GROUP BY
+	timeGroup 
+ORDER BY
+	timeGroup DESC
+
+
+SELECT
+	CONCAT(
+		DATE_FORMAT( gk.start_time, '%H:' ),
+		LPAD( FLOOR( MINUTE ( gk.start_time ) / 15 ) * 15, 2, '0' ) 
+	) AS timeGroup,
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	SUM(JSON_EXTRACT(gk.kpi_values, '$[0].`UPF.01`')) AS 'UPF.01',
+	SUM(JSON_EXTRACT(gk.kpi_values, '$[1].`UPF.02`')) AS 'UPF.02',
+	SUM(JSON_EXTRACT(gk.kpi_values, '$[2].`UPF.03`')) AS 'UPF.03'
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-05-08"
+	AND gk.start_time >= '10:53:00' 
+	AND gk.start_time <= '10:59:59' 
+GROUP BY
+	timeGroup 
+ORDER BY
+	timeGroup DESC
+	
+
+SELECT
+	min( CASE WHEN gk.INDEX != '' THEN gk.INDEX ELSE 0 END ) AS startIndex,
+	min( CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END ) AS neName,
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[*].kpi_id') = 'UPF.01' THEN JSON_EXTRACT(gk.kpi_values, '$[*].value') ELSE 0 END) AS 'UPF.01',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[*].kpi_id') = 'UPF.02' THEN JSON_EXTRACT(gk.kpi_values, '$[*].value') ELSE 0 END) AS 'UPF.02',
+	SUM(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[*].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(gk.kpi_values, '$[*].value') ELSE 0 END) AS 'UPF.03'
+FROM
+	kpi_report_upf gk 
+WHERE
+	gk.rm_uid = '4400HX1UPF001'
+	AND gk.date = "2024-05-03"
+	AND gk.start_time >= '00:00:00' 
+	AND gk.start_time <= '23:59:59' 
+
+
+SELECT 
+	CONCAT( DATE_FORMAT(CONCAT(gk.`date`, " ", gk.start_time), '%Y-%m-%d %H:'), LPAD(FLOOR(MINUTE(gk.start_time) / 15) * 15, 2, '0') ) AS timeGroup,
+	min(CASE WHEN gk.index != '' THEN gk.index ELSE 0 END) AS startIndex,
+	min(CASE WHEN gk.ne_type != '' THEN gk.ne_type ELSE 0 END) AS neType,
+	min(CASE WHEN gk.ne_name != '' THEN gk.ne_name ELSE 0 END) AS neName,
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[0].kpi_id') = 'UPF.01' THEN JSON_EXTRACT(gk.kpi_values, '$[0].value') ELSE 0 END) AS 'UPF.01',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[1].kpi_id') = 'UPF.02' THEN JSON_EXTRACT(gk.kpi_values, '$[1].value') ELSE 0 END) AS 'UPF.02',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[2].kpi_id') = 'UPF.03' THEN JSON_EXTRACT(gk.kpi_values, '$[2].value') ELSE 0 END) AS 'UPF.03',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[3].kpi_id') = 'UPF.04' THEN JSON_EXTRACT(gk.kpi_values, '$[3].value') ELSE 0 END) AS 'UPF.04',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[4].kpi_id') = 'UPF.05' THEN JSON_EXTRACT(gk.kpi_values, '$[4].value') ELSE 0 END) AS 'UPF.05',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[5].kpi_id') = 'UPF.06' THEN JSON_EXTRACT(gk.kpi_values, '$[5].value') ELSE 0 END) AS 'UPF.06',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[6].kpi_id') = 'UPF.07' THEN JSON_EXTRACT(gk.kpi_values, '$[6].value') ELSE 0 END) AS 'UPF.07',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[7].kpi_id') = 'UPF.08' THEN JSON_EXTRACT(gk.kpi_values, '$[7].value') ELSE 0 END) AS 'UPF.08',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[8].kpi_id') = 'UPF.09' THEN JSON_EXTRACT(gk.kpi_values, '$[8].value') ELSE 0 END) AS 'UPF.09',
+	sum(CASE WHEN JSON_EXTRACT(gk.kpi_values, '$[9].kpi_id') = 'UPF.10' THEN JSON_EXTRACT(gk.kpi_values, '$[9].value') ELSE 0 END) AS 'UPF.10' 
+FROM kpi_report_upf gk 
+where gk.rm_uid = '4400HX1UPF001' and gk.ne_type = 'UPF' and CONCAT(gk.`date`, " ", gk.start_time) >= '2024-05-08 10:00:00' and CONCAT(gk.`date`, " ", gk.start_time) <= '2024-05-08 23:59:59' 
+GROUP BY timeGroup order by timeGroup desc
+
+
+
+DELETE t1
+FROM ne_state t1
+JOIN (
+SELECT `timestamp`
+FROM ne_state where ne_type='upf'
+ORDER BY id DESC
+LIMIT 999999 OFFSET 3
+) t2 ON t1.`timestamp` = t2.`timestamp` and ne_type='upf';
+
+
+select count(1) from ne_state where ne_type='upf'
+
+
+CREATE TABLE IF NOT EXISTS kpi_report_test AS SELECT * FROM kpi_report WHERE 1=0;ALTER TABLE kpi_report_test MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`);
+
+ALTER TABLE kpi_report_ims MODIFY COLUMN `id` int(11) NOT NULL AUTO_INCREMENT FIRST,ADD PRIMARY KEY IF NOT EXISTS (`id`)
+
+SELECT * FROM kpi_report WHERE 1=0

docs/tips.txt

@@ -67,10 +67,10 @@ sed -i "s/FREETYPE2_CONFIG --libs/FREETYPE2_CONFIG freetype2 --cflags/g" ./confi
 
 
 # 导入参数配置文件
-D:\local.git\ems.agt\tools\loadpconf> go run .\loadpconf.go .\load.go .\db.go -p ..\..\config\param\udm_param_config.yaml
+D:\omc.git\ems.agt\tools\loadpconf> go run .\loadpconf.go .\load.go .\db.go -p ..\..\config\param\udm_param_config.yaml
 # 导入mml配置文件
 # 需配置load
-D:\local.git\ems.agt\tools\loadmconf> go run .\loadmconf.go .\load.go .\db.go -m ..\..\config\mml\system\mme_sys_mml_config.yaml
+D:\omc.git\ems.agt\tools\loadmconf> go run .\loadmconf.go .\load.go .\db.go -m ..\..\config\mml\system\mme_sys_mml_config.yaml
 
 # ssh信任关系绑定出错时，执行
 ssh-keygen -f "/root/.ssh/known_hosts" -R "20.15.0.190"

makepkg.sh

@@ -1,93 +0,0 @@
-#!/bin/bash
-
-usage() {
-    echo "Usage: $0 deb|rpm [option]..."
-    echo 
-    echo "Make omc package, option as follow:"
-    echo "  deb|rpm,                    deb: ubuntu|debian package build by dpkg"
-    echo "                              rpm: centos/redhat package, build by rpmbuild"
-    echo "  -r, =build root directory   build root directory, default directory is $HOME/local.git"
-    echo "  -d                          dump SQL from database"
-    echo "  -m, =be|fe|all              be: only process back-end code, default if non input"
-    echo "                              fe: only process front-end code"
-    echo "                              all: process all include be and fe" 
-}
-
-pkgtype=""
-new_args=()
-be_args=()
-# Traverse all parameters
-for arg in "$@"; do
-    if [[ "$arg" == "deb" || "$arg" == "rpm" ]]; then
-        pkgtype=$arg
-        be_args+=("$arg")
-    else
-        new_args+=("$arg") # Add non pkgtype parameters to a new parameter list
-    fi  
-done
-
-if [ -z "$pkgtype" ]; then
-    usage
-    exit 1    
-fi
-
-# Use a new parameter list
-set -- "${new_args[@]}"
-
-rootdir=${HOME}/local.git
-m_arg="*"
-while getopts "m:r:d" option; do
-    case $option in
-        m)
-            m_arg=$(echo $OPTARG | tr '[:upper:]' '[:lower:]')
-        ;;
-        r)
-            rootdir=$OPTARG
-            be_args+=("-r ${rootdir}")
-        ;;
-        d)
-            be_args+=("-d")
-        ;;
-        \?)
-            echo "Invalid option: -$OPTARG" >&2
-            usage
-            exit 2
-        ;;
-    esac
-done
-
-if [ ! -d ${rootdir} ]; then
-    echo "Not exist directory: ${rootdir}"
-    exit 3
-fi
-
-bedir=${rootdir}/be.ems
-fedir=${rootdir}/fe.ems.vue3
-builddir=${rootdir}/build.ems
-
-makefe() {
-    cd ${fedir}
-    git pull
-    npm install --registry https://registry.npmmirror.com
-    npm run build
-}
-
-makebe() {
-    cd ${builddir}
-    #chmod +x mkpkg.sh 
-    chmod +x build.sh
-    ./build.sh ${be_args[@]}
-}
-
-case "${m_arg}" in
-    fe)
-        makefe 
-    ;;
-    all)
-        makefe 
-        makebe 
-    ;;
-    be | *)
-        makebe 
-    ;;
-esac

pkg.sh

@@ -0,0 +1,101 @@
+#!/bin/bash
+
+# front-end Catalog
+WebDir=/root/omc.git/fe.ems.vue3
+WebBranch=multi-tenant
+BuildWeb=""
+# back-end Catalog
+ApiDir=/root/omc.git/be.ems
+ApiBranch=multi-tenant
+BuildApi=""
+# Package Catalog
+BuildDir=/root/omc.git/build.ems
+BuildBranch=multi-tenant
+# Default Version Value
+VERSION="2.2508.1"
+
+# usage
+usage() {
+  echo "Usage: bash $0 [OPTION]"
+  echo
+  echo "Build Software Package OPTION:"
+  echo "  -v                 Specify the version"
+  echo "  --web              Build Web ($WebDir) Branch ($WebBranch)"
+  echo "  --api              Build Api ($ApiDir) Branch ($ApiBranch)"
+  echo "  -h                 Display this help message"
+  echo
+  exit 1
+}
+# Read command line arguments
+while [[ $# -gt 0 ]]; do
+  case "$1" in
+    -v) VERSION="$2"; shift 2 ;;
+    --web) BuildWeb="build"; shift ;;
+    --api) BuildApi="build"; shift ;;
+    *) usage ;;
+  esac
+done
+
+# =================== build branch
+echo
+cd $BuildDir
+rm -rf debbuild/*
+git checkout .
+git pull
+git checkout $BuildBranch
+git pull
+echo "===> build checkout directory: $BuildDir"
+
+# =================== Web
+echo
+# Determine if --web is passed in
+if [ -n "$BuildWeb" ]; then
+  cd $WebDir
+  git checkout .
+  git pull
+  git checkout $WebBranch
+  git pull
+
+  sed -i "s/VITE_APP_VERSION = .*/VITE_APP_VERSION = \"${VERSION}\"/g" $WebDir/.env.development
+  sed -i "s/VITE_APP_VERSION = .*/VITE_APP_VERSION = \"${VERSION}\"/g" $WebDir/.env.production
+
+  cp -rf $BuildDir/customized/ba.d/images/background_light.jpg $WebDir/public/background/light.jpg
+  cp -rf $BuildDir/customized/ba.d/images/background_dark.jpg $WebDir/public/background/dark.jpg
+  cp -rf $BuildDir/customized/ba.d/locales/zh-CN.ts $WebDir/src/i18n/locales/zh-CN.ts
+
+  npm install --registry https://registry.npmmirror.com
+  npm run build
+  echo "===> build web directory: $WebDir"
+fi
+
+# =================== Api
+echo
+# Determine if --api is passed in
+if [ -n "$BuildApi" ]; then
+  cd $ApiDir
+  git checkout .
+  git pull
+  git checkout $ApiBranch
+  git pull
+
+  ProcList="restagent sshsvc"
+  for procName in $ProcList;do
+      cd $ApiDir/$procName
+      sed -i "s/VERSION = .*/VERSION = ${VERSION}/g" $ApiDir/$procName/makefile
+      echo "Make $procName ..."
+      make
+  done 
+  echo "===> build api directory: $ApiDir"
+fi
+
+# =================== ba deb
+echo
+cd $BuildDir
+sed -i "s/VERSION=.*/VERSION=${VERSION}/g" $BuildDir/bin/build.sh
+sed -i "s/Version: .*/Version: ${VERSION}-YYYYMMDD-mt/g" $BuildDir/debbuild/DEBIAN/control
+sed -i "s/Version: .*/Version: ${VERSION}-YYYYMMDD-mt/g" $BuildDir/debbuild/22.04/DEBIAN/control
+sed -i "s/Version: .*/Version: ${VERSION}/g" $BuildDir/rpmbuild/SPECS/omc.spec
+bash bin/build.sh badeb
+
+# bash pkg.sh --web --api -v 2.2508.1
+# bash pkg.sh --web --api

rpmbuild/SPECS/omc.spec

@@ -8,7 +8,7 @@
 
 Name: %{project_lname} 
 Summary: 5GC OMC
-Version: 2.2410.1
+Version: 2.2508.1
 Release: %{release_date}
 Vendor: omc
 URL: https://www.omc.com/
@@ -33,20 +33,17 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
 OMCRootDir=/usr/local/omc
 OMCEtcDir=${OMCRootDir}/etc
 FERootDir=${OMCRootDir}/htdocs/front
-UsrLib64Dir=/usr/lib64
 OMCBinDir=${OMCRootDir}/bin
 OMCStaticDir=${OMCRootDir}/static
 UsrLocalBinDir=/usr/local/bin
 OMCDaemon=omcd
 NginxEtcDir=/etc/nginx
-CFileList="restconf.yaml crontask.yaml tasks.yaml sshsvc.yaml capconf.yaml omc.conf"
+CFileList="restconf.yaml sshsvc.yaml omc.conf"
 LogoFileList="zh_brand.png zh_icon.png en_brand.png en_icon.png"
 
 echo -n "Stopping OMC service ... "
 systemctl stop restagent.service
-systemctl stop crontask.service
 systemctl stop sshsvc.service
-systemctl stop captrace.service
 echo "done"
 
 for CFile in ${CFileList}; do
@@ -55,28 +52,23 @@ for CFile in ${CFileList}; do
     else 
         # mv -f ${OMCEtcDir}/${CFile} ${OMCEtcDir}/${CFile}.bak
         # cp -f ${OMCEtcDir}/default/${CFile} ${OMCEtcDir}
-        if [ -e "${OMCBinDir}/upgconf.sh" ]; then
+        if [ -e "${OMCBinDir}/upgconf.sh" ] && [ "${CFile}" = "restconf.yaml" ]; then
             ${OMCBinDir}/upgconf.sh
         fi
     fi                                
 done
   
 if [ ! -e "${FERootDir}/config.js" ]; then    cp ${FERootDir}/default/config.js ${FERootDir}; fi    
-for LogoFile in ${LogoFileList}; do
-    if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
-        cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
-    fi
-done   
+
+#for LogoFile in ${LogoFileList}; do
+#    if [ ! -e "${OMCStaticDir}/logo/${LogoFile}" ]; then
+#        cp ${OMCStaticDir}/omc.d/logo/${LogoFile} ${OMCStaticDir}/logo;
+#    fi
+#done   
+
 if ! id -u omc >/dev/null 2>&1 ; then     useradd -d /opt/omc -m -s /bin/bash -p1000ftp@kp omc; else echo "user omc exist"; fi
 mkdir -p /opt/omc/ftp
 mkdir -p /opt/omc/ftp/log
-cd ${UsrLib64Dir}
-if [ ! -e libwireshark.so.15 ]; then  ln -s libwireshark.so.15.0.12 libwireshark.so.15; fi
-if [ ! -e libwireshark.so ]; then  ln -s libwireshark.so.15.0.12 libwireshark.so; fi
-if [ ! -e libwiretap.so.12 ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so.12; fi
-if [ ! -e libwiretap.so ]; then  ln -s libwiretap.so.12.0.12 libwiretap.so; fi
-if [ ! -e libwsutil.so.13 ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so.13; fi
-if [ ! -e libwsutil.so ]; then  ln -s libwsutil.so.13.1.0 libwsutil.so; fi
 cd ${UsrLocalBinDir}
 if [ ! -e ${OMCDaemon} ]; then  ln -s ${OMCBinDir}/omcsvc.sh ${OMCDaemon}; fi
 
@@ -89,9 +81,7 @@ firewall-cmd --reload
 
 systemctl daemon-reload
 systemctl enable restagent.service
-systemctl enable crontask.service
 systemctl enable sshsvc.service
-systemctl enable captrace.service
 
 # read environment parameter and to do 
 if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
@@ -110,23 +100,13 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
 fi
 
 echo -n "Starting OMC service ... "
-systemctl start captrace.service
 systemctl start sshsvc.service
-systemctl start crontask.service
 systemctl start restagent.service
 echo "done"
 
 # 卸载时执行
 %postun
 UsrLocalBinDir=/usr/local/bin
-UsrLib64Dir=/usr/lib64
-cd ${UsrLib64Dir}
-rm libwireshark.so.15
-rm libwireshark.so
-rm libwiretap.so.12
-rm libwiretap.so
-rm libwsutil.so.13
-rm libwsutil.so
 rm -f ${UsrLocalBinDir}/omcd
 
 # setting firewall
@@ -138,25 +118,17 @@ firewall-cmd --reload
 
 if [ "$1" = "0" ] ; then
     sudo systemctl stop restagent.service
-    sudo systemctl stop crontask.service
     sudo systemctl stop sshsvc.service
-    sudo systemctl stop captrace.service
     #rm -rf /usr/local/omc
     rm -rf /etc/nginx/conf.d/omc.conf
     sudo systemctl disable restagent.service
-    sudo systemctl disable crontask.service
     sudo systemctl disable sshsvc.service
-    sudo systemctl disable captrace.service
     sudo systemctl daemon-reload
 else
     sudo systemctl daemon-reload
     sudo systemctl stop restagent.service
-    sudo systemctl stop crontask.service
     sudo systemctl stop sshsvc.service
-    sudo systemctl stop captrace.service
-    sudo systemctl start crontask.service
     sudo systemctl start sshsvc.service
-    sudo systemctl start captrace.service
     sudo systemctl start restagent.service
 fi
 
@@ -179,11 +151,5 @@ fi
 /usr/local/omc/static
 #/etc/nginx/conf.d/omc.conf
 /lib/systemd/system/restagent.service
-/lib/systemd/system/crontask.service
 /lib/systemd/system/sshsvc.service
-/lib/systemd/system/captrace.service
-/usr/lib64/libwireshark.so.15.0.12
-/usr/lib64/libwiretap.so.12.0.12
-/usr/lib64/libwsutil.so.13.1.0
-/usr/local/bin/tshark