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

feat: nbi release 2.2506.1

Browse Source
This commit is contained in:
simon
2025-06-23 18:29:05 +08:00
parent 9fa77a139a
commit 13c07004b4
11 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/modules/crontask/processor/syncNbiNRM/amf/sync.go
View File

@@ -151,8 +151,8 @@ func SyncNbiCM() error {
epRpDynN8Amf := EpRpDynN8Amf{
Id: fmt.Sprintf("%s-%s-EpRpDynN8Amf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN8Amf",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.10.0.0/16\"]",
LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: `{{Subnetwork:10.10.1.0,Mask:255.255.255.255}}`,
}
n8JSON, err := json.Marshal(epRpDynN8Amf)
if err != nil {
@@ -194,8 +194,8 @@ func SyncNbiCM() error {
epRpDynN11Amf := EpRpDynN11Amf{
Id: fmt.Sprintf("%s-%s-EpRpDynN11Amf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN11Amf",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.11.0.0/16\"]",
LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: `{{Subnetwork:10.11.1.0,Mask:255.255.255.255}}`,
}
n11JSON, err := json.Marshal(epRpDynN11Amf)
if err != nil {
@@ -237,8 +237,8 @@ func SyncNbiCM() error {
epRpDynN12Amf := EpRpDynN12Amf{
Id: fmt.Sprintf("%s-%s-EpRpDynN12Amf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN12Amf",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.12.0.0/16\"]",
LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: `{{Subnetwork:10.12.1.0,Mask:255.255.255.255}}`,
}
n12JSON, err := json.Marshal(epRpDynN12Amf)
if err != nil {
@@ -281,7 +281,7 @@ func SyncNbiCM() error {
Id: fmt.Sprintf("%s-%s-IPResource", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-IPResource",
InterfaceType: "{Mgt,N8,N11,N12}",
LocIpV4AddrList: fmt.Sprintf("{%s,Default,Default,Default}", ne.Ip),
LocIpV4AddrList: fmt.Sprintf("{%s,%s,%s,%s}", ne.Ip, "10.10.1.100", "10.11.1.100", "10.12.1.100"),
LocIpV6AddrList: "{Default,Default,Default,Default}",
}
ipJSON, err := json.Marshal(ipResource)

10
src/modules/crontask/processor/syncNbiNRM/smf/sync.go
View File

@@ -149,7 +149,7 @@ func SyncNbiCM() error {
UserLabel: ne.NeName + "-AddrPool",
AddrType: "UE",
IpVersion: "IPv4",
AddrSegList: "[\"10.60.0.0/16\",\"10.61.0.0/16\"]",
AddrSegList: `{{StartIp:10.60.1.100,SegLen:100},{StartIp:10.61.1.100,SegLen:100}}`,
}
addrPoolJSON, err := json.Marshal(addrPool)
if err != nil {
@@ -191,8 +191,8 @@ func SyncNbiCM() error {
epRpDynN7Smf := EpRpDynN7Smf{
Id: fmt.Sprintf("%s-%s-EpRpDynN7Smf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-N7",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.17.0.0/16\"]",
LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: `{{Subnetwork:10.17.1.0,Mask:255.255.255.255}}`,
}
n7JSON, err := json.Marshal(epRpDynN7Smf)
if err != nil {
@@ -234,8 +234,8 @@ func SyncNbiCM() error {
epRpDynN10Smf := EpRpDynN10Smf{
Id: fmt.Sprintf("%s-%s-EpRpDynN10Smf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-N10",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.20.0.0/16\"]",
LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: `{{Subnetwork:10.20.1.0,Mask:255.255.255.255}}`,
}
n10JSON, err := json.Marshal(epRpDynN10Smf)
if err != nil {

8
src/modules/crontask/processor/syncNbiNRM/upf/sync.go
View File

@@ -402,8 +402,8 @@ func SyncNbiCM() error {
epRpDynN3Upf := EpRpDynN3Upf{
Id: fmt.Sprintf("%s-%s-EpRpDynN3Upf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN3Upf",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.13.0.0/16\"]",
LocIpAddrList: `{"` + ne.Ip + `"}`,
FarIpSubnetworkList: `{{"Subnetwork":"10.13.1.0","Mask":"255.255.255.255"}}`,
}
n3JSON, err := json.Marshal(epRpDynN3Upf)
if err != nil {
@@ -445,8 +445,8 @@ func SyncNbiCM() error {
epRpDynN9Upf := EpRpDynN9Upf{
Id: fmt.Sprintf("%s-%s-EpRpDynN9Upf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN9Upf",
LocIpAddrList: "[\"" + ne.Ip + "\"]",
FarIpSubnetworkList: "[\"10.19.0.0/16\"]",
LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: `{{Subnetwork:10.19.1.0,Mask:255.255.255.255}}`,
}
n9JSON, err := json.Marshal(epRpDynN9Upf)
if err != nil {