From 5b99fd73dfcf826a6fcb5f1bbd7894ded2feaad1 Mon Sep 17 00:00:00 2001 From: denverwilliams Date: Mon, 7 Aug 2023 21:23:14 +0000 Subject: [PATCH] Add Values file for UERANSIM to embedded files cncf/cnf-testsuite#1803 --- spec/5g/5g_spec.cr | 15 +++++ spec/fixtures/5g-core-config.yml | 82 ------------------------ spec/fixtures/udm-config-open5gs.yml | 32 --------- src/tasks/constants.cr | 1 + src/tasks/utils/embedded_file_manager.cr | 21 +++--- 5 files changed, 28 insertions(+), 123 deletions(-) delete mode 100644 spec/fixtures/5g-core-config.yml delete mode 100644 spec/fixtures/udm-config-open5gs.yml diff --git a/spec/5g/5g_spec.cr b/spec/5g/5g_spec.cr index e6445ef9d..220d56770 100644 --- a/spec/5g/5g_spec.cr +++ b/spec/5g/5g_spec.cr @@ -20,7 +20,22 @@ describe "5g" do File.copy("#{Dir.current}/spec/fixtures/udm-config-open5gs.yml", "#{Dir.current}/open5gs/charts/open5gs-udm/resources/config/udm.yaml") Helm.install("open5gs #{Dir.current}/open5gs --values #{Dir.current}/spec/fixtures/5g-core-config.yml") KubectlClient::Get.wait_for_install("open5gs-pcf") + $?.success?.should be_true # (/PASSED: CNF compatible with both Calico and Cilium/ =~ response_s).should_not be_nil end end + + #TODO exec tshark command: tshark -ni any -Y nas_5gs.mm.type_id -T json + #TODO parse tshark command + #TODO look for authentication text + # extra + #TODO look for connection text (sanity check) + #TODO tshark library + #TODO 5g tools library + #TODO 5g RAN and Core mobile traffic check (connection check) + #TODO 5g RAN (only) mobile traffic check ???? + #TODO ueransim library (w/setup command) + #TODO Open5gs libary (w/setup command) + + end diff --git a/spec/fixtures/5g-core-config.yml b/spec/fixtures/5g-core-config.yml deleted file mode 100644 index 356ebdb99..000000000 --- a/spec/fixtures/5g-core-config.yml +++ /dev/null @@ -1,82 +0,0 @@ -hss: - enabled: false - -mme: - enabled: false - -pcrf: - enabled: false - -smf: - config: - pcrf: - enabled: false - -sgwc: - enabled: false - -sgwu: - enabled: false - -udm: - extraVolumeMounts: - - name: curve - mountPath: /etc/open5gs/hnet/curve25519-1.key - subPath: curve25519-1.key - - name: secp - mountPath: /etc/open5gs/hnet/secp256r1-2.key - subPath: secp256r1-2.key - extraVolumes: - - name: curve - configMap: - name: key - items: - - key: curve - path: curve25519-1.key - - name: secp - configMap: - name: key - items: - - key: secp - path: secp256r1-2.key - -amf: - config: - guamiList: - - plmn_id: - mcc: "999" - mnc: "70" - amf_id: - region: 2 - set: 1 - taiList: - - plmn_id: - mcc: "999" - mnc: "70" - tac: [1] - plmnList: - - plmn_id: - mcc: "999" - mnc: "70" - s_nssai: - - sst: 1 - sd: "0x111111" - -nssf: - config: - nsiList: - - nrf: - hostname: "" # if empty default is autogenerated open5gs svc fullname - port: 7777 - sst: 1 - sd: "0x111111" - -webui: - ingress: - enabled: false - -populate: - enabled: true - initCommands: - - open5gs-dbctl add_ue_with_slice 999700000000001 465B5CE8B199B49FAA5F0A2EE238A6BC E8ED289DEBA952E4283B54E88E6183CA internet 1 111111 - - open5gs-dbctl add_ue_with_slice 999700000000002 465B5CE8B199B49FAA5F0A2EE238A6BC E8ED289DEBA952E4283B54E88E6183CA internet 1 111111 diff --git a/spec/fixtures/udm-config-open5gs.yml b/spec/fixtures/udm-config-open5gs.yml deleted file mode 100644 index dd69d2101..000000000 --- a/spec/fixtures/udm-config-open5gs.yml +++ /dev/null @@ -1,32 +0,0 @@ -{{ $open5gsName := .Release.Name }} -logger: - level: {{ .Values.config.logLevel }} -parameter: {} - -sbi: - server: - no_tls: {{ .Values.config.sbi.server.no_tls }} - client: - no_tls: {{ .Values.config.sbi.client.no_tls }} - -udm: - hnet: - - id: 1 - scheme: 1 - key: /etc/open5gs/hnet/curve25519-1.key - - id: 2 - scheme: 2 - key: /etc/open5gs/hnet/secp256r1-2.key - -udm: - sbi: - - dev: "eth0" - port: {{ .Values.containerPorts.sbi }} - {{- if .Values.config.sbi.advertise }} - advertise: "{{ tpl .Values.config.sbi.advertise . }}" - {{- end }} - -nrf: - sbi: - - name: {{ default (printf "%s-nrf-sbi" $open5gsName) .Values.config.nrf.sbi.hostname }} - port: {{ .Values.config.nrf.sbi.port }} diff --git a/src/tasks/constants.cr b/src/tasks/constants.cr index 4332c0f74..c0a38a8c8 100644 --- a/src/tasks/constants.cr +++ b/src/tasks/constants.cr @@ -38,6 +38,7 @@ EmbeddedFileManager.constraint_template EmbeddedFileManager.disable_cni EmbeddedFileManager.fluentd_values EmbeddedFileManager.fluentbit_values +EmbeddedFileManager.ues_values EXCLUDE_NAMESPACES = [ "kube-system", diff --git a/src/tasks/utils/embedded_file_manager.cr b/src/tasks/utils/embedded_file_manager.cr index cd94e9b88..b8ed29d54 100644 --- a/src/tasks/utils/embedded_file_manager.cr +++ b/src/tasks/utils/embedded_file_manager.cr @@ -13,33 +13,36 @@ module EmbeddedFileManager macro reboot_daemon REBOOT_DAEMON = Base64.decode_string("{{ `cat ./tools/reboot_daemon/manifest.yml | base64` }}") end - macro chaos_network_loss + macro chaos_network_loss CHAOS_NETWORK_LOSS = Base64.decode_string("{{ `cat ./embedded_files/chaos_network_loss.yml | base64`}}") end - macro chaos_cpu_hog + macro chaos_cpu_hog CHAOS_CPU_HOG = Base64.decode_string("{{ `cat ./embedded_files/chaos_cpu_hog.yml | base64`}}") end - macro chaos_container_kill + macro chaos_container_kill CHAOS_CONTAINER_KILL = Base64.decode_string("{{ `cat ./embedded_files/chaos_container_kill.yml | base64`}}") end - macro points_yml + macro points_yml POINTSFILE = Base64.decode_string("{{ `cat ./embedded_files/points.yml | base64`}}") end - macro enforce_image_tag + macro enforce_image_tag ENFORCE_IMAGE_TAG = Base64.decode_string("{{ `cat ./embedded_files/enforce-image-tag.yml | base64`}}") end - macro constraint_template + macro constraint_template CONSTRAINT_TEMPLATE = Base64.decode_string("{{ `cat ./embedded_files/constraint_template.yml | base64`}}") end - macro disable_cni + macro disable_cni DISABLE_CNI = Base64.decode_string("{{ `cat ./embedded_files/kind-disable-cni.yaml | base64`}}") end - macro fluentd_values + macro fluentd_values FLUENTD_VALUES = Base64.decode_string("{{ `cat ./embedded_files/fluentd-values.yml | base64`}}") end - macro fluentbit_values + macro fluentbit_values FLUENTBIT_VALUES = Base64.decode_string("{{ `cat ./embedded_files/fluentbit-config.yml | base64`}}") end + macro ues_values + UES_VALUES = Base64.decode_string("{{ `cat ./embedded_files/ues-values.yml | base64`}}") + end def self.points_yml_write_file File.write("points.yml", POINTSFILE) end