Commit 5476c934 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

End-to-end Test - Ryu-OpenFlow: 

- Fixed scenario cleanup test
parent a3afa87e

src/tests/ryu-openflow/tests/test_cleanup.py

+10 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


import logging, os

from common.Constants import DEFAULT_CONTEXT_NAME

from common.proto.context_pb2 import ContextId, Empty

from common.proto.context_pb2 import ContextId, DeviceFilter, Empty

from common.tools.descriptor.Loader import DescriptorLoader, validate_empty_scenario

from common.tools.grpc.Tools import grpc_message_to_json_string

from common.tools.object_factory.Context import json_context_id
@@ -37,6 +37,15 @@ def test_scenario_cleanup( 
    assert len(response.service_ids) == 0

    assert len(response.slice_ids) == 0



    response = context_client.SelectDevice(DeviceFilter(

        include_endpoints=False, include_config_rules=False, include_components=False

    ))

    #LOGGER.debug('Devices: {:s}'.format(grpc_message_to_json_string(response)))

    for device in response.devices:

        if device.device_type in {'openflow-ryu-controller', 'emu-client'}: continue

        if device.name == 'RYU': continue

        context_client.RemoveDevice(device.device_id)



    # Load descriptors and validate the base scenario

    descriptor_loader = DescriptorLoader(

        descriptors_file=DESCRIPTOR_FILE, context_client=context_client, device_client=device_client