From 62d6c3d6f74dee3d06ac11b632e5d6d2ad78af9a Mon Sep 17 00:00:00 2001
From: mansoca <carlos.manso@cttc.es>
Date: Fri, 19 Apr 2024 13:15:15 +0200
Subject: [PATCH] small fixes
---
deploy/all.sh | 3 +-
...scription_ws.sh => subscription_ws_e2e.sh} | 23 +++-------
deploy/subscription_ws_ip.sh | 45 +++++++++++++++++++
manifests/e2e_orchestratorservice.yaml | 9 ++--
manifests/nbiservice.yaml | 24 +++++++---
manifests/vnt_managerservice.yaml | 4 --
.../E2EOrchestratorServiceServicerImpl.py | 19 +++++---
.../context_subscription/__init__.py | 2 +-
src/tests/ecoc24/.gitignore | 2 -
src/tests/ecoc24/deploy.sh | 11 +++--
.../descriptors/emulated/dc-2-dc-service.json | 41 +++++++++++++++++
.../descriptors/emulated/descriptor_e2e.json | 20 +++++++++
.../descriptors/emulated/descriptor_ip.json | 40 +++++++++++++++++
src/tests/ecoc24/fast_redeploy.sh | 42 ++++++++---------
.../ecoc24/nginx-ingress-controller-e2e.yaml | 4 ++
.../ecoc24/nginx-ingress-controller-ip.yaml | 4 ++
16 files changed, 224 insertions(+), 69 deletions(-)
rename deploy/{subscription_ws.sh => subscription_ws_e2e.sh} (65%)
create mode 100755 deploy/subscription_ws_ip.sh
delete mode 100644 src/tests/ecoc24/.gitignore
create mode 100644 src/tests/ecoc24/descriptors/emulated/dc-2-dc-service.json
create mode 100644 src/tests/ecoc24/descriptors/emulated/descriptor_e2e.json
create mode 100644 src/tests/ecoc24/descriptors/emulated/descriptor_ip.json
diff --git a/deploy/all.sh b/deploy/all.sh
index d99ffa88c..e7aabff0c 100755
--- a/deploy/all.sh
+++ b/deploy/all.sh
@@ -176,7 +176,8 @@ export GRAF_EXT_PORT_HTTP=${GRAF_EXT_PORT_HTTP:-"3000"}
./deploy/tfs.sh
#Configure Subscription WS
-#./deploy/subscription_ws.sh
+./deploy/subscription_ws_ip.sh
+./deploy/subscription_ws_e2e.sh
# Show deploy summary
./deploy/show.sh
diff --git a/deploy/subscription_ws.sh b/deploy/subscription_ws_e2e.sh
similarity index 65%
rename from deploy/subscription_ws.sh
rename to deploy/subscription_ws_e2e.sh
index a3d2f939e..1aeb41965 100755
--- a/deploy/subscription_ws.sh
+++ b/deploy/subscription_ws_e2e.sh
@@ -19,13 +19,12 @@
########################################################################################################################
# If not already set, set the namespace where CockroackDB will be deployed.
-export SUBSCRIPTION_WS_NAMESPACE=${SUBSCRIPTION_WS_NAMESPACE:-"tfs"}
+export SUBSCRIPTION_WS_NAMESPACE=${SUBSCRIPTION_WS_NAMESPACE:-"tfs-e2e"}
# If not already set, set the external port interface will be exposed to.
-export SUBSCRIPTION_WS_EXT_PORT=${SUBSCRIPTION_WS_EXT_PORT:-"8765"}
+export SUBSCRIPTION_WS_EXT_PORT=${SUBSCRIPTION_WS_EXT_PORT:-"8761"}
+
-# If not already set, set the external port interface will be exposed to.
-export SUBSCRIPTION_WS_INT_PORT=${SUBSCRIPTION_WS_INT_PORT:-"8765"}
########################################################################################################################
# Automated steps start here
########################################################################################################################
@@ -34,25 +33,13 @@ export SUBSCRIPTION_WS_INT_PORT=${SUBSCRIPTION_WS_INT_PORT:-"8765"}
echo "Subscription WebSocket Port Mapping"
echo ">>> ExposeSubscription WebSocket port (${SUBSCRIPTION_WS_EXT_PORT}->${SUBSCRIPTION_WS_EXT_PORT})"
PATCH='{"data": {"'${SUBSCRIPTION_WS_EXT_PORT}'": "'${SUBSCRIPTION_WS_NAMESPACE}'/nbiservice:'${SUBSCRIPTION_WS_EXT_PORT}'"}}'
-kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"
+kubectl patch configmap nginx-ingress-tcp-microk8s-conf-e2e --namespace ingress --patch "${PATCH}"
PORT_MAP='{"containerPort": '${SUBSCRIPTION_WS_EXT_PORT}', "hostPort": '${SUBSCRIPTION_WS_EXT_PORT}'}'
CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'
PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
-kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"
+kubectl patch daemonset nginx-ingress-microk8s-controller-e2e --namespace ingress --patch "${PATCH}"
echo
-echo "Subscription WebSocket Port Mapping"
-echo ">>> ExposeSubscription WebSocket port (${SUBSCRIPTION_WS_INT_PORT}->${SUBSCRIPTION_WS_INT_PORT})"
-PATCH='{"data": {"'${SUBSCRIPTION_WS_INT_PORT}'": "'${SUBSCRIPTION_WS_NAMESPACE}'/nbiservice:'${SUBSCRIPTION_WS_INT_PORT}'"}}'
-kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"
-
-PORT_MAP='{"containerPort": '${SUBSCRIPTION_WS_INT_PORT}', "hostPort": '${SUBSCRIPTION_WS_INT_PORT}'}'
-CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'
-PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
-kubectl patch daemonset nginx-ingress-microk8s-controller --namespace ingress --patch "${PATCH}"
-echo
-
-
diff --git a/deploy/subscription_ws_ip.sh b/deploy/subscription_ws_ip.sh
new file mode 100755
index 000000000..77310ed09
--- /dev/null
+++ b/deploy/subscription_ws_ip.sh
@@ -0,0 +1,45 @@
+#!/bin/bash
+# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+
+########################################################################################################################
+# Read deployment settings
+########################################################################################################################
+
+# If not already set, set the namespace where CockroackDB will be deployed.
+export SUBSCRIPTION_WS_NAMESPACE=${SUBSCRIPTION_WS_NAMESPACE:-"tfs-ip"}
+
+# If not already set, set the external port interface will be exposed to.
+export SUBSCRIPTION_WS_INT_PORT=${SUBSCRIPTION_WS_INT_PORT:-"8762"}
+########################################################################################################################
+# Automated steps start here
+########################################################################################################################
+
+
+
+
+echo "Subscription WebSocket Port Mapping"
+echo ">>> ExposeSubscription WebSocket port (${SUBSCRIPTION_WS_INT_PORT}->${SUBSCRIPTION_WS_INT_PORT})"
+PATCH='{"data": {"'${SUBSCRIPTION_WS_INT_PORT}'": "'${SUBSCRIPTION_WS_NAMESPACE}'/nbiservice:'${SUBSCRIPTION_WS_INT_PORT}'"}}'
+kubectl patch configmap nginx-ingress-tcp-microk8s-conf-ip --namespace ingress --patch "${PATCH}"
+
+PORT_MAP='{"containerPort": '${SUBSCRIPTION_WS_INT_PORT}', "hostPort": '${SUBSCRIPTION_WS_INT_PORT}'}'
+CONTAINER='{"name": "nginx-ingress-microk8s", "ports": ['${PORT_MAP}']}'
+PATCH='{"spec": {"template": {"spec": {"containers": ['${CONTAINER}']}}}}'
+kubectl patch daemonset nginx-ingress-microk8s-controller-ip --namespace ingress --patch "${PATCH}"
+echo
+
+
+
diff --git a/manifests/e2e_orchestratorservice.yaml b/manifests/e2e_orchestratorservice.yaml
index dfbfff816..c02823c9f 100644
--- a/manifests/e2e_orchestratorservice.yaml
+++ b/manifests/e2e_orchestratorservice.yaml
@@ -24,8 +24,7 @@ spec:
template:
metadata:
annotations:
- config.linkerd.io/skip-outbound-ports: "8765"
- config.linkerd.io/skip-inbound-ports: "8765"
+ config.linkerd.io/skip-outbound-ports: "8761"
labels:
app: e2e-orchestratorservice
spec:
@@ -37,7 +36,7 @@ spec:
ports:
- containerPort: 10050
- containerPort: 9192
- - containerPort: 8765
+ - containerPort: 8761
env:
- name: LOG_LEVEL
value: "DEBUG"
@@ -73,5 +72,5 @@ spec:
port: 9192
targetPort: 9192
- name: ws
- port: 8765
- targetPort: 8765
+ port: 8761
+ targetPort: 8761
diff --git a/manifests/nbiservice.yaml b/manifests/nbiservice.yaml
index 1d0ffc1a1..df3bde883 100644
--- a/manifests/nbiservice.yaml
+++ b/manifests/nbiservice.yaml
@@ -24,8 +24,8 @@ spec:
template:
metadata:
annotations:
- config.linkerd.io/skip-outbound-ports: "8765"
- config.linkerd.io/skip-inbound-ports: "8765"
+ config.linkerd.io/skip-inbound-ports: "8762"
+ config.linkerd.io/skip-outbound-ports: "8762"
labels:
app: nbiservice
spec:
@@ -38,7 +38,7 @@ spec:
- containerPort: 8080
- containerPort: 9090
- containerPort: 9192
- - containerPort: 8765
+ - containerPort: 8762
env:
- name: LOG_LEVEL
value: "INFO"
@@ -79,7 +79,19 @@ spec:
protocol: TCP
port: 9192
targetPort: 9192
- - name: websocket
+ - name: ws
protocol: TCP
- port: 8765
- targetPort: 8765
+ port: 8762
+ targetPort: 8762
+---
+apiVersion: v1
+kind: Service
+metadata:
+ name: remote-teraflow
+spec:
+ type: ExternalName
+ externalName: nbiservice.asdf.svc.cluster.local
+ ports:
+ - name: ws
+ protocol: TCP
+ port: 8762
diff --git a/manifests/vnt_managerservice.yaml b/manifests/vnt_managerservice.yaml
index 0aca37806..cb060a5b6 100644
--- a/manifests/vnt_managerservice.yaml
+++ b/manifests/vnt_managerservice.yaml
@@ -37,7 +37,6 @@ spec:
ports:
- containerPort: 10070
- containerPort: 9192
- - containerPort: 8765
env:
- name: LOG_LEVEL
value: "INFO"
@@ -72,6 +71,3 @@ spec:
- name: metrics
port: 9192
targetPort: 9192
- - name: ws
- port: 8765
- targetPort: 8765
diff --git a/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py b/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py
index 1fe4d0478..b00bbb732 100644
--- a/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py
+++ b/src/e2e_orchestrator/service/E2EOrchestratorServiceServicerImpl.py
@@ -44,7 +44,7 @@ class E2EOrchestratorServiceServicerImpl(E2EOrchestratorServiceServicer):
LOGGER.debug("Creating Servicer...")
LOGGER.debug("Servicer Created")
- time.sleep(15)
+ time.sleep(5)
try:
LOGGER.info("Requesting subscription")
self.RequestSubscription()
@@ -106,18 +106,22 @@ class E2EOrchestratorServiceServicerImpl(E2EOrchestratorServiceServicer):
def RequestSubscription(self):
LOGGER.info("Trying to connect...!!!")
- OWN_HOST = "10.1.1.83"
- OWN_PORT = "8765"
- EXT_HOST = "10.1.1.83"
- EXT_PORT = "8765"
+ EXT_HOST = "nbiservice.tfs-ip.svc.cluster.local"
+ EXT_PORT = "8762"
+ OWN_HOST = "e2e-orchestratorservice.tfs-e2e.svc.cluster.local"
+ OWN_PORT = "8761"
+
+
+
url = "ws://" + EXT_HOST + ":" + EXT_PORT
request = VNTSubscriptionRequest()
request.host = OWN_HOST
request.port = OWN_PORT
LOGGER.info("Trying to connect... to {}".format(url))
- with connect(url, logger=LOGGER) as websocket:
+ with connect(url) as websocket:
+ LOGGER.info("CONNECTED!!! {}")
send = grpc_message_to_json_string(request)
LOGGER.info("Sending {}".format(send))
websocket.send(send)
@@ -132,7 +136,8 @@ class E2EOrchestratorServiceServicerImpl(E2EOrchestratorServiceServicer):
except Exception as e:
LOGGER.info('Exception2!: {}'.format(e))
-
+
+
with serve(self._event_received, "0.0.0.0", OWN_PORT, logger=LOGGER) as server:
LOGGER.info("Running subscription server...: {}:{}".format("0.0.0.0", OWN_PORT))
server.serve_forever()
diff --git a/src/nbi/service/rest_server/nbi_plugins/context_subscription/__init__.py b/src/nbi/service/rest_server/nbi_plugins/context_subscription/__init__.py
index d5deb9352..eb841cb7f 100644
--- a/src/nbi/service/rest_server/nbi_plugins/context_subscription/__init__.py
+++ b/src/nbi/service/rest_server/nbi_plugins/context_subscription/__init__.py
@@ -36,7 +36,7 @@ vnt_manager_client: VNTManagerClient = VNTManagerClient()
context_client: ContextClient = ContextClient()
HOST = "0.0.0.0"
-PORT = 8765
+PORT = 8762
LOGGER = logging.getLogger(__name__)
diff --git a/src/tests/ecoc24/.gitignore b/src/tests/ecoc24/.gitignore
deleted file mode 100644
index 0a3f4400d..000000000
--- a/src/tests/ecoc24/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Add here your files containing confidential testbed details such as IP addresses, ports, usernames, passwords, etc.
-descriptors_real.json
diff --git a/src/tests/ecoc24/deploy.sh b/src/tests/ecoc24/deploy.sh
index 10a31ebc3..7b65822aa 100755
--- a/src/tests/ecoc24/deploy.sh
+++ b/src/tests/ecoc24/deploy.sh
@@ -25,12 +25,15 @@ kubectl delete -f ./src/tests/ecoc24/nginx-ingress-controller-ip.yaml
kubectl apply -f ./src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
kubectl apply -f ./src/tests/ecoc24/nginx-ingress-controller-ip.yaml
-# Deploy TFS for e2e
-source ./src/tests/ecoc24/deploy_specs_e2e.sh
-./deploy/all.sh
-mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
# Deploy TFS for ip
source ./src/tests/ecoc24/deploy_specs_ip.sh
./deploy/all.sh
mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_ip.sh
+
+
+# Deploy TFS for e2e
+source ./src/tests/ecoc24/deploy_specs_e2e.sh
+./deploy/all.sh
+mv tfs_runtime_env_vars.sh tfs_runtime_env_vars_e2e.sh
+
diff --git a/src/tests/ecoc24/descriptors/emulated/dc-2-dc-service.json b/src/tests/ecoc24/descriptors/emulated/dc-2-dc-service.json
new file mode 100644
index 000000000..7c3be015d
--- /dev/null
+++ b/src/tests/ecoc24/descriptors/emulated/dc-2-dc-service.json
@@ -0,0 +1,41 @@
+{
+ "services": [
+ {
+ "service_id": {
+ "context_id": {"context_uuid": {"uuid": "admin"}}, "service_uuid": {"uuid": "dc-2-dc-svc"}
+ },
+ "service_type": 2,
+ "service_status": {"service_status": 1},
+ "service_endpoint_ids": [
+ {"device_id":{"device_uuid":{"uuid":"DC1"}},"endpoint_uuid":{"uuid":"int"}},
+ {"device_id":{"device_uuid":{"uuid":"DC2"}},"endpoint_uuid":{"uuid":"int"}}
+ ],
+ "service_constraints": [
+ {"sla_capacity": {"capacity_gbps": 10.0}},
+ {"sla_latency": {"e2e_latency_ms": 15.2}}
+ ],
+ "service_config": {"config_rules": [
+ {"action": 1, "custom": {"resource_key": "/settings", "resource_value": {
+ "address_families": ["IPV4"], "bgp_as": 65000, "bgp_route_target": "65000:123",
+ "mtu": 1512, "vlan_id": 300
+ }}},
+ {"action": 1, "custom": {"resource_key": "/device[PE1]/endpoint[1/1]/settings", "resource_value": {
+ "route_distinguisher": "65000:123", "router_id": "10.0.0.1",
+ "address_ip": "3.3.1.1", "address_prefix": 24, "sub_interface_index": 1, "vlan_id": 300
+ }}},
+ {"action": 1, "custom": {"resource_key": "/device[PE2]/endpoint[1/1]/settings", "resource_value": {
+ "route_distinguisher": "65000:123", "router_id": "10.0.0.2",
+ "address_ip": "3.3.2.1", "address_prefix": 24, "sub_interface_index": 1, "vlan_id": 300
+ }}},
+ {"action": 1, "custom": {"resource_key": "/device[PE3]/endpoint[1/1]/settings", "resource_value": {
+ "route_distinguisher": "65000:123", "router_id": "10.0.0.3",
+ "address_ip": "3.3.3.1", "address_prefix": 24, "sub_interface_index": 1, "vlan_id": 300
+ }}},
+ {"action": 1, "custom": {"resource_key": "/device[PE4]/endpoint[1/1]/settings", "resource_value": {
+ "route_distinguisher": "65000:123", "router_id": "10.0.0.4",
+ "address_ip": "3.3.4.1", "address_prefix": 24, "sub_interface_index": 1, "vlan_id": 300
+ }}}
+ ]}
+ }
+ ]
+}
diff --git a/src/tests/ecoc24/descriptors/emulated/descriptor_e2e.json b/src/tests/ecoc24/descriptors/emulated/descriptor_e2e.json
new file mode 100644
index 000000000..93acb6faa
--- /dev/null
+++ b/src/tests/ecoc24/descriptors/emulated/descriptor_e2e.json
@@ -0,0 +1,20 @@
+{
+ "contexts": [
+ {"context_id": {"context_uuid": {"uuid": "admin"}}}
+ ],
+ "topologies": [
+ {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
+ ],
+ "devices": [
+ {
+ "device_id": {"device_uuid": {"uuid": "TFS-IP"}}, "device_type": "teraflowsdn", "device_drivers": [7],
+ "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8002"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
+ "scheme": "http", "username": "admin", "password": "admin"
+ }}}
+ ]}
+ }
+ ]
+}
diff --git a/src/tests/ecoc24/descriptors/emulated/descriptor_ip.json b/src/tests/ecoc24/descriptors/emulated/descriptor_ip.json
new file mode 100644
index 000000000..d0fd09350
--- /dev/null
+++ b/src/tests/ecoc24/descriptors/emulated/descriptor_ip.json
@@ -0,0 +1,40 @@
+{
+ "contexts": [
+ {"context_id": {"context_uuid": {"uuid": "admin"}}}
+ ],
+ "topologies": [
+ {"topology_id": {"context_id": {"context_uuid": {"uuid": "admin"}}, "topology_uuid": {"uuid": "admin"}}}
+ ],
+ "devices": [
+ {
+ "device_id": {"device_uuid": {"uuid": "PE1"}}, "device_type": "emu-packet-router", "device_drivers": [0],
+ "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+ {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/1"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/2"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/3"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/4"}
+ ]}}}
+ ]}
+ },
+ {
+ "device_id": {"device_uuid": {"uuid": "PE2"}}, "device_type": "emu-packet-router", "device_drivers": [0],
+ "device_endpoints": [], "device_operational_status": 0, "device_config": {"config_rules": [
+ {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
+ {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
+ {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {"endpoints": [
+ {"sample_types": [], "type": "copper/internal", "uuid": "1/1"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "1/2"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/1"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/2"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/3"},
+ {"sample_types": [], "type": "copper/internal", "uuid": "2/4"}
+ ]}}}
+ ]}
+ }
+ ]
+}
diff --git a/src/tests/ecoc24/fast_redeploy.sh b/src/tests/ecoc24/fast_redeploy.sh
index 0a6d9bf32..2b18e9a84 100755
--- a/src/tests/ecoc24/fast_redeploy.sh
+++ b/src/tests/ecoc24/fast_redeploy.sh
@@ -17,37 +17,37 @@
kubectl delete namespace tfs-e2e tfs-ip
echo "Deploying tfs-e2e ..."
-kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl create namespace tfs-e2e > ./tmp/logs/deploy-tfs-e2e.log
-kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/e2eorchestratorservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ./tmp/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-e2e.log
-kubectl --namespace tfs-e2e apply -f ecoc24/tfs-ingress-e2e.yaml > ./tmp/logs/deploy-tfs-e2e.log
+kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl create namespace tfs-e2e > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-e2e.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/contextservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/deviceservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/e2e_orchestratorservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/pathcompservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/serviceservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/sliceservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f ./tmp/tfs-e2e/manifests/webuiservice.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
+kubectl --namespace tfs-e2e apply -f src/tests/ecoc24/tfs-ingress-e2e.yaml > ./tmp/tfs-e2e/logs/deploy-tfs-e2e.log
printf "\n"
echo "Deploying tfs-ip ..."
kubectl delete -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
kubectl create namespace tfs-ip > ./tmp/logs/deploy-tfs-ip.log
kubectl apply -f src/tests/ecoc24/nginx-ingress-controller-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/vntmanagerservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ./tmp/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-ip.log
-kubectl --namespace tfs-ip apply -f ecoc24/tfs-ingress-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/contextservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/deviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/pathcompservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/serviceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/sliceservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/vnt_managerservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f ./tmp/tfs-ip/manifests/webuiservice.yaml > ./tmp/logs/deploy-tfs-ip.log
+kubectl --namespace tfs-ip apply -f src/tests/ecoc24/tfs-ingress-ip.yaml > ./tmp/logs/deploy-tfs-ip.log
printf "\n"
echo "Waiting tfs-e2e ..."
kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/contextservice
kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/deviceservice
-kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/e2eorchestratorservice
+kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/e2e-orchestratorservice
kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/pathcompservice
kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/serviceservice
kubectl wait --namespace tfs-e2e --for='condition=available' --timeout=300s deployment/sliceservice
@@ -60,7 +60,7 @@ kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deplo
kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deployment/pathcompservice
kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deployment/serviceservice
kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deployment/sliceservice
-kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deployment/vntmanagerservice
+kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deployment/vnt-managerservice
kubectl wait --namespace tfs-ip --for='condition=available' --timeout=300s deployment/webuiservice
printf "\n"
diff --git a/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml b/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
index 2e7ca2ca4..aa41ad916 100644
--- a/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
+++ b/src/tests/ecoc24/nginx-ingress-controller-e2e.yaml
@@ -122,6 +122,10 @@ spec:
containerPort: 10254
hostPort: 12541
protocol: TCP
+ - name: ws
+ containerPort: 8761
+ hostPort: 8761
+ protocol: TCP
args:
- /nginx-ingress-controller
- --configmap=$(POD_NAMESPACE)/nginx-load-balancer-microk8s-conf-e2e
diff --git a/src/tests/ecoc24/nginx-ingress-controller-ip.yaml b/src/tests/ecoc24/nginx-ingress-controller-ip.yaml
index 0160b7bba..8969297d6 100644
--- a/src/tests/ecoc24/nginx-ingress-controller-ip.yaml
+++ b/src/tests/ecoc24/nginx-ingress-controller-ip.yaml
@@ -122,6 +122,10 @@ spec:
containerPort: 10254
hostPort: 12542
protocol: TCP
+ - name: ws
+ containerPort: 8762
+ hostPort: 8762
+ protocol: TCP
args:
- /nginx-ingress-controller
- --configmap=$(POD_NAMESPACE)/nginx-load-balancer-microk8s-conf-ip
--
GitLab