From 12f1a3712f9a27783eb31ad3fe522495210a1ef7 Mon Sep 17 00:00:00 2001 From: simonzhangsz Date: Wed, 16 Aug 2023 17:15:22 +0800 Subject: [PATCH] permission --- config/mml/system/amf_sys_mml_config.yaml | 30 +++++++++ database/upgrade/mml_system.sql | 82 +++++++++++++++++++++++ database/upgrade/upgrade.sql | 1 + features/mml/mml.go | 42 +++++++++--- features/trace/trace.go | 5 ++ restagent/etc/restconf-t.yaml | 4 +- 6 files changed, 153 insertions(+), 11 deletions(-) create mode 100644 database/upgrade/mml_system.sql diff --git a/config/mml/system/amf_sys_mml_config.yaml b/config/mml/system/amf_sys_mml_config.yaml index 0c3dfd45..25f466a4 100644 --- a/config/mml/system/amf_sys_mml_config.yaml +++ b/config/mml/system/amf_sys_mml_config.yaml @@ -62,6 +62,36 @@ amf: filter: "0~65535" display: "Port" comment: "" + - operation: "set" + object: "ntpversion" + display: "Set NTP Version" + params: + - name: "version" + type: "int" + optional: "false" + filter: "" + display: "Version" + comment: "" + - operation: "set" + object: "ntpmaxdiff" + display: "Set NTP Max Diff" + params: + - name: "value" + type: "int" + optional: "false" + filter: "100~2000" + display: "Max Value(ms)" + comment: "" + - operation: "set" + object: "ntpsynctimer" + display: "Set NTP Sync Timer" + params: + - name: "periods" + type: "int" + optional: "false" + filter: "" + display: "Periods(second)" + comment: "" - operation: "add" object: "slice" display: "Add Slice" diff --git a/database/upgrade/mml_system.sql b/database/upgrade/mml_system.sql new file mode 100644 index 00000000..092da92f --- /dev/null +++ b/database/upgrade/mml_system.sql @@ -0,0 +1,82 @@ +/* + Navicat Premium Data Transfer + + Source Server : root@192.168.4.230 + Source Server Type : MariaDB + Source Server Version : 100335 (10.3.35-MariaDB) + Source Host : 192.168.4.230:33066 + Source Schema : omc_db + + Target Server Type : MariaDB + Target Server Version : 100335 (10.3.35-MariaDB) + File Encoding : 65001 + + Date: 16/08/2023 15:22:28 +*/ + +SET NAMES utf8mb4; +SET FOREIGN_KEY_CHECKS = 0; + +-- ---------------------------- +-- Table structure for mml_system +-- ---------------------------- +DROP TABLE IF EXISTS `mml_system`; +CREATE TABLE `mml_system` ( + `id` int(11) NOT NULL AUTO_INCREMENT, + `ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `category` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `cat_display` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `operation` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `object` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `mml_display` varchar(128) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, + `param_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL, + PRIMARY KEY (`id`) USING BTREE, + INDEX `id`(`id`) USING BTREE +) ENGINE = InnoDB AUTO_INCREMENT = 521 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; + +-- ---------------------------- +-- Records of mml_system +-- ---------------------------- +INSERT INTO `mml_system` VALUES (475, 'AMF', 'systemManagement', 'System Management', 'set', 'n8_ip', 'Set N8 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (476, 'AMF', 'systemManagement', 'System Management', 'set', 'n11_ip', 'Set N11 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (477, 'AMF', 'systemManagement', 'System Management', 'set', 'n12_ip', 'Set N12 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (478, 'AMF', 'systemManagement', 'System Management', 'set', 'n2_ip', 'Set N2 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (479, 'AMF', 'systemManagement', 'System Management', 'set', 'n2_port', 'Set N2 Port', '[{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"0~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (480, 'AMF', 'systemManagement', 'System Management', 'add', 'slice', 'Add Slice', '[{\"comment\":\"\",\"display\":\"SST\",\"filter\":\"\",\"name\":\"sst\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"SD\",\"filter\":\"\",\"name\":\"sd\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (481, 'AMF', 'systemManagement', 'System Management', 'deregister', 'imsi', 'Deregister IMSI', '[{\"comment\":\"\",\"display\":\"IMSI\",\"filter\":\"\",\"name\":\"IMSI\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (482, 'AMF', 'systemManagement', 'System Management', 'exec', 'shell', 'Execute Shell Command', '[{\"comment\":\"\",\"display\":\"CMD\",\"filter\":\"\",\"name\":\"cmd\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (483, 'AUSF', 'systemManagement', 'System Management', 'set', 'n12ip', 'Set N12 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (484, 'AUSF', 'systemManagement', 'System Management', 'set', 'n12port', 'Set N12 Port', '[{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"1~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (485, 'AUSF', 'systemManagement', 'System Management', 'set', 'n12scheme', 'Set N12 Scheme', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"}]'); +INSERT INTO `mml_system` VALUES (486, 'AUSF', 'systemManagement', 'System Management', 'set', 'supirange', 'Set SUPI Range', '[{\"comment\":\"\",\"display\":\"SUPI Range\",\"filter\":\"\",\"name\":\"supirange\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (487, 'SMF', 'systemManagement', 'System Management', 'set', 'n7 server', 'Set N7 Server', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"0~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (488, 'SMF', 'systemManagement', 'System Management', 'set', 'n7 client', 'Set N7 Client', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (489, 'SMF', 'systemManagement', 'System Management', 'set', 'n10 server', 'Set N10 Server', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"0~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (490, 'SMF', 'systemManagement', 'System Management', 'set', 'n10 client', 'Set N10 Client', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (491, 'SMF', 'systemManagement', 'System Management', 'set', 'n11 server', 'Set N11 Server', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"0~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (492, 'SMF', 'systemManagement', 'System Management', 'set', 'n11 client', 'Set N11 Client', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"0~64\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (493, 'SMF', 'systemManagement', 'System Management', 'set', 'dnn', 'Set DNN', '[{\"comment\":\"\",\"display\":\"Index\",\"filter\":\"\",\"name\":\"index\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"\",\"name\":\"DNN\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (495, 'SMF', 'systemManagement', 'System Management', 'set', 'qos', 'Set Qos', '[{\"comment\":\"\",\"display\":\"Index\",\"filter\":\"\",\"name\":\"index\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"SD\",\"filter\":\"\",\"name\":\"5qi\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"5qipl\",\"filter\":\"\",\"name\":\"5qipl\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"arppl\",\"filter\":\"\",\"name\":\"arppl\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"arppci\",\"filter\":\"\",\"name\":\"arppci\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"arppvi\",\"filter\":\"\",\"name\":\"arppvi\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"mfbrul\",\"filter\":\"\",\"name\":\"mfbrul\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"mfbrdl\",\"filter\":\"\",\"name\":\"mfbrdl\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"gfbrul\",\"filter\":\"\",\"name\":\"gfbrul\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"gfbrdl\",\"filter\":\"\",\"name\":\"gfbrdl\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (496, 'SMF', 'systemManagement', 'System Management', 'set', 'snssai', 'Set Snssai', '[{\"comment\":\"\",\"display\":\"Index\",\"filter\":\"\",\"name\":\"index\",\"optional\":\"false\",\"type\":\"string\"},{\"display\":\"sst-sd\",\"filter\":\"\",\"name\":\"sst-sd\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (497, 'SMF', 'systemManagement', 'System Management', 'release', 'imsi', 'Release IMSI', '[{\"comment\":\"\",\"display\":\"IMSI\",\"filter\":\"\",\"name\":\"imsi\",\"optional\":\"false\",\"type\":\"string\"},{\"display\":\"PDU Session Id\",\"filter\":\"\",\"name\":\"pduSessId\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (498, 'SMF', 'systemManagement', 'System Management', 'set', 'urr', 'Set URR', '[{\"comment\":\"\",\"display\":\"Index\",\"filter\":\"\",\"name\":\"index\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Quota Volume Tatol\",\"filter\":\"\",\"name\":\"quotavolumetatol\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Quota Volume UL\",\"filter\":\"\",\"name\":\"quotavolumeul\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Quota Volume DL\",\"filter\":\"\",\"name\":\"quotavolumedl\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Quota Time\",\"filter\":\"\",\"name\":\"quotatime\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (499, 'SMF', 'systemManagement', 'System Management', 'set', 'dpi', 'Set DPI', '[{\"comment\":\"\",\"display\":\"Flag\",\"filter\":\"{\\\"0\\\":\\\"disable\\\", \\\"1\\\":\\\"enable\\\"}\",\"name\":\"flag\",\"optional\":\"false\",\"type\":\"enum\"},{\"comment\":\"\",\"display\":\"Max Detect Packet Number\",\"filter\":\"\",\"name\":\"max\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (500, 'SMF', 'systemManagement', 'System Management', 'exec', 'shell', 'Execute Shell Command', '[{\"comment\":\"\",\"display\":\"CMD\",\"filter\":\"\",\"name\":\"cmd\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (505, 'UDM', 'systemManagement', 'System Management', 'set', 'n8ip', 'Set N8 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"ipv4\"}]'); +INSERT INTO `mml_system` VALUES (506, 'UDM', 'systemManagement', 'System Management', 'set', 'n8port', 'Set N8 Port', '[{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"1~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (507, 'UDM', 'systemManagement', 'System Management', 'set', 'n8scheme', 'Set N8 Scheme', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"}]'); +INSERT INTO `mml_system` VALUES (508, 'UDM', 'systemManagement', 'System Management', 'set', 'n10ip', 'Set N10 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (509, 'UDM', 'systemManagement', 'System Management', 'set', 'n10port', 'Set N10 Port', '[{\"comment\":\"\",\"display\":\"Port\",\"filter\":\"1~65535\",\"name\":\"port\",\"optional\":\"false\",\"type\":\"int\"}]'); +INSERT INTO `mml_system` VALUES (510, 'UDM', 'systemManagement', 'System Management', 'set', 'n10scheme', 'Set N10 Scheme', '[{\"comment\":\"\",\"display\":\"Scheme\",\"filter\":\"{\\\"0\\\":\\\"http\\\", \\\"1\\\":\\\"https\\\"}\",\"name\":\"scheme\",\"optional\":\"false\",\"type\":\"enum\"}]'); +INSERT INTO `mml_system` VALUES (511, 'UDM', 'systemManagement', 'System Management', 'exec', 'shell', 'Execute Shell Command', '[{\"comment\":\"\",\"display\":\"CMD\",\"filter\":\"\",\"name\":\"cmd\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (512, 'UPF', 'systemManagement', 'System Management', 'set', 'n3 driver', 'Set N3 Driver', '[{\"comment\":\"\",\"display\":\"Type\",\"filter\":\"\",\"name\":\"type\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"IP address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Mask\",\"filter\":\"\",\"name\":\"mask\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Mac address\",\"filter\":\"\",\"name\":\"mac\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"PCI address\",\"filter\":\"\",\"name\":\"pci\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (513, 'UPF', 'systemManagement', 'System Management', 'set', 'n4 ip', 'Set N4 IP Address', '[{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (514, 'UPF', 'systemManagement', 'System Management', 'set', 'n6 driver', 'Set N6 Driver', '[{\"comment\":\"\",\"display\":\"Type\",\"filter\":\"\",\"name\":\"type\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"IP address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Mask\",\"filter\":\"\",\"name\":\"mask\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Mac address\",\"filter\":\"\",\"name\":\"mac\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"PCI address\",\"filter\":\"\",\"name\":\"pci\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (515, 'UPF', 'systemManagement', 'System Management', 'set', 'n9 driver', 'Set N9 Driver', '[{\"comment\":\"\",\"display\":\"Type\",\"filter\":\"\",\"name\":\"type\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"IP address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Mask\",\"filter\":\"\",\"name\":\"mask\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Mac address\",\"filter\":\"\",\"name\":\"mac\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"PCI address\",\"filter\":\"\",\"name\":\"pci\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (516, 'UPF', 'systemManagement', 'System Management', 'set', 'dnn', 'Set DNN', '[{\"comment\":\"\",\"display\":\"DNN\",\"filter\":\"\",\"name\":\"dnn\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"IP Address\",\"filter\":\"\",\"name\":\"ip\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (517, 'UPF', 'systemManagement', 'System Management', 'set', 'pfcp', 'Set PFCP', '[{\"comment\":\"\",\"display\":\"Path\",\"filter\":\"\",\"name\":\"path\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Local IP Address\",\"filter\":\"\",\"name\":\"local\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Remote IP Address\",\"filter\":\"\",\"name\":\"remote\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (518, 'UPF', 'systemManagement', 'System Management', 'set', 'qos', 'Set Qos', '[{\"comment\":\"\",\"display\":\"Index\",\"filter\":\"\",\"name\":\"index\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"5qi\",\"filter\":\"\",\"name\":\"5qi\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Priority Level\",\"filter\":\"\",\"name\":\"priority\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"MBR\",\"filter\":\"\",\"name\":\"mbr\",\"optional\":\"false\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"GBR\",\"filter\":\"\",\"name\":\"gbr\",\"optional\":\"false\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (519, 'UPF', 'systemManagement', 'System Management', 'set', 'pccrule', 'Set PCC Rule', '[{\"comment\":\"\",\"display\":\"Index\",\"filter\":\"0~65535\",\"name\":\"index\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"Precedence\",\"filter\":\"\",\"name\":\"precedence\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"QOS Index\",\"filter\":\"\",\"name\":\"qosindex\",\"optional\":\"false\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"Filter Direction\",\"filter\":\"{\\\"0\\\":\\\"NA\\\", \\\"1\\\":\\\"Uplink\\\", \\\"2\\\":\\\"Downlink\\\", \\\"3\\\":\\\"Bidirectionallink\\\"}\",\"name\":\"direction\",\"optional\":\"true\",\"type\":\"int\"},{\"comment\":\"\",\"display\":\"Filter\",\"filter\":\"\",\"name\":\"filter\",\"optional\":\"true\",\"type\":\"string\"},{\"comment\":\"\",\"display\":\"Application ID\",\"filter\":\"\",\"name\":\"appid\",\"optional\":\"true\",\"type\":\"string\"}]'); +INSERT INTO `mml_system` VALUES (520, 'UPF', 'systemManagement', 'System Management', 'exec', 'shell', 'Execute Shell Command', '[{\"comment\":\"\",\"display\":\"CMD\",\"filter\":\"\",\"name\":\"cmd\",\"optional\":\"false\",\"type\":\"string\"}]'); + +SET FOREIGN_KEY_CHECKS = 1; diff --git a/database/upgrade/upgrade.sql b/database/upgrade/upgrade.sql index dd2b3ced..0c6520e2 100644 --- a/database/upgrade/upgrade.sql +++ b/database/upgrade/upgrade.sql @@ -25,6 +25,7 @@ ADD COLUMN IF NOT EXISTS `management` varchar(32) NULL DEFAULT '*' AFTER `method ALTER TABLE `omc_db`.`permission` CHANGE COLUMN `create_at` `created_at` datetime NULL DEFAULT current_timestamp AFTER `description`, +MODIFY COLUMN `method` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' AFTER `permission_name`, MODIFY COLUMN `management` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' AFTER `method`, MODIFY COLUMN `element` varchar(10) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' AFTER `management`, MODIFY COLUMN `object` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT '*' AFTER `element`, diff --git a/features/mml/mml.go b/features/mml/mml.go index 71590721..fad384e9 100644 --- a/features/mml/mml.go +++ b/features/mml/mml.go @@ -50,6 +50,12 @@ var ( func PostMMLToNF(w http.ResponseWriter, r *http.Request) { log.Debug("PostMMLToNF processing... ") + token, err := services.CheckExtValidRequest(w, r) + if err != nil { + log.Error("Request error:", err) + return + } + vars := mux.Vars(r) neType := vars["elementTypeValue"] params := r.URL.Query() @@ -61,14 +67,36 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) { } log.Debug("neType:", neType, "neId", neId) - if strings.ToLower(neType) == "omc" { - PostMMLToOMC(w, r) + log.Debugf("token:%s, method:%s, dbname:%s, tbname:%s", token, r.Method, neType, neId[0]) + + var buf [8192]byte + var n int + var mmlResult []string + + exist, err := services.CheckUserPermission(token, strings.ToLower(r.Method), neType, neId[0]) + if err != nil { + log.Error("Failed to get permission:", err) + errMsg := fmt.Sprintf("RetCode = -1 operation failed: do not have the operation permissions") + log.Error(errMsg) + mmlResult = append(mmlResult, errMsg) + response := Response{mmlResult} + services.ResponseWithJson(w, http.StatusOK, response) + //services.ResponseForbidden403NotPermission(w) + return + } + if !exist { + log.Error("Not permission!") + errMsg := fmt.Sprintf("RetCode = -1 operation failed: do not have the operation permissions") + log.Error(errMsg) + mmlResult = append(mmlResult, errMsg) + response := Response{mmlResult} + services.ResponseWithJson(w, http.StatusOK, response) + //services.ResponseForbidden403NotPermission(w) return } - _, err := services.CheckExtValidRequest(w, r) - if err != nil { - log.Error("Failed to CheckMmlValidRequest:", err) + if strings.ToLower(neType) == "omc" { + PostMMLToOMC(w, r) return } @@ -80,10 +108,6 @@ func PostMMLToNF(w http.ResponseWriter, r *http.Request) { return } - var buf [8192]byte - var n int - var mmlResult []string - if neInfo != nil { hostMML := fmt.Sprintf("%s:%d", neInfo.Ip, config.GetYamlConfig().MML.Port) conn, err := net.Dial("tcp", hostMML) diff --git a/features/trace/trace.go b/features/trace/trace.go index 34010b46..dd447705 100644 --- a/features/trace/trace.go +++ b/features/trace/trace.go @@ -89,6 +89,8 @@ func PostTraceTaskToNF(w http.ResponseWriter, r *http.Request) { services.ResponseInternalServerError500ProcessError(w, err) return } + } else { + neTypes = []string{"AMF", "SMF", "UDM", "AUSF", "UPF"} } } else { neTypes = append(neTypes, traceTask.NeType) @@ -215,7 +217,10 @@ func PutTraceTaskToNF(w http.ResponseWriter, r *http.Request) { services.ResponseInternalServerError500ProcessError(w, err) return } + } else { + neTypes = []string{"AMF", "SMF", "UDM", "AUSF", "UPF"} } + } else { neTypes = append(neTypes, traceTask.NeType) } diff --git a/restagent/etc/restconf-t.yaml b/restagent/etc/restconf-t.yaml index 294c2849..4f68a218 100644 --- a/restagent/etc/restconf-t.yaml +++ b/restagent/etc/restconf-t.yaml @@ -3,7 +3,7 @@ # duration: rotation time with xx hours, example: 1/12/24 hours # count: rotation count of log, default is 30 rotation logger: - file: d:/omc.git/goprojects/ems.agt/restagent/log/restagent-t.log + file: d:/local.git/be.ems/restagent/log/restagent-t.log level: trace duration: 24 count: 2 @@ -55,7 +55,7 @@ omc: checksign: false backup: ./backup upload: ./upload - frontUpload: d:/omc.git/goprojects/build/omc/htdocs/front/upload + frontUpload: d:/local.git/fe.ems/upload software: ./software license: ./license gtpUri: gtp:192.168.2.119:2152