Skip to content
Snippets Groups Projects
Commit 42794440 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Device component - Microwave Driver:

- Added logic to retrieve configured services
parent aa2579a6
No related branches found
No related tags found
2 merge requests!142Release TeraFlowSDN 2.1,!71OFC'23 + IETF L2VPN Device Driver + Device Controllers + Multiple small improvements
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
import json, logging, requests import json, logging, requests
from requests.auth import HTTPBasicAuth from requests.auth import HTTPBasicAuth
from typing import Optional, Set from typing import Dict, Optional, Set
from device.service.driver_api._Driver import RESOURCE_ENDPOINTS from device.service.driver_api._Driver import RESOURCE_ENDPOINTS
LOGGER = logging.getLogger(__name__) LOGGER = logging.getLogger(__name__)
...@@ -43,6 +43,14 @@ def is_exportable_endpoint(node, termination_point_id, links): ...@@ -43,6 +43,14 @@ def is_exportable_endpoint(node, termination_point_id, links):
return False return False
return True return True
VLAN_CLASSIFICATION_TYPES = {'ietf-eth-tran-types:vlan-classification', 'vlan-classification'}
OUTER_TAG_C_TYPE = {'ietf-eth-tran-types:classify-c-vlan', 'classify-c-vlan'}
def get_vlan_outer_tag(endpoint : Dict) -> Optional[int]:
if endpoint.get('service-classification-type', '') not in VLAN_CLASSIFICATION_TYPES: return None
outer_tag = endpoint.get('outer-tag', {})
if outer_tag.get('tag-type', '') not in OUTER_TAG_C_TYPE: return None
return outer_tag.get('vlan-value')
def config_getter( def config_getter(
root_url : str, resource_key : str, auth : Optional[HTTPBasicAuth] = None, timeout : Optional[int] = None, root_url : str, resource_key : str, auth : Optional[HTTPBasicAuth] = None, timeout : Optional[int] = None,
node_ids : Set[str] = set() node_ids : Set[str] = set()
...@@ -92,7 +100,29 @@ def config_getter( ...@@ -92,7 +100,29 @@ def config_getter(
for service in service_instances: for service in service_instances:
service_name = service['etht-svc-name'] service_name = service['etht-svc-name']
resource_key = '/services/service[{:s}]'.format(service_name) resource_key = '/services/service[{:s}]'.format(service_name)
result.append((resource_key, service)) resource_value = {'uuid': service.get('etht-svc-name', '<UNDEFINED>')}
for endpoint in service.get('etht-svc-end-points', []):
_vlan_id = get_vlan_outer_tag(endpoint)
if _vlan_id is not None:
vlan_id = resource_value.get('vlan_id')
if vlan_id is None:
resource_value['vlan_id'] = _vlan_id
elif vlan_id != _vlan_id:
raise Exception('Incompatible VLAN Ids: {:s}'.format(str(service)))
access_points = endpoint.get('etht-svc-access-points', [])
for access_point in access_points:
if access_point['access-point-id'] == '1':
resource_value['node_id_src'] = access_point['access-node-id']
resource_value['tp_id_src'] = access_point['access-ltp-id']
elif access_point['access-point-id'] == '2':
resource_value['node_id_dst'] = access_point['access-node-id']
resource_value['tp_id_dst'] = access_point['access-ltp-id']
if len(node_ids) > 0 and resource_value['node_id_src'] not in node_ids: continue
if len(node_ids) > 0 and resource_value['node_id_dst'] not in node_ids: continue
result.append((resource_key, resource_value))
except requests.exceptions.Timeout: except requests.exceptions.Timeout:
LOGGER.exception('Timeout connecting {:s}'.format(url)) LOGGER.exception('Timeout connecting {:s}'.format(url))
except Exception as e: # pylint: disable=broad-except except Exception as e: # pylint: disable=broad-except
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment