Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

configmap: CNF Installation (5.2) Remove installation configmap #2164

Merged
merged 1 commit into from
Oct 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 2 additions & 24 deletions spec/5g/ran_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -35,33 +35,11 @@ describe "5g" do
end

it "'oran_e2_connection' should pass if the ORAN enabled RAN connects to the RIC using the e2 standard", tags: ["oran"] do
begin
setup_success = setup_5g_network
setup_success.should be_true
ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-oran-ric/cnf-testsuite.yml")
result = ShellCmd.run_testsuite("oran_e2_connection verbose")
(/(PASSED).*(RAN connects to a RIC using the e2 standard interface)/ =~ result[:output]).should_not be_nil
ensure
result = Helm.delete("open5gs -n oran")
result[:status].success?.should be_true
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-oran-ric/cnf-testsuite.yml")
result[:status].success?.should be_true
end
# (kosstennbl) TODO: Test and specs for 'oran_e2_connection' should be redesigned. Check #2153 for more info. Spec was using sample_srsran_ueauth_open5gs and sample-oran-ric.
kosstennbl marked this conversation as resolved.
Show resolved Hide resolved
end

it "'oran_e2_connection' should fail if the ORAN enabled RAN does not connect to the RIC using the e2 standard", tags: ["oran"] do
begin
setup_success = setup_5g_network
setup_success.should be_true
ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-oran-noric/cnf-testsuite.yml")
result = ShellCmd.run_testsuite("oran_e2_connection verbose")
(/(FAILED).*(RAN does not connect to a RIC using the e2 standard interface)/ =~ result[:output]).should_not be_nil
ensure
result = Helm.delete("open5gs -n oran")
result[:status].success?.should be_true
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-oran-noric/cnf-testsuite.yml")
result[:status].success?.should be_true
end
# (kosstennbl) TODO: Test and specs for 'oran_e2_connection' should be redesigned. Check #2153 for more info. Spec was using sample_srsran_ueauth_open5gs and sample-oran-noric.
end

end
2 changes: 1 addition & 1 deletion spec/workload/installability_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ describe CnfTestSuite do
ShellCmd.cnf_setup("cnf-path=./sample-cnfs/k8s-non-helm")
result = ShellCmd.run_testsuite("helm_deploy verbose")
result[:status].success?.should be_true
(/(FAILED).*(Helm deploy failed)/ =~ result[:output]).should_not be_nil
(/(FAILED).*(CNF has deployments that are not installed with helm)/ =~ result[:output]).should_not be_nil
ensure
result = ShellCmd.run_testsuite("cnf_cleanup cnf-path=./sample-cnfs/k8s-non-helm verbose")
end
Expand Down
29 changes: 2 additions & 27 deletions spec/workload/observability_spec.cr
Original file line number Diff line number Diff line change
Expand Up @@ -161,35 +161,10 @@ describe "Observability" do
end

it "'tracing' should fail if tracing is not used", tags: ["observability_jaeger_fail"] do
Log.info { "Installing Jaeger " }
JaegerManager.install

ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-coredns-cnf/cnf-testsuite.yml")
result = ShellCmd.run_testsuite("tracing")
(/(FAILED).*(Tracing not used)/ =~ result[:output]).should_not be_nil
ensure
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-coredns-cnf/cnf-testsuite.yml")
JaegerManager.uninstall
KubectlClient::Get.resource_wait_for_uninstall("Statefulset", "jaeger-cassandra")
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-collector")
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-query")
KubectlClient::Get.resource_wait_for_uninstall("Daemonset", "jaeger-agent")
# (kosstennbl) TODO: Test and specs for 'tracing' should be redesigned. Check #2153 for more info. Spec was using sample-coredns-cnf CNF.
kosstennbl marked this conversation as resolved.
Show resolved Hide resolved
end

it "'tracing' should pass if tracing is used", tags: ["observability_jaeger_pass"] do
Log.info { "Installing Jaeger " }
JaegerManager.install

ShellCmd.cnf_setup("cnf-config=sample-cnfs/sample-tracing/cnf-testsuite.yml")
result = ShellCmd.run_testsuite("tracing")
(/(PASSED).*(Tracing used)/ =~ result[:output]).should_not be_nil
ensure
result = ShellCmd.run_testsuite("cnf_cleanup cnf-config=sample-cnfs/sample-tracing/cnf-testsuite.yml")
JaegerManager.uninstall
KubectlClient::Get.resource_wait_for_uninstall("Statefulset", "jaeger-cassandra")
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-collector")
KubectlClient::Get.resource_wait_for_uninstall("Deployment", "jaeger-query")
KubectlClient::Get.resource_wait_for_uninstall("Daemonset", "jaeger-agent")
# (kosstennbl) TODO: Test and specs for 'tracing' should be redesigned. Check #2153 for more info. Spec was using sample-tracing CNF.
end

end
1 change: 1 addition & 0 deletions src/tasks/constants.cr
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ EMPTY_JSON = JSON.parse(%({}))
EMPTY_JSON_ARRAY = JSON.parse(%([]))
SPECIALIZED_INIT_SYSTEMS = ["tini", "dumb-init", "s6-svscan"]
ROLLING_VERSION_CHANGE_TEST_NAMES = ["rolling_update", "rolling_downgrade", "rolling_version_change"]
WORKLOAD_RESOURCE_KIND_NAMES = ["replicaset", "deployment", "statefulset", "pod", "daemonset"]

TESTSUITE_NAMESPACE = "cnf-testsuite"
DEFAULT_CNF_NAMESPACE = "cnf-default"
Expand Down
Loading
Loading