OMC/nms_cxy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 相关测试配置

Browse Source
This commit is contained in:
TsMask
2024-07-12 17:45:51 +08:00
parent 04b3fb3e43
commit 1104be0b19
5 changed files with 11 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
omc/etc/omc.yaml
View File

@@ -187,7 +187,7 @@ nmsCXY:
# 专业编码2位 核心网HX 无线网WX # 专业编码2位 核心网HX 无线网WX
professionCode: "HX" professionCode: "HX"
# 厂商编码2位 中信科ZX # 厂商编码2位 中信科ZX
vendorCode: "AG" vendorCode: "AT"
# OMC编号3位 # OMC编号3位
omcCode: "001" omcCode: "001"
# 设备序列号 # 设备序列号
@@ -195,9 +195,9 @@ nmsCXY:
# Kafka配置 # Kafka配置
kafka: kafka:
addrs: addrs:
- "192.168.5.59:19092" - "192.168.8.58:19092"
- "192.168.5.59:29092" - "192.168.8.58:29092"
- "192.168.5.59:39092" - "192.168.8.58:39092"
# 启用 Kerberos 认证 # 启用 Kerberos 认证
krb5: krb5:
enable: false enable: false
@@ -211,7 +211,7 @@ nmsCXY:
# OSS配置 # OSS配置
oss: oss:
bucketname: "omc-bucket" bucketname: "omc-bucket"
endpoint: "192.168.5.59:9000" endpoint: "192.168.8.58:39000"
useSSL: false useSSL: false
accessKeyID: "aOW0r1gfw74G88Z3XZJ6" accessKeyID: "hZjJOByIz6TFzOzNkKB9"
secretAccessKey: "9tDErvtCEuVox6LoQu5BOVtycQKcQjlXOGvjl1eD" secretAccessKey: "eLpRYAG5Wb3Dr6bvmznGoiLmmflUsydOENLp9tlu"

9
omc/omc.go
View File

@@ -214,15 +214,6 @@ func main() {
go HttpListen(listen, app) go HttpListen(listen, app)
} }
} }
// if rest.IPv4 != "0.0.0.0" {
// // 默认启动localhost侦听
// listenLocal := "127.0.0.1" + ":" + strconv.Itoa(int(rest.Port))
// if strings.ToLower(rest.Scheme) == "https" {
// go HttpListenTLS(listenLocal, rest.CaFile, rest.CertFile, rest.KeyFile, rest.ClientAuthType, app)
// } else {
// go HttpListen(listenLocal, app)
// }
// }
// ipv6 goroutines // ipv6 goroutines
if rest.IPv6 != "" { if rest.IPv6 != "" {
listenv6 := "[" + rest.IPv6 + "]" + ":" + strconv.Itoa(int(rest.Port)) listenv6 := "[" + rest.IPv6 + "]" + ":" + strconv.Itoa(int(rest.Port))

6
src/framework/config/config.go
View File

@@ -27,9 +27,9 @@ func InitConfig() {
func initFlag() { func initFlag() {
// --env prod // --env prod
pflag.String("env", "prod", "Specify Run Environment Configuration local or prod") pflag.String("env", "prod", "Specify Run Environment Configuration local or prod")
// --c /etc/restconf.yaml // --c /etc/omc.yaml
// -c /etc/restconf.yaml // -c /etc/omc.yaml
pConfig := pflag.StringP("config", "c", "./etc/restconf.yaml", "Specify Configuration File") pConfig := pflag.StringP("config", "c", "./etc/omc.yaml", "Specify Configuration File")
// --version // --version
// -V // -V
pVersion := pflag.BoolP("version", "V", false, "Output program version") pVersion := pflag.BoolP("version", "V", false, "Output program version")

2
src/modules/nms_cxy/controller/test.go
View File

@@ -85,7 +85,7 @@ func (s *TestController) Demo(c *gin.Context) {
return return
} }
if body.OperType == "performance" { if body.OperType == "performance" {
err := s.performanceService.PerformanceUploadOSS("SMF", "2024-03-20 19:00:05", "2024-03-20 19:50:05") err := s.performanceService.PerformanceUploadOSS("AMF", "2024-07-12 16:00:05", "2024-07-12 17:00:05")
c.JSON(200, map[string]any{ c.JSON(200, map[string]any{
"requestId": body.RequestId, "requestId": body.RequestId,
"operType": body.OperType, "operType": body.OperType,

1
src/modules/nms_cxy/service/alarm.impl.go
View File

@@ -97,7 +97,6 @@ func (s *AlarmImpl) KafkaPush(alarm neDataModel.Alarm) error {
// 发送消息 // 发送消息
partition, offset, err := kafka.KInitConm.MessageSyncSend(topic, 0, string(bytes)) partition, offset, err := kafka.KInitConm.MessageSyncSend(topic, 0, string(bytes))
if err != nil { if err != nil {
logger.Errorf("KafkaPush MessageSyncSend err => %s", err.Error())
return err return err
} }
logger.Infof("KafkaPush MessageSyncSend Partition:%d, Offset:%d", partition, offset) logger.Infof("KafkaPush MessageSyncSend Partition:%d, Offset:%d", partition, offset)