Commit 75b7283f authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Improve robustness of service parsing in optical tfs driver

parent b3cc3550
Loading
Loading
Loading
Loading
+23 −16
Changes for src/device/service/drivers/optical_tfs/TfsApiClient.py: 23 added lines, 16 removed lines.
Original line number Diff line number Diff line
@@ -245,23 +245,28 @@ class TfsApiClient(RestApiClient):
            self.delete(service_url)

    @staticmethod
    def parse_service(service : Dict) -> Tuple[str, Dict]:
        service_uuid = service['service_id']['service_uuid']['uuid']
        src_endpoint_id = service['service_endpoint_ids'][ 0]
        dst_endpoint_id = service['service_endpoint_ids'][-1]
    def parse_service(service : Dict) -> Optional[Tuple[str, Dict]]:
        service_uuid = service.get('service_id', {}).get('service_uuid', {}).get('uuid')
        if not service_uuid:
            return None
        endpoints = service.get('service_endpoint_ids', [])
        if len(endpoints) < 2:
            return None
        src_endpoint_id = endpoints[ 0]
        dst_endpoint_id = endpoints[-1]
        parsed_service = {
            'service_uuid'     : service_uuid,
            'service_name'     : service['name'],
            'src_device_uuid'  : src_endpoint_id['device_id']['device_uuid']['uuid'],
            'src_endpoint_uuid': src_endpoint_id['endpoint_uuid']['uuid'],
            'dst_device_uuid'  : dst_endpoint_id['device_id']['device_uuid']['uuid'],
            'dst_endpoint_uuid': dst_endpoint_id['endpoint_uuid']['uuid'],
            'service_name'     : service.get('name', ''),
            'src_device_uuid'  : src_endpoint_id.get('device_id', {}).get('device_uuid', {}).get('uuid', ''),
            'src_endpoint_uuid': src_endpoint_id.get('endpoint_uuid', {}).get('uuid', ''),
            'dst_device_uuid'  : dst_endpoint_id.get('device_id', {}).get('device_uuid', {}).get('uuid', ''),
            'dst_endpoint_uuid': dst_endpoint_id.get('endpoint_uuid', {}).get('uuid', ''),
        }

        for constraint in service.get('service_constraints', list()):
            if 'custom' not in constraint: continue
            constraint_type  = constraint['custom']['constraint_type']
            constraint_value = constraint['custom']['constraint_value']
            constraint_type  = constraint['custom'].get('constraint_type')
            constraint_value = constraint['custom'].get('constraint_value')
            if constraint_type == 'bandwidth[gbps]':
                parsed_service['bitrate'] = int(float(constraint_value))
            if constraint_type == 'bidirectionality':
@@ -279,11 +284,13 @@ class TfsApiClient(RestApiClient):
            'SERVICETYPE_OPTICAL_CONNECTIVITY',
            ServiceTypeEnum.SERVICETYPE_OPTICAL_CONNECTIVITY
        }
        return [
            TfsApiClient.parse_service(service)
            for service in _services['services']
            if service['service_type'] in OPTICAL_CONNECTIVITY_SERVICE_TYPES
        ]
        results = []
        for service in _services.get('services', []):
            if service.get('service_type') in OPTICAL_CONNECTIVITY_SERVICE_TYPES:
                parsed = TfsApiClient.parse_service(service)
                if parsed is not None:
                    results.append(parsed)
        return results

    def get_service(self, service_uuid : str) -> Tuple[str, Dict]:
        service_url = SERVICE_URL.format(context_uuid=self.context_uuid, service_uuid=service_uuid)