Merge remote-tracking branch 'origin/main' into lichang

config/etc/default/crontask.yaml

@@ -3,7 +3,7 @@
 # duration: saved days, default is 30 days
 logger:
   file: /usr/local/omc/log/crontask.log
-  level: trace
+  level: debug
   duration: 24
   count: 90 
 
@@ -11,7 +11,7 @@ omc:
   name: OMC01
   hosturi: http://127.0.0.1:33030
   hostno: A001
-  province: GD
+  province: ""
   netabbr: HX
   vendor: ""
 

config/etc/default/restconf.yaml

@@ -127,7 +127,7 @@ omc:
 
 # Alarm module setting
 # Forward interface:
-# email/sms  
+# email/sms/smsc  
 alarm: 
   forwardAlarm: true
   email:
@@ -143,6 +143,11 @@ alarm:
     accessKeySecret: xxx
     signName: XXX SMSC
     templateCode: 1000
+  smsc:
+    addr: "192.168.13.114:2775"
+    systemID: "alarmsmsfw"
+    password: "omc123"
+    systemType: ""
   
 # User authorized information
 # crypt: mysql/md5/bcrypt

config/param/pcf_param_config.yaml

@@ -30,6 +30,34 @@ pcf:
       filter: ''
       display: "NRF URI"
       comment: ""
+    - name: "supportedPlmn1"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn1"
+      comment: ""
+    - name: "supportedPlmn2"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn2"
+      comment: ""
+    - name: "supportedPlmn3"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn3"
+      comment: ""
+    - name: "supportedPlmn4"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn4"
+      comment: ""
   serviceAreaRestriction:
     display: "Service Area Restriction"
     array:

config/param/udm_param_config.yaml

@@ -58,6 +58,34 @@ udm:
       filter: ''
       display: "Group ID"
       comment: ""
+    - name: "supportedPlmn1"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn1"
+      comment: ""
+    - name: "supportedPlmn2"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn2"
+      comment: ""
+    - name: "supportedPlmn3"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn3"
+      comment: ""
+    - name: "supportedPlmn4"
+      type: "string"
+      value: "00101"
+      access: "read-write"
+      filter: '^\d{5,6}$'
+      display: "Supported Plmn4"
+      comment: ""
     - name: "supiRanges"
       type: "regex"
       value: "imsi-001010100080000~imsi-001010100080099"