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

End-to-end Test - Ryu-OpenFlow: 

- Fixed log message levels
- Reactivated all CI tests
parent c7dfd06b

.gitlab-ci.yml

+38 −38
Original line number Diff line number Diff line
@@ -28,44 +28,44 @@ workflow: 


# include the individual .gitlab-ci.yml of each micro-service and tests

include:

#  #- local: '/manifests/.gitlab-ci.yml'

#  - local: '/src/monitoring/.gitlab-ci.yml'

#  - local: '/src/nbi/.gitlab-ci.yml'

#  - local: '/src/context/.gitlab-ci.yml'

#  - local: '/src/device/.gitlab-ci.yml'

#  - local: '/src/service/.gitlab-ci.yml'

#  - local: '/src/qkd_app/.gitlab-ci.yml'

#  - local: '/src/dbscanserving/.gitlab-ci.yml'

#  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

#  - local: '/src/opticalattackdetector/.gitlab-ci.yml'

#  - local: '/src/opticalattackmanager/.gitlab-ci.yml'

#  - local: '/src/opticalcontroller/.gitlab-ci.yml'

#  - local: '/src/ztp/.gitlab-ci.yml'

#  - local: '/src/policy/.gitlab-ci.yml'

#  - local: '/src/automation/.gitlab-ci.yml'

#  - local: '/src/forecaster/.gitlab-ci.yml'

#  #- local: '/src/webui/.gitlab-ci.yml'

#  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

#  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

#  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

#  - local: '/src/slice/.gitlab-ci.yml'

#  #- local: '/src/interdomain/.gitlab-ci.yml'

#  - local: '/src/pathcomp/.gitlab-ci.yml'

#  #- local: '/src/dlt/.gitlab-ci.yml'

#  - local: '/src/load_generator/.gitlab-ci.yml'

#  - local: '/src/bgpls_speaker/.gitlab-ci.yml'

#  - local: '/src/kpi_manager/.gitlab-ci.yml'

#  - local: '/src/kpi_value_api/.gitlab-ci.yml'

#  #- local: '/src/kpi_value_writer/.gitlab-ci.yml'

#  #- local: '/src/telemetry/.gitlab-ci.yml'

#  - local: '/src/analytics/.gitlab-ci.yml'

#  - local: '/src/qos_profile/.gitlab-ci.yml'

#  - local: '/src/vnt_manager/.gitlab-ci.yml'

#  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

#  - local: '/src/ztp_server/.gitlab-ci.yml'

#  - local: '/src/osm_client/.gitlab-ci.yml'

#  - local: '/src/simap_connector/.gitlab-ci.yml'

#  - local: '/src/pluggables/.gitlab-ci.yml'

  #- local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/nbi/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'

  - local: '/src/qkd_app/.gitlab-ci.yml'

  - local: '/src/dbscanserving/.gitlab-ci.yml'

  - local: '/src/opticalattackmitigator/.gitlab-ci.yml'

  - local: '/src/opticalattackdetector/.gitlab-ci.yml'

  - local: '/src/opticalattackmanager/.gitlab-ci.yml'

  - local: '/src/opticalcontroller/.gitlab-ci.yml'

  - local: '/src/ztp/.gitlab-ci.yml'

  - local: '/src/policy/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/forecaster/.gitlab-ci.yml'

  #- local: '/src/webui/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

  - local: '/src/slice/.gitlab-ci.yml'

  #- local: '/src/interdomain/.gitlab-ci.yml'

  - local: '/src/pathcomp/.gitlab-ci.yml'

  #- local: '/src/dlt/.gitlab-ci.yml'

  - local: '/src/load_generator/.gitlab-ci.yml'

  - local: '/src/bgpls_speaker/.gitlab-ci.yml'

  - local: '/src/kpi_manager/.gitlab-ci.yml'

  - local: '/src/kpi_value_api/.gitlab-ci.yml'

  #- local: '/src/kpi_value_writer/.gitlab-ci.yml'

  #- local: '/src/telemetry/.gitlab-ci.yml'

  - local: '/src/analytics/.gitlab-ci.yml'

  - local: '/src/qos_profile/.gitlab-ci.yml'

  - local: '/src/vnt_manager/.gitlab-ci.yml'

  - local: '/src/e2e_orchestrator/.gitlab-ci.yml'

  - local: '/src/ztp_server/.gitlab-ci.yml'

  - local: '/src/osm_client/.gitlab-ci.yml'

  - local: '/src/simap_connector/.gitlab-ci.yml'

  - local: '/src/pluggables/.gitlab-ci.yml'



  # This should be last one: end-to-end integration tests

  - local: '/src/tests/.gitlab-ci.yml'

src/tests/.gitlab-ci.yml

+16 −16
Original line number Diff line number Diff line
@@ -14,21 +14,21 @@ 


# include the individual .gitlab-ci.yml of each end-to-end integration test

include:

#  - local: '/src/tests/ofc22/.gitlab-ci.yml'

#  #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'

#  - local: '/src/tests/ecoc22/.gitlab-ci.yml'

#  #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc23/.gitlab-ci.yml'

#  - local: '/src/tests/ofc24/.gitlab-ci.yml'

#  - local: '/src/tests/eucnc24/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml'

#  #- local: '/src/tests/ofc25/.gitlab-ci.yml'

  - local: '/src/tests/ofc22/.gitlab-ci.yml'

  #- local: '/src/tests/oeccpsc22/.gitlab-ci.yml'

  - local: '/src/tests/ecoc22/.gitlab-ci.yml'

  #- local: '/src/tests/nfvsdn22/.gitlab-ci.yml'

  #- local: '/src/tests/ofc23/.gitlab-ci.yml'

  - local: '/src/tests/ofc24/.gitlab-ci.yml'

  - local: '/src/tests/eucnc24/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25-camara-agg-net-controller/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25-camara-e2e-controller/.gitlab-ci.yml'

  #- local: '/src/tests/ofc25/.gitlab-ci.yml'

  - local: '/src/tests/ryu-openflow/.gitlab-ci.yml'

#  - local: '/src/tests/qkd_end2end/.gitlab-ci.yml'

#  - local: '/src/tests/acl_end2end/.gitlab-ci.yml'

  - local: '/src/tests/qkd_end2end/.gitlab-ci.yml'

  - local: '/src/tests/acl_end2end/.gitlab-ci.yml'



#  - local: '/src/tests/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'

#  - local: '/src/tests/tools/mock_qkd_node/.gitlab-ci.yml'

#  - local: '/src/tests/tools/mock_osm_nbi/.gitlab-ci.yml'

#  - local: '/src/tests/tools/simap_server/.gitlab-ci.yml'
 
  - local: '/src/tests/tools/mock_tfs_nbi_dependencies/.gitlab-ci.yml'

  - local: '/src/tests/tools/mock_qkd_node/.gitlab-ci.yml'

  - local: '/src/tests/tools/mock_osm_nbi/.gitlab-ci.yml'

  - local: '/src/tests/tools/simap_server/.gitlab-ci.yml'

src/tests/ryu-openflow/.gitlab-ci.yml

+4 −4
Original line number Diff line number Diff line
@@ -202,9 +202,9 @@ end2end_test ryu-openflow: 
    # 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

    - yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.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

    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/serviceservice.yaml

    #- yq -i '((select(.kind=="Deployment").spec.template.spec.containers.[] | select(.name=="server").env.[]) | select(.name=="LOG_LEVEL").value) |= "DEBUG"' manifests/nbiservice.yaml



    - source src/tests/${TEST_NAME}/deploy_specs.sh

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

+6 −6
Original line number Diff line number Diff line
@@ -42,12 +42,12 @@ def test_scenario_cleanup( 
    # Doing it manually...



    link_ids = context_client.ListLinkIds(Empty())

    LOGGER.debug('Link Ids: {:s}'.format(grpc_message_to_json_string(link_ids)))

    LOGGER.info('Link Ids: {:s}'.format(grpc_message_to_json_string(link_ids)))

    for link_id in link_ids.link_ids:

        context_client.RemoveLink(link_id)



    devices = context_client.ListDevices(Empty())

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

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



    dag_device_uuids = graphlib.TopologicalSorter()

    device_uuid_to_data : Dict[str, Tuple[DeviceId, str]] = dict()
@@ -65,18 +65,18 @@ def test_scenario_cleanup( 


    sorted_device_uuids = list(dag_device_uuids.static_order())



    LOGGER.debug('device_uuid_to_data: {:s}'.format(str(device_uuid_to_data)))

    LOGGER.debug('sorted_device_uuids: {:s}'.format(str(sorted_device_uuids)))

    LOGGER.info('device_uuid_to_data: {:s}'.format(str(device_uuid_to_data)))

    LOGGER.info('sorted_device_uuids: {:s}'.format(str(sorted_device_uuids)))

           

    for device_uuid in sorted_device_uuids:

        device_id = device_uuid_to_data[device_uuid][0]

        context_client.RemoveDevice(device_id)



    context_ids = context_client.ListContextIds(Empty())

    LOGGER.debug('Context Ids: {:s}'.format(grpc_message_to_json_string(context_ids)))

    LOGGER.info('Context Ids: {:s}'.format(grpc_message_to_json_string(context_ids)))

    for context_id in context_ids.context_ids:

        topology_ids = context_client.ListTopologyIds(context_id)

        LOGGER.debug('Topology Ids: {:s}'.format(grpc_message_to_json_string(topology_ids)))

        LOGGER.info('Topology Ids: {:s}'.format(grpc_message_to_json_string(topology_ids)))

        for topology_id in topology_ids.topology_ids:

            context_client.RemoveTopology(topology_id)

        context_client.RemoveContext(context_id)

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

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ def test_service_ietf_creation( 


    # Check there is 1 service

    response = context_client.ListServices(ADMIN_CONTEXT_ID)

    LOGGER.warning('Services[{:d}] = {:s}'.format(

    LOGGER.info('Services[{:d}] = {:s}'.format(

        len(response.services), grpc_message_to_json_string(response)

    ))

    assert len(response.services) == 1
@@ -66,7 +66,7 @@ def test_service_ietf_creation( 
        assert service.service_type == ServiceTypeEnum.SERVICETYPE_L3NM



        response = context_client.ListConnections(service_id)

        LOGGER.warning('  ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(

        LOGGER.info('  ServiceId[{:s}] => Connections[{:d}] = {:s}'.format(

            grpc_message_to_json_string(service_id), len(response.connections),

            grpc_message_to_json_string(response)

        ))