chmod +x

build/usr/local/omc/etc/default/crontask.yaml

@@ -3,17 +3,17 @@
 # duration: saved days, default is 30 days
 logger:
   file: /usr/local/omc/log/crontask.log
-  level: trace
+  level: warn
   duration: 24
   count: 90 
 
 omc:
-  name: RJ_OMC_S001
+  name: OMC01
-  hosturi: http://127.0.0.1:3030
+  hosturi: http://127.0.0.1:33030
-  hostno: S001
+  hostno: A001
-  province: BJ
+  province: ""
   netabbr: HX
-  vendor: RJ
+  vendor: ""
 
 tasks:
   file: /usr/local/omc/etc/tasks.yaml
@@ -25,20 +25,20 @@ database:
   host: 127.0.0.1
   port: 33066
   name: omc_db
-  backup: /usr/local/omc/database
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True 
 
 # northbound interface, cm/pm
 # duration(day): saved days
 # zipPeriods(day): periods of zip pm data file 
-northbound:
+nbi:
   cm: 
     cfgfiledir: /usr/local/omc/etc/cm
-    xmlfiledir: /opt/omc/ftp/cm
+    xmlfiledir: /opt/omc/ftp
     version: V1.0.1
     duration: 30
   pm:
     cfgfiledir: /usr/local/omc/etc/pm
-    xmlfiledir: /opt/omc/ftp/pm
+    xmlfiledir: /opt/omc/ftp
     version: V1.0.1
     duration: 30
     zipPeriods: 1

build/usr/local/omc/etc/default/restconf.yaml

@@ -4,19 +4,39 @@
 # count: rotation count of log, default is 30 rotation
 logger:
   file: /usr/local/omc/log/restagent.log 
-  level: debug
+  level: warn
   duration: 24
   count: 90   
 
 # rest agent listen ipv4/v6 and port, support multiple routines
 # ip: 0.0.0.0 or ::0, support IPv4/v6
+# clientAuthType: 0:NoClientCert (default), 1:RequestClientCert, 2:RequireAnyClientCert, 
+#                 3:VerifyClientCertIfGiven, 4:RequireAndVerifyClientCerts
 rest:
   - ipv4: 0.0.0.0
     ipv6: 
-    port: 3030
+    port: 33030
-  - ipv4: 
+  - ipv4: 0.0.0.0
-    ipv6: ::0
+    ipv6: 
-    port: 6060
+    port: 33443
+    schema: https
+    clientAuthType: 0
+    caFile: /usr/local/omc/etc/certs/omc-ca.crt
+    certFile: /usr/local/omc/etc/certs/omc-server.crt
+    keyFile: /usr/local/omc/etc/certs/omc-server.key
+
+webServer:
+  enabled: true
+  rootDir: /usr/local/omc/htdocs/front
+  listen: 
+    - addr: :80
+      schema: http
+    - addr: :443
+      schema: https
+      clientAuthType: 0
+      caFile: /usr/local/omc/etc/certs/omc-ca.crt
+      certFile: /usr/local/omc/etc/certs/omc-server.crt
+      keyFile: /usr/local/omc/etc/certs/omc-server.key
 
 database:
   type: mysql
@@ -25,71 +45,133 @@ database:
   host: 127.0.0.1
   port: 33066
   name: omc_db
-  backup: /usr/loal/omc/database
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
+  backup: /usr/local/omc/database
 
+# Redis data cache
+redis:
+  dataSource:
+    # OMC system db
+    default:
+      port: 6379 # Redis port
+      host: "127.0.0.1" # Redis host
+      password: "helloearth"
+      db: 10 # Redis db_num
+    # 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)
+# deadLine: timeout for io read and write (second)
 mml:
-  port: 4100
   sleep: 200
-  user: admin
+  deadLine: 10
-  password: admin
+  sizeRow: 600
+  sizeCol: 128
+  bufferSize: 65535
+  mmlHome: ./mmlhome
 
+# Tracking configuration
+trace:
+  enabled: true
+  host: "172.16.5.100" # Fill in the specific IP address
+  port: 33033
+
+# NE config
 ne:
-  user: root
+  user: omcuser
   etcdir: /usr/local/etc
   bindir: /usr/local/bin
   omcdir: /usr/local/omc
+  scpdir: /tmp
   licensedir: /usr/local/etc/{neType}/license
+  # backup etc list of IMS, does not contain spaces
+  etcListIMS: '{*.yaml,mmtel,vars.cfg}'
+  etcListDefault: '{*.yaml,*.conf,*.cfg}'
+  # true/false to overwrite config file when dpkg ne software 
+  dpkgOverwrite: false
+  # dpkg timeout (second)
+  dpkgTimeout: 180
 
 # chk2ne: true/false, if put OmcNeConfig parameters to NE
 omc:
-  uriPrefix: /api/rest/oam
+  uriPrefix: "/omc/rest"
   neType: OMC
   neId: 001
-  rmUID: 1100RJHX1OMC001
+  rmUID: 4400HX101
   neName: OMC
-  province: BJ
+  province: ""
-  vendor: RJ
+  vendor: ""
-  dn: 4600
+  dn: ""
   chk2ne: false
-  sn: 13750650
+  sn: "-"
   checksign: false
+  rootDir: /usr/local/omc
+  binDir: /usr/local/omc/bin
   backup: /usr/local/omc/backup
   upload: /usr/local/omc/upload
   frontUpload: /usr/local/omc/htdocs/front/upload
+  frontTraceDir: /usr/local/omc/htdocs/front/trace
   software: /usr/local/omc/software
   license: /usr/local/omc/license
-  gtpUri: gtp:192.168.2.119:2152 
+  gtpUri: gtp:192.168.2.119:32152 
   checkContentType: false
-  testMode: true
+  testMode: false
   rbacMode: true
+  runDir: /usr/local/omc/run
+  cmdTimeout: 120
 
 # Alarm module setting
 # Forward interface:
-# email/sms  
+# 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
+  alarmEmailForward:
-  email:
+    enable: true
-    smtp: smtp@ruijie.com.cn
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpuser
+    user: smtpext@smtp.com
-    password: smtpuser@omc
+    password: "1000smtp@omc!"
+    tlsSkipVerify: true    
+  alarmSMSForward:
+    enable: true
+    mobileList: 
+    smscAddr: "192.168.13.114:2775"
+    systemID: "omc"
+    password: "omc123"
+    systemType: "UTRAN"
+    dataCoding: 0
+    serviceNumber: "OMC"
   sms:
-    apiURL: http://smsc.ruijie.com.cn/
+    apiURL: http://smsc.xxx.com/
     accessKeyID: xxxx
     accessKeySecret: xxxx
-    signName: Ruijie SMSC
+    signName: xxx SMSC
     templateCode: 1000
+  smProxy: smsc
   
-#User authorized information
+# User authorized information
 # crypt: mysql/md5/bcrypt
 # token: true/false to check accessToken
 # expires for session, unit: second
 # Support single/multiple session of user
+#
 auth:
   crypt: bcrypt
   token: true
   expires: 1800
   session: multiple
+  publicKey: /usr/local/omc/etc/certs/omc
+  privateKey: /usr/local/omc/etc/certs/omc
 
 # Parameter for limit number 
 # rmuid_maxnum: the max number of rmUID, default: 50
@@ -107,5 +189,5 @@ params:
   rmuidregexp: "[0-9]{4}[A-Z]{2}[A-Z]{2}[0-9A-Z]{1}[0-9A-Z]{3}[0-9A-Z]{1,16}"
 
 testConfig:
-  enabled: true
+  enabled: false
   file: /usr/local/omc/etc/testconfig.yaml

build/usr/local/omc/etc/default/sshsvc.yaml

@@ -4,7 +4,7 @@
 # count: rotation count of log, default is 30 rotation
 logger:
   file: /usr/local/omc/log/sshsvc.log
-  level: debug
+  level: warn
   duration: 24
   count: 30   
 
@@ -23,12 +23,48 @@ logmml:
 # session: single/multiple session for one user
 sshd:
   listenAddr: 0.0.0.0
-  listenPort: 2222
+  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
@@ -36,9 +72,10 @@ database:
   host: 127.0.0.1
   port: 33066
   name: omc_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
 
 omc:
-  httpUri: http://127.0.0.1:3030
+  httpUri: http://127.0.0.1:33030
   userCrypt: bcrypt
   
 ne:

build/usr/local/omc/etc/default/tasks.yaml

@@ -21,12 +21,21 @@ tasks:
     at: 00:10:00   # do at time such as xx:xx:xx when unit such as Day/Days/Mondays...
     do: TaskHelloWorld  # (Do what: callback function)
   - name: clear expired history alarm
+    status: Inactive 
     uri: /api/rest/databaseManagement/v1/omc_db/alarm
     params: WHERE=now()+>+ADDDATE(event_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='historyDuration')+day)+and+alarm_status='0'
     interval: 1
     unit: Days
     at: 00:10:00
     do: TaskDeleteExpiredRecord
+  - name: clear expired history gold_kpi
+    status: Inactive 
+    uri: /api/rest/databaseManagement/v1/omc_db/gold_kpi
+    params: WHERE=now()+>+ADDDATE(`date`,+interval+IFNULL((SELECT+`value`+FROM+config+WHERE+config_tag='goldKpiDuration'),7)+day)
+    interval: 1
+    unit: Days
+    at: 00:12:00
+    do: TaskDeleteExpiredRecord    
   - name: clear deleted custom pm kpi
     uri: /api/rest/databaseManagement/v1/omc_db/pm_custom_title
     params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted'
@@ -35,6 +44,7 @@ tasks:
     at: 00:15:00
     do: TaskDeleteExpiredRecord    
   - name: update expired user session
+    status: Inactive 
     uri: /api/rest/databaseManagement/v1/omc_db/session
     params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online'
     body: '{"session":{"status":"offline"}}'
@@ -43,6 +53,7 @@ tasks:
     at: 
     do: TaskUpdateTable     
   - name: clear expired log
+    status: Inactive 
     uri: 
     params: 
     interval: 1
@@ -86,6 +97,7 @@ tasks:
     at: 
     do: TaskHandShakeToNF
   - name: Export CM from NF
+    status: Inactive 
     uri:  /api/rest/systemManagement/v1/elementType/%s/objectType/cm
     params: ne_id=%s
     interval: 1
@@ -102,7 +114,7 @@ tasks:
   - name: Task of Generate measure threshold alarm
     status: Active
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms  
-    params: RJHXEMSPM10200
+    params: 10200
     interval: 10
     unit: Seconds
     at: 
@@ -110,15 +122,15 @@ tasks:
   - name: Task of Generate license alarm
     status: Inactive
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
-    params: RJHXEMSCM10100
+    params: 10100          #alarm_code
     interval: 1
     unit: Days
     at: 00:30
     do: TaskGenLicenseAlarm        
   - name: Task of Generate NE system state alarm
-    status: Active
+    status: Inactive
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSSM10000
+    params: 10000
     interval: 5
     unit: Seconds
     at: 
@@ -126,7 +138,7 @@ tasks:
   - name: Task of Generate Measure Report Timeout
     status: Active
     uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSPM10201
+    params: 10201
     interval: 10
     unit: Seconds
     at: 

debbuild/22.04/DEBIAN/control

@@ -1,5 +1,5 @@
 Package: OMC
-Version: 2.2410.2-YYYYMMDD
+Version: 2.2410.2-20241022
 Section: AGrandTech
 Prioritt: optional   
 Architecture: amd64  

debbuild/22.04/usr/local/omc/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
+  alarmEmailForward:
-  email:
+    enable: true
-    smtp: smtp.xxx.com
+    emailList: 
+    smtp: mail.smtp.com
     port: 25
-    user: smtpuser@xxx.com
+    user: smtpext@smtp.com
-    password: xxxxxx
+    password: "1000smtp@omc!"
-    # TLS skip verify: true/false
     tlsSkipVerify: true    
-  smProxy: smsc
+  alarmSMSForward:
-  sms:
+    enable: true
-    apiURL: http://smsc.xxx.com
+    mobileList: 
-    accessKeyID: xxx
+    smscAddr: "192.168.13.114:2775"
-    accessKeySecret: xxx
+    systemID: "omc"
-    signName: XXX SMSC
-    templateCode: 1000
-  smsc:
-    addr: "192.168.13.114:2775"
-    systemID: "alarmsmsfw"
     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