GitLab CI/CD pipeline - ECOC'22 & Service component:

- Testing failure condition

src/service/service/ServiceServiceServicerImpl.py

@@ -312,19 +312,19 @@ class ServiceServiceServicerImpl(ServiceServiceServicer):
                 pathcomp_request = PathCompRequest()
                 pathcomp_request.services.append(service_with_uuids)    # pylint: disable=no-member
 
-                if num_disjoint_paths is None or num_disjoint_paths in {0, 1} :
-                    pathcomp_request.shortest_path.Clear()              # pylint: disable=no-member
-                else:
-                    pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths  # pylint: disable=no-member
+            if num_disjoint_paths is None or num_disjoint_paths in {0, 1} :
+                pathcomp_request.shortest_path.Clear()              # pylint: disable=no-member
+            else:
+                pathcomp_request.k_disjoint_path.num_disjoint = num_disjoint_paths  # pylint: disable=no-member
 
-                pathcomp = PathCompClient()
-                pathcomp_reply = pathcomp.Compute(pathcomp_request)
-                pathcomp.close()
+            pathcomp = PathCompClient()
+            pathcomp_reply = pathcomp.Compute(pathcomp_request)
+            pathcomp.close()
 
-                # Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among
-                # the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be
-                # executed) to implement the requested create/update operation.
-                tasks_scheduler.compose_from_pathcompreply(pathcomp_reply, is_delete=False)
+            # Feed TaskScheduler with this path computation reply. TaskScheduler identifies inter-dependencies among
+            # the services and connections retrieved and produces a schedule of tasks (an ordered list of tasks to be
+            # executed) to implement the requested create/update operation.
+            tasks_scheduler.compose_from_pathcompreply(pathcomp_reply, is_delete=False)
 
         tasks_scheduler.execute_all()
         return service_with_uuids.service_id

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

@@ -54,6 +54,7 @@ end2end_test ecoc22:
     - kubectl get pods --all-namespaces
 
     # Configure TeraFlowSDN deployment
+    # Uncomment if DEBUG log level is needed for the components
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/contextservice.yaml
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/deviceservice.yaml
     #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="frontend").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/pathcompservice.yaml
@@ -85,7 +86,6 @@ end2end_test ecoc22:
       --volume "$PWD/tfs_runtime_env_vars.sh:/var/teraflow/tfs_runtime_env_vars.sh"
       --volume "$PWD/src/tests/${TEST_NAME}:/opt/results"
       $CI_REGISTRY_IMAGE/${TEST_NAME}:latest
-    - docker logs ${TEST_NAME}
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/contextservice -c server
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/deviceservice -c server
     - kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend