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

update ruijie

Browse Source
This commit is contained in:
simonzhangsz
2023-09-08 09:45:46 +08:00
parent 3887015727
commit 972182b4d2
5 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
config/etc/default/restconf.yaml
View File

@@ -87,15 +87,15 @@ omc:
alarm: alarm:
forwardAlarm: true forwardAlarm: true
email: email:
smtp: smtp@ruijie.com.cn smtp: smtp@xxx.com
port: 25 port: 25
user: smtpuser user: smtpuser
password: smtpuser@omc password: smtpuser@omc
sms: sms:
apiURL: http://smsc.ruijie.com.cn/ apiURL: http://smsc.xxx.com
accessKeyID: xxxx accessKeyID: xxx
accessKeySecret: xxxx accessKeySecret: xxx
signName: Ruijie SMSC signName: XXX SMSC
templateCode: 1000 templateCode: 1000
#User authorized information #User authorized information

4
crontask/gencmxml.go
View File

@@ -137,11 +137,11 @@ func (t *TaskFunc) GenNFXmlFile(neType string) error {
vmId := fmt.Sprintf("kylin10.0-00%d-%s", s+1, neType) 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) vnfInstanceID := fmt.Sprintf("2%xd55b4-%d018-41f4-af%d5-28b%d828788", s+10, s+6, s+4, s+3)
object = cmschema.Object{RmUIDAttr: rmUID, 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} UserLabelAttr: ne.NeName, PVFlagAttr: ne.PvFlag, VMIDAttr: vmId, VNFInstanceIDAttr: vnfInstanceID}
} else { } else {
object = cmschema.Object{RmUIDAttr: rmUID, 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} UserLabelAttr: ne.NeName, PVFlagAttr: ne.PvFlag}
} }

6
restagent/etc/restconf-t.yaml
View File

@@ -69,15 +69,15 @@ omc:
alarm: alarm:
forwardAlarm: true forwardAlarm: true
email: email:
smtp: smtp@ruijie.com.cn smtp: smtp@xxx.com.cn
port: 25 port: 25
user: smtpuser user: smtpuser
password: smtpuser@omc password: smtpuser@omc
sms: sms:
apiURL: http://smsc.ruijie.com.cn/ apiURL: http://smsc.xxx.com.cn/
accessKeyID: xxxx accessKeyID: xxxx
accessKeySecret: xxxx accessKeySecret: xxxx
signName: Ruijie SMSC signName: xxx SMSC
templateCode: 1000 templateCode: 1000
#User authorized information #User authorized information

6
restagent/etc/restconf.yaml
View File

@@ -95,15 +95,15 @@ omc:
alarm: alarm:
forwardAlarm: true forwardAlarm: true
email: email:
smtp: smtp@ruijie.com.cn smtp: smtp@xxx.com.cn
port: 25 port: 25
user: smtpuser user: smtpuser
password: smtpuser@omc password: smtpuser@omc
sms: sms:
apiURL: http://smsc.ruijie.com.cn/ apiURL: http://smsc.xxx.com.cn/
accessKeyID: xxxx accessKeyID: xxxx
accessKeySecret: xxxx accessKeySecret: xxxx
signName: Ruijie SMSC signName: xxx SMSC
templateCode: 1000 templateCode: 1000
#User authorized information #User authorized information

6
tools/xsdgen/genxml.go
View File

@@ -33,7 +33,7 @@ func main() {
nrmFile.FileHeader = FileHeader{ nrmFile.FileHeader = FileHeader{
TimeStamp: timestamp, TimeStamp: timestamp,
TimeZone: tzOffset, TimeZone: tzOffset,
VendorName: "Ruijie Network", VendorName: "xxx Network",
ElementType: "SMF", ElementType: "SMF",
CmVersion: "16.1.1", CmVersion: "16.1.1",
} }
@@ -45,14 +45,14 @@ func main() {
nrmFile.Objects.FieldName.N = append(nrmFile.Objects.FieldName.N, N{IAttr: i, Value: "Id"}) nrmFile.Objects.FieldName.N = append(nrmFile.Objects.FieldName.N, N{IAttr: i, Value: "Id"})
} }
object := Object{RmUIDAttr: "1000HXSMF001", 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"} UserLabelAttr: "SMF_BJ_JC001", PVFlagAttr: "VNF", VMIDAttr: "kylin10.0-001-SMF", VNFInstanceIDAttr: "2bdd55b4-9018-41f4-af35-28b6828788"}
for i := 1; i < 10; i++ { for i := 1; i < 10; i++ {
object.V = append(object.V, V{IAttr: i, Value: "SMF"}) object.V = append(object.V, V{IAttr: i, Value: "SMF"})
} }
nrmFile.Objects.FieldValue.Object = append(nrmFile.Objects.FieldValue.Object, object) nrmFile.Objects.FieldValue.Object = append(nrmFile.Objects.FieldValue.Object, object)
object = Object{RmUIDAttr: "1000HXSMF002", 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"} UserLabelAttr: "SMF_BJ_JC001", PVFlagAttr: "VNF", VMIDAttr: "kylin10.0-002-SMF", VNFInstanceIDAttr: "2bdd55b4-9018-41f4-af35-28b6828788"}
for i := 1; i < 10; i++ { for i := 1; i < 10; i++ {
object.V = append(object.V, V{IAttr: i, Value: "SMF"}) object.V = append(object.V, V{IAttr: i, Value: "SMF"})