modify Makefile, run.sh, config & add CHF to GitHub workflow

.github/workflows/dispatch.yml

@@ -43,6 +43,10 @@ on:
         description: 'NF patch'
         required: false
         type: string
+      chf_patch:
+        description: 'NF patch'
+        required: false
+        type: string
 jobs:
   build:
     runs-on: [self-hosted, linux, x64]
@@ -82,6 +86,7 @@ jobs:
         AUSF_PATCH: ${{ inputs.ausf_patch }}
         N3IWF_PATCH: ${{ inputs.n3iwf_patch }}
         PCF_PATCH: ${{ inputs.pcf_patch }}
+        CHF_PATCH: ${{ inputs.chf_patch }}
 
     - name: Basic Test
       run: |

Makefile

@@ -4,7 +4,7 @@ C_BUILD_PATH = build
 ROOT_PATH = $(shell pwd)
 
 NF = $(GO_NF)
-GO_NF = amf ausf nrf nssf pcf smf udm udr n3iwf upf
+GO_NF = amf ausf nrf nssf pcf smf udm udr n3iwf upf chf
 
 WEBCONSOLE = webconsole
 

cert/chf.key

@@ -0,0 +1,27 @@
+-----BEGIN RSA PRIVATE KEY-----
+MIIEpAIBAAKCAQEAvrAD943EXFG1sWQYv4HzMWAsZdvypE+taRGaFB4IoqPpPKLj
+gJN6wsHE16ehisixMXLwTNmuaiT6BAWDLKSuLTAJENB/3wX89Ga3KGEo9BKOVy0j
+lU3PZDfGS6Crc1I2xyT5cwtZe85h941XtPCkuSyIO2ZDz2uT5cOj/Hm1gLeZqEXC
++6fly7K87DUrosOXAVxRtMhyYENeTGQPZV9Wcwqqi3f+01kVhESmT3hTw4u5f/nn
++Isx99uZwsHBlkmiUC9prgef9jdN1+GwfUKptTDPPzKNMn/aG7glKs9VnI3pcgha
+WoUENMkhSOwIvfePPf1PF35yEK5fdm2HfxCNTQIDAQABAoIBAQCieRboNsK4ZmaJ
+XuA3TGIKEAfEQkPb/IeknnrJ6U0yRrbUE3YEd6SBjNhLZ2kc9yMDHwvgbxlNF3Rv
+OMMrpqVBm0weJ4jMXi3JkDs/DIn4bFcbsDpBXKr4mQ08IwnymHpT9A0XGPSFqLOQ
+Wb4BTYkMvgTVl6zvbpn1i1yOIqWjpVMmmofA7ENLtBJxq+vMIhks3Pd8xjw2bUeL
+Sc6PDc8mf5Svsjy+vIX4wzda+ND95QyFyTV9O+Liia3JU+VvaoTUTtLr8OwWmUw9
+V7d3XyCddw2FasmB9OfUHDsvags2DoChp3S+zh0V3YDQlCJv9v111L7rMJFUA8Uo
+KfVohnOBAoGBAOiIVxtcqE5xxrWjJlHc1ljBY6egqRNNgRBWstcW7WctxGQAAYCy
+DIpYcgRfNKgThcerLJa0hy+THBFNjh9c35vLfL/mOXEHE4tw2MsZGr8I/p9e7c7i
+m7aR43mUXMoYocbD9htZ/xs0zR+nzurT6UEVHT7c5qb/ifU4UYy92AZvAoGBANHu
+k6HGE6uiI+53Rwzc5Uv4t80F5xGg31yEgNXmcq0pCiYNju90gvMWXJujdqtKQXWF
+xnGobchzzRoMclsOpmADgeyOIf0FHue1W2U/q2anZJpmZFz9ApvLiTGfX1ntubYw
+5RriSe08c50Sa6naGF3MXiJrqwcMWdjNqgA+rCYDAoGAPfbW/3uZfg3jndN0CqyG
+kfA21hyB8ZrdobT4w0hgyvXvN5aoz9qibNtUxsV4CrHpHGQI5cAFpi/Vcubv0Hu3
+OpTnEVwQQoZYNvhDTRvLfMywzVdGl7LbO7N0oplegJw/v+/ITVGWIXHYl27oPLtr
+lORDftTuweGmqanwUUjloBECgYBjIzx6qBS/98jqI0/dRi/Oib0ayA/P5l20ziod
+WT+MgJX3VG3MrQPuEgBXy4EN8PoqqqsFH5oAkJcqFvimAawWKXHgqVppp1Jp794i
+WUfzKVe8BmCc/SqPMjYuxel8iWQrIrn+0SBCNUsPwRQw2PqqyQknThstL+r6FF2U
+0gPvywKBgQDOHgczHI+G8pgivzC2W6OUvImm7DEFKZw2ZRNFSqq0/ksWfUnYIUaf
+KyNhKOCmCqYSZr6ivX47dO9G2x8OM5u95paY8ysOB+mlx/yrXKI8B4ZMax3xaVMq
+QDwiWcsGN6VUvyWITyDDsoUgWK7sPsVcoJgvVKduz/VRkPZk2YNGyA==
+-----END RSA PRIVATE KEY-----

cert/chf.pem

@@ -0,0 +1,20 @@
+-----BEGIN CERTIFICATE-----
+MIIDSDCCAjACCQDQLErVY/eE8DANBgkqhkiG9w0BAQsFADBmMQswCQYDVQQGEwJU
+VzEPMA0GA1UECAwGVGFpd2FuMQ8wDQYDVQQHDAZUYWlwZWkxDTALBgNVBAoMBE5U
+Q1UxDDAKBgNVBAsMA0lPVDEYMBYGA1UEAwwPd3d3Lm50Y3UuZWR1LnR3MB4XDTE5
+MDcyMzAzMjcwM1oXDTI5MDcyMDAzMjcwM1owZjELMAkGA1UEBhMCVFcxDzANBgNV
+BAgMBlRhaXdhbjEPMA0GA1UEBwwGVGFpcGVpMQ0wCwYDVQQKDAROVENVMQwwCgYD
+VQQLDANJT1QxGDAWBgNVBAMMD3d3dy5udGN1LmVkdS50dzCCASIwDQYJKoZIhvcN
+AQEBBQADggEPADCCAQoCggEBAL6wA/eNxFxRtbFkGL+B8zFgLGXb8qRPrWkRmhQe
+CKKj6Tyi44CTesLBxNenoYrIsTFy8EzZrmok+gQFgyykri0wCRDQf98F/PRmtyhh
+KPQSjlctI5VNz2Q3xkugq3NSNsck+XMLWXvOYfeNV7TwpLksiDtmQ89rk+XDo/x5
+tYC3mahFwvun5cuyvOw1K6LDlwFcUbTIcmBDXkxkD2VfVnMKqot3/tNZFYREpk94
+U8OLuX/55/iLMffbmcLBwZZJolAvaa4Hn/Y3TdfhsH1CqbUwzz8yjTJ/2hu4JSrP
+VZyN6XIIWlqFBDTJIUjsCL33jz39Txd+chCuX3Zth38QjU0CAwEAATANBgkqhkiG
+9w0BAQsFAAOCAQEABtO5Re3ekkXGgBGDBBxBzfIV9H19s4xi3sIhav8d20uaT0lK
+rYlYIFH4U7yi2eIs60OWDa5kATrOtTeE3Q9hQ4zZMq8xlerz8w/muRS/1AcjI6y0
+MXQIiv+RVNeWrWSwaOXPDjOXIP1QjG8WEddJg4DMu4copGSmLlv+ETYRuE6OklgU
+YUgu+Fo+73UAL8LMQFwXNpfvtkvwWLEZhPvkbMgnTY/1da+BIX0nJqkKxy2E5xYf
+gRMPsd6DdcQ1yHc/b90G0X3VRSaUgW97SPoEn+LFuQMJ0aIN7o5O+GW74yUfyxMo
+VVF59Dz6FUAk+PupYWvjsh2tL92R/tdykSlDVw==
+-----END CERTIFICATE-----

config/chfcfg.yaml

@@ -0,0 +1,49 @@
+info:
+  version: 1.0.3
+  description: CHF initial local configuration
+
+configuration:
+  chfName: CHF # the name of this CHF
+  sbi: # Service-based interface information
+    scheme: http # the protocol for sbi (http or https)
+    registerIPv4: 127.0.0.113 # IP used to register to NRF
+    bindingIPv4: 127.0.0.113  # IP used to bind the service
+    port: 8000              # port used to bind the service
+    tls: # the local path of TLS key
+      pem: cert/chf.pem # CHF TLS Certificate
+      key: cert/chf.key # CHF TLS Private key
+  nrfUri: http://127.0.0.10:8000  # a valid URI of NRF
+  serviceNameList:   # the SBI services provided by this CHF, refer to TS 32.291
+    - nchf-convergedcharging # Nchf_AMPolicyControl service
+  mongodb:       # the mongodb connected by this CHF
+    name: free5gc                  # name of the mongodb
+    url: mongodb://localhost:27017 # a valid URL of the mongodb
+  quotaValidityTime: 10000
+  volumeLimit: 50000
+  volumeLimitPDU: 10000
+  volumeThresholdRate: 0.8
+  cgf:
+    hostIPv4: 127.0.0.1
+    port: 2122
+    listenPort: 2121
+    tls:
+      pem: cert/chf.pem
+      key: cert/chf.key
+  abmfDiameter:
+    protocol: tcp 
+    hostIPv4: 127.0.0.113
+    port: 3868
+    tls:
+      pem: cert/chf.pem
+      key: cert/chf.key
+  rfDiameter: 
+    protocol: tcp
+    hostIPv4: 127.0.0.113
+    port: 3869
+    tls:
+      pem: cert/chf.pem # CHF TLS Certificate
+      key: cert/chf.key # CHF TLS Private key
+logger: # log output setting
+  enable: true # true or false
+  level: info # how detailed to output, value: trace, debug, info, warn, error, fatal, panic
+  reportCaller: false # enable the caller report or not, value: true or false

run.sh

@@ -112,7 +112,7 @@ mongo --eval "db.NfProfile.drop();db.applicationData.influenceData.subsToNotify.
 mongosh --eval "db.NfProfile.drop();db.applicationData.influenceData.subsToNotify.drop();db.applicationData.subsToNotify.drop();db.policyData.subsToNotify.drop();db.exposureData.subsToNotify.drop()" free5gc
 sleep 0.1
 
-NF_LIST="nrf amf smf udr pcf udm nssf ausf"
+NF_LIST="nrf amf smf udr pcf udm nssf ausf chf"
 
 export GIN_MODE=release
 

test/ulclsession_test.go

@@ -65,7 +65,7 @@ func testULCLSessionBase(t *testing.T, ueCount int, upfNum int) {
 	servingPlmnId := "20893"
 	sNssai := models.Snssai{
 		Sst: 1,
-		Sd:  "010203",
+		Sd:  "112233",
 	}
 
 	for i := 0; i < ueCount; i++ {