From 3c252d35d4e11b747bd583b94a53db22a10222c6 Mon Sep 17 00:00:00 2001
From: hajipour <shajipour@cttc.es>
Date: Sat, 1 Feb 2025 16:59:23 +0100
Subject: [PATCH] debug: IP domain controller port changed in agg-net test of
ofc25
---
src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml | 8 ++++++--
src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml | 8 ++++++++
2 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
index b4c380b85..67530bbec 100644
--- a/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml
@@ -17,14 +17,16 @@ build ofc25_camara_agg_net:
variables:
TEST_NAME: 'ofc25-camara-agg-net-controller'
IP_NAME: 'ip'
- IP_PORT: '9090'
+ IP_PORT: '9092'
stage: build
before_script:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- HOST_IP=$(kubectl get nodes -o json | jq -r '.items[].status.addresses[] | select(.type=="InternalIP") | .address')
+ - echo "HOST_IP: $HOST_IP"
- sed -i "s/IP_NET_IP/${HOST_IP}/g" src/tests/${TEST_NAME}/data/agg-net-descriptor.json
- sed -i "s/IP_NET_PORT/${IP_PORT}/g" src/tests/${TEST_NAME}/data/agg-net-descriptor.json
+
- docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile .
- docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
- docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
@@ -48,7 +50,7 @@ end2end_test ofc25_camara_agg_net:
variables:
TEST_NAME: 'ofc25-camara-agg-net-controller'
IP_NAME: 'ip'
- IP_PORT: '9090'
+ IP_PORT: '9092'
stage: end2end_test
# Disable to force running it after all other tasks
before_script:
@@ -98,6 +100,8 @@ end2end_test ofc25_camara_agg_net:
- kubectl --namespace tfs logs deployment/serviceservice -c server
- kubectl --namespace tfs logs deployment/sliceservice -c server
- kubectl --namespace tfs logs deployment/nbiservice -c server
+ - echo "L3VPN SDN Controller logs:"
+ - docker logs ${IP_NAME}
# Destroy Scenario
- kubectl delete namespaces tfs || true
diff --git a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
index 42cef05aa..bf1326ad2 100644
--- a/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
+++ b/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml
@@ -25,10 +25,12 @@ build ofc25_camara_e2e:
- docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY
script:
- HOST_IP=$(kubectl get nodes -o json | jq -r '.items[].status.addresses[] | select(.type=="InternalIP") | .address')
+ - echo "HOST_IP: $HOST_IP"
- sed -i "s/AGG_NET_IP/${HOST_IP}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json
- sed -i "s/NCE_IP/${HOST_IP}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json
- sed -i "s/AGG_NET_PORT/${AGG_NET_PORT}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json
- sed -i "s/NCE_PORT/${NCE_PORT}/g" src/tests/${TEST_NAME}/data/camara-e2e-topology.json
+
- docker buildx build -t "${TEST_NAME}:latest" -f ./src/tests/${TEST_NAME}/Dockerfile .
- docker tag "${TEST_NAME}:latest" "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
- docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}:latest"
@@ -110,6 +112,12 @@ end2end_test ofc25_camara_e2e:
- kubectl --namespace tfs logs deployment/sliceservice -c server
- kubectl --namespace tfs logs deployment/nbiservice -c server
+ - echo "NCE logs:"
+ - docker logs ${NCE_NAME}
+
+ - echo "Aggregation controller logs:"
+ - docker logs ${AGG_NET_NAME}
+
# Destroy Scenario
- kubectl delete namespaces tfs || true
--
GitLab