chore: 更新版本号 2.2503.6

.gitignore

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

build.sh

@@ -56,7 +56,7 @@ fi
 ProjectL=omc
 ProjectU=OMC
 PROJECT=${ProjectL}
-VERSION=2.2505.1
+VERSION=2.2503.6
 RelDate=`date +%Y%m%d`
 RelVer=${VERSION}-${RelDate}
 Ky10Arch=ky10.aarch64
@@ -159,8 +159,7 @@ case $(get_os_info) in
     ;;
     openEuler)
         ptype=rpm
-        majorVersion=${OSVersion:0:2}
+        RelOS=oe20
-        RelOS=oe${majorVersion}
         RpmPkgName=${ProjectL}-${RelVer}.${RpmArch}.${ptype}
         RpmPkgRename=${ProjectL}-r${RelVer}-${RelOS}-${RelArch}.${ptype}
     ;;

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

@@ -57,6 +57,12 @@ 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"
 
@@ -72,7 +78,7 @@ mml:
 
 # Tracking configuration
 trace:
-  enabled: false
+  enabled: true
   host: "172.16.5.100" # Fill in the specific IP address
   port: 33033
 
@@ -103,9 +109,7 @@ 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.2505.1-YYYYMMDD
+Version: 2.2503.6-YYYYMMDD
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/DEBIAN/control

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

docs/nbi/protocol.md

@@ -1,47 +0,0 @@
-# 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支持一个

makepkg.sh

@@ -107,7 +107,7 @@ makefe() {
 }
 
 makebe() {
-    cd ${builddir}/bin
+    cd ${builddir}
     #chmod +x mkpkg.sh 
     chmod +x build.sh
     ./build.sh ${be_args[@]}

rpmbuild/SPECS/omc.spec

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