From 9b7c73a84fe5237ea577e8c5ebe2951c6cbf9ec6 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Fri, 1 Sep 2023 11:31:17 +0800 Subject: [PATCH] new --- config/etc/certs/omc_pri.key.aes_en | Bin 1680 -> 0 bytes config/etc/certs/omc_pub.key | 9 -- config/etc/default/4a_agent.yaml | 14 --- config/etc/default/capconf.yaml | 21 +++++ config/etc/default/nbi_agent.json | 91 -------------------- config/etc/default/nbi_alarm.json | 40 --------- config/etc/default/tasks-1s.yaml | 129 ---------------------------- config/etc/default/testconfig.yaml | 19 ---- 8 files changed, 21 insertions(+), 302 deletions(-) delete mode 100644 config/etc/certs/omc_pri.key.aes_en delete mode 100644 config/etc/certs/omc_pub.key delete mode 100644 config/etc/default/4a_agent.yaml create mode 100644 config/etc/default/capconf.yaml delete mode 100644 config/etc/default/nbi_agent.json delete mode 100644 config/etc/default/nbi_alarm.json delete mode 100644 config/etc/default/tasks-1s.yaml delete mode 100644 config/etc/default/testconfig.yaml diff --git a/config/etc/certs/omc_pri.key.aes_en b/config/etc/certs/omc_pri.key.aes_en deleted file mode 100644 index cc22ab63db1d46a9a8de2883178f6decbc42ebe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1680 zcmV;B25&0n;$bqP5np zVs4dS$vzJ)1)kK}fv|g1+d(`oF|I~U2g{y|5ME3m6RV3_yG)3JqS7E^v7yul^cR%? zY!;ug>C)0lnH~Z#6urZNC)(*!v)M?Tt91#Mn2%1wrSnu+h=;aQbB+uf|5f?e_xz%p zYgoF{kb52T`Khm&jQpOmw(YL&HsJyXK($m7TUfAeex}2qA%DcFOKK4{hiFCfgC zOXKt?3exdK+xTOIDxwSz!qfOPbFs(5H+~8=MfL;I98-iip-7shj^jg{{Y3r0%Npq6`Q^G@^ut>GYpiDE{vRca2u?LPY6WxWK9rfEB)Ff(s3PH z?bpG>W2xozwOC`2k?>a#K&I7IhP0&S#z0e`Tcz>1OvyX+!cy*Z)l8m?D8UJKRp(x& zd;KqT6x?%qAnSxn3|qJWb83o_80d*@n&rJ(D@5bRM=et;482sbQ-b`vTN-};qPoDt z98-yeaLZPDM8%}5NUF_h(BsI^{2&8s}J((?L%)_v~F z>^S-z&_9kraHx|NS42E==7jJjFC-Sen14fChw$8P2q=%nhMxx5lmorc_ULEN(|SNO z*g&3R2pA7|8^2>-yTO|{il-Wm%Y}Di|AFM*_nruDV2!t4nv6)eN-?$Pcsncx)*!;2 zm*hU(_BV+r2b$G!Dm&ofL)2R@98o@OjrLWOF_ z8f2+4JXx(lPRDL)3c=@OT%r!IeS#mx1cd5hhRn20yxKrEYeU@+R*?({ss(pb#8lj> zFBZg}AGAICo8ptVYLE6#GgSL)J_nbeZ)q0OmGIBN8H?Kr;>?)?E^Nn3L5dV|!O1mF z3#C8RoS0fE_y4glO~Zvs7s@MquWhHy$%K3v?q=$$(^8ZMX_{HMiIMk35 zN$ZB=6oH2#*H|P8Q%Z}qc%=x9KPm1YnAd!wW$ss;z`@B+GGmT}6 z71a(}uYl`&;G)$^loQs*qYhe5HgIT`DY(FjJqc)$?bzgA=8A;e7SA#n$-x z%Ub_TIoTanjhMXcDUh9xG&E_)%Dc(>cd=RVE&H;nt$Q^?yCaI1GYmg?#PB|UsTP+x z%s?{f)KB!<*|(tgnKmM4aRVl%yy$L*8xxU6SlfmKVSzo&#$v_rjh#lY1(pG@zF$Ol z40NhnxVRe%J*>V{5}bU}__N|rAEwLZityUUCj3YUScydSG3D!YbBE(HUKmP`Qe1pl zl@C0F;O>4^(3c3|5;Nw zSJo)*PMY@)3D;F8B&O#k32}mBa3jOa=^t%Hn?}wOn3afy$UsU}9ug#4f%Nq2>Kncl ar?zZizb61*JnuG-KzqbaNJ-rZHD6wR6+dVI diff --git a/config/etc/certs/omc_pub.key b/config/etc/certs/omc_pub.key deleted file mode 100644 index 4f0922c8..00000000 --- a/config/etc/certs/omc_pub.key +++ /dev/null @@ -1,9 +0,0 @@ ------BEGIN PUBLIC KEY----- -MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA10O52xwLqvwrrof3Ckso -QAXgQOMfIHB5HfrJYrd31tJlJbFw+bR1JHXIAdqh9Cz+H0ir8KfBXS/U2XgI5fbI -upkzg3cRv86nuksGtrKHzi9Q7lYYzGWVW9Tc/hcvdibG6XwLSNYemFN6JrOa5mZ7 -IabtZLuPRwFCBx2XC/dg45wxrGWIe7fbw2SpGId76erwSn/oKJtoy5Ash7LrOkp6 -lu8L0QQNfs9cRntjf4aQo99ppWvUF0H6OFBsGymwRfPRtWqLiwK824zrpXKMLFX3 -e4FjFO7WQNR1spOuL0bH+Ym1cEPYUn8LJN9OaiodjEXc1pM1E5MHWXGMhnhiE9q3 -jwIDAQAB ------END PUBLIC KEY----- diff --git a/config/etc/default/4a_agent.yaml b/config/etc/default/4a_agent.yaml deleted file mode 100644 index 98de00de..00000000 --- a/config/etc/default/4a_agent.yaml +++ /dev/null @@ -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 diff --git a/config/etc/default/capconf.yaml b/config/etc/default/capconf.yaml new file mode 100644 index 00000000..74c1b7a6 --- /dev/null +++ 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 + + diff --git a/config/etc/default/nbi_agent.json b/config/etc/default/nbi_agent.json deleted file mode 100644 index 363de015..00000000 --- a/config/etc/default/nbi_agent.json +++ /dev/null @@ -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" - ] - } -} diff --git a/config/etc/default/nbi_alarm.json b/config/etc/default/nbi_alarm.json deleted file mode 100644 index fbac0b99..00000000 --- a/config/etc/default/nbi_alarm.json +++ /dev/null @@ -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" -} diff --git a/config/etc/default/tasks-1s.yaml b/config/etc/default/tasks-1s.yaml deleted file mode 100644 index f39e93e3..00000000 --- a/config/etc/default/tasks-1s.yaml +++ /dev/null @@ -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 diff --git a/config/etc/default/testconfig.yaml b/config/etc/default/testconfig.yaml deleted file mode 100644 index 1d0b592c..00000000 --- a/config/etc/default/testconfig.yaml +++ /dev/null @@ -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: [] -