Updating the location of files

e2e/tests/oai/003-upf.yaml → e2e/tests/oai/002-database.yaml

@@ -8,19 +8,25 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-apiVersion: config.porch.kpt.dev/v1alpha1
-kind: PackageVariant
+apiVersion: config.porch.kpt.dev/v1alpha2
+kind: PackageVariantSet
 metadata:
-  name: oai-upf-edge
+  name: oai-common
 spec:
   upstream:
     repo: oai-core-packages
-    package: oai-upf-edge
+    package: database
     revision: r2
-  downstream:
-    repo: edge
-    package: oai-upf
-  annotations:
-    approval.nephio.org/policy: initial
-  injectors:
-  - name: edge
+  targets:
+  - objectSelector:
+      apiVersion: infra.nephio.org/v1alpha1
+      kind: WorkloadCluster
+      matchLabels:
+        nephio.org/site-type: core
+    template:
+      downstream:
+        package: database
+      annotations:
+        approval.nephio.org/policy: initial
+      injectors:
+      - nameExpr: target.name

e2e/tests/oai/002.sh → e2e/tests/oai/002-dependency.sh

@@ -27,7 +27,8 @@ source "${LIBDIR}/k8s.sh"
 # shellcheck source=e2e/lib/kpt.sh
 source "${LIBDIR}/kpt.sh"
 
-k8s_apply "$TESTDIR/002-oai-operators.yaml"
+k8s_apply "$TESTDIR/002-database.yaml"
+k8s_apply "$TESTDIR/002-operators.yaml"
 
 for pkgvar in common-core-database cp-operators up-operators ran-operator-edge ran-operator-regional; do
     k8s_wait_ready "packagevariant" "oai-$pkgvar"
@@ -41,9 +42,9 @@ kpt_wait_pkg "edge" "oai-ran-operator"
 _core_kubeconfig="$(k8s_get_capi_kubeconfig "core")"
 _edge_kubeconfig="$(k8s_get_capi_kubeconfig "edge")"
 k8s_wait_ready_replicas "deployment" "mysql" "$_core_kubeconfig" "oai-core"
-for controller in amf ausf nrf smf udm udr; do
-    k8s_wait_ready_replicas "deployment" "oai-$controller-controller" "$_core_kubeconfig" "oai-operators"
+for nf in amf ausf nrf smf udm udr; do
+    k8s_wait_ready_replicas "deployment" "oai-$nf-operator" "$_core_kubeconfig" "oai-cn-operators"
 done
-k8s_wait_ready_replicas "deployment" "oai-upf-controller" "$_edge_kubeconfig" "oai-operators"
+k8s_wait_ready_replicas "deployment" "oai-upf-operator" "$_edge_kubeconfig" "oai-cn-operators"
 k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$(k8s_get_capi_kubeconfig "regional")" "oai-ran-operators"
 k8s_wait_ready_replicas "deployment" "oai-ran-operator" "$_edge_kubeconfig" "oai-ran-operators"

e2e/tests/oai/002-oai-operators.yaml → e2e/tests/oai/002-operators.yaml

@@ -8,29 +8,6 @@
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
 
-apiVersion: config.porch.kpt.dev/v1alpha2
-kind: PackageVariantSet
-metadata:
-  name: oai-common
-spec:
-  upstream:
-    repo: oai-core-packages
-    package: database
-    revision: r2
-  targets:
-  - objectSelector:
-      apiVersion: infra.nephio.org/v1alpha1
-      kind: WorkloadCluster
-      matchLabels:
-        nephio.org/site-type: core
-    template:
-      downstream:
-        package: database
-      annotations:
-        approval.nephio.org/policy: initial
-      injectors:
-      - nameExpr: target.name
----
 apiVersion: config.porch.kpt.dev/v1alpha1
 kind: PackageVariant
 metadata:

e2e/tests/oai/003.sh → e2e/tests/oai/003-core-network.sh

@@ -49,37 +49,13 @@ function _wait_for_pfcp_session {
     debug "timeout: $timeout"
 }
 
-for nf in nrf udm udr ausf amf smf; do
-    cat <<EOF | kubectl apply -f -
-apiVersion: config.porch.kpt.dev/v1alpha2
-kind: PackageVariantSet
-metadata:
-  name: oai-$nf
-spec:
-  upstream:
-    repo: oai-core-packages
-    package: oai-$nf
-    revision: r2
-  targets:
-  - objectSelector:
-      apiVersion: infra.nephio.org/v1alpha1
-      kind: WorkloadCluster
-      matchLabels:
-        nephio.org/site-type: core
-    template:
-      downstream:
-        package: oai-$nf
-      annotations:
-        approval.nephio.org/policy: initial
-      injectors:
-      - nameExpr: target.name
-EOF
-done
-k8s_apply "$TESTDIR/003-upf.yaml"
+k8s_apply "$TESTDIR/003-core-network.yaml"
 
 for nf in nrf udm udr ausf amf smf; do
-    k8s_wait_ready "packagevariant" "oai-$nf-core-oai-$nf"
+    k8s_wait_ready "packagevariant" "oai-$nf"
 done
+k8s_wait_ready "packagevariant" "oai-upf-edge"
+
 for nf in nrf udm udr ausf amf smf; do
     kpt_wait_pkg "core" "oai-$nf" "nephio" "1800"
 done

e2e/tests/oai/003-core-network.yaml

@@ -0,0 +1,128 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2023 The Nephio Authors.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-nrf
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-nrf
+    revision: r2
+  downstream:
+    repo: core
+    package: oai-nrf
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: core
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-udm
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-udm
+    revision: r2
+  downstream:
+    repo: core
+    package: oai-udm
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: core
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-ausf
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-ausf
+    revision: r2
+  downstream:
+    repo: core
+    package: oai-ausf
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: core
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-udr
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-udr
+    revision: r2
+  downstream:
+    repo: core
+    package: oai-udr
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: core
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-amf
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-amf
+    revision: r2
+  downstream:
+    repo: core
+    package: oai-amf
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: core
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-smf
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-smf
+    revision: r2
+  downstream:
+    repo: core
+    package: oai-smf
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: core
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-upf-edge
+spec:
+  upstream:
+    repo: oai-core-packages
+    package: oai-upf-edge
+    revision: r2
+  downstream:
+    repo: edge
+    package: oai-upf
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: edge

e2e/tests/oai/004.sh → e2e/tests/oai/004-ran-network.sh

@@ -10,7 +10,7 @@
 ##############################################################################
 
 ## TEST METADATA
-## TEST-NAME: Deploy OAI E1 Split RAN Network Functions
+## TEST-NAME: Deploy OAI E1 and F1 Split RAN Network Functions
 ##
 
 set -o pipefail
@@ -65,28 +65,7 @@ function _wait_for_f1_link {
     _wait_for_ran "$1" "Cell Configuration ok" "F1"
 }
 
-k8s_apply "$TESTDIR/004-ran-cucp.yaml"
-
-for nf in du cuup; do
-    cat <<EOF | kubectl apply -f -
-apiVersion: config.porch.kpt.dev/v1alpha1
-kind: PackageVariant
-metadata:
-  name: oai-$nf
-spec:
-  upstream:
-    repo: catalog-workloads-oai-ran
-    package: pkg-example-$nf-bp
-    revision: main
-  downstream:
-    repo: edge
-    package: oai-ran-$nf
-  annotations:
-    approval.nephio.org/policy: initial
-  injectors:
-  - name: edge
-EOF
-done
+k8s_apply "$TESTDIR/004-ran-network.yaml"
 
 for nf in du cuup cucp; do
     k8s_wait_ready "packagevariant" "oai-$nf"

e2e/tests/oai/004-ran-network.yaml

@@ -0,0 +1,61 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2024 The Nephio Authors.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-cucp
+spec:
+  upstream:
+    repo: catalog-workloads-oai-ran
+    package: pkg-example-cucp-bp
+    revision: main
+  downstream:
+    repo: regional
+    package: oai-ran-cucp
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: regional
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-du
+spec:
+  upstream:
+    repo: catalog-workloads-oai-ran
+    package: pkg-example-du-bp
+    revision: main
+  downstream:
+    repo: edge
+    package: oai-ran-du
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: edge
+---
+apiVersion: config.porch.kpt.dev/v1alpha1
+kind: PackageVariant
+metadata:
+  name: oai-cuup
+spec:
+  upstream:
+    repo: catalog-workloads-oai-ran
+    package: pkg-example-cuup-bp
+    revision: main
+  downstream:
+    repo: edge
+    package: oai-ran-cuup
+  annotations:
+    approval.nephio.org/policy: initial
+  injectors:
+  - name: edge
+

e2e/tests/oai/005.sh → e2e/tests/oai/005-ue.sh

@@ -58,24 +58,7 @@ function _wait_for_ue_pdu_session {
     _wait_for_ue "$1" "Interface oaitun_ue1 successfully configured" "PDU session"
 }
 
-cat <<EOF | kubectl apply -f -
-apiVersion: config.porch.kpt.dev/v1alpha1
-kind: PackageVariant
-metadata:
-  name: oai-ue
-spec:
-  upstream:
-    repo: catalog-workloads-oai-ran
-    package: pkg-example-ue-bp
-    revision: main
-  downstream:
-    repo: edge
-    package: oai-ran-ue
-  annotations:
-    approval.nephio.org/policy: initial
-  injectors:
-  - name: edge
-EOF
+k8s_apply "$TESTDIR/005-ue.yaml"
 
 k8s_wait_ready "packagevariant" "oai-ue"
 kpt_wait_pkg "edge" "oai-ran-ue" "nephio" "1800"