Commit 2b88256d authored by Pablo Armingol's avatar Pablo Armingol
Browse files

code clean up

parent 1960ff80

src/common/DeviceTypes.py

+0 −1
Original line number Diff line number Diff line
@@ -52,7 +52,6 @@ class DeviceTypeEnum(Enum): 
    OPEN_ROADM                      = 'openroadm'

    PON_CONTROLLER                  = 'pon-controller'





    # ETSI TeraFlowSDN controller

    TERAFLOWSDN_CONTROLLER          = 'teraflowsdn'

    IETF_SLICE                      = 'ietf-slice'

src/device/service/DeviceServiceServicerImpl.py

+4 −10
Original line number Diff line number Diff line
@@ -61,8 +61,8 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
        t0 = time.time()



        device_uuid = request.device_id.device_uuid.uuid

        connection_config_rules = check_connect_rules(request.device_config)

        

        connection_config_rules = check_connect_rules(request.device_config)

        check_no_endpoints(request.device_endpoints)



        t1 = time.time()
@@ -87,6 +87,7 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 


            device_id = context_client.SetDevice(device)

            device = get_device(context_client, device_id.device_uuid.uuid, rw_copy=True)



        # update device_uuid to honor UUID provided by Context

        device_uuid = device.device_id.device_uuid.uuid

        device_name = device.name
@@ -99,15 +100,9 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
        self.mutex_queues.add_alias(device_uuid, device_name)

        self.mutex_queues.wait_my_turn(device_uuid)

        t3 = time.time()

        LOGGER.info('request.device_endpoints ' + str(request.device_endpoints))

        LOGGER.info('device.device_endpoints ' + str(device.device_endpoints))



        try:





            driver : _Driver = get_driver(self.driver_instance_cache, device)

             



            t4 = time.time()



            errors = []
@@ -133,7 +128,6 @@ class DeviceServiceServicerImpl(DeviceServiceServicer): 
            else:

                t_pop_endpoints = None





            is_optical_device = request.device_drivers[0] == DeviceDriverEnum.DEVICEDRIVER_OC

            if len(device.device_config.config_rules) == len(connection_config_rules) and not is_optical_device:

                # created from request, populate config rules using driver

my_deploy.sh

+1 −1

File changed.

Contains only whitespace changes.