Fix: Rename nrfCertPem

free5gc · Dec 9, 2023 · a6fb146 · a6fb146
1 parent eec538e
commit a6fb146
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/internal/context/context.go b/internal/context/context.go
@@ -45,7 +45,7 @@ type UDMContext struct {
 	NFDiscoveryClient              *Nnrf_NFDiscovery.APIClient
 	UdmUePool                      sync.Map // map[supi]*UdmUeContext
 	NrfUri                         string
-	NrfCerPem                      string
+	NrfCertPem                     string
 	GpsiSupiList                   models.IdentityData
 	SharedSubsDataMap              map[string]models.SharedData // sharedDataIds as key
 	SubscriptionOfSharedDataChange sync.Map                     // subscriptionID as key
@@ -123,8 +123,8 @@ func InitUdmContext(context *UDMContext) {
 		}
 	}
 	udmContext.NrfUri = configuration.NrfUri
-	if configuration.NrfCerPem != "" {
-		context.NrfCerPem = configuration.NrfCerPem
+	if configuration.NrfCertPem != "" {
+		context.NrfCertPem = configuration.NrfCertPem
 	}
 	servingNameList := configuration.ServiceNameList
 

diff --git a/internal/sbi/consumer/nf_management.go b/internal/sbi/consumer/nf_management.go
@@ -74,8 +74,8 @@ func SendRegisterNFInstance(nrfUri, nfInstanceId string, profile models.NfProfil
 			oauth2 := nf.CustomInfo["oauth2"].(bool)
 			udm_context.GetSelf().OAuth2Required = oauth2
 			logger.MainLog.Infoln("OAuth2 setting receive from NRF:", oauth2)
-			if oauth2 && udm_context.GetSelf().NrfCerPem == "" {
-				logger.CfgLog.Error("OAuth2 enable but no nrfCerPem provided in config.")
+			if oauth2 && udm_context.GetSelf().NrfCertPem == "" {
+				logger.CfgLog.Error("OAuth2 enable but no nrfCertPem provided in config.")
 			}
 			break
 		} else {

diff --git a/pkg/factory/config.go b/pkg/factory/config.go
@@ -62,7 +62,7 @@ type Configuration struct {
 	Sbi             *Sbi               `yaml:"sbi,omitempty"  valid:"required"`
 	ServiceNameList []string           `yaml:"serviceNameList,omitempty"  valid:"required"`
 	NrfUri          string             `yaml:"nrfUri,omitempty"  valid:"required, url"`
-	NrfCerPem       string             `yaml:"nrfCerPem,omitempty" valid:"type(string),minstringlength(1),optional"`
+	NrfCertPem      string             `yaml:"nrfCertPem,omitempty" valid:"type(string),minstringlength(1),optional"`
 	SuciProfiles    []suci.SuciProfile `yaml:"SuciProfile,omitempty"`
 }
 type Logger struct {