chore: 更新版本号 2.2410.4

CHANGELOG.md

@@ -1,5 +1,14 @@
 # 版本发布日志
 
+## 2.2410.4-20241102
+
+- 新增 直连网元信息取得hostname/os属性值
+- 新增 UDM鉴权签约imsi多查询
+- 更新 更新系统菜单新增关键指标概览
+- 更新 定时任务周期同步更新UDM用户数据
+- 更新 AMF/SMF参数配置项数据
+- 修复 SMSC安装时关联修改IMS和UDM配置
+
 ## 2.2410.3-20241018
 
 - 新增 网元主机支持redis配置项

captrace/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2410.3
+VERSION = 2.2410.4
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build

config/param/amf_param_config.yaml

@@ -80,6 +80,34 @@ amf:
         filter: "0~64"
         display: "PCF URI"
         comment: ""
+      - name: "backupAusfUri"
+        type: "string"
+        value: "http://172.16.5.131:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup AUSF URI"
+        comment: ""
+      - name: "backupUdmUri"
+        type: "string"
+        value: "http://172.16.5.141:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup UDM URI"
+        comment: ""
+      - name: "backupSmfUri"
+        type: "string"
+        value: "http://172.16.5.151:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup SMF URI"
+        comment: ""
+      - name: "backupPcfUri"
+        type: "string"
+        value: "http://172.16.5.161:8080"
+        access: "read-write"
+        filter: "0~64"
+        display: "Backup PCF URI"
+        comment: ""
       - name: "lmfUri"
         type: "string"
         value: "http://172.16.5.200:8080"
@@ -471,4 +499,3 @@ amf:
         filter: '{"0":"false","1":"true"}'
         display: "statusReportEnabled"
         comment: ""
-

config/param/smf_param_config.yaml

@@ -72,14 +72,14 @@ smf:
         access: "read-write"
         filter: ""
         display: "PCF URI"
-        comment: ""
+        comment: "URI1;URI2"
       - name: "udmUri"
         type: "string"
         value: "http://172.16.5.140:8080"
         access: "read-write"
         filter: ""
         display: "UDM URI"
-        comment: ""
+        comment: "URI1;URI2"
       - name: "chfEnable"
         type: "bool"
         value: "false"

crontask/makefile

@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2410.3
+VERSION = 2.2410.4
 LIBDIR = be.ems/lib
 BINNAME = crontask
 

data2html/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2410.3
+VERSION = 2.2410.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)

makefile

@@ -3,7 +3,7 @@
 ProjectL = omc
 ProjectU = OMC
 PROJECT = $(ProjectL)
-VERSION = 2.2410.3
+VERSION = 2.2410.4
 RelDate = `date +%Y%m%d`
 Release = $(RelDate)
 RelVer = $(VERSION)-$(RelDate)
@@ -107,7 +107,7 @@ dist:
 		--exclude=../crontask/crontask \
 		--exclude=../initems/initems 
 
-prep_deb: $(BINNAME) 
+pre_build: $(BINNAME) 
 	# clear build cache
 	rm -rf $(FrontBuildDir)/front/*
 	rm -rf $(DebFEBuildDir)/front/*
@@ -134,7 +134,7 @@ replace_chinese:
 	@find $(DebBuildOMCDir)/etc/db -type f -name '*.sql' -exec sed -i '' 's/[一-龥]//g' {} +
 	@echo "Replace all chinese charecter."
 
-deb: prep_deb
+deb: pre_build
 	cp -rf $(CustomizedDir)/agt.d $(DebBuildOMCDir)/static
 	cp -rf $(CustomizedDir)/omc.d $(DebBuildOMCDir)/static
 	#cp -rf $(BuildDir)/nginx/*  $(DebBuildDir)/etc/nginx/conf.d
@@ -145,7 +145,7 @@ deb: prep_deb
 	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) $(ReleaseDebs)/$(DebPkgFile)
 
-ba-deb: prep_deb replace_chinese 
+badeb: pre_build replace_chinese 
 	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/

misc/setomc.sh

@@ -20,6 +20,9 @@ check_args() {
                 elif [ "${C_ARG_LOWER}" == "omc" ]; then
                         C_ARG_UPPER="OMC"
                         sed -i 's/VENDORS=.*/VENDORS=OMC/' /usr/local/omc/etc/omc.conf
+                elif [ "${C_ARG_LOWER}" == "agt" ]; then
+                        C_ARG_UPPER="AGT"
+                        sed -i 's/VENDORS=.*/VENDORS=AGT/' /usr/local/omc/etc/omc.conf
                 fi
                 ;;  
             m)  
@@ -65,6 +68,10 @@ case "${M_ARG}" in
             done
             cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
             cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
+            if [ "${C_ARG_LOWER}" == "ba" ]; then
+                rm -rf ${OMCStaticDir}/logo/zh_*
+                rm -rf ${OMCStaticDir}/helpDoc/zh_*
+            fi
             #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCRootDir}/etc/default/restconf.yaml
             #perl -0777 -i -pe 's/omcuser/bluearcus/g' ${OMCBinDir}/nehosts
             if [ $? = 0 ]; then
@@ -88,6 +95,10 @@ case "${M_ARG}" in
             done
             cp -rf ${CustomizedDir}/logo/* ${OMCStaticDir}/logo
             cp -rf ${CustomizedDir}/doc/* ${OMCStaticDir}/helpDoc
+            if [ "${C_ARG_LOWER}" == "ba" ]; then
+                rm -rf ${OMCStaticDir}/logo/zh_*
+                rm -rf ${OMCStaticDir}/helpDoc/zh_*
+            fi            
             if [ $? = 0 ]; then
                	echo "done" 
             fi 

mkpkg.sh

@@ -2,7 +2,7 @@
 
 ProcList="restagent crontask sshsvc captrace data2html"
 ProjectL=omc
-VERSION=2.2410.3
+VERSION=2.2410.4
 RelDate=`date +%Y%m%d`
 Release=${RelDate}
 RelVer=${VERSION}-${RelDate}
@@ -53,11 +53,17 @@ case "$1" in
         make deb
         cd $ReleaseDir/"$1"s/$RelArch
         rm -f omc-md5sum.txt
-#        rpm --addsign *.rpm
+        md5sum $DebPkgName >omc-md5sum.txt        
+    ;;
+    badeb)
+        cd $EmsBEDir
+        make badeb
+        cd $ReleaseDir/"$1"s/$RelArch
+        rm -f omc-md5sum.txt
         md5sum $DebPkgName >omc-md5sum.txt        
     ;;
     *)
         echo "make omc package"
-        echo "Usage: $0 rpm|deb <db>"
+        echo "Usage: $0 rpm|deb|badeb <db>"
     ;;
 esac  

restagent/makefile

@@ -1,7 +1,7 @@
 # Makefile for rest agent project
 
 PROJECT = OMC
-VERSION = 2.2410.3
+VERSION = 2.2410.4
 PLATFORM = amd64
 ARMPLATFORM = aarch64
 BUILDDIR = ../../build

src/framework/config/config/config.default.yaml

@@ -1,7 +1,7 @@
 # 项目信息
 framework:
   name: "OMC"
-  version: "2.2410.3"
+  version: "2.2410.4"
 
 # 应用服务配置
 server:

src/modules/network_element/service/ne_version.go

@@ -657,11 +657,40 @@ func (r *NeVersion) operateDome(action string, neVersion model.NeVersion) error
 		if neInfo.NeId != neVersion.NeId {
 			return fmt.Errorf("error found neinfo")
 		}
+
 		// ========= 网元OAM配置文件 start ==========
 		if err := NewNeInfo.NeConfOAMWirteSync(neInfo, nil, true); err != nil {
 			return fmt.Errorf("error wirte OAM file info")
 		}
 		// ========= 网元OAM配置文件 end ===========
+
+		// SMSC配置修改IMS和UDM 配置
+		if neInfo.NeType == "SMSC" {
+			para5GData := NewNeInfo.Para5GData
+			mnc_mcc := fmt.Sprintf("mnc%s.mcc%s", para5GData["MNC_DOMAIN"], para5GData["MCC"])
+			smscHost := fmt.Sprintf("%s smsc.ims.%s.3gppnetwork.org", para5GData["SMSC_IP"], mnc_mcc)
+			smscHostCMD := fmt.Sprintf("grep -qxF '%s' /etc/hosts || echo '%s' | sudo tee -a /etc/hosts \n", smscHost, smscHost)
+			smscIPCMD := fmt.Sprintf("grep -qxF '%s smsc' /etc/hosts || echo '%s smsc' | sudo tee -a /etc/hosts \n", para5GData["SMSC_IP"], para5GData["SMSC_IP"])
+			// IMS 配置
+			imsNEs := NewNeInfo.SelectList(model.NeInfo{NeType: "IMS"}, false, false)
+			for _, v := range imsNEs {
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, smscIPCMD)
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, smscHostCMD)
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, "sudo sed -i '/^#!define WITH_SMS/ s/^/#/' /usr/local/etc/ims/vars.cfg")
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, "ims-stop || true && ims-start")
+			}
+			// UDM 配置
+			smscASName := fmt.Sprintf("sudo sed -i '/- name: sms_as/{n;s|serverName: .*|serverName: sip:%s:5060|}' /usr/local/etc/udm/as.yaml", para5GData["SMSC_IP"])
+			smscASAddress := fmt.Sprintf("sudo sed -i '/- name: sms_as/{n;s|diameterAddress: .*|diameterAddress: smsc.ims.%s.3gppnetwork.org|}' /usr/local/etc/udm/as.yaml", mnc_mcc)
+			udmNEs := NewNeInfo.SelectList(model.NeInfo{NeType: "UDM"}, false, false)
+			for _, v := range udmNEs {
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, smscIPCMD)
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, smscHostCMD)
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, smscASName)
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, smscASAddress)
+				NewNeInfo.NeRunSSHCmd(v.NeType, v.NeId, "sudo service udm restart")
+			}
+		}
 	}
 
 	// 更新Version

sshsvc/makefile

@@ -1,7 +1,7 @@
 # Makefile for OMC-OMC-crontask project
 
 PROJECT = OMC
-VERSION = 2.2410.3
+VERSION = 2.2410.4
 LIBDIR = be.ems/lib
 BINNAME = sshsvc