Skip to content
GitLab
Commits (2)
  • Lluis Gifre Renom's avatar
    Tests OECC/PSC'22, OFC23, NFVSDN22 · 7c150fd0
    Lluis Gifre Renom authored 
    - Fixed modified ingress controller settings to fit with endpoints exposed by NBI component
    7c150fd0
  • Lluis Gifre Renom's avatar
    Merge branch... · b309a76c
    Lluis Gifre Renom authored 
    Merge branch 'feat/155-fix-tfs-api-exposition-in-ingress-controllers-for-multi-tfs-tests' into 'develop'

Resolve "Fix TFS APi exposition in ingress controllers for multi-TFS tests"

See merge request !234
    b309a76c
Hide whitespace changes
Inline Side-by-side
src/tests/oeccpsc22/nginx-ingress-http-dom1.yaml
View file @ b309a76c
...@@ -21,26 +21,40 @@ metadata: ...@@ -21,26 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom1 ingressClassName: tfs-ingress-class-dom1
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /()(restconf/.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 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
src/tests/oeccpsc22/nginx-ingress-http-dom2.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom2 ingressClassName: tfs-ingress-class-dom2
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/ofc23/tfs-ingress-child.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-child ingressClassName: tfs-ingress-class-child
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/ofc23/tfs-ingress-parent.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-parent ingressClassName: tfs-ingress-class-parent
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom1.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom1 ingressClassName: tfs-ingress-class-dom1
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom2.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom2 ingressClassName: tfs-ingress-class-dom2
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom3.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom3 ingressClassName: tfs-ingress-class-dom3
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080
src/tests/scenario2/tfs-ingress-dom4.yaml
View file @ b309a76c
...@@ -21,33 +21,40 @@ metadata: ...@@ -21,33 +21,40 @@ metadata:
spec: spec:
ingressClassName: tfs-ingress-class-dom4 ingressClassName: tfs-ingress-class-dom4
rules: rules:
- http: - http:
paths: paths:
- path: /webui(/|$)(.*) - path: /webui(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 8004 number: 8004
- path: /grafana(/|$)(.*) - path: /grafana(/|$)(.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: webuiservice name: webuiservice
port: port:
number: 3000 number: 3000
- path: /context(/|$)(.*) - path: /()(restconf/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: contextservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(restconf/.*) - path: /()(tfs-api/.*)
pathType: Prefix pathType: Prefix
backend: backend:
service: service:
name: nbiservice name: nbiservice
port: port:
number: 8080 number: 8080
- path: /()(bmw/.*)
pathType: Prefix
backend:
service:
name: nbiservice
port:
number: 8080