From 16f4fa1391055dfeaf4fe94f73fd65dab2c8d440 Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Fri, 17 Feb 2023 16:38:07 +0000
Subject: [PATCH] Common - Tools - Object Factory - Constraints:
- implemented missing methods
---
src/common/tools/object_factory/Constraint.py | 17 ++++++++++++++---
1 file changed, 14 insertions(+), 3 deletions(-)
diff --git a/src/common/tools/object_factory/Constraint.py b/src/common/tools/object_factory/Constraint.py
index e3c5129fd..ef00e3872 100644
--- a/src/common/tools/object_factory/Constraint.py
+++ b/src/common/tools/object_factory/Constraint.py
@@ -13,7 +13,7 @@
# limitations under the License.
import json
-from typing import Any, Dict, Union
+from typing import Any, Dict, List, Union
def json_constraint_custom(constraint_type : str, constraint_value : Union[str, Dict[str, Any]]) -> Dict:
if not isinstance(constraint_value, str): constraint_value = json.dumps(constraint_value, sort_keys=True)
@@ -29,5 +29,16 @@ 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_availability(num_disjoint_paths : int, all_active : bool) -> Dict:
- return {'sla_availability': {'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active}}
+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}}
--
GitLab