marge: 合并11.2版本

config/etc/default/restconf.yaml

@@ -69,17 +69,19 @@ redis:
 # sleep: time delay for after write buffer (millisecond)
 # deadLine: timeout for io read and write (second)
 mml:
-  port: 4100
-  port2: 5002
   sleep: 200
   deadLine: 10
   sizeRow: 600
   sizeCol: 128
   bufferSize: 65535
-  user: admin
-  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
@@ -126,28 +128,36 @@ omc:
 
 # Alarm module setting
 # Forward interface:
-# email/sms/smsc  
+# TLS Skip verify: true/false
+# email/sms
+# smProxy: sms(Short Message Service)/smsc(SMS Centre)  
+# dataCoding: 0:GSM7BIT, 1:ASCII, 2:BINARY8BIT1, 3:LATIN1, 
+#             4:BINARY8BIT2, 6:CYRILLIC, 7:HEBREW, 8:UCS2
 alarm: 
-  forwardAlarm: true
-  email:
-    smtp: smtp.xxx.com
+  alarmEmailForward:
+    enable: true
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpuser@xxx.com
-    password: xxxxxx
-    # TLS skip verify: true/false
+    user: smtpext@smtp.com
+    password: "1000smtp@omc!"
     tlsSkipVerify: true    
-  smProxy: smsc
-  sms:
-    apiURL: http://smsc.xxx.com
-    accessKeyID: xxx
-    accessKeySecret: xxx
-    signName: XXX SMSC
-    templateCode: 1000
-  smsc:
-    addr: "192.168.13.114:2775"
-    systemID: "alarmsmsfw"
+  alarmSMSForward:
+    enable: true
+    mobileList: 
+    smscAddr: "192.168.13.114:2775"
+    systemID: "omc"
     password: "omc123"
-    systemType: ""
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
+  sms:
+    apiURL: http://smsc.xxx.com/
+    accessKeyID: xxxx
+    accessKeySecret: xxxx
+    signName: xxx SMSC
+    templateCode: 1000
+  smProxy: smsc
   
 # User authorized information
 # crypt: mysql/md5/bcrypt

config/etc/default/sshsvc.yaml

@@ -23,13 +23,48 @@ logmml:
 # session: single/multiple session for one user
 sshd:
   listenAddr: 0.0.0.0
-  listenPort: 22222
+  listenPort: 32222
   privateKey: /usr/local/omc/.ssh/id_rsa
-  maxConnNum: 20
+  maxConnNum: 2
   timeout: 1800
   session: multiple
   mmlHome: /usr/local/omc/mmlhome
+  userName: manager
+  password: pass123
+  authType: local
+  tagNE: omc
 
+# authType: local/omc
+telnetServer:
+  listenAddr: 0.0.0.0
+  listenPort: 32323
+  maxConnNum: 2
+  timeout: 1800
+  session: multiple
+  mmlHome: /usr/local/omc/mmlhome
+  userName: manager
+  password: pass123
+  authType: local
+  tagNE: omc
+
+# authproto: NoAuth/MD5/SHA
+# privProto: NoPriv/DES/AES/AES192/AES256
+snmpServer:
+  listenAddr: '[::]'
+  listenPort: 34957
+  userName: manager
+  authPass: pass123
+  authproto: MD5
+  privPass: "3F2A1B4C5D6E7F8A9B0C1D2E3F4A5B6C7D8E9F0A1B2C3D4E"
+  privProto: DES
+  engineID: "8000000004323030313a6462383a3a39313636"
+  trapPort: 34958
+  trapListen: false
+  trapBool: false
+  trapTick: 60
+  timeOut: 5
+  trapTarget: "" 
+  
 database:
   type: mysql
   user: root