solve conflict file

2024-10-25 14:58:42 +08:00
parent 5cdb82297a
commit 3649afe328
1533 changed files with 77808 additions and 0 deletions
--- a/debbuild/22.04/usr/local/omc/etc/default/capconf.yaml
+++ b/debbuild/22.04/usr/local/omc/etc/default/capconf.yaml
@@ -0,0 +1,22 @@
+# file: log file name
+# level: /trace/debug/info/error/warn/error/fatal, default: debug
+# duration: saved days, default is 30 days
+logger:
+  file: /usr/local/omc/log/captrace.log
+  level: warn
+  duration: 24
+  count: 10 
+
+gtp:
+  addr: :32152
+
+database:
+  type: mysql
+  user: root
+  password: 1000omc@kp!
+  host: 127.0.0.1
+  port: 33066
+  name: tenants_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True 
+
+
--- a/debbuild/22.04/usr/local/omc/etc/default/crontask.yaml
+++ b/debbuild/22.04/usr/local/omc/etc/default/crontask.yaml
@@ -0,0 +1,44 @@
+# file: log file name
+# level: /trace/debug/info/warn/error/fatal, default: debug
+# duration: saved days, default is 30 days
+logger:
+  file: /usr/local/omc/log/crontask.log
+  level: warn
+  duration: 24
+  count: 90 
+
+omc:
+  name: OMC01
+  hosturi: http://127.0.0.1:33030
+  hostno: A001
+  province: ""
+  netabbr: HX
+  vendor: ""
+
+tasks:
+  file: /usr/local/omc/etc/tasks.yaml
+
+database:
+  type: mysql
+  user: root
+  password: 1000omc@kp!
+  host: 127.0.0.1
+  port: 33066
+  name: tenants_db
+  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 
+nbi:
+  cm: 
+    cfgfiledir: /usr/local/omc/etc/cm
+    xmlfiledir: /opt/omc/ftp
+    version: V1.0.1
+    duration: 30
+  pm:
+    cfgfiledir: /usr/local/omc/etc/pm
+    xmlfiledir: /opt/omc/ftp
+    version: V1.0.1
+    duration: 30
+    zipPeriods: 1
--- a/debbuild/22.04/usr/local/omc/etc/default/omc.conf
+++ b/debbuild/22.04/usr/local/omc/etc/default/omc.conf
@@ -0,0 +1,4 @@
+## Command Configuration
+VENDORS=CoreNet_EMS
+
+## Other
--- a/debbuild/22.04/usr/local/omc/etc/default/sshsvc.yaml
+++ b/debbuild/22.04/usr/local/omc/etc/default/sshsvc.yaml
@@ -0,0 +1,87 @@
+# file: log file name
+# level: /trace/debug/info/warn/error/fatal, default: debug
+# duration: rotation time with xx hours, example: 1/12/24 hours
+# count: rotation count of log, default is 30 rotation
+logger:
+  file: /usr/local/omc/log/sshsvc.log
+  level: warn
+  duration: 24
+  count: 30   
+
+# file: MML log file name
+# duration: rotation time with xx hours, example: 1/12/24 hours
+# count: rotation count of log, default is 30 rotation
+# level: cmd/ret log cmd/log cmd & result
+logmml:     
+  file: /usr/local/omc/mmllog/omcmml.log
+  duration: 24
+  count: 30
+  level: cmd
+
+# ssh service listen ipv4/v6 and port, support multiple routines
+# ip: 0.0.0.0 or ::0, support IPv4/v6
+# session: single/multiple session for one user
+sshd:
+  listenAddr: 0.0.0.0
+  listenPort: 32222
+  privateKey: /usr/local/omc/.ssh/id_rsa
+  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
+  password: 1000omc@kp!
+  host: 127.0.0.1
+  port: 33066
+  name: tenants_db
+  connParam: charset=utf8mb4&collation=utf8mb4_general_ci&parseTime=True&interpolateParams=True
+
+omc:
+  httpUri: http://127.0.0.1:33030
+  userCrypt: bcrypt
+  
+ne:
+  port: 4100
+  sleep: 200
+  user: admin
+  password: admin
+
+
--- a/debbuild/22.04/usr/local/omc/etc/default/tasks.yaml
+++ b/debbuild/22.04/usr/local/omc/etc/default/tasks.yaml
@@ -0,0 +1,183 @@
+# example:
+# tasks:
+#  - name: test # task comment
+#    uri:  # restful uri
+#    params: # params of url
+#    interval: 30 # do sometion in the interval
+#    unit: Seconds   #Seconds/Minutes/Hours/Days/Weeks, Monday/Tuesday/.../Sunday, 
+#    at: 00:10:00   # do at time such as xx:xx:xx
+#    do: HelloWorldTask  # (Do what: callback function)
+#
+# Attention: must restart crontask after modified this file
+#
+tasks:
+  - name: test # task comment
+    status: Active #active/inactive  
+    uri:  # restful uri
+    params: # params of http url
+    body: # body of http request
+    interval: 60 # do sometion in the interval
+    unit: Seconds   #Seconds/Minutes/Hours/Days/Weeks, Monday/Tuesday/.../Sunday, 
+    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/tenants_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/tenants_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/tenants_db/pm_custom_title
+    params: WHERE=now()+>+ADDDATE(update_time,+interval+(SELECT+`value`+FROM+config+WHERE+config_tag='keepPMCKpi')+day)+and+status='Deleted'
+    interval: 1
+    unit: Days
+    at: 00:15:00
+    do: TaskDeleteExpiredRecord    
+  - name: update expired user session
+    status: Inactive 
+    uri: /api/rest/databaseManagement/v1/tenants_db/session
+    params: WHERE=NOW()+>+ADDDATE(shake_time,+interval+expires+second)+and+status='online'
+    body: '{"session":{"status":"offline"}}'
+    interval: 30
+    unit: Seconds
+    at: 
+    do: TaskUpdateTable     
+  - name: clear expired log
+    status: Inactive 
+    uri: 
+    params: 
+    interval: 1
+    unit: Days
+    at: 00:50:00
+    do: TaskDeleteExpiredRecord
+  - name: Backup measure data
+    uri: /api/rest/databaseManagement/v1/tenants_db/measure_data
+    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','date','task_id','ne_name','rm_uid','ne_type','granul_option','kpi_code','kpi_id','kpi_ext','start_time','end_time','value','timestamp'+union+select+id,date,task_id,ne_name,rm_uid,ne_type,granul_option,kpi_code,kpi_id,kpi_ext,start_time,end_time,value,timestamp+from+measure_data)+b
+    interval: 1
+    unit: Days
+    at: 00:20:00
+    do: TaskDBBackupCSVGetBySQL    
+  - name: Backup operation log
+    uri: /api/rest/databaseManagement/v1/tenants_db/operation_log
+    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'op_id','account_name','op_ip','subsys_tag','op_type','op_content','op_result','begin_time','end_time','vnf_flag','log_time'+union+select+op_id,account_name,op_ip,subsys_tag,op_type,op_content,op_result,begin_time,end_time,vnf_flag,log_time+from+operation_log)+b
+    interval: 1
+    unit: Days
+    at: 00:26:00
+    do: TaskDBBackupCSVGetBySQL    
+  - name: Backup security log
+    uri: /api/rest/databaseManagement/v1/tenants_db/security_log
+    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','account_name','account_type','op_ip','op_type','op_content','op_result','op_time'+union+select+id,account_name,account_type,op_ip,op_type,op_content,op_result,op_time+from+security_log)+b
+    interval: 1
+    unit: Days
+    at: 00:28:00
+    do: TaskDBBackupCSVGetBySQL    
+  - name: Backup alarm log
+    uri: /api/rest/databaseManagement/v1/tenants_db/alarm_log
+    params: SQL=select+*+into+outfile+'%s'+fields+terminated+by+','+escaped+by+''+optionally+enclosed+by+''+lines+terminated+by+'\n'+from+(select+'id','ne_type','ne_id','alarm_seq','alarm_id','alarm_code','alarm_status','event_time','log_time'+union+select+id,ne_type,ne_id,alarm_seq,alarm_id,alarm_code,alarm_status,event_time,log_time+from+alarm_log)+b
+    interval: 1
+    unit: Days
+    at: 00:30:00
+    do: TaskDBBackupCSVGetBySQL        
+  - name: handshake to NF
+    status: Active
+    uri:  /api/rest/systemManagement/v1/elementType/%s/objectType/systemState
+    params: 
+    interval: 10
+    unit: Seconds
+    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
+    unit: Days
+    at: 00:15
+    do: TaskExportCmFromNF    
+  - name: Generate NRM xml file
+    uri: 
+    params: 
+    interval: 1
+    unit: Day
+    at: 00:00,06:00,12:00,18:00
+    do: GenCmXmlFile
+  - name: Task of Generate measure threshold alarm
+    status: Active
+    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms  
+    params: 10200
+    interval: 10
+    unit: Seconds
+    at: 
+    do: TaskGenMeasureThresholdAlarm    
+  - name: Task of Generate license alarm
+    status: Inactive
+    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
+    params: 10100          #alarm_code
+    interval: 1
+    unit: Days
+    at: 00:30
+    do: TaskGenLicenseAlarm        
+  - name: Task of Generate NE system state alarm
+    status: Inactive
+    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
+    params: 10000
+    interval: 5
+    unit: Seconds
+    at: 
+    do: TaskGenNeStateAlarm
+  - name: Task of Generate Measure Report Timeout
+    status: Active
+    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
+    params: 10201
+    interval: 10
+    unit: Seconds
+    at: 
+    do: TaskGenMeasureReportTimeoutAlarm    
+  - name: Monitor proces list and write system log
+    uri: /api/rest/databaseManagement/v1/tenants_db/system_log
+    params:
+    body: 
+    interval: 10
+    unit: Seconds
+    at: 
+    do: TaskWriteSystemLog        
+  - name: Copy log to /opt/omc/ftp/log
+    uri: 
+    params: cp -rf /usr/local/omc/database/*.csv /opt/omc/ftp/log 
+    interval: 10
+    unit: Minutes
+    at: 
+    do: TaskRunShellCommand              
+#  - name: Import CM to NF
+#    uri: /api/rest/systemManagement/v1/elementType/udm/objectType/cm 
+#   params: ne_id=SZ_01
+#   interval: 15
+#   unit: Seconds
+#   at: 
+#   do: TaskImportCmToNF                
+crontab:
+#  - name: 每隔1分钟执行
+#    tab: 0 */1 * * * ?  // crontab: rule like linux crontab
+#    do: CronHelloWorldTask  // function name to call 
+#    params:     
+  - name: Generate PM xml file
+    status: Active
+    tab: 5,20,35,50 * * * * 
+    do: GenPmXmlFile
+    uri: this is uri
+    params: Generating PM xml file
+#  - name: Import CM to NF
+#   tab: 0 * * * * *
+#   do: TaskImportCmToNF
+#   uri: /api/rest/systemManagement/v1/elementType/udm/objectType/cm
+#   params: ne_id=SZ_01