Merge branch...

Merge branch 'feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers' of https://labs.etsi.org/rep/tfs/controller into feat/216-cttc-implement-integration-test-between-e2e-ip-optical-sdn-controllers

src/tests/ecoc24/.gitlab-ci.yml

@@ -70,7 +70,7 @@ end2end_test ecoc24:
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/sliceservice.yaml
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml
-    - source src/tests/${TEST_NAME}/deploy_specs.sh
+    # - source src/tests/${TEST_NAME}/deploy_specs.sh
     #- export TFS_REGISTRY_IMAGES="${CI_REGISTRY_IMAGE}"
     #- export TFS_SKIP_BUILD="YES"
     #- export TFS_IMAGE_TAG="latest"
@@ -103,9 +103,9 @@ end2end_test ecoc24:
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/serviceservice -c server
-    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/sliceservice -c server
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/nbiservice -c server
-    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/opticalcontrollerservice -c server
+    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/e2e_orchestratorservice -c server
+    - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/vtn_managerservice -c server
     - if docker ps -a | grep ${TEST_NAME}; then docker rm -f ${TEST_NAME}; fi
 
     # Dump Optical Device Node Agents container status and logs