From a173e1ab173f53c0eef1ae9c64be60f44c39ef1c Mon Sep 17 00:00:00 2001
From: Lluis Gifre <lluis.gifre@cttc.es>
Date: Wed, 6 Jul 2022 17:54:58 +0200
Subject: [PATCH] Common:
- improved object factory tools for links
---
src/common/tools/object_factory/Link.py | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/src/common/tools/object_factory/Link.py b/src/common/tools/object_factory/Link.py
index 624cbb8dc..9519335ca 100644
--- a/src/common/tools/object_factory/Link.py
+++ b/src/common/tools/object_factory/Link.py
@@ -13,15 +13,21 @@
# limitations under the License.
import copy
-from typing import Dict, List
+from typing import Dict, List, Tuple
-def get_link_uuid(a_device_id : Dict, a_endpoint_id : Dict, z_device_id : Dict, z_endpoint_id : Dict) -> str:
+def get_link_uuid(a_endpoint_id : Dict, z_endpoint_id : Dict) -> str:
return '{:s}/{:s}=={:s}/{:s}'.format(
- a_device_id['device_uuid']['uuid'], a_endpoint_id['endpoint_uuid']['uuid'],
- z_device_id['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])
+ a_endpoint_id['device_id']['device_uuid']['uuid'], a_endpoint_id['endpoint_uuid']['uuid'],
+ a_endpoint_id['device_id']['device_uuid']['uuid'], z_endpoint_id['endpoint_uuid']['uuid'])
-def json_link_id(link_uuid : str):
+def json_link_id(link_uuid : str) -> Dict:
return {'link_uuid': {'uuid': link_uuid}}
-def json_link(link_uuid : str, endpoint_ids : List[Dict]):
+def json_link(link_uuid : str, endpoint_ids : List[Dict]) -> Dict:
return {'link_id': json_link_id(link_uuid), 'link_endpoint_ids': copy.deepcopy(endpoint_ids)}
+
+def compose_link(endpoint_a, endpoint_z) -> Tuple[Dict, Dict]:
+ link_uuid = get_link_uuid(endpoint_a['endpoint_id'], endpoint_z['endpoint_id'])
+ link_id = json_link_id(link_uuid)
+ link = json_link(link_uuid, [endpoint_a['endpoint_id'], endpoint_z['endpoint_id']])
+ return link_id, link
--
GitLab