From 972182b4d2cf460d3efe05674666b795aeda4a71 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 8 Sep 2023 09:45:46 +0800 Subject: [PATCH] update ruijie --- config/etc/default/restconf.yaml | 10 +++++----- crontask/gencmxml.go | 4 ++-- restagent/etc/restconf-t.yaml | 6 +++--- restagent/etc/restconf.yaml | 6 +++--- tools/xsdgen/genxml.go | 6 +++--- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/config/etc/default/restconf.yaml b/config/etc/default/restconf.yaml index 48e91c62..95b43647 100644 --- a/config/etc/default/restconf.yaml +++ b/config/etc/default/restconf.yaml @@ -87,15 +87,15 @@ omc: alarm: forwardAlarm: true email: - smtp: smtp@ruijie.com.cn + smtp: smtp@xxx.com port: 25 user: smtpuser password: smtpuser@omc sms: - apiURL: http://smsc.ruijie.com.cn/ - accessKeyID: xxxx - accessKeySecret: xxxx - signName: Ruijie SMSC + apiURL: http://smsc.xxx.com + accessKeyID: xxx + accessKeySecret: xxx + signName: XXX SMSC templateCode: 1000 #User authorized information diff --git a/crontask/gencmxml.go b/crontask/gencmxml.go index f0975af0..fcaab5df 100644 --- a/crontask/gencmxml.go +++ b/crontask/gencmxml.go @@ -137,11 +137,11 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error { vmId := fmt.Sprintf("kylin10.0-00%d-%s", s+1, neType) vnfInstanceID := fmt.Sprintf("2%xd55b4-%d018-41f4-af%d5-28b%d828788", s+10, s+6, s+4, s+3) object = cmschema.Object{RmUIDAttr: rmUID, - DnAttr: "DC=www.ruijie.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", + DnAttr: "DC=www.xxx.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", UserLabelAttr: ne.NeName, PVFlagAttr: ne.PvFlag, VMIDAttr: vmId, VNFInstanceIDAttr: vnfInstanceID} } else { object = cmschema.Object{RmUIDAttr: rmUID, - DnAttr: "DC=www.ruijie.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", + DnAttr: "DC=www.xxx.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", UserLabelAttr: ne.NeName, PVFlagAttr: ne.PvFlag} } diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index 7239429c..cd9ef0e3 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -69,15 +69,15 @@ omc: alarm: forwardAlarm: true email: - smtp: smtp@ruijie.com.cn + smtp: smtp@xxx.com.cn port: 25 user: smtpuser password: smtpuser@omc sms: - apiURL: http://smsc.ruijie.com.cn/ + apiURL: http://smsc.xxx.com.cn/ accessKeyID: xxxx accessKeySecret: xxxx - signName: Ruijie SMSC + signName: xxx SMSC templateCode: 1000 #User authorized information diff --git a/restagent/etc/restconf.yaml b/restagent/etc/restconf.yaml index 7963c0c5..875cf460 100644 --- a/restagent/etc/restconf.yaml +++ b/restagent/etc/restconf.yaml @@ -95,15 +95,15 @@ omc: alarm: forwardAlarm: true email: - smtp: smtp@ruijie.com.cn + smtp: smtp@xxx.com.cn port: 25 user: smtpuser password: smtpuser@omc sms: - apiURL: http://smsc.ruijie.com.cn/ + apiURL: http://smsc.xxx.com.cn/ accessKeyID: xxxx accessKeySecret: xxxx - signName: Ruijie SMSC + signName: xxx SMSC templateCode: 1000 #User authorized information diff --git a/tools/xsdgen/genxml.go b/tools/xsdgen/genxml.go index e40c184e..0bd8fe67 100644 --- a/tools/xsdgen/genxml.go +++ b/tools/xsdgen/genxml.go @@ -33,7 +33,7 @@ func main() { nrmFile.FileHeader = FileHeader{ TimeStamp: timestamp, TimeZone: tzOffset, - VendorName: "Ruijie Network", + VendorName: "xxx Network", ElementType: "SMF", CmVersion: "16.1.1", } @@ -45,14 +45,14 @@ func main() { nrmFile.Objects.FieldName.N = append(nrmFile.Objects.FieldName.N, N{IAttr: i, Value: "Id"}) } object := Object{RmUIDAttr: "1000HXSMF001", - DnAttr: "DC=www.ruijie.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", + DnAttr: "DC=www.xxx.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", UserLabelAttr: "SMF_BJ_JC001", PVFlagAttr: "VNF", VMIDAttr: "kylin10.0-001-SMF", VNFInstanceIDAttr: "2bdd55b4-9018-41f4-af35-28b6828788"} for i := 1; i < 10; i++ { object.V = append(object.V, V{IAttr: i, Value: "SMF"}) } nrmFile.Objects.FieldValue.Object = append(nrmFile.Objects.FieldValue.Object, object) object = Object{RmUIDAttr: "1000HXSMF002", - DnAttr: "DC=www.ruijie.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", + DnAttr: "DC=www.xxx.com.cn,SubNetwork=10001,SubNetwork=114214,ManagedElement=325", UserLabelAttr: "SMF_BJ_JC001", PVFlagAttr: "VNF", VMIDAttr: "kylin10.0-002-SMF", VNFInstanceIDAttr: "2bdd55b4-9018-41f4-af35-28b6828788"} for i := 1; i < 10; i++ { object.V = append(object.V, V{IAttr: i, Value: "SMF"})