chore: simplify e2e testing setup (#379)

Signed-off-by: Guillaume Belanger <[email protected]>
ellanetworks · Jan 19, 2025 · 78fd850 · 78fd850
1 parent 52ce16c
commit 78fd850
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 77 deletions.
diff --git a/k8s/core-deployment.yaml b/k8s/core-deployment.yaml
@@ -15,8 +15,8 @@ spec:
       annotations:
         k8s.v1.cni.cncf.io/networks: |
           [
-            {"name": "n3-net", "interface": "n3"},
-            {"name": "n6-net", "interface": "n6"}
+            {"name": "core-n3", "interface": "n3"},
+            {"name": "core-n6", "interface": "n6"}
           ]
     spec:
       initContainers:
@@ -27,7 +27,6 @@ spec:
         - -c
         - |
           ip route replace default via 192.168.250.1 metric 110
-          ip route replace 192.168.251.0/24 via 192.168.252.1
           sysctl -w net.ipv4.ip_forward=1
         securityContext:
           privileged: true

diff --git a/k8s/core-n3-nad.yaml b/k8s/core-n3-nad.yaml
@@ -1,13 +1,13 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: n3-net
+  name: core-n3
   namespace: dev2
 spec:
   config: '{
     "cniVersion": "0.3.1",
     "type": "bridge",
-    "bridge": "access-br",
+    "bridge": "n3-br",
     "ipam": {
       "type": "static",
       "addresses": [

diff --git a/k8s/core-n6-nad.yaml b/k8s/core-n6-nad.yaml
@@ -1,13 +1,13 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: n6-net
+  name: core-n6
   namespace: dev2
 spec:
   config: '{
     "cniVersion": "0.3.1",
     "type": "bridge",
-    "bridge": "core-br",
+    "bridge": "n6-br",
     "ipam": {
       "type": "static",
       "addresses": [

diff --git a/k8s/gnbsim-deployment.yaml b/k8s/gnbsim-deployment.yaml
@@ -16,25 +16,11 @@ spec:
         k8s.v1.cni.cncf.io/networks: |
           [
             {
-              "name": "gnb-net",
+              "name": "gnb-n3",
               "interface": "gnb"
             }
           ]
     spec:
-      initContainers:
-      - name: init-route
-        image: busybox:latest
-        command:
-        - /bin/sh
-        - -c
-        - |
-          echo "Setting up custom route..."
-          ip route replace 192.168.252.0/24 via 192.168.251.1
-        securityContext:
-          privileged: true
-          capabilities:
-            add:
-              - NET_ADMIN
       containers:
       - name: gnbsim
         image: ghcr.io/canonical/sdcore-gnbsim:1.4.5

diff --git a/k8s/gnbsim-gnb-nad.yaml b/k8s/gnbsim-gnb-nad.yaml
diff --git a/k8s/router-ran-nad.yaml → k8s/gnbsim-n3-nad.yaml b/k8s/router-ran-nad.yaml → k8s/gnbsim-n3-nad.yaml
@@ -1,17 +1,17 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: ran-gw
+  name: gnb-n3
   namespace: dev2
 spec:
   config: '{
     "cniVersion": "0.3.1",
     "type": "bridge",
-    "bridge": "ran-br",
+    "bridge": "n3-br",
     "ipam": {
       "type": "static",
       "addresses": [
-        {"address": "192.168.251.1/24"}
+        {"address": "192.168.252.5/24"}
       ]
     },
     "capabilities": {"mac": true}

diff --git a/k8s/router-access-nad.yaml b/k8s/router-access-nad.yaml
diff --git a/k8s/router-deployment.yaml b/k8s/router-deployment.yaml
@@ -16,16 +16,8 @@ spec:
         k8s.v1.cni.cncf.io/networks: |
           [
             {
-              "name": "core-gw",
+              "name": "router-n6",
               "interface": "core"
-            },
-            {
-              "name": "access-gw",
-              "interface": "access"
-            },
-            {
-              "name": "ran-gw",
-              "interface": "ran"
             }
           ]
     spec:

diff --git a/k8s/router-core-nad.yaml → k8s/router-n6-nad.yaml b/k8s/router-core-nad.yaml → k8s/router-n6-nad.yaml
@@ -1,13 +1,13 @@
 apiVersion: "k8s.cni.cncf.io/v1"
 kind: NetworkAttachmentDefinition
 metadata:
-  name: core-gw
+  name: router-n6
   namespace: dev2
 spec:
   config: '{
     "cniVersion": "0.3.1",
     "type": "bridge",
-    "bridge": "core-br",
+    "bridge": "n6-br",
     "ipam": {
       "type": "static",
       "routes": [

diff --git a/tests/test_integration.py b/tests/test_integration.py
@@ -122,9 +122,7 @@ async def test_given_ella_and_gnbsim_deployed_when_start_simulation_then_simulat
     ):
         k8s_client = Kubernetes(namespace=NAMESPACE)
         manifests = [
-            "k8s/router-ran-nad.yaml",
-            "k8s/router-core-nad.yaml",
-            "k8s/router-access-nad.yaml",
+            "k8s/router-n6-nad.yaml",
             "k8s/router-deployment.yaml",
             "k8s/core-n3-nad.yaml",
             "k8s/core-n6-nad.yaml",
@@ -150,7 +148,7 @@ async def test_given_ella_and_gnbsim_deployed_when_start_simulation_then_simulat
         subscriber = configure_ella_core(core_address=core_address)
         create_gnbsim_configmap(k8s_client, subscriber)
         gnbsim_manifests = [
-            "k8s/gnbsim-gnb-nad.yaml",
+            "k8s/gnbsim-n3-nad.yaml",
             "k8s/gnbsim-deployment.yaml",
             "k8s/gnbsim-service.yaml",
         ]
@@ -250,7 +248,7 @@ def create_gnbsim_configmap(k8s_client: Kubernetes, subscriber: Subscriber) -> N
                                 },
                             },
                             "n2Port": 9487,
-                            "n3IpAddr": "192.168.251.5",
+                            "n3IpAddr": "192.168.252.5",
                             "n3Port": 2152,
                             "name": "gnb1",
                             "supportedTaList": [