diff --git a/src/modules/crontask/processor/syncNbiNRM/syncAmf.go b/src/modules/crontask/processor/syncNbiNRM/syncAmf.go index a3e67ed1..785b8cd0 100644 --- a/src/modules/crontask/processor/syncNbiNRM/syncAmf.go +++ b/src/modules/crontask/processor/syncNbiNRM/syncAmf.go @@ -3,6 +3,7 @@ package syncNbiNRM import ( "encoding/json" "fmt" + "strings" "time" "be.ems/lib/dborm" @@ -94,10 +95,10 @@ func (s *BarProcessor) SyncAmfNbiCM() error { AdministrativeState: adminState, OperationalState: operState, VnfInstanceId: "vnf-" + ne.NeType + "-" + ne.NeId, - Fqdn: "amf-" + ne.NeId + ".5gc.3gpp.org", + Fqdn: fmt.Sprintf("%s%s.mnc000.mcc460.3gppnetwork.org", strings.ToLower(ne.NeType), ne.NeId), SbiServiceList: "Namf_Communication,Namf_EventExposure,Namf_MT,Namf_Location", - AmfGuamiList: "[{\"mcc\":\"460\",\"mnc\":\"01\",\"amfId\":\"" + ne.NeId + "\"}]", - SnssaiList: "[{\"sst\":1,\"sd\":\"010203\"}]", + AmfGuamiList: "[{\"mcc\":\"460\",\"mnc\":\"000\",\"amfId\":\"" + ne.NeId + "\"}]", + SnssaiList: "[{\"sst\":1,\"sd\":\"000001\"}]", MaxUser: 1000000, RelativeCapacity: 30, MaxGnbNum: 100, diff --git a/src/modules/crontask/processor/syncNbiNRM/syncPcf.go b/src/modules/crontask/processor/syncNbiNRM/syncPcf.go index 019587db..0a6039bb 100644 --- a/src/modules/crontask/processor/syncNbiNRM/syncPcf.go +++ b/src/modules/crontask/processor/syncNbiNRM/syncPcf.go @@ -3,6 +3,7 @@ package syncNbiNRM import ( "encoding/json" "fmt" + "strings" "time" "be.ems/lib/dborm" @@ -89,7 +90,7 @@ func (s *BarProcessor) SyncPcfNbiCM() error { AdministrativeState: adminState, OperationalState: operState, VnfInstanceId: "vnf-" + ne.NeType + "-" + ne.NeId, - Fqdn: "pcf-" + ne.NeId + ".5gc.3gpp.org", + Fqdn: fmt.Sprintf("%s%s.mnc000.mcc460.3gppnetwork.org", strings.ToLower(ne.NeType), ne.NeId), SbiServiceList: "Npcf_AMPolicyControl,Npcf_PolicyAuthorization,Npcf_SMPolicyControl,Npcf_BDTPolicyControl", } diff --git a/src/modules/crontask/processor/syncNbiNRM/syncSmf.go b/src/modules/crontask/processor/syncNbiNRM/syncSmf.go index 20edf0cf..a258a93a 100644 --- a/src/modules/crontask/processor/syncNbiNRM/syncSmf.go +++ b/src/modules/crontask/processor/syncNbiNRM/syncSmf.go @@ -3,6 +3,7 @@ package syncNbiNRM import ( "encoding/json" "fmt" + "strings" "time" "be.ems/lib/dborm" @@ -89,11 +90,11 @@ func (s *BarProcessor) SyncSmfNbiCM() error { AdministrativeState: string(adminState), OperationalState: string(operState), VnfInstanceId: "vnf-" + ne.NeType + "-" + ne.NeId, - Fqdn: "smf-" + ne.NeId + ".5gc.3gpp.org", + Fqdn: fmt.Sprintf("%s%s.mnc000.mcc460.3gppnetwork.org", strings.ToLower(ne.NeType), ne.NeId), SbiServiceList: "Nsmf_PDUSession,Nsmf_EventExposure", MaxPduSessions: 1000000, MaxQfi: 64, - UpfList: "[\"UPF-1\",\"UPF-2\"]", + UpfList: "[\"UPF-001\",\"UPF-2\"]", } // 序列化为JSON diff --git a/src/modules/crontask/processor/syncNbiNRM/syncUdm.go b/src/modules/crontask/processor/syncNbiNRM/syncUdm.go index c36b786f..7a9d3019 100644 --- a/src/modules/crontask/processor/syncNbiNRM/syncUdm.go +++ b/src/modules/crontask/processor/syncNbiNRM/syncUdm.go @@ -3,6 +3,7 @@ package syncNbiNRM import ( "encoding/json" "fmt" + "strings" "time" "be.ems/lib/dborm" @@ -89,7 +90,7 @@ func (s *BarProcessor) SyncUdmNbiCM() error { AdministrativeState: string(adminState), OperationalState: string(operState), VnfInstanceId: "vnf-" + ne.NeType + "-" + ne.NeId, - Fqdn: "udm-" + ne.NeId + ".5gc.3gpp.org", + Fqdn: fmt.Sprintf("%s%s.mnc000.mcc460.3gppnetwork.org", ne.NeType, ne.NeId), SbiServiceList: "Nudm_UEAuthentication,Nudm_SubscriberDataManagement,Nudm_UEContextManagement", } @@ -126,7 +127,7 @@ func (s *BarProcessor) SyncUdmNbiCM() error { AdministrativeState: string(adminState), OperationalState: string(operState), VnfInstanceId: "vnf-UDR-" + ne.NeId, - Fqdn: "udr-" + ne.NeId + ".5gc.3gpp.org", + Fqdn: fmt.Sprintf("%s%s.mnc000.mcc460.3gppnetwork.org", strings.ToLower(ne.NeType), ne.NeId), SbiServiceList: "Nudr_DataRepository", MaxNumSupi: 800000, MaxNumMsisdn: 800000, @@ -163,7 +164,7 @@ func (s *BarProcessor) SyncUdmNbiCM() error { AdministrativeState: string(adminState), OperationalState: string(operState), VnfInstanceId: "vnf-AUSF-" + ne.NeId, - Fqdn: "ausf-" + ne.NeId + ".5gc.3gpp.org", + Fqdn: fmt.Sprintf("ausf%s.mnc000.mcc460.3gppnetwork.org", ne.NeId), SbiServiceList: "Nausf_UEAuthentication,Nausf_SoRProtection", }