From b9a8208e0d75e895a55af87c0bf8e029c4064bb3 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Tue, 14 Nov 2023 16:40:42 +0000
Subject: [PATCH] Common - Tools - Object Factory:
- Added methods to build constraints: schedule and exclusions
- Ordered build constraint methods according to context.proto file
---
src/common/tools/object_factory/Constraint.py | 24 +++++++++++++++----
1 file changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/common/tools/object_factory/Constraint.py b/src/common/tools/object_factory/Constraint.py
index ef00e3872..9fccd9d5f 100644
--- a/src/common/tools/object_factory/Constraint.py
+++ b/src/common/tools/object_factory/Constraint.py
@@ -19,6 +19,9 @@ def json_constraint_custom(constraint_type : str, constraint_value : Union[str,
if not isinstance(constraint_value, str): constraint_value = json.dumps(constraint_value, sort_keys=True)
return {'custom': {'constraint_type': constraint_type, 'constraint_value': constraint_value}}
+def json_constraint_schedule(start_timestamp : float, duration_days : float) -> Dict:
+ return {'schedule': {'start_timestamp': start_timestamp, 'duration_days': duration_days}}
+
def json_constraint_endpoint_location_region(endpoint_id : Dict, region : str) -> Dict:
return {'endpoint_location': {'endpoint_id': endpoint_id, 'location': {'region': region}}}
@@ -29,16 +32,27 @@ def json_constraint_endpoint_location_gps(endpoint_id : Dict, latitude : float,
def json_constraint_endpoint_priority(endpoint_id : Dict, priority : int) -> Dict:
return {'endpoint_priority': {'endpoint_id': endpoint_id, 'priority': priority}}
+def json_constraint_sla_capacity(capacity_gbps : float) -> Dict:
+ return {'sla_capacity': {'capacity_gbps': capacity_gbps}}
+
+def json_constraint_sla_latency(e2e_latency_ms : float) -> Dict:
+ return {'sla_latency': {'e2e_latency_ms': e2e_latency_ms}}
+
def json_constraint_sla_availability(num_disjoint_paths : int, all_active : bool, availability : float) -> Dict:
return {'sla_availability': {
'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active, 'availability': availability
}}
-def json_constraint_sla_capacity(capacity_gbps : float) -> Dict:
- return {'sla_capacity': {'capacity_gbps': capacity_gbps}}
-
def json_constraint_sla_isolation(isolation_levels : List[int]) -> Dict:
return {'sla_isolation': {'isolation_level': isolation_levels}}
-def json_constraint_sla_latency(e2e_latency_ms : float) -> Dict:
- return {'sla_latency': {'e2e_latency_ms': e2e_latency_ms}}
+def json_constraint_exclusions(
+ is_permanent : bool = False, device_ids : List[Dict] = [], endpoint_ids : List[Dict] = [],
+ link_ids : List[Dict] = []
+) -> Dict:
+ return {'exclusions': {
+ 'is_permanent' : is_permanent,
+ 'device_ids' : device_ids,
+ 'endpoint_ids' : endpoint_ids,
+ 'link_ids' : link_ids,
+ }}
--
GitLab