From 7c150fd0d668e61847a3bd977fbea5e479bf3ced Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Wed, 24 Apr 2024 15:31:02 +0000
Subject: [PATCH] Tests OECC/PSC'22, OFC23, NFVSDN22

- Fixed modified ingress controller settings to fit with endpoints exposed by NBI component
---
 .../oeccpsc22/nginx-ingress-http-dom1.yaml    | 60 ++++++++++-------
 .../oeccpsc22/nginx-ingress-http-dom2.yaml    | 67 ++++++++++---------
 src/tests/ofc23/tfs-ingress-child.yaml        | 67 ++++++++++---------
 src/tests/ofc23/tfs-ingress-parent.yaml       | 67 ++++++++++---------
 src/tests/scenario2/tfs-ingress-dom1.yaml     | 67 ++++++++++---------
 src/tests/scenario2/tfs-ingress-dom2.yaml     | 67 ++++++++++---------
 src/tests/scenario2/tfs-ingress-dom3.yaml     | 67 ++++++++++---------
 src/tests/scenario2/tfs-ingress-dom4.yaml     | 67 ++++++++++---------
 8 files changed, 296 insertions(+), 233 deletions(-)

diff --git a/src/tests/oeccpsc22/nginx-ingress-http-dom1.yaml b/src/tests/oeccpsc22/nginx-ingress-http-dom1.yaml
index c3bbbb8a..39502bb2 100644
--- a/src/tests/oeccpsc22/nginx-ingress-http-dom1.yaml
+++ b/src/tests/oeccpsc22/nginx-ingress-http-dom1.yaml
@@ -21,26 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-dom1
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/oeccpsc22/nginx-ingress-http-dom2.yaml b/src/tests/oeccpsc22/nginx-ingress-http-dom2.yaml
index 82985e96..1c0ff6de 100644
--- a/src/tests/oeccpsc22/nginx-ingress-http-dom2.yaml
+++ b/src/tests/oeccpsc22/nginx-ingress-http-dom2.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-dom2
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/ofc23/tfs-ingress-child.yaml b/src/tests/ofc23/tfs-ingress-child.yaml
index f921a349..ab0e948b 100644
--- a/src/tests/ofc23/tfs-ingress-child.yaml
+++ b/src/tests/ofc23/tfs-ingress-child.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-child
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/ofc23/tfs-ingress-parent.yaml b/src/tests/ofc23/tfs-ingress-parent.yaml
index 686478a8..8d67a7cb 100644
--- a/src/tests/ofc23/tfs-ingress-parent.yaml
+++ b/src/tests/ofc23/tfs-ingress-parent.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-parent
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/scenario2/tfs-ingress-dom1.yaml b/src/tests/scenario2/tfs-ingress-dom1.yaml
index e196d2e6..39502bb2 100644
--- a/src/tests/scenario2/tfs-ingress-dom1.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom1.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-dom1
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/scenario2/tfs-ingress-dom2.yaml b/src/tests/scenario2/tfs-ingress-dom2.yaml
index 82985e96..1c0ff6de 100644
--- a/src/tests/scenario2/tfs-ingress-dom2.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom2.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-dom2
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/scenario2/tfs-ingress-dom3.yaml b/src/tests/scenario2/tfs-ingress-dom3.yaml
index af6d6e77..80957e65 100644
--- a/src/tests/scenario2/tfs-ingress-dom3.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom3.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-dom3
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
diff --git a/src/tests/scenario2/tfs-ingress-dom4.yaml b/src/tests/scenario2/tfs-ingress-dom4.yaml
index 4cfeb26b..6b384eed 100644
--- a/src/tests/scenario2/tfs-ingress-dom4.yaml
+++ b/src/tests/scenario2/tfs-ingress-dom4.yaml
@@ -21,33 +21,40 @@ metadata:
 spec:
   ingressClassName: tfs-ingress-class-dom4
   rules:
-  - http:
-      paths:
-        - path: /webui(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 8004
-        - path: /grafana(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: webuiservice
-              port:
-                number: 3000
-        - path: /context(/|$)(.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: contextservice
-              port:
-                number: 8080
-        - path: /()(restconf/.*)
-          pathType: Prefix
-          backend:
-            service:
-              name: nbiservice
-              port:
-                number: 8080
+    - http:
+        paths:
+          - path: /webui(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 8004
+          - path: /grafana(/|$)(.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: webuiservice
+                port:
+                  number: 3000
+          - path: /()(restconf/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(tfs-api/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
+          - path: /()(bmw/.*)
+            pathType: Prefix
+            backend:
+              service:
+                name: nbiservice
+                port:
+                  number: 8080
-- 
GitLab