From 6d9d1cf43bee55fe6243e5786813c6fcc262128e Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 17 Oct 2024 16:05:30 +0000
Subject: [PATCH] EuCNC24: Fixed CI/CD pipeline
---
src/tests/eucnc24/Dockerfile | 6 ++++++
.../eucnc24/tests/test_service_ietf_remove.py | 15 +++++++++------
2 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/src/tests/eucnc24/Dockerfile b/src/tests/eucnc24/Dockerfile
index 06c463ac6..23a38bace 100644
--- a/src/tests/eucnc24/Dockerfile
+++ b/src/tests/eucnc24/Dockerfile
@@ -76,3 +76,9 @@ COPY src/tests/eucnc24/__init__.py ./tests/eucnc24/__init__.py
COPY src/tests/eucnc24/data/. ./tests/eucnc24/data/
COPY src/tests/eucnc24/tests/. ./tests/eucnc24/tests/
COPY src/tests/eucnc24/scripts/. ./
+
+RUN apt-get --yes --quiet --quiet update && \
+ apt-get --yes --quiet --quiet install tree && \
+ rm -rf /var/lib/apt/lists/*
+
+RUN tree -la /var/teraflow
diff --git a/src/tests/eucnc24/tests/test_service_ietf_remove.py b/src/tests/eucnc24/tests/test_service_ietf_remove.py
index fe4210a57..8b87474ca 100644
--- a/src/tests/eucnc24/tests/test_service_ietf_remove.py
+++ b/src/tests/eucnc24/tests/test_service_ietf_remove.py
@@ -13,13 +13,13 @@
# limitations under the License.
import logging, os
-from typing import Dict
+from typing import Dict, Set, Tuple
from common.Constants import DEFAULT_CONTEXT_NAME
from common.proto.context_pb2 import ContextId, ServiceStatusEnum, ServiceTypeEnum
from common.tools.grpc.Tools import grpc_message_to_json_string
from common.tools.object_factory.Context import json_context_id
from context.client.ContextClient import ContextClient
-from .Fixtures import context_client, storage # pylint: disable=unused-import
+from .Fixtures import context_client # pylint: disable=unused-import
from .Tools import do_rest_delete_request
@@ -33,7 +33,6 @@ ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
# pylint: disable=redefined-outer-name, unused-argument
def test_service_ietf_removal(
context_client : ContextClient, # pylint: disable=redefined-outer-name
- storage : Dict
):
# Verify the scenario has 1 service and 0 slices
response = context_client.GetContext(ADMIN_CONTEXT_ID)
@@ -50,9 +49,7 @@ def test_service_ietf_removal(
LOGGER.warning('Services[{:d}] = {:s}'.format(len(response.services), grpc_message_to_json_string(response)))
assert len(response.services) == 1
- assert 'svc-uuid' in storage
- service_uuid = storage['svc-uuid']
-
+ service_uuids : Set[str] = set()
for service in response.services:
service_id = service.service_id
assert service_id.service_uuid.uuid == service_uuid
@@ -66,6 +63,12 @@ def test_service_ietf_removal(
))
assert len(response.connections) == 1
+ service_uuids.add(service_id.service_uuid.uuid)
+
+ # Identify service to delete
+ assert len(service_uuids) == 1
+ service_uuid = set(service_uuids).pop()
+
URL = '/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services/vpn-service={:s}/'.format(service_uuid)
do_rest_delete_request(URL, logger=LOGGER, expected_status_codes={204})
--
GitLab