Changes to adapt to R2 cluster configurations

workloads/oai/README.md

@@ -1,9 +1,100 @@
 # OAI Packages
 
-Packages for deploying the following are stored here
+Packages for deploying the following are stored in the folder
 
 - OAI RAN custom controller
 - OAI CU-CP
 - OAI CU-UP
 - OAI DU
 - OAI UE SIM
+- Network for RAN and Core deployments
+- Workload cluster for RAN and Core deployments
+
+PackageVariant and PackageVariantSets for deploying OAI RAN are also stored in this folder.
+
+# Steps to manually deploy OAI RAN on Nephio
+
+Note: Scripts to automatically deploy OAI RAN on Nephio, will be available here: https://github.com/nephio-project/test-infra/tree/main/e2e/tests/oai
+
+## Step 0: Prerequisite
+
+1. Nephio should be installed.
+2. Verify Network required for OAI RAN and Core should should be installed.
+   Perform the following to verify in the Nephio management cluster.
+3. Catalog repository need to be registered. 
+   Since the OAI RAN packages are in workloads/oai of https://github.com/nephio-project/catalog.git repository,
+   we need to register the repository with --directory option
+
+   e.g. kpt alpha repo register --namespace default https://github.com/nephio-project/catalog.git --directory=workloads/oai
+
+   Also the following tags need to be created for upstream repository(https://github.com/nephio-project/catalog.git) used:
+   1. workloads/oai/oai-ran-operator/v1
+   2. workloads/oai/pkg-example-cucp-bp/v1
+   3. workloads/oai/pkg-example-cuup-bp/v1
+   4. workloads/oai/pkg-example-du-bp/v1
+   5. workloads/oai/pkg-example-ue-bp/v1
+
+```bash
+kubectl get networks
+```
+Verify output as shown below.
+
+```console
+    NAME               REPO_STATUS
+    vpc-cu-e1-srl      True
+    vpc-cudu-f1-srl    True
+    vpc-internal-srl   True
+    vpc-internet-srl   True
+    vpc-ran-srl        True
+```
+3. OAI core components should be deployed before deploying OAI RAN.
+   Steps are mentioned here: https://github.com/OPENAIRINTERFACE/oai-packages/blob/r2/README.md
+
+
+## Step 2: Deploy OAI RAN NF operator
+
+Execute the command as shown below in Nephio Management cluster
+
+```bash
+kubectl apply -f package-variants/oai-ran-operator.yaml
+```
+Check OAI RAN operators pods are in running state in all clusters.
+
+```bash
+kubectl get pods -n oai-ran-operators
+```
+
+## Step 3: Deploy OAI RAN NFs
+
+Deploy OAI CU CP using the below command in Nephio Management cluster
+
+```bash
+kubectl apply -f package-variants/oai-cucp.yaml
+```
+Check OAI CU CP pod is in running state in regional cluster.
+
+```bash
+kubectl get pods -n oai-ran-cucp
+```
+Deploy OAI CU UP using the below command in Nephio Management cluster
+
+```bash
+kubectl apply -f package-variants/oai-cuup.yaml
+```
+
+Check OAI CU UP pod is in running state in edge cluster.
+
+```bash
+kubectl get pods -n oai-ran-cuup
+```
+Deploy OAI DU using the below command in Nephio Management cluster
+
+```bash
+kubectl apply -f package-variants/oai-du.yaml
+```
+
+Check OAI DU pod is in running state in edge cluster.
+
+```bash
+kubectl get pods -n oai-ran-du
+```

workloads/oai/packagevariants/edge-oai-cucp.yaml → workloads/oai/package-variants/oai-cucp.yaml

@@ -1,16 +1,16 @@
 apiVersion: config.porch.kpt.dev/v1alpha1
 kind: PackageVariant
 metadata:
-  name: edge-oai-cucp
+  name: regional-oai-cucp
 spec:
   upstream:
     repo: catalog
     package: pkg-example-cucp-bp
     revision: v1
   downstream:
-    repo: edge02
+    repo: regional
     package: oai-ran-cucp
   annotations:
     approval.nephio.org/policy: initial
   injectors:
-  - name: edge02
+  - name: regional

workloads/oai/packagevariants/edge-oai-cuup.yaml → workloads/oai/package-variants/oai-cuup.yaml

@@ -8,9 +8,9 @@ spec:
     package: pkg-example-cuup-bp
     revision: v1
   downstream:
-    repo: edge01
+    repo: edge
     package: oai-ran-cuup
   annotations:
     approval.nephio.org/policy: initial
   injectors:
-  - name: edge01
+  - name: edge

workloads/oai/packagevariants/edge-oai-du.yaml → workloads/oai/package-variants/oai-du.yaml

@@ -8,9 +8,9 @@ spec:
     package: pkg-example-du-bp
     revision: v1
   downstream:
-    repo: edge01
+    repo: edge
     package: oai-ran-du
   annotations:
     approval.nephio.org/policy: initial
   injectors:
-  - name: edge01
+  - name: edge

workloads/oai/packagevariants/edge-oai-ue.yaml → workloads/oai/package-variants/oai-ue.yaml

@@ -8,9 +8,9 @@ spec:
     package: pkg-example-ue-bp
     revision: v1
   downstream:
-    repo: edge01
+    repo: edge
     package: oai-ran-ue
   annotations:
     approval.nephio.org/policy: initial
   injectors:
-  - name: edge01
+  - name: edge

workloads/oai/pkg-example-cucp-bp/apply-replacements-namespace.yaml

@@ -29,14 +29,6 @@ replacements:
       kind: Interface
     fieldPaths:
     - metadata.annotations.[specializer.nephio.org/namespace]
-  - select:
-      kind: Capacity
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/namespace]
-  - select:
-      kind: DataNetwork
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/namespace]
   - select:
       kind: Dependency
     fieldPaths:

workloads/oai/pkg-example-cucp-bp/apply-replacements-owner.yaml

@@ -24,20 +24,6 @@ replacements:
     options:
       delimiter: '-'
       index: 1
-  - select:
-      kind: Capacity
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/owner]
-    options:
-      delimiter: '-'
-      index: 1
-  - select:
-      kind: DataNetwork
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/owner]
-    options:
-      delimiter: '-'
-      index: 1
   - select:
       kind: Dependency
     fieldPaths:

workloads/oai/pkg-example-cucp-bp/config_ran_nf.yaml

@@ -1,14 +1,14 @@
 apiVersion: workload.nephio.org/v1alpha1
 kind: NFConfig
 metadata:
-  name: cucp-nf-config-edge01
+  name: cucp-nf-config
   namespace: example
 spec:
   configRefs:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: RANConfig
     metadata:
-      name: ranconfig-edge01
+      name: ranconfig
       namespace: default
     spec:
       cellIdentity: 12345678L
@@ -23,7 +23,7 @@ spec:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: PLMN
     metadata:
-      name: plmn-edge01
+      name: plmn
       namespace: default
     spec:
       PLMNInfo:
@@ -37,7 +37,7 @@ spec:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: OAIConfig
     metadata:
-      name: oai-nf-config-edge01
+      name: oai-nf-config
       namespace: default
     spec:
       image: "docker.io/oaisoftwarealliance/oai-gnb:2023.w19"

workloads/oai/pkg-example-cucp-bp/cucpdeployment.yaml

@@ -6,9 +6,7 @@ metadata:
 spec:
   provider: cucp.openairinterface.org
   capacity:
-    maxDownlinkThroughput: 100M
-    maxUplinkThroughput: 1M
   parametersRefs:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: NFConfig
-    name: cucp-nf-config-edge01
+    name: cucp-nf-config

workloads/oai/pkg-example-cuup-bp/apply-replacements-namespace.yaml

@@ -29,14 +29,6 @@ replacements:
       kind: Interface
     fieldPaths:
     - metadata.annotations.[specializer.nephio.org/namespace]
-  - select:
-      kind: Capacity
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/namespace]
-  - select:
-      kind: DataNetwork
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/namespace]
   - select:
       kind: Dependency
     fieldPaths:

workloads/oai/pkg-example-cuup-bp/apply-replacements-owner.yaml

@@ -24,20 +24,6 @@ replacements:
     options:
       delimiter: '-'
       index: 1
-  - select:
-      kind: Capacity
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/owner]
-    options:
-      delimiter: '-'
-      index: 1
-  - select:
-      kind: DataNetwork
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/owner]
-    options:
-      delimiter: '-'
-      index: 1
   - select:
       kind: Dependency
     fieldPaths:

workloads/oai/pkg-example-cuup-bp/config_ran_nf.yaml

@@ -1,14 +1,14 @@
 apiVersion: workload.nephio.org/v1alpha1
 kind: NFConfig
 metadata:
-  name: cuup-nf-config-edge01
+  name: cuup-nf-config
   namespace: example
 spec:
   configRefs:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: RANConfig
     metadata:
-      name: ranconfig-edge01
+      name: ranconfig
       namespace: default
     spec:
       cellIdentity: 12345678L
@@ -23,7 +23,7 @@ spec:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: PLMN
     metadata:
-      name: plmn-edge01
+      name: plmn
       namespace: default
     spec:
       PLMNInfo:
@@ -37,7 +37,7 @@ spec:
   - apiVersion: workload.nephio.org/v1alpha1
     kind: OAIConfig
     metadata:
-      name: oai-nf-config-edge01
+      name: oai-nf-config
       namespace: default
     spec:
       image: "docker.io/oaisoftwarealliance/oai-nr-cuup:2023.w19"

workloads/oai/pkg-example-cuup-bp/cuupdeployment.yaml

@@ -5,10 +5,7 @@ metadata:
   namespace: example
 spec:
   provider: cuup.openairinterface.org
-  capacity:
-    maxDownlinkThroughput: 100M
-    maxUplinkThroughput: 1M
   parametersRefs:
     - apiVersion: workload.nephio.org/v1alpha1
       kind: NFConfig
-      name: cuup-nf-config-edge01
+      name: cuup-nf-config

workloads/oai/pkg-example-du-bp/apply-replacements-namespace.yaml

@@ -29,14 +29,6 @@ replacements:
       kind: Interface
     fieldPaths:
     - metadata.annotations.[specializer.nephio.org/namespace]
-  - select:
-      kind: Capacity
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/namespace]
-  - select:
-      kind: DataNetwork
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/namespace]
   - select:
       kind: Dependency
     fieldPaths:

workloads/oai/pkg-example-du-bp/apply-replacements-owner.yaml

@@ -24,20 +24,6 @@ replacements:
     options:
       delimiter: '-'
       index: 1
-  - select:
-      kind: Capacity
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/owner]
-    options:
-      delimiter: '-'
-      index: 1
-  - select:
-      kind: DataNetwork
-    fieldPaths:
-    - metadata.annotations.[specializer.nephio.org/owner]
-    options:
-      delimiter: '-'
-      index: 1
   - select:
       kind: Dependency
     fieldPaths: