Merge remote-tracking branch 'origin/main' into lichang

config/etc/default/restconf.yaml

@@ -135,13 +135,14 @@ omc:
 # TLS Skip verify: true/false
 # email/sms
 # smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:UCS2, 1:ASCII, 2:LATIN1
 alarm: 
   alarmEmailForward:
     enable: true
     emailList: 
-    smtp: mail.agrandtech.com
+    smtp: mail.smtp.com
     port: 25
-    user: smtpext@agrandtech.com
+    user: smtpext@smtp.com
     password: "1000smtp@omc!"
     tlsSkipVerify: true    
   alarmSMSForward:
@@ -151,6 +152,8 @@ alarm:
     systemID: "omc"
     password: "omc123"
     systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
   sms:
     apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx