Configurable registerIP for AMF (#41)

nephio-project · Jun 29, 2023 · db7c258 · db7c258
1 parent 383e69d
commit db7c258
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/controllers/amf/resources.go b/controllers/amf/resources.go
@@ -171,7 +171,8 @@ func createConfigMap(log logr.Logger, amfDeployment *nephiov1alpha1.AMFDeploymen
 	}
 
 	templateValues := configurationTemplateValues{
-		N2_IP: n2ip,
+		SVC_NAME: instanceName,
+		N2_IP:    n2ip,
 	}
 
 	configuration, err := renderConfigurationTemplate(templateValues)

diff --git a/controllers/amf/resources_test.go b/controllers/amf/resources_test.go
@@ -157,7 +157,8 @@ func TestCreateConfigMap(t *testing.T) {
 	n2ip, _ := controllers.GetFirstInterfaceConfigIPv4(amfDeployment.Spec.Interfaces, "n2")
 
 	templateValues := configurationTemplateValues{
-		N2_IP: n2ip,
+		SVC_NAME: "test-amf-deployment",
+		N2_IP:    n2ip,
 	}
 
 	configuration, err := renderConfigurationTemplate(templateValues)

diff --git a/controllers/amf/templates.go b/controllers/amf/templates.go
@@ -34,7 +34,7 @@ configuration:
 
   sbi:
     scheme: http
-    registerIPv4: release-name-free5gc-amf-service # IP used to register to NRF
+    registerIPv4: {{ .SVC_NAME }}
     bindingIPv4: 0.0.0.0  # IP used to bind the service
     port: 80
     tls:
@@ -160,7 +160,8 @@ logger:
 var configurationTemplate = template.Must(template.New("AMFConfiguration").Parse(configurationTemplateSource))
 
 type configurationTemplateValues struct {
-	N2_IP string
+	SVC_NAME string
+	N2_IP    string
 }
 
 func renderConfigurationTemplate(values configurationTemplateValues) (string, error) {