Merge pull request #1863 from horecoli/amf_service_name_change

amf: Change amf_pod_name to amf_service_name
cnti-testcatalog · Jan 31, 2024 · 463be6d · 463be6d
2 parents bd48466 + 4506945
commit 463be6d
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/sample-cnfs/sample_open5gs/cnf-testsuite.yml b/sample-cnfs/sample_open5gs/cnf-testsuite.yml
@@ -6,7 +6,7 @@ allowlist_helm_chart_container_names: []
 amf_label: app.kubernetes.io/name=amf
 smf_label: app.kubernetes.io/name=smf
 upf_label: app.kubernetes.io/name=upf
-amf_pod_name: open5gs-amf-ngap
+amf_service_name: open5gs-amf-ngap
 mmc: '999'
 mnc: '70'
 sst: 1 

diff --git a/sample-cnfs/sample_open5gs_no_auth/cnf-testsuite.yml b/sample-cnfs/sample_open5gs_no_auth/cnf-testsuite.yml
@@ -4,7 +4,7 @@ release_name: open5gs
 allowlist_helm_chart_container_names: []
 #optional 5gcore tag
 amf_label: app.kubernetes.io/name=amf
-amf_pod_name: open5gs-amf-ngap
+amf_service_name: open5gs-amf-ngap
 mmc: '999'
 mnc: '70'
 sst: 1 

diff --git a/sample-cnfs/sample_srsran_ueauth_open5gs/cnf-testsuite.yml b/sample-cnfs/sample_srsran_ueauth_open5gs/cnf-testsuite.yml
@@ -4,7 +4,7 @@ release_name: open5gs
 allowlist_helm_chart_container_names: []
 #optional 5gcore tag
 core: app.kubernetes.io/name=amf
-amf_pod_name: open5gs-amf-ngap
+amf_service_name: open5gs-amf-ngap
 mmc: '999'
 mnc: '70'
 sst: 1 

diff --git a/src/tasks/utils/config.cr b/src/tasks/utils/config.cr
@@ -39,7 +39,7 @@ module CNFManager
                                      smf_label: String,
                                      upf_label: String,
                                      ric_label: String,
-                                     fiveG_core: NamedTuple(amf_pod_name: String,
+                                     fiveG_core: NamedTuple(amf_service_name: String,
                                                            mmc: String,
                                                            mnc: String,
                                                            sst: String,
@@ -111,7 +111,7 @@ module CNFManager
       else
         core_sd = "" 
       end
-      fiveG_core = {amf_pod_name: optional_key_as_string(config, "amf_pod_name"),
+      fiveG_core = {amf_service_name: optional_key_as_string(config, "amf_service_name"),
       mmc: optional_key_as_string(config, "mmc"),
       mnc:  optional_key_as_string(config, "mnc"),
       sst:  optional_key_as_string(config, "sst"),

diff --git a/src/tasks/utils/srsran.cr b/src/tasks/utils/srsran.cr
@@ -17,7 +17,7 @@ module SRSRAN
     core = config.cnf_config[:amf_label]? 
     Log.info { "core: #{core}" }
     #todo use sane defaults (i.e. search for amf, upf, etc in pod names) if no 5gcore labels are present
-    amf_pod_name = config.cnf_config[:fiveG_core][:amf_pod_name]? 
+    amf_service_name = config.cnf_config[:fiveG_core][:amf_service_name]? 
     mmc = config.cnf_config[:fiveG_core][:mmc]? 
     mnc = config.cnf_config[:fiveG_core][:mnc]? 
     sst = config.cnf_config[:fiveG_core][:sst]? 
@@ -65,7 +65,7 @@ module SRSRAN
         routingIndicator = "routingIndicator: '#{config.cnf_config[:fiveG_core][:routingIndicator]}'"
       end
 
-      ue_values = UERANSIM::Template.new(amf_pod_name,
+      ue_values = UERANSIM::Template.new(amf_service_name,
                                          mmc,
                                          mnc,
                                          sst,
@@ -103,7 +103,7 @@ module SRSRAN
     # The argument for insecure_registries is a string
     # because the template only writes the content
     # and expects a list of comma separated strings.
-    def initialize(@amf_pod_name : String,
+    def initialize(@amf_service_name : String,
                    @mmc : String,
                    @mnc : String,
                    @sst : String,

diff --git a/src/tasks/utils/task.cr b/src/tasks/utils/task.cr
@@ -88,7 +88,7 @@ module CNFManager
                                             smf_label: "",
                                             upf_label: "",
                                             ric_label: "",
-                                            fiveG_core: {amf_pod_name:  "",
+                                            fiveG_core: {amf_service_name:  "",
                                                            mmc:  "",
                                                            mnc:  "",
                                                            sst:  "",

diff --git a/src/tasks/utils/ueransim.cr b/src/tasks/utils/ueransim.cr
@@ -23,7 +23,7 @@ module UERANSIM
     core = config.cnf_config[:amf_label]? 
     Log.info { "core: #{core}" }
     #todo use sane defaults (i.e. search for amf, upf, etc in pod names) if no 5gcore labels are present
-    amf_pod_name = config.cnf_config[:fiveG_core][:amf_pod_name]? 
+    amf_service_name = config.cnf_config[:fiveG_core][:amf_service_name]? 
     mmc = config.cnf_config[:fiveG_core][:mmc]? 
     mnc = config.cnf_config[:fiveG_core][:mnc]? 
     sst = config.cnf_config[:fiveG_core][:sst]? 
@@ -71,7 +71,7 @@ module UERANSIM
         routingIndicator = "routingIndicator: '#{config.cnf_config[:fiveG_core][:routingIndicator]}'"
       end
 
-      ue_values = UERANSIM::Template.new(amf_pod_name,
+      ue_values = UERANSIM::Template.new(amf_service_name,
                                          mmc,
                                          mnc,
                                          sst,
@@ -109,7 +109,7 @@ module UERANSIM
     # The argument for insecure_registries is a string
     # because the template only writes the content
     # and expects a list of comma separated strings.
-    def initialize(@amf_pod_name : String,
+    def initialize(@amf_service_name : String,
                    @mmc : String,
                    @mnc : String,
                    @sst : String,

diff --git a/src/templates/ues-values-template.yml.ecr b/src/templates/ues-values-template.yml.ecr
@@ -1,5 +1,5 @@
 amf:
-  hostname: <%= @amf_pod_name %>
+  hostname: <%= @amf_service_name %>
 
 mcc: '<%= @mmc %>'
 mnc: '<%= @mnc %>'