Skip to content
Snippets Groups Projects
Commit 85b07090 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

EuCNC24:

- Reorganized scripts
- Adapted test to check connectivity between devices with ping
parent 6235134c
No related branches found
No related tags found
2 merge requests!294Release TeraFlowSDN 4.0,!172Resolve "(CTTC) Extend gNMI-OpenConfig SBI driver"
......@@ -12,15 +12,15 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import json, logging, os, pytest
import logging, os
from typing import Dict
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 # pylint: disable=unused-import
from .Tools import do_rest_delete_request, do_rest_get_request, do_rest_post_request
from .Fixtures import context_client, storage # pylint: disable=unused-import
from .Tools import do_rest_delete_request
LOGGER = logging.getLogger(__name__)
......@@ -29,78 +29,6 @@ LOGGER.setLevel(logging.DEBUG)
REQUEST_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'ietf-l3vpn-service.json')
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
@pytest.fixture(scope='session')
def storage() -> Dict:
yield dict()
# pylint: disable=redefined-outer-name, unused-argument
def test_service_ietf_creation(
context_client : ContextClient,
storage : Dict
):
# Issue service creation request
with open(REQUEST_FILE, 'r', encoding='UTF-8') as f:
svc1_data = json.load(f)
URL = '/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services'
do_rest_post_request(URL, body=svc1_data, logger=LOGGER, expected_status_codes={201})
vpn_id = svc1_data['ietf-l3vpn-svc:l3vpn-svc']['vpn-services']['vpn-service'][0]['vpn-id']
URL = '/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services/vpn-service={:s}/'.format(vpn_id)
service_data = do_rest_get_request(URL, logger=LOGGER, expected_status_codes={200})
service_uuid = service_data['service-id']
storage['svc-uuid'] = service_uuid
# Verify service was created
response = context_client.GetContext(ADMIN_CONTEXT_ID)
assert len(response.service_ids) == 1
assert len(response.slice_ids) == 0
# Check there is 1 service
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.warning('Services[{:d}] = {:s}'.format(
len(response.services), grpc_message_to_json_string(response)
))
assert len(response.services) == 1
for service in response.services:
service_id = service.service_id
assert service_id.service_uuid.uuid == service_uuid
assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE
assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM
response = context_client.ListConnections(service_id)
LOGGER.warning(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
grpc_message_to_json_string(service_id), len(response.connections),
grpc_message_to_json_string(response)
))
assert len(response.connections) == 1
# pylint: disable=redefined-outer-name, unused-argument
def test_service_ietf_retrieval(
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)
assert len(response.service_ids) == 1
assert len(response.slice_ids) == 0
# Check there are no slices
response = context_client.ListSlices(ADMIN_CONTEXT_ID)
LOGGER.warning('Slices[{:d}] = {:s}'.format(len(response.slices), grpc_message_to_json_string(response)))
assert len(response.slices) == 0
# Check there is 1 service
response = context_client.ListServices(ADMIN_CONTEXT_ID)
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']
URL = '/restconf/data/ietf-l3vpn-svc:l3vpn-svc/vpn-services/vpn-service={:s}/'.format(service_uuid)
do_rest_get_request(URL, logger=LOGGER, expected_status_codes={200})
# pylint: disable=redefined-outer-name, unused-argument
def test_service_ietf_removal(
......
# Copyright 2022-2024 ETSI OSG/SDG TeraFlowSDN (TFS) (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.
import logging, os
from common.Constants import DEFAULT_CONTEXT_NAME
from common.proto.context_pb2 import ContextId, ServiceStatusEnum, ServiceTypeEnum
from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_load_results
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 device.client.DeviceClient import DeviceClient
from service.client.ServiceClient import ServiceClient
from .Fixtures import context_client, device_client, service_client # pylint: disable=unused-import
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
DESCRIPTOR_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'tfs-service.json')
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_tfs_creation(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
service_client : ServiceClient, # pylint: disable=redefined-outer-name
):
# Load descriptors and validate the base scenario
descriptor_loader = DescriptorLoader(
descriptors_file=DESCRIPTOR_FILE, context_client=context_client,
device_client=device_client, service_client=service_client
)
results = descriptor_loader.process()
check_descriptor_load_results(results, descriptor_loader)
# Verify the scenario has 1 service and 0 slices
response = context_client.GetContext(ADMIN_CONTEXT_ID)
assert len(response.service_ids) == 1
assert len(response.slice_ids) == 0
# Check there are no slices
response = context_client.ListSlices(ADMIN_CONTEXT_ID)
LOGGER.warning('Slices[{:d}] = {:s}'.format(
len(response.slices), grpc_message_to_json_string(response)
))
assert len(response.slices) == 0
# Check there is 1 service
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.warning('Services[{:d}] = {:s}'.format(
len(response.services), grpc_message_to_json_string(response)
))
assert len(response.services) == 1
for service in response.services:
service_id = service.service_id
assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE
assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM
response = context_client.ListConnections(service_id)
LOGGER.warning(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
grpc_message_to_json_string(service_id), len(response.connections),
grpc_message_to_json_string(response)
))
assert len(response.connections) == 1
......@@ -16,14 +16,13 @@ import logging, os
from typing import Set, Tuple
from common.Constants import DEFAULT_CONTEXT_NAME
from common.proto.context_pb2 import ContextId, ServiceId, ServiceStatusEnum, ServiceTypeEnum
from common.tools.descriptor.Loader import DescriptorLoader, check_descriptor_load_results
from common.tools.grpc.Tools import grpc_message_to_json_string
from common.tools.object_factory.Context import json_context_id
from common.tools.object_factory.Service import json_service_id
from context.client.ContextClient import ContextClient
from device.client.DeviceClient import DeviceClient
from service.client.ServiceClient import ServiceClient
from .Fixtures import context_client, device_client, service_client # pylint: disable=unused-import
from .Fixtures import context_client, service_client # pylint: disable=unused-import
LOGGER = logging.getLogger(__name__)
LOGGER.setLevel(logging.DEBUG)
......@@ -31,49 +30,6 @@ LOGGER.setLevel(logging.DEBUG)
DESCRIPTOR_FILE = os.path.join(os.path.dirname(os.path.abspath(__file__)), '..', 'data', 'tfs-service.json')
ADMIN_CONTEXT_ID = ContextId(**json_context_id(DEFAULT_CONTEXT_NAME))
def test_service_tfs_creation(
context_client : ContextClient, # pylint: disable=redefined-outer-name
device_client : DeviceClient, # pylint: disable=redefined-outer-name
service_client : ServiceClient, # pylint: disable=redefined-outer-name
):
# Load descriptors and validate the base scenario
descriptor_loader = DescriptorLoader(
descriptors_file=DESCRIPTOR_FILE, context_client=context_client,
device_client=device_client, service_client=service_client
)
results = descriptor_loader.process()
check_descriptor_load_results(results, descriptor_loader)
# Verify the scenario has 1 service and 0 slices
response = context_client.GetContext(ADMIN_CONTEXT_ID)
assert len(response.service_ids) == 1
assert len(response.slice_ids) == 0
# Check there are no slices
response = context_client.ListSlices(ADMIN_CONTEXT_ID)
LOGGER.warning('Slices[{:d}] = {:s}'.format(
len(response.slices), grpc_message_to_json_string(response)
))
assert len(response.slices) == 0
# Check there is 1 service
response = context_client.ListServices(ADMIN_CONTEXT_ID)
LOGGER.warning('Services[{:d}] = {:s}'.format(
len(response.services), grpc_message_to_json_string(response)
))
assert len(response.services) == 1
for service in response.services:
service_id = service.service_id
assert service.service_status.service_status == ServiceStatusEnum.SERVICESTATUS_ACTIVE
assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM
response = context_client.ListConnections(service_id)
LOGGER.warning(' ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(
grpc_message_to_json_string(service_id), len(response.connections),
grpc_message_to_json_string(response)
))
assert len(response.connections) == 1
def test_service_tfs_removal(
context_client : ContextClient, # pylint: disable=redefined-outer-name
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment