OMC/be.ems
1
0
Fork 0
Code Issues Releases 3 Activity

feat: nbi release 2.2506.1

Browse Source
This commit is contained in:
simon
2025-06-23 18:29:05 +08:00
parent 9fa77a139a
commit 13c07004b4
11 changed files with 88 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
database/install/nbi_cm.sql
View File

@@ -1,17 +1,17 @@
/* /*
Navicat Premium Data Transfer Navicat Premium Data Transfer
Source Server : omc@192.168.2.164 Source Server : root@192.168.2.165
Source Server Type : MariaDB Source Server Type : MariaDB
Source Server Version : 100528 (10.5.28-MariaDB) Source Server Version : 100335 (10.3.35-MariaDB)
Source Host : 192.168.2.164:33066 Source Host : 192.168.2.165:33066
Source Schema : omc_db Source Schema : omc_db
Target Server Type : MariaDB Target Server Type : MariaDB
Target Server Version : 100528 (10.5.28-MariaDB) Target Server Version : 100335 (10.3.35-MariaDB)
File Encoding : 65001 File Encoding : 65001
Date: 29/04/2025 19:39:13 Date: 26/05/2025 17:26:21
*/ */
SET NAMES utf8mb4; SET NAMES utf8mb4;
@@ -27,12 +27,13 @@ CREATE TABLE `nbi_cm` (
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`cm_version` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `cm_version` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`event_type` enum('ObjectCreationEvent','ObjectDeletionEvent','ObjectAttributeValueChangeEvent') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ObjectCreationEvent', `event_type` enum('ObjectOriginalEvent','ObjectCreationEvent','ObjectDeletionEvent','ObjectAttributeValueChangeEvent') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ObjectCreationEvent',
`object_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `object_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`value_json` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL, `value_json` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
`timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP, `timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE, PRIMARY KEY (`id`) USING BTREE,
INDEX `idx-ne-id-rmuid`(`ne_type`, `ne_id`, `rm_uid`) USING BTREE INDEX `idx-ne-id-rmuid`(`ne_type`, `ne_id`, `rm_uid`) USING BTREE,
) ENGINE = InnoDB AUTO_INCREMENT = 321573 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic; INDEX `idx-timestamp`(`timestamp`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 93 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1; SET FOREIGN_KEY_CHECKS = 1;

39
database/upgrade/nbi_cm1.sql Executable file
View File

@@ -0,0 +1,39 @@
/*
Navicat Premium Data Transfer
Source Server : root@192.168.2.165
Source Server Type : MariaDB
Source Server Version : 100335 (10.3.35-MariaDB)
Source Host : 192.168.2.165:33066
Source Schema : omc_db
Target Server Type : MariaDB
Target Server Version : 100335 (10.3.35-MariaDB)
File Encoding : 65001
Date: 26/05/2025 17:22:45
*/
SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0;
-- ----------------------------
-- Table structure for nbi_cm
-- ----------------------------
DROP TABLE IF EXISTS `nbi_cm`;
CREATE TABLE `nbi_cm` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`cm_version` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`event_type` enum('ObjectOriginalEvent','ObjectCreationEvent','ObjectDeletionEvent','ObjectAttributeValueChangeEvent') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ObjectCreationEvent',
`object_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`value_json` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
`timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx-ne-id-rmuid`(`ne_type`, `ne_id`, `rm_uid`) USING BTREE,
INDEX `idx-timestamp`(`timestamp`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 93 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
SET FOREIGN_KEY_CHECKS = 1;

2
database/upgrade/upg_alarm_relation.sql
View File

@@ -1,7 +1,7 @@
SET NAMES utf8mb4; SET NAMES utf8mb4;
SET FOREIGN_KEY_CHECKS = 0; SET FOREIGN_KEY_CHECKS = 0;
CREATE TABLE `alarm_relation` ( CREATE TABLE IF NOT EXISTS `alarm_relation` (
`id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT, `id` bigint(20) UNSIGNED NOT NULL AUTO_INCREMENT,
`root_alarm_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `root_alarm_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`alarm_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL, `alarm_id` varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,

20
database/upgrade/upg_nbi_cm.sql
View File

@@ -1,6 +1,21 @@
SET FOREIGN_KEY_CHECKS=0; SET FOREIGN_KEY_CHECKS=0;
ALTER TABLE `nbi_cm` ADD COLUMN IF NOT EXISTS `event_type` enum('ObjectCreationEvent','ObjectDeletionEvent','ObjectAttributeValueChangeEvent') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ObjectCreationEvent' AFTER `rm_uid`; CREATE TABLE IF NOT EXISTS `nbi_cm` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`ne_type` varchar(16) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`cm_version` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`rm_uid` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`event_type` enum('ObjectOriginalEvent','ObjectCreationEvent','ObjectDeletionEvent','ObjectAttributeValueChangeEvent') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ObjectCreationEvent',
`object_type` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL,
`value_json` varchar(1024) CHARACTER SET utf8mb4 COLLATE utf8mb4_bin NULL DEFAULT NULL,
`timestamp` datetime NULL DEFAULT current_timestamp() ON UPDATE CURRENT_TIMESTAMP,
PRIMARY KEY (`id`) USING BTREE,
INDEX `idx-ne-id-rmuid`(`ne_type`, `ne_id`, `rm_uid`) USING BTREE,
INDEX `idx-timestamp`(`timestamp`) USING BTREE
) ENGINE = InnoDB AUTO_INCREMENT = 93 CHARACTER SET = utf8mb4 COLLATE = utf8mb4_general_ci ROW_FORMAT = Dynamic;
ALTER TABLE `nbi_cm` ADD COLUMN IF NOT EXISTS `event_type` enum('ObjectOriginalEvent','ObjectCreationEvent','ObjectDeletionEvent','ObjectAttributeValueChangeEvent') CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT 'ObjectCreationEvent' AFTER `rm_uid`;
ALTER TABLE `nbi_cm` MODIFY COLUMN `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `ne_type`; ALTER TABLE `nbi_cm` MODIFY COLUMN `ne_id` varchar(32) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NULL DEFAULT NULL AFTER `ne_type`;
@@ -25,4 +40,7 @@ ALTER TABLE `nbi_cm` DROP COLUMN IF EXISTS `status`;
ALTER TABLE `nbi_cm` ALTER TABLE `nbi_cm`
ADD INDEX IF NOT EXISTS `idx-ne-id-rmuid`(`ne_type`, `ne_id`, `rm_uid`) USING BTREE; ADD INDEX IF NOT EXISTS `idx-ne-id-rmuid`(`ne_type`, `ne_id`, `rm_uid`) USING BTREE;
ALTER TABLE `nbi_cm`
ADD INDEX `idx-timestamp`(`timestamp`) USING BTREE;
SET FOREIGN_KEY_CHECKS=1; SET FOREIGN_KEY_CHECKS=1;

2
makefile
View File

@@ -3,7 +3,7 @@
ProjectL = omc ProjectL = omc
ProjectU = OMC ProjectU = OMC
PROJECT = $(ProjectL) PROJECT = $(ProjectL)
VERSION = 2.2505.1 VERSION = 2.2506.1
RelDate = `date +%Y%m%d` RelDate = `date +%Y%m%d`
Release = $(RelDate) Release = $(RelDate)
RelVer = $(VERSION)-$(RelDate) RelVer = $(VERSION)-$(RelDate)

2
mkpkg.sh
View File

@@ -2,7 +2,7 @@
ProcList="restagent sshsvc" ProcList="restagent sshsvc"
ProjectL=omc ProjectL=omc
VERSION=2.2505.1 VERSION=2.2506.1
RelDate=`date +%Y%m%d` RelDate=`date +%Y%m%d`
Release=${RelDate} Release=${RelDate}
RelVer=${VERSION}-${RelDate} RelVer=${VERSION}-${RelDate}

2
restagent/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for rest agent project # Makefile for rest agent project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2505.1 VERSION = 2.2506.1
PLATFORM = amd64 PLATFORM = amd64
ARMPLATFORM = aarch64 ARMPLATFORM = aarch64
BUILDDIR = ../../build BUILDDIR = ../../build

14
src/modules/crontask/processor/syncNbiNRM/amf/sync.go
View File

@@ -151,8 +151,8 @@ func SyncNbiCM() error {
epRpDynN8Amf := EpRpDynN8Amf{ epRpDynN8Amf := EpRpDynN8Amf{
Id: fmt.Sprintf("%s-%s-EpRpDynN8Amf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN8Amf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN8Amf", UserLabel: ne.NeName + "-EpRpDynN8Amf",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: "[\"10.10.0.0/16\"]", FarIpSubnetworkList: `{{Subnetwork:10.10.1.0,Mask:255.255.255.255}}`,
} }
n8JSON, err := json.Marshal(epRpDynN8Amf) n8JSON, err := json.Marshal(epRpDynN8Amf)
if err != nil { if err != nil {
@@ -194,8 +194,8 @@ func SyncNbiCM() error {
epRpDynN11Amf := EpRpDynN11Amf{ epRpDynN11Amf := EpRpDynN11Amf{
Id: fmt.Sprintf("%s-%s-EpRpDynN11Amf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN11Amf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN11Amf", UserLabel: ne.NeName + "-EpRpDynN11Amf",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: "[\"10.11.0.0/16\"]", FarIpSubnetworkList: `{{Subnetwork:10.11.1.0,Mask:255.255.255.255}}`,
} }
n11JSON, err := json.Marshal(epRpDynN11Amf) n11JSON, err := json.Marshal(epRpDynN11Amf)
if err != nil { if err != nil {
@@ -237,8 +237,8 @@ func SyncNbiCM() error {
epRpDynN12Amf := EpRpDynN12Amf{ epRpDynN12Amf := EpRpDynN12Amf{
Id: fmt.Sprintf("%s-%s-EpRpDynN12Amf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN12Amf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN12Amf", UserLabel: ne.NeName + "-EpRpDynN12Amf",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: "[\"10.12.0.0/16\"]", FarIpSubnetworkList: `{{Subnetwork:10.12.1.0,Mask:255.255.255.255}}`,
} }
n12JSON, err := json.Marshal(epRpDynN12Amf) n12JSON, err := json.Marshal(epRpDynN12Amf)
if err != nil { if err != nil {
@@ -281,7 +281,7 @@ func SyncNbiCM() error {
Id: fmt.Sprintf("%s-%s-IPResource", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-IPResource", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-IPResource", UserLabel: ne.NeName + "-IPResource",
InterfaceType: "{Mgt,N8,N11,N12}", InterfaceType: "{Mgt,N8,N11,N12}",
LocIpV4AddrList: fmt.Sprintf("{%s,Default,Default,Default}", ne.Ip), LocIpV4AddrList: fmt.Sprintf("{%s,%s,%s,%s}", ne.Ip, "10.10.1.100", "10.11.1.100", "10.12.1.100"),
LocIpV6AddrList: "{Default,Default,Default,Default}", LocIpV6AddrList: "{Default,Default,Default,Default}",
} }
ipJSON, err := json.Marshal(ipResource) ipJSON, err := json.Marshal(ipResource)

10
src/modules/crontask/processor/syncNbiNRM/smf/sync.go
View File

@@ -149,7 +149,7 @@ func SyncNbiCM() error {
UserLabel: ne.NeName + "-AddrPool", UserLabel: ne.NeName + "-AddrPool",
AddrType: "UE", AddrType: "UE",
IpVersion: "IPv4", IpVersion: "IPv4",
AddrSegList: "[\"10.60.0.0/16\",\"10.61.0.0/16\"]", AddrSegList: `{{StartIp:10.60.1.100,SegLen:100},{StartIp:10.61.1.100,SegLen:100}}`,
} }
addrPoolJSON, err := json.Marshal(addrPool) addrPoolJSON, err := json.Marshal(addrPool)
if err != nil { if err != nil {
@@ -191,8 +191,8 @@ func SyncNbiCM() error {
epRpDynN7Smf := EpRpDynN7Smf{ epRpDynN7Smf := EpRpDynN7Smf{
Id: fmt.Sprintf("%s-%s-EpRpDynN7Smf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN7Smf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-N7", UserLabel: ne.NeName + "-N7",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: "[\"10.17.0.0/16\"]", FarIpSubnetworkList: `{{Subnetwork:10.17.1.0,Mask:255.255.255.255}}`,
} }
n7JSON, err := json.Marshal(epRpDynN7Smf) n7JSON, err := json.Marshal(epRpDynN7Smf)
if err != nil { if err != nil {
@@ -234,8 +234,8 @@ func SyncNbiCM() error {
epRpDynN10Smf := EpRpDynN10Smf{ epRpDynN10Smf := EpRpDynN10Smf{
Id: fmt.Sprintf("%s-%s-EpRpDynN10Smf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN10Smf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-N10", UserLabel: ne.NeName + "-N10",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: "[\"10.20.0.0/16\"]", FarIpSubnetworkList: `{{Subnetwork:10.20.1.0,Mask:255.255.255.255}}`,
} }
n10JSON, err := json.Marshal(epRpDynN10Smf) n10JSON, err := json.Marshal(epRpDynN10Smf)
if err != nil { if err != nil {

8
src/modules/crontask/processor/syncNbiNRM/upf/sync.go
View File

@@ -402,8 +402,8 @@ func SyncNbiCM() error {
epRpDynN3Upf := EpRpDynN3Upf{ epRpDynN3Upf := EpRpDynN3Upf{
Id: fmt.Sprintf("%s-%s-EpRpDynN3Upf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN3Upf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN3Upf", UserLabel: ne.NeName + "-EpRpDynN3Upf",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{"` + ne.Ip + `"}`,
FarIpSubnetworkList: "[\"10.13.0.0/16\"]", FarIpSubnetworkList: `{{"Subnetwork":"10.13.1.0","Mask":"255.255.255.255"}}`,
} }
n3JSON, err := json.Marshal(epRpDynN3Upf) n3JSON, err := json.Marshal(epRpDynN3Upf)
if err != nil { if err != nil {
@@ -445,8 +445,8 @@ func SyncNbiCM() error {
epRpDynN9Upf := EpRpDynN9Upf{ epRpDynN9Upf := EpRpDynN9Upf{
Id: fmt.Sprintf("%s-%s-EpRpDynN9Upf", ne.NeType, ne.NeId), Id: fmt.Sprintf("%s-%s-EpRpDynN9Upf", ne.NeType, ne.NeId),
UserLabel: ne.NeName + "-EpRpDynN9Upf", UserLabel: ne.NeName + "-EpRpDynN9Upf",
LocIpAddrList: "[\"" + ne.Ip + "\"]", LocIpAddrList: `{` + ne.Ip + `}`,
FarIpSubnetworkList: "[\"10.19.0.0/16\"]", FarIpSubnetworkList: `{{Subnetwork:10.19.1.0,Mask:255.255.255.255}}`,
} }
n9JSON, err := json.Marshal(epRpDynN9Upf) n9JSON, err := json.Marshal(epRpDynN9Upf)
if err != nil { if err != nil {

2
sshsvc/makefile
View File

@@ -1,7 +1,7 @@
# Makefile for OMC-OMC-crontask project # Makefile for OMC-OMC-crontask project
PROJECT = OMC PROJECT = OMC
VERSION = 2.2505.1 VERSION = 2.2506.1
LIBDIR = be.ems/lib LIBDIR = be.ems/lib
BINNAME = sshsvc BINNAME = sshsvc