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

Device component: 

- TransportAPI Driver: Updated input_sip/output_sip fields to input_sip_uuid/output_sip_uuid
- XR Driver: Updated input_sip/output_sip fields to input_sip_name/output_sip_name
parent 0b3afc61

src/device/service/drivers/transport_api/TransportApiDriver.py

+2 −2
Original line number Diff line number Diff line
@@ -85,9 +85,9 @@ class TransportApiDriver(_Driver): 
            for resource in resources:

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



                input_sip = find_key(resource, 'input_sip')

                output_sip = find_key(resource, 'output_sip')

                uuid = find_key(resource, 'uuid')

                input_sip = find_key(resource, 'input_sip_uuid')

                output_sip = find_key(resource, 'output_sip_uuid')

                capacity_value = find_key(resource, 'capacity_value')

                capacity_unit = find_key(resource, 'capacity_unit')

                layer_protocol_name = find_key(resource, 'layer_protocol_name')

src/device/service/drivers/xr/cm-cli.py

+2 −2
Original line number Diff line number Diff line
@@ -160,8 +160,8 @@ if args.emulate_tf_set_config_service: 
    hub_module_name, uuid, input_sip, output_sip, capacity_value  = eargs[0:5]

    capacity_value = int(capacity_value)

    config = {

        "input_sip": input_sip,

        "output_sip": output_sip,

        "input_sip_name": input_sip,

        "output_sip_name": output_sip,

        "capacity_value": capacity_value,

        "capacity_unit": "gigabit"

    }

src/device/service/drivers/xr/cm/tests/test_xr_service_set_config.py

+2 −2
Original line number Diff line number Diff line
@@ -44,8 +44,8 @@ def mock_cm(): 


uuid = "12345ABCDEFGHIJKLMN"

config = {

    "input_sip": "XR HUB 1|XR-T4;",

    "output_sip": "XR LEAF 1|XR-T1",

    "input_sip_name": "XR HUB 1|XR-T4;",

    "output_sip_name": "XR LEAF 1|XR-T1",

    "capacity_value": 125,

    "capacity_unit": "gigabit"

}

src/device/service/drivers/xr/cm/tf.py

+1 −1
Original line number Diff line number Diff line
@@ -38,7 +38,7 @@ def _get_capacity(config) -> int: 


def set_config_for_service(cm_connection: CmConnection, constellation: Constellation, uuid: str, config: Dict[str, any]) -> Union[bool, Exception]:

    try:

        service = TFService(uuid, config["input_sip"], config["output_sip"], _get_capacity(config))

        service = TFService(uuid, config["input_sip_name"], config["output_sip_name"], _get_capacity(config))

        if constellation.is_vti_mode():

            desired_tc = TransportCapacity(from_tf_service=service)

            active_tc = cm_connection.get_transport_capacity_by_name(service.name())