Merge remote-tracking branch 'origin/main' into multi-tenant

restagent/etc/restconf.yaml

@@ -38,29 +38,29 @@ webServer:
 database:
   type: mysql
   user: root
-  password: 1000omc@kp!
-  host: 127.0.0.1
+  password: "1000omc@kp!"
+  host: "127.0.0.1"
   port: 33066
   name: tenants_db
   connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
   backup: d:/local.git/be.ems/restagent/database
 
-# Redis 缓存数据，数据源声明全小写
+# Redis data cache
 redis:
   dataSource:
-    # OMC系统使用库
+    # OMC system db
     default:
       port: 6379 # Redis port
       host: "127.0.0.1" # Redis host
       password: "helloearth"
       db: 10 # Redis db_num
-    # UDM网元用户库
+    # UDM sub/auth db
     udmuser:
       port: 6379 # Redis port
       host: "127.0.0.1"
       password: "helloearth"
       db: 0 # Redis db_num
-  # 多个数据源时可以用这个指定默认的数据源
+  # used to specify the default data source for multiple data resourece
   defaultDataSourceName: "default"
 
 # sleep: time delay for after write buffer (millisecond)
@@ -77,6 +77,12 @@ mml:
   password: admin
   mmlHome: ./mmlhome
 
+# Tracking configuration
+trace:
+  enabled: true
+  host: "172.16.5.100" # Fill in the specific IP address
+  port: 33033
+
 # NE config
 ne:
   user: omcuser
@@ -123,29 +129,35 @@ omc:
 
 # Alarm module setting
 # Forward interface:
+# TLS Skip verify: true/false
 # email/sms
 # smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:UCS2, 1:ASCII, 2:LATIN1
 alarm:
-  forwardAlarm: false
-  email:
-    smtp: mail.agrandtech.com
+  alarmEmailForward:
+    enable: true
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpext@agrandtech.com
+    user: smtpext@smtp.com
     password: "1000smtp@omc!"
-    # TLS skip verify: true/false
     tlsSkipVerify: true
-  smProxy: smsc
+  alarmSMSForward:
+    enable: true
+    mobileList: 
+    smscAddr: "192.168.13.114:2775"
+    systemID: "omc"
+    password: "omc123"
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
   sms:
     apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx
     accessKeySecret: xxxx
     signName: xxx SMSC
     templateCode: 1000
-  smsc:
-    addr: "192.168.13.114:2775"
-    systemID: "omc"
-    password: "omc123"
-    systemType: "UTRAN"
+  smProxy: smsc
     
 #User authorized information
 # crypt: mysql/md5/bcrypt