OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

fix: 网元公共参数n3/n6IP不携带/子网掩码处理异常

Browse Source
This commit is contained in:
TsMask
2024-07-03 18:34:04 +08:00
parent d8e9658a75
commit 5ca9424d60
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/framework/utils/parse/parse.go
View File

@@ -172,10 +172,10 @@ func Color(colorStr string) *color.RGBA {
} }
} }
// ConvertIPMask 转换IP网络地址掩码 24 -> 255.255.255.0 // ConvertIPMask 转换IP网络地址掩码 24->"255.255.255.0" 20->"255.255.240.0"
func ConvertIPMask(bits int64) string { func ConvertIPMask(bits int64) string {
if bits < 0 || bits > 32 { if bits < 0 || bits > 32 {
return "Invalid Mask Bits" return "255.255.255.255"
} }
// 构建一个32位的uint32类型掩码，指定前bits位为1，其余为0 // 构建一个32位的uint32类型掩码，指定前bits位为1，其余为0

24
src/modules/network_element/service/ne_info.impl.go
View File

@@ -705,20 +705,30 @@ func (r *NeInfoImpl) neConfPara5GDataConvert(content map[string]any) map[string]
} }
n3IPAmdMask := external["upfn3_ip"].(string) n3IPAmdMask := external["upfn3_ip"].(string)
n3Arr := strings.Split(n3IPAmdMask, "/") n3Arr := strings.SplitN(n3IPAmdMask, "/", 2)
n3IP := n3Arr[0] n3IP := n3Arr[0]
n3Mask := parse.ConvertIPMask(parse.Number(n3Arr[1])) n3Mask := "255.255.255.0"
if len(n3Arr) > 1 {
n3Mask = parse.ConvertIPMask(parse.Number(n3Arr[1]))
}
n6IPAmdMask := external["upfn6_ip"].(string) n6IPAmdMask := external["upfn6_ip"].(string)
n6Arr := strings.Split(n6IPAmdMask, "/") n6Arr := strings.SplitN(n6IPAmdMask, "/", 2)
n6IP := n6Arr[0] n6IP := n6Arr[0]
n6Mask := parse.ConvertIPMask(parse.Number(n6Arr[1])) n6Mask := "255.255.255.0"
if len(n6Arr) > 1 {
n6Mask = parse.ConvertIPMask(parse.Number(n6Arr[1]))
}
ueIPAmdMask := external["ue_pool"].(string) ueIPAmdMask := external["ue_pool"].(string)
ueArr := strings.Split(ueIPAmdMask, "/") ueArr := strings.SplitN(ueIPAmdMask, "/", 2)
ueIP := ueArr[0] ueIP := ueArr[0]
ueCicr := ueArr[1] ueCicr := "24"
ueMask := parse.ConvertIPMask(parse.Number(ueArr[1])) ueMask := "255.255.255.0"
if len(ueArr) > 1 {
ueCicr = ueArr[1]
ueMask = parse.ConvertIPMask(parse.Number(ueArr[1]))
}
return map[string]string{ return map[string]string{
// basic // basic