chore: 更新版本号 2.2503.6

.gitignore

@@ -12,9 +12,20 @@
 # Run temp file and dir
 docs/temp/
 
-
 # Built Visual Studio Code Extensions
 *.vsix
 *.bak
+# build files
+build
+debbuild/etc
+debbuild/usr
+debbuild/lib
+debbuild/22.04/etc
+debbuild/22.04/usr
+debbuild/22.04/lib
+release
+rpmbuild/RPMS
+rpmbuild/SOURCES
+rpmbuild/BUILD
 
 

build.sh

@@ -1,10 +1,11 @@
 #!/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/omc.git"
     echo "  -d                          dump SQL from database"
@@ -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
@@ -55,7 +56,7 @@ fi
 ProjectL=omc
 ProjectU=OMC
 PROJECT=${ProjectL}
-VERSION=2.2410.2
+VERSION=2.2503.6
 RelDate=`date +%Y%m%d`
 RelVer=${VERSION}-${RelDate}
 Ky10Arch=ky10.aarch64
@@ -65,23 +66,27 @@ DebPkgName=${ProjectL}-r${RelVer}-ub*.deb
 EmsBEDir=${GitLocalRoot}/be.ems
 EmsBuildRoot=${GitLocalRoot}/build.ems
 RpmArch=`arch`
-RpmsDir=${EmsBuildRoot}/rpmbuild/RPMS/
+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
-DebFEBuildDir=${EmsBuildRoot}/debbuild/usr/local/omc/htdocs
+DebBuildOMCDir=${EmsBuildRoot}/debbuild/usr/local/omc
+DebFEBuildDir=${DebBuildOMCDir}/htdocs
 DebBuild2204Dir=${EmsBuildRoot}/debbuild/22.04
-DebFEBuild2204Dir=${EmsBuildRoot}/debbuild/22.04/usr/local/omc/htdocs
+DebBuild2204OMCDir=${EmsBuildRoot}/debbuild/22.04/usr/local/omc
+DebFEBuild2204Dir=${DebBuild2204OMCDir}/htdocs
 RpmBuildDir=${EmsBuildRoot}/rpmbuild
-RpmFEBuildDir=${RpmBuildDir}/BUILD/usr/local/omc/htdocs
+RpmBuildOMCDir=${RpmBuildDir}/BUILD/usr/local/omc
+RpmFEBuildDir=${RpmBuildOMCDir}/htdocs
 OmcInstallDir=/usr/local/omc
 ConfigEtcDir=${EmsBEDir}/config/etc
 ConfigSystemdDir=${EmsBEDir}/config/systemd
@@ -89,36 +94,92 @@ 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
+# Get the output of uname -a
+UnameOutput=$(uname -a)
+
+# Extract hardware architecture
+if [[ $UnameOutput =~ "x86_64" ]]; then
     RelArch=amd64
-elif [[ ${RpmArch} =~ "aarch64" ]];then
+    RpmArch=x86_64
+elif [[ $UnameOutput =~ "aarch64" ]]; then
     RelArch=arm64
+    RpmArch=aarch64
+else
+    echo "Unsupported hardware architecture"
+    exit 1
 fi
-ReleasePkgDir=${ReleaseDir}/"${pkgtype}"s/${RelArch}
+
+get_os_info() {
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        echo $ID
+    else
+        echo "unknown"
+    fi
+}
+
+get_os_version() {
+    if [ -f /etc/os-release ]; then
+        . /etc/os-release
+        echo $VERSION_ID
+    else
+        echo "unknown"
+    fi
+}
+
+OSVersion=$(get_os_version)
+case $(get_os_info) in
+    ubuntu|debian)
+        ptype=deb
+        if [[ "$OSVersion" == "22.04" ]]; then
+            RelOS=ub22
+            DebBuildDir=${DebBuild2204Dir}
+            DebBuildOMCDir=${DebBuild2204OMCDir}
+            DebFEBuildDir=${DebFEBuild2204Dir}         
+        elif [[ "$OSVersion" == "18.04" ]]; then
+            RelOS=ub18         
+        else
+            echo "Unsupported Ubuntu version: $OSVersion"
+            exit 1
+        fi
+    ;;
+    centos|rhel)
+        ptype=rpm
+        RelOS=ct8
+        RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
+    ;;
+    openEuler)
+        ptype=rpm
+        RelOS=oe20
+        RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.${ptype}
+        RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
+    ;;
+    kylin|anolis)
+        ptype=rpm
+        RelOS=ky
+        RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.${ptype}
+        RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
+    ;;
+    *)
+        echo "Unsupported OS"
+        exit 1
+    ;;
+esac
 
 case "${pkgtype}" in
     rpm)
-        ProcList="restagent crontask sshsvc captrace data2html"
+        echo "Begin to make ${pkgtype} package ======>"
+        ReleasePkgDir=${ReleaseDir}/rpms/${RelArch}
+        ProcList="restagent sshsvc"
         cd $EmsBEDir
         for procName in $ProcList;do
             cd $EmsBEDir/$procName
@@ -134,24 +195,15 @@ 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 ${MiscDir}/* ${BuildOMCBinDir}
         #	rm -rf ${BinDir2}/ne-hosts
         cp -rf ${ConfigEtcDir}/* ${BuildOMCEtcDir}
         rm -rf ${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}
@@ -163,10 +215,9 @@ case "${pkgtype}" in
         mkdir -p ${FrontBuildDir}/front
         cp -rf ${EmsFEVue3Dir}/* ${FrontBuildDir}/front >/dev/null
         chmod 755 ${BuildOMCBinDir}/*
-        #	chmod 755 ${BinDir2}/*
         cp -rf ${BuildDir}/* ${RpmBuildDir}/BUILD/
-        #cp -rf ${BuildDir}/nginx ${RpmBuildDir}/BUILD/etc/
-        #cp -rf ${BuildDir}/systemd ${RpmBuildDir}/BUILD/lib/
+        cp -rf ${CustomizedDir}/agt.d ${RpmBuildOMCDir}/static
+	    cp -rf ${CustomizedDir}/omc.d ${RpmBuildOMCDir}/static
         cd ${RpmBuildDir}
         rpmbuild -bb -D "_topdir ${RpmBuildDir}" ${RpmBuildDir}/SPECS/omc.spec        
     
@@ -175,9 +226,12 @@ case "${pkgtype}" in
         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"
+        echo "Begin to make ${pkgtype} package ======>"
+        ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
+        ProcList="restagent sshsvc"
         cd $EmsBEDir
         for procName in $ProcList;do
             cd $EmsBEDir/$procName
@@ -185,24 +239,10 @@ case "${pkgtype}" in
             make
         done
         
-        VersionID=`grep VERSION_ID /etc/os-release`
-        if [[ ${VersionID} =~ 'VERSION_ID="22.04"' ]]; then
-            DebBuildDir=${DebBuild2204Dir}
-            DebFEBuildDir=${DebFEBuild2204Dir}
-            #DebPkgFile=${PROJECT}-${VERSION}-22.04-${Release).${PLATFORM).deb
-            DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22.deb
-            if [ ! $ProjectTag = "" ]; then
-                DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub22-${ProjectTag}.deb
-            fi
-        elif [[ ${VersionID} =~ 'VERSION_ID="18.04"' ]]; then
-            DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18.deb
-            if [ ! $ProjectTag = "" ]; then
-                DebPkgFile=${PROJECT}-r${VERSION}-${RelDate}-ub18-${ProjectTag}.deb
-            fi            
-        else 
-            echo "Invalid OS release: ${VersionID}"
-            exit 1
-        fi
+        DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
+        if [ ! $ProjectTag = "" ]; then
+            DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-${ProjectTag}.${ptype}
+        fi  
 
         cd ${EmsBEDir}
 
@@ -211,19 +251,17 @@ 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/*
         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 +275,82 @@ 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 ${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
+        sed -i "s/Architecture: amd64/Architecture: ${RelArch}/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
         dpkg -b ${DebBuildDir} ${ReleasePkgDir}/${DebPkgFile}
 
         cd ${ReleasePkgDir}
         rm -f omc-md5sum.txt
 #        rpm --addsign *.rpm
-        md5sum ${DebPkgName} >omc-md5sum.txt        
+        md5sum ${DebPkgName} >omc-md5sum.txt
+        echo "Finish to make ${pkgtype} package <======="        
     ;;
+    badeb)
+        echo "Begin to make ${pkgtype} package ======>"
+        ReleasePkgDir=${ReleaseDir}/debs/${RelArch}
+        ProcList="restagent sshsvc"
+        cd $EmsBEDir
+        for procName in $ProcList;do
+            cd $EmsBEDir/$procName
+            echo "Make $procName ..."
+            make
+        done
+        
+        DebPkgFile=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}-ba.deb
+
+        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/*
+        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
+        sed -i "s/Architecture: amd64/Architecture: ${RelArch}/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
+        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

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

@@ -4,19 +4,39 @@
 # count: rotation count of log, default is 30 rotation
 logger:
   file: /usr/local/omc/log/restagent.log 
-  level: debug
+  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: 3030
-  - ipv4: 
-    ipv6: ::0
-    port: 6060
+    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
@@ -24,72 +44,134 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
-  backup: /usr/loal/omc/database
+  name: omc_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
   sleep: 200
-  user: admin
-  password: admin
+  deadLine: 10
+  sizeRow: 600
+  sizeCol: 128
+  bufferSize: 65535
+  mmlHome: ./mmlhome
 
+# Tracking configuration
+trace:
+  enabled: true
+  host: "172.16.5.100" # Fill in the specific IP address
+  port: 33033
+
+# NE config
 ne:
-  user: root
+  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: /api/rest/oam
+  uriPrefix: "/omc/rest"
   neType: OMC
   neId: 001
-  rmUID: 1100RJHX1OMC001
+  rmUID: 4400HX101
   neName: OMC
-  province: BJ
-  vendor: RJ
-  dn: 4600
+  province: ""
+  vendor: ""
+  dn: ""
   chk2ne: false
-  sn: 13750650
+  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:2152 
+  gtpUri: gtp:192.168.2.119:32152 
   checkContentType: false
-  testMode: true
+  testMode: false
   rbacMode: true
+  runDir: /usr/local/omc/run
+  cmdTimeout: 120
 
 # Alarm module setting
 # Forward interface:
-# email/sms  
+# TLS Skip verify: true/false
+# email/sms
+# smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:GSM7BIT, 1:ASCII, 2:BINARY8BIT1, 3:LATIN1, 
+#             4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2
 alarm: 
-  forwardAlarm: true
-  email:
-    smtp: smtp@ruijie.com.cn
+  alarmEmailForward:
+    enable: true
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpuser
-    password: smtpuser@omc
+    user: smtpext@smtp.com
+    password: "1000smtp@omc!"
+    tlsSkipVerify: true    
+  alarmSMSForward:
+    enable: true
+    mobileList: 
+    smscAddr: "192.168.13.114:2775"
+    systemID: "omc"
+    password: "omc123"
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
   sms:
-    apiURL: http://smsc.ruijie.com.cn/
+    apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx
     accessKeySecret: xxxx
-    signName: Ruijie SMSC
+    signName: xxx SMSC
     templateCode: 1000
+  smProxy: smsc
   
-#User authorized information
+# 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
@@ -107,5 +189,5 @@ params:
   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
+  enabled: false
   file: /usr/local/omc/etc/testconfig.yaml

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

@@ -4,7 +4,7 @@
 # count: rotation count of log, default is 30 rotation
 logger:
   file: /usr/local/omc/log/sshsvc.log
-  level: debug
+  level: warn
   duration: 24
   count: 30   
 
@@ -23,22 +23,59 @@ logmml:
 # session: single/multiple session for one user
 sshd:
   listenAddr: 0.0.0.0
-  listenPort: 2222
+  listenPort: 32222
   privateKey: /usr/local/omc/.ssh/id_rsa
-  maxConnNum: 20
+  maxConnNum: 2
   timeout: 1800
   session: multiple
+  mmlHome: /usr/local/omc/mmlhome
+  userName: manager
+  password: pass123
+  authType: local
+  tagNE: omc
 
+# authType: local/omc
+telnetServer:
+  listenAddr: 0.0.0.0
+  listenPort: 32323
+  maxConnNum: 2
+  timeout: 1800
+  session: multiple
+  mmlHome: /usr/local/omc/mmlhome
+  userName: manager
+  password: pass123
+  authType: local
+  tagNE: omc
+
+# authproto: NoAuth/MD5/SHA
+# privProto: NoPriv/DES/AES/AES192/AES256
+snmpServer:
+  listenAddr: '[::]'
+  listenPort: 34957
+  userName: manager
+  authPass: pass123
+  authproto: MD5
+  privPass: "3F2A1B4C5D6E7F8A9B0C1D2E3F4A5B6C7D8E9F0A1B2C3D4E"
+  privProto: DES
+  engineID: "8000000004323030313a6462383a3a39313636"
+  trapPort: 34958
+  trapListen: false
+  trapBool: false
+  trapTick: 60
+  timeOut: 5
+  trapTarget: "" 
+  
 database:
   type: mysql
   user: root
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
 
 omc:
-  httpUri: http://127.0.0.1:3030
+  httpUri: http://127.0.0.1:33030
   userCrypt: bcrypt
   
 ne:

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

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 ©2024', '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 ©2024', '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.2-YYYYMMDD
+Version: 2.2503.6-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/22.04/DEBIAN/postinst

@@ -4,38 +4,25 @@ OMCRootDir=/usr/local/omc
 SystemdRootDir=/lib/systemd/system
 OMCEtcDir=${OMCRootDir}/etc
 FERootDir=${OMCRootDir}/htdocs/front
-X86Lib64Dir=/lib/x86_64-linux-gnu
-OMCBinDir=${OMCRootDir}/bin
+OmcBinDir=${OMCRootDir}/bin
 OMCStaticDir=${OMCRootDir}/static
 UsrLocalBinDir=/usr/local/bin
-OMCDaemon=omcd
+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
+if [ ! -e ${OmcDaemon} ]; then  ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi
 
 chmod +rx ${OMCRootDir}/bin/*
 chmod +rx ${OMCRootDir}/*
@@ -45,7 +32,7 @@ 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
@@ -54,62 +41,6 @@ for CFile in ${CFileList}; do
     fi                  
 done
 
-# # Install redis db if not exist /usr/local/db
-# if [ ! -e "${RedisRootDir}/bin/kvdb-server" ]; then
-# #    if [ ! -e "${RedisRootDir}" ]; then
-# #        mkdir -p ${RedisRootDir}
-# #    fi
-#     # stop old adb service
-#     if [ -e "${RedisOldRootDir}/bin/redis-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
-#         systemctl stop adb.service
-#         systemctl disable adb.service
-#     fi
-#     # stop adb service
-#     if [ -e "${UsrLocalBinDir}/adb-server" ] && [ -e "${SystemdRootDir}/adb.service" ]; then
-#         systemctl stop adb.service
-#         systemctl disable adb.service
-#     fi   
-#     cp -rf ${DependsRootDir}/kvdb/* /
-#     chmod +rx ${RedisRootDir}/bin/kvdb*
-#     if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then    
-#         cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}
-#     fi
-#     sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf 
-
-#     LINE="masterauth helloearth"
-#     FILE="${RedisConfDir}/kvdb.conf"
-#     # 检查文件中是否存在该行
-#     if ! grep -qxF "$LINE" "$FILE"; then
-#         # 如果不存在，将其添加到文件末尾
-#         echo "$LINE" >> "$FILE"
-#     fi
-
-#     # copy the old adb dump.rdb
-#     if [ -e "${RedisOldRootDir}/bin/conf/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then
-#         cp -f ${RedisOldRootDir}/bin/conf/dump.rdb ${RedisRootDir}/etc/kvdb/;
-#         mv -f ${RedisRootDir}/db ${RedisRootDir}/adb.old
-#     fi
-#     # copy the adb dump.rdb
-#     if [ -e "${RedisRootDir}/etc/adb/dump.rdb" ] && [ ! -e "${RedisRootDir}/etc/kvdb/dump.rdb" ]; then
-#         cp -f ${RedisRootDir}/etc/adb/dump.rdb ${RedisRootDir}/etc/kvdb/;
-#         mv -f ${RedisRootDir}/etc/adb ${RedisRootDir}/etc/adb.old
-#     fi     
-# #    cp -f ${DependsRootDir}/systemd/kvdb.service ${SystemdRootDir}
-# else
-#     if [ ! -e "${RedisConfDir}/kvdb.conf" ]; then    
-#         cp ${RedisConfDir}/default/kvdb.conf ${RedisConfDir}
-#     fi
-#     sed -i 's/replica-read-only yes/replica-read-only no/g' ${RedisConfDir}/kvdb.conf
-
-#     LINE="masterauth helloearth"
-#     FILE="${RedisConfDir}/kvdb.conf"
-#     # 检查文件中是否存在该行
-#     if ! grep -qxF "$LINE" "$FILE"; then
-#         # 如果不存在，将其添加到文件末尾
-#         echo "$LINE" >> "$FILE"
-#     fi         
-# fi
-
 if [ ! -e "${FERootDir}/config.js" ]; then    
     cp ${FERootDir}/default/config.js ${FERootDir}; 
 fi
@@ -132,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
 
@@ -159,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/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/etc/default/restconf.yaml

@@ -44,7 +44,7 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: /usr/local/omc/database
 
@@ -69,17 +69,19 @@ redis:
 # 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
 
+# Tracking configuration
+trace:
+  enabled: true
+  host: "172.16.5.100" # Fill in the specific IP address
+  port: 33033
+
 # NE config
 ne:
   user: omcuser
@@ -126,28 +128,36 @@ omc:
 
 # Alarm module setting
 # Forward interface:
-# email/sms/smsc  
+# TLS Skip verify: true/false
+# email/sms
+# smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:GSM7BIT, 1:ASCII, 2:BINARY8BIT1, 3:LATIN1, 
+#             4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2
 alarm: 
-  forwardAlarm: true
-  email:
-    smtp: smtp.xxx.com
+  alarmEmailForward:
+    enable: true
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpuser@xxx.com
-    password: xxxxxx
-    # TLS skip verify: true/false
+    user: smtpext@smtp.com
+    password: "1000smtp@omc!"
     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"
+  alarmSMSForward:
+    enable: true
+    mobileList: 
+    smscAddr: "192.168.13.114:2775"
+    systemID: "omc"
     password: "omc123"
-    systemType: ""
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
+  sms:
+    apiURL: http://smsc.xxx.com/
+    accessKeyID: xxxx
+    accessKeySecret: xxxx
+    signName: xxx SMSC
+    templateCode: 1000
+  smProxy: smsc
   
 # User authorized information
 # crypt: mysql/md5/bcrypt

debbuild/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2410.2-YYYYMMDD
+Version: 2.2503.6-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/DEBIAN/postinst

@@ -4,38 +4,25 @@ OMCRootDir=/usr/local/omc
 SystemdRootDir=/lib/systemd/system
 OMCEtcDir=${OMCRootDir}/etc
 FERootDir=${OMCRootDir}/htdocs/front
-X86Lib64Dir=/lib/x86_64-linux-gnu
-OMCBinDir=${OMCRootDir}/bin
+OmcBinDir=${OMCRootDir}/bin
 OMCStaticDir=${OMCRootDir}/static
 UsrLocalBinDir=/usr/local/bin
-OMCDaemon=omcd
+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
+if [ ! -e ${OmcDaemon} ]; then  ln -s ${OmcBinDir}/omcsvc.sh ${OmcDaemon}; fi
 
 chmod +rx ${OMCRootDir}/bin/*
 chmod +rx ${OMCRootDir}/*
@@ -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/etc/default/restconf.yaml

@@ -44,7 +44,8 @@ database:
   password: 1000omc@kp!
   host: 127.0.0.1
   port: 33066
-  name: tenants_db
+  name: omc_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: /usr/local/omc/database
 
 # Redis data cache

docs/overview/04-OMC Overview.md

@@ -1,6 +1,6 @@
-
-# OMC Overview
-
+---
+OMC Overview
+---
 ## Introduction to OMC
 
 The Core Network OMC (Operation and Maintenance Center) is a central facility used by operators to manage and maintain core network equipment. It typically includes modules for network monitoring, fault management, performance management, configuration management, security management, and other functions to ensure the smooth operation and efficient maintenance of core network equipment. By monitoring and managing core network equipment, the OMC can quickly identify and resolve network faults in real-time, improve network performance, ensure network security, and enhance operational efficiency. The OMC plays a crucial role in the network operations and maintenance of operators, serving as a key element in ensuring stable network operation.
@@ -19,8 +19,6 @@ The Core Network OMC (Operation and Maintenance Center) is a central facility us
 
 ## Features
 
-General Version:
-
 1. Topology Management (Dashboard/State/Monitor): Dashboard, Network topology, System status, etc.
 2. Fault Management (FM): active alarms, historical alarms, etc.
 3. Configuration Management (CM): NE (Network Element) management, parameter configuration, etc.
@@ -34,23 +32,6 @@ General Version:
 11. System Management (System): menu management, dictionary management, system information, scheduling tasks, etc.
 12. Northbound Interface (NBI): optional and customized interfaces, northbound interface services, resource configuration data, performance statistics data, performance golden indicators, alarm reporting, 4A, etc.
 
-Multi-tenancy Version:
-
-1. In a public cloud core network, logical isolation of network assets leased by different tenants is achieved through element-specific devices (such as edge UPF), different base station IDs, SIM card number ranges, or slices. 
-2. The network management system data isolates user data, user online information, base station information, and UPF throughput for each tenant based on the mapping of slice information and tenants.
-3. Tenants can view their own users (UE), have their own dedicated dashboard, and only view operation logs related to their users and accounts after logging in through the network management system.
-4. Account roles include platform operation and tenants, where the operation account is equivalent to the current network management account. Operation and multi-tenant accounts can both log in to the network management system simultaneously without affecting each other.
-
-Practical Training Version:
-
-1. Implement multiple student logins to the network management system for configuration practical training, where configuration parameters are stored independently but not directly pushed to network elements; final device configuration deployment is controlled by the teacher.
-2. All student configurations can be exported into a single Excel spreadsheet (students can also export their own), including header information (various configuration parameter names), student accounts, PLMN, and other key details.
-3. Teacher account privileges:
-   * Ability to export, view, and compare all student parameter configurations.
-   * Login with selected student accounts to browse the student's operation interface.
-   * Restore a student's configuration to the system default with one click.
-   * Load and deploy a student's configuration to the devices.
-
 ## Supported NEs
 
 AMF, AUSF, UDM, SMF, UPF, PCF, NRF, NSSF, NEF, LMF, IMS, MME, N3IWF, SMSC, MOCNGW