merge: 合并代码20241228

restagent/config/config.go

@@ -67,7 +67,9 @@ type YamlConfig struct {
 		Vendor           string `yaml:"vendor"`
 		Dn               string `yaml:"dn"`
 		Chk2Ne           bool   `yaml:"chk2ne"`
+		Capability       uint32 `yaml:"capability"`
 		Sn               string `yaml:"sn"`
+		ExpiryDate       string `yaml:"expiryDate"`
 		CheckSign        bool   `yaml:"checksign"`
 		RootDir          string `yaml:"rootDir"`
 		BinDir           string `yaml:"binDir"`

restagent/etc/restconf.yaml

@@ -21,6 +21,14 @@ rest:
   - ipv4: 0.0.0.0
     ipv6: 
     port: 33040
+  - ipv4: 0.0.0.0
+    ipv6: 
+    port: 33443
+    scheme: https
+    clientAuthType: 0
+    caFile: ./etc/certs/omc-ca.crt
+    certFile: ./etc/certs/omc-server.crt
+    keyFile: ./etc/certs/omc-server.key
 
 webServer:
   enabled: false
@@ -54,12 +62,6 @@ redis:
       host: "192.168.9.58" # Redis host
       password: "helloearth"
       db: 10 # Redis db_num
-    # UDM sub/auth db
-    udmuser:
-      port: 6379 # Redis port
-      host: "192.168.8.58"
-      password: "helloearth"
-      db: 0 # Redis db_num
   # used to specify the default data source for multiple data resourece
   defaultDataSourceName: "default"
 
@@ -106,7 +108,9 @@ omc:
   vendor: ""
   dn: 4600
   chk2ne: false
-  sn: "-"
+  capability: 50
+  sn: "12345678"
+  expiryDate: "2099-12-31"
   checksign: false
   rootDir: ./
   binDir: ./bin

restagent/makefile

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