Commit a7407358 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

End-to-end Test - Ryu-OpenFlow: 

- Fixed onboarding validations
parent 684d4ab8

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

+6 −4
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ from common.proto.context_pb2 import ContextId, DeviceOperationalStatusEnum, Emp 
from common.tools.descriptor.Loader import (

    DescriptorLoader, check_descriptor_load_results, validate_empty_scenario

)

from common.tools.grpc.Tools import grpc_message_to_json_string

#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
@@ -46,13 +46,15 @@ def test_scenario_onboarding( 
    #descriptor_loader.validate()



    response = context_client.ListDevices(Empty())

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

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

    num_openvswitches = 5 # OpenVSwitch in Mininet

    assert len(response.devices) == descriptor_loader.num_devices + num_openvswitches



    response = context_client.ListLinks(Empty())

    LOGGER.info('Links: {:s}'.format(grpc_message_to_json_string(response)))

    assert len(response.links) == descriptor_loader.num_links

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

    num_mgmt_links = num_openvswitches

    num_ovs_2_ovs_links = 2*num_openvswitches # pentagon with bidirectional links

    assert len(response.links) == descriptor_loader.num_links + num_mgmt_links + num_ovs_2_ovs_links



    # Verify the scenario has no services/slices

    response = context_client.GetContext(ADMIN_CONTEXT_ID)