new

2023-09-01 11:31:17 +08:00
parent f896cf9147
commit 9b7c73a84f
8 changed files with 21 additions and 302 deletions
--- a/config/etc/certs/omc_pri.key.aes_en
+++ b/config/etc/certs/omc_pri.key.aes_en
--- a/config/etc/certs/omc_pub.key
+++ b/config/etc/certs/omc_pub.key
@@ -1,9 +0,0 @@
-----BEGIN PUBLIC KEY-----
-MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA10O52xwLqvwrrof3Ckso
-QAXgQOMfIHB5HfrJYrd31tJlJbFw+bR1JHXIAdqh9Cz+H0ir8KfBXS/U2XgI5fbI
-upkzg3cRv86nuksGtrKHzi9Q7lYYzGWVW9Tc/hcvdibG6XwLSNYemFN6JrOa5mZ7
-IabtZLuPRwFCBx2XC/dg45wxrGWIe7fbw2SpGId76erwSn/oKJtoy5Ash7LrOkp6
-lu8L0QQNfs9cRntjf4aQo99ppWvUF0H6OFBsGymwRfPRtWqLiwK824zrpXKMLFX3
-e4FjFO7WQNR1spOuL0bH+Ym1cEPYUn8LJN9OaiodjEXc1pM1E5MHWXGMhnhiE9q3
-jwIDAQAB
-----END PUBLIC KEY-----
--- a/config/etc/default/4a_agent.yaml
+++ b/config/etc/default/4a_agent.yaml
@@ -1,14 +0,0 @@
-http:
-  ipv4: 0.0.0.0
-  ipv6: ::0
-  port: 4040
-db:
-  dbuser: "root"
-  dbpwd: "1000omc@kp!"
-  dbip: "127.0.0.1"
-  dbport: "33066"
-  dbname: "omc_db"
-logger:
-  file: /usr/local/omc/log/4a/4a_agent.log
-  level: debug
-  duration: 90
--- a/config/etc/default/capconf.yaml
+++ b/config/etc/default/capconf.yaml
@@ -0,0 +1,21 @@
+# 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: trace
+  duration: 24
+  count: 10 
+
+gtp:
+  addr: :2152
+
+database:
+  type: mysql
+  user: root
+  password: 1000omc@kp!
+  host: 127.0.0.1
+  port: 33066
+  name: omc_db
+
+
--- a/config/etc/default/nbi_agent.json
+++ b/config/etc/default/nbi_agent.json
@@ -1,91 +0,0 @@
-{
-
-  "omc_name":"APP-BJ-OMC-002-B-01",	
-  "oss_info":
-    {
-      "login_url": "https://172.29.247.106:8080/api/rest/securityManagement/v1/oauth/token",
-      "handshake_url": "https://172.29.247.106:8080/api/rest/securityManagement/v1/oauth/handshake",
-      "kpi_report_url": [
-      "https://172.29.247.106:8080/api/rest/performanceManagement/v1/kpiReport1"
-      ],
-
-      "grant_type":"password",
-      "user_name":"test",
-      "user_key":"test",
-      "max_data_len":3200,
-      "time_out":10
-    },
-
-  "ca":{
-    "root_cert":"/usr/local/omc/etc/certs/ca_cert.pem",
-    "cert":"/usr/local/omc/etc/certs/public_key.pem",
-    "private_key":"/usr/local/omc/etc/certs/private_key.pem",
-    "check":true
-  },
-  "syslog":{
-    "facility": 16,
-    "severity": 6,
-    "vendor": "RJ",
-    "ne_name": "AGENT_001",
-    "rm_uid": "1100RJHX1AGENT001",
-    "ne_type": "omc",
-    "log_file": [
-      {
-        "table_name": "nbi_operation_log",
-        "log_path": "/opt/omc/ftp/log/nbi/nbi_operation.log",
-        "period": 1
-      },
-      {
-        "table_name": "nbi_secure_log",
-        "log_path": "/opt/omc/ftp/log/nbi/nbi_secure.log",
-        "period": 1
-      }
-    ]
-  },
-  "mysql":"root:1000omc@kp!@tcp(172.25.97.150:33066)/omc_db?charset=utf8mb4&parseTime=True&loc=Local",
-  "log_dir":"/usr/local/omc/log/nbi",
-  "log_file":"nbi_agent.log",
-  "mock_report_api":true,
-  "web_addr":"0.0.0.0:5050",
-  "cm":{
-    "udm":[
-      "ManagedElement",
-      "UdmFunction",
-      "UdrFunction",
-      "AusfFunction",
-      "IPResource"
-    ],
-    "upf":[
-      "ManagedElement",
-      "InventoryUnitRack",
-      "InventoryUnitShelf",
-      "InventoryUnitPack",
-      "InventoryUnitHost",
-      "InventoryUnitAccessory",
-      "UpfFunction",
-      "EpRpDynN9Upf",
-      "EpRpDynN3Upf",
-      "AmfFunction",
-      "SmfFunction",
-      "UdrFunction",
-      "AusfFunction",
-      "IPResource"
-    ],
-    "smf":[
-      "ManagedElement",
-      "SmfFunction",
-      "AddrPool",
-      "EpRpDynN7Smf",
-      "EpRpDynN10Smf",
-      "IPResource"
-    ],
-    "amf":[
-      "ManagedElement",
-      "AmfFunction",
-      "EpRpDynN8Amf",
-      "EpRpDynN11Amf",
-      "EpRpDynN12Amf",
-      "IPResource"
-    ]
-  }
-}
--- a/config/etc/default/nbi_alarm.json
+++ b/config/etc/default/nbi_alarm.json
@@ -1,40 +0,0 @@
-{
-  "channel": [
-    {
-      "tcp_port": 31232,
-      "bind_flag": "SMF#1101RJHX1SMF01",
-      "province": "BJ",
-      "device_code": "0001"
-    },
-    {
-      "tcp_port": 31233,
-      "bind_flag": "UDM#1101RJHX1UDM01",
-      "province": "BJ",
-      "device_code": "0002"
-    },
-    {
-      "tcp_port": 31234,
-      "bind_flag": "AUSF#1101RJHX1AUF01",
-      "province": "BJ",
-      "device_code": "0003"
-    },
-    {
-      "tcp_port": 31235,
-      "bind_flag": "AMF#1101RJHX1AMF01",
-      "province": "BJ",
-      "device_code": "0004"
-    },
-    {
-      "tcp_port": 31236,
-      "bind_flag": "UPF#1101RJHX1UPF01",
-      "province": "BJ",
-      "device_code": "0005"
-    }
-  ],
-  "mysql": "root:1000omc@kp!@tcp(127.0.0.1:33066)/omc_db?charset=utf8mb4&parseTime=True&loc=Local",
-  "ftp_root": "/opt/omc/ftp/",
-  "mame":"nbi alarm agent",
-  "heartbeat_max": 180,
-  "log_dir": "/usr/local/omc/log/nbi",
-  "log_file":"nbi_alarm.log"
-}
--- a/config/etc/default/tasks-1s.yaml
+++ b/config/etc/default/tasks-1s.yaml
@@ -1,129 +0,0 @@
-# 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
-    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 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'
-    interval: 1
-    unit: Days
-    at: 00:15:00
-    do: TaskDeleteExpiredRecord    
-  - name: update expired user session
-    uri: /api/rest/databaseManagement/v1/omc_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
-    uri: 
-    params: 
-    interval: 1
-    unit: Days
-    at: 00:50:00
-    do: TaskDeleteExpiredRecord
-  - name: Backup measure data
-    uri: /api/rest/databaseManagement/v1/omc_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: handshake to NF
-    status: Active
-    uri:  /api/rest/systemManagement/v1/elementType/%s/objectType/systemState
-    params: 
-    interval: 1
-    unit: Seconds
-    at: 
-    do: TaskHandShakeToNF
-  - name: Export CM from NF
-    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: RJHXEMSPM10200
-    interval: 10
-    unit: Seconds
-    at: 
-    do: TaskGenMeasureThresholdAlarm    
-  - name: Task of Generate license alarm
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms
-    params: RJHXEMSCM10100
-    interval: 1
-    unit: Days
-    at: 00:30
-    do: TaskGenLicenseAlarm        
-  - name: Task of Generate NE system state alarm
-    status: Active
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSSM10000
-    interval: 1
-    unit: Seconds
-    at: 
-    do: TaskGenNeStateAlarm
-  - name: Task of Generate Measure Report Timeout
-    status: Active
-    uri: /api/rest/faultManagement/v1/elementType/%s/objectType/alarms 
-    params: RJHXEMSPM10201
-    interval: 10
-    unit: Seconds
-    at: 
-    do: TaskGenMeasureReportTimeoutAlarm    
-#  - 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
--- a/config/etc/default/testconfig.yaml
+++ b/config/etc/default/testconfig.yaml
@@ -1,19 +0,0 @@
-UDM:
-  capUsed: 16
-  featureEnabled: [N8,N10,N13,N12] 
-AUSF:
-  capUsed: 16
-  featureEnabled: [N12]  
-AMF:
-  capUsed: 16
-  featureEnabled: [N1,N2,N8,N11,N12,N14,N15]  
-SMF:
-  capUsed: 16
-  featureEnabled: [N4,N7,N10,N11]     
-UPF:
-  capUsed: 16
-  featureEnabled: [N3,N4,N6,N9]
-OMC:
-  capUsed: 0
-  featureEnabled: []
-