release 2.2504.1

.gitignore

@@ -27,5 +27,6 @@ release
 rpmbuild/RPMS
 rpmbuild/SOURCES
 rpmbuild/BUILD
+rpmbuild/BUILDROOT
 
 

bin/build.sh

@@ -56,7 +56,7 @@ fi
 ProjectL=omc
 ProjectU=OMC
 PROJECT=${ProjectL}
-VERSION=2.2502.3
+VERSION=2.2505.1
 RelDate=`date +%Y%m%d`
 RelVer=${VERSION}-${RelDate}
 Ky10Arch=ky10.aarch64
@@ -159,7 +159,14 @@ case $(get_os_info) in
     ;;
     openEuler)
         ptype=rpm
-        RelOS=oe20
+        majorVersion=${OSVersion:0:2}
+        RelOS=oe${majorVersion}
+        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}
     ;;
@@ -332,7 +339,7 @@ case "${pkgtype}" in
         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' {} +
+        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

bin/makepkg.sh

@@ -91,8 +91,8 @@ makefe() {
     if [ "${pkgtype}" == "badeb" ]; then
         cp -rf ${customizeddir}/images/* ${feassetsdir}
         cp -rf ${customizeddir}/locales/* ${felocalesdir}
-        find "${feconstantsdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥]//g' {} +
-        find "${fehooksdir}" -type f -name '*.ts' -exec sed -i 's/[一-龥]//g' {} +
+        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
     echo -n "Building front-end vue ... "
@@ -107,7 +107,7 @@ makefe() {
 }
 
 makebe() {
-    cd ${builddir}
+    cd ${builddir}/bin
     #chmod +x mkpkg.sh 
     chmod +x build.sh
     ./build.sh ${be_args[@]}

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

@@ -57,12 +57,6 @@ redis:
       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"
 
@@ -78,7 +72,7 @@ mml:
 
 # Tracking configuration
 trace:
-  enabled: true
+  enabled: false
   host: "172.16.5.100" # Fill in the specific IP address
   port: 33033
 
@@ -109,7 +103,9 @@ omc:
   vendor: ""
   dn: ""
   chk2ne: false
+  capability: 50
   sn: "-"
+  expiryDate: "-"
   checksign: false
   rootDir: /usr/local/omc
   binDir: /usr/local/omc/bin

debbuild/22.04/DEBIAN/control

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

debbuild/DEBIAN/control

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

docs/nbi/protocol.md

@@ -0,0 +1,47 @@
+# OMC->北向通信协议 基于redis stream消息队列实现			
+
+## 告警关联关系数据上报变更
+
+alarm_relation告警新增时
+
+* streamkey和数据格式
+
+```json
+alarm_relation	
+{
+    "payload": "{\"ids\":[\"871847\",\"557903\"]}"
+}
+```
+
+1、871847,557903为alarm_relation表主键，至少一个数据
+
+## 资源数据上报变更
+
+nbi_cm表新增时
+
+* streamkey和数据格式
+
+```json
+nbi_cm	
+{
+    "payload": "{\"ids\":[\"642470\",\"105633\"]}"
+}	
+```
+
+1、642470,105633为nbi_cm表主键ID，ID支持多个
+
+## 1分钟性能订阅上报数据
+
+kpi_report_*表新增时	
+
+* 数据格式
+
+```json
+nbi_pm	
+{
+    "payload": "{\"neType\":\"AMF\",\"id\":\"606538\"}"
+}
+```
+
+1、AMF、PCF等为具体对应的网元
+2、606538为kpi_report_amf、kpi_report_pcf等表主键ID，ID支持一个

rpmbuild/SPECS/omc.spec

@@ -6,9 +6,10 @@
 %define project_lname omc
 %define project_Uname OMC
 
+
 Name: %{project_lname} 
 Summary: 5GC OMC
-Version: 2.2502.3
+Version: 2.2505.1
 Release: %{release_date}
 Vendor: omc
 URL: https://www.omc.com/
@@ -28,6 +29,13 @@ chmod +rx ${RPM_BUILD_ROOT}/usr/local/bin/*
 chmod +x ${RPM_BUILD_ROOT}/usr/local/omc/htdocs/front
 chmod +rx ${RPM_BUILD_ROOT}/usr/lib64/*
 
+# 安装前执行
+%pre
+echo -n "Stopping OMC service ... "
+systemctl stop restagent.service
+systemctl stop sshsvc.service
+echo "done"
+
 # 安装完成后执行
 %post
 OMCRootDir=/usr/local/omc
@@ -41,10 +49,10 @@ NginxEtcDir=/etc/nginx
 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 sshsvc.service
-echo "done"
+# echo -n "Stopping OMC service ... "
+# systemctl stop restagent.service
+# systemctl stop sshsvc.service
+# echo "done"
 
 for CFile in ${CFileList}; do
     if [ ! -e "${OMCEtcDir}/${CFile}" ]; then
@@ -67,12 +75,17 @@ 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 ${UsrLocalBinDir}
-if [ ! -e ${OMCDaemon} ]; then  ln -s ${OMCBinDir}/omcsvc.sh ${OMCDaemon}; fi
+
+if [ ! -e ${UsrLocalBinDir}/${OMCDaemon} ]; then  
+    echo -n "Creating symbolic link ${UsrLocalBinDir}/${OMCDaemon} ... "
+    ln -s ${OMCBinDir}/omcsvc.sh ${UsrLocalBinDir}/${OMCDaemon};
+    echo "done" 
+fi
 
 # setting firewall
-PortList="80 443 44080 44443 33030 22222"
-for Port in ${PortList}; do 
+port_list="80 443 44080 44443 33030 33443 33066 6379 22222"
+for Port in ${port_list}; do
+    echo -n "firewall-cmd add port ${Port} ... "
     firewall-cmd --zone=public --add-port=${Port}/tcp --permanent
 done
 firewall-cmd --reload
@@ -97,22 +110,15 @@ if [ "$M_PARAM" = "install" -o "$M_PARAM" = "upgrade" ]; then
     fi
 fi
 
-echo -n "Starting OMC service ... "
-systemctl start sshsvc.service
-systemctl start restagent.service
-echo "done"
+# echo -n "Starting OMC service ... "
+# systemctl start sshsvc.service
+# systemctl start restagent.service
+# echo "done"
 
 # 卸载时执行
 %postun
 UsrLocalBinDir=/usr/local/bin
-rm -f ${UsrLocalBinDir}/omcd
-
-# setting firewall
-PortList="80 443 44080 44443 33030 22222"
-for Port in ${PortList}; do 
-    firewall-cmd --zone=public --remove-port=${Port}/tcp --permanent
-done
-firewall-cmd --reload
+OMCDaemon=omcd
 
 if [ "$1" = "0" ] ; then
     sudo systemctl stop restagent.service
@@ -122,12 +128,22 @@ if [ "$1" = "0" ] ; then
     sudo systemctl disable restagent.service
     sudo systemctl disable sshsvc.service
     sudo systemctl daemon-reload
+    # setting firewall
+    port_list="80 443 44080 44443 33030 33443 33066 6379 22222"
+    for Port in ${port_list}; do
+        echo -n "firewall-cmd remove port ${Port} ... " 
+        firewall-cmd --zone=public --remove-port=${Port}/tcp --permanent
+    done
+    firewall-cmd --reload
+    rm -f ${UsrLocalBinDir}/${OMCDaemon}
 else
+    echo -n "Starting OMC service ... "
     sudo systemctl daemon-reload
     sudo systemctl stop restagent.service
     sudo systemctl stop sshsvc.service
     sudo systemctl start sshsvc.service
     sudo systemctl start restagent.service
+    echo "done"
 fi
 
 # 规定那些文件必须放入安装程序中，如果没有就报错