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

Merge branch 'release/2.0.1' of https://labs.etsi.org/rep/tfs/controller into feat/slice-grouping

parents 5ef1e909 ddf424f1
No related branches found
No related tags found
2 merge requests!142Release TeraFlowSDN 2.1,!64Slice Grouping
...@@ -66,7 +66,7 @@ def compose_constraints_data( ...@@ -66,7 +66,7 @@ def compose_constraints_data(
constraint_name = '{:s}:{:s}:{:s}'.format(parent_kind, kind.value, endpoint_uuid) constraint_name = '{:s}:{:s}:{:s}'.format(parent_kind, kind.value, endpoint_uuid)
elif kind in { elif kind in {
ConstraintKindEnum.SCHEDULE, ConstraintKindEnum.SLA_CAPACITY, ConstraintKindEnum.SLA_LATENCY, ConstraintKindEnum.SCHEDULE, ConstraintKindEnum.SLA_CAPACITY, ConstraintKindEnum.SLA_LATENCY,
ConstraintKindEnum.SLA_AVAILABILITY, ConstraintKindEnum.SLA_ISOLATION_LEVEL ConstraintKindEnum.SLA_AVAILABILITY, ConstraintKindEnum.SLA_ISOLATION
}: }:
constraint_name = '{:s}:{:s}:'.format(parent_kind, kind.value) constraint_name = '{:s}:{:s}:'.format(parent_kind, kind.value)
else: else:
......
...@@ -19,15 +19,17 @@ from typing import Dict ...@@ -19,15 +19,17 @@ from typing import Dict
from ._Base import _Base from ._Base import _Base
# Enum values should match name of field in Constraint message # Enum values should match name of field in Constraint message
# - enum item name should be Constraint message type in upper case
# - enum item value should be Constraint message type as it is in the proto files
class ConstraintKindEnum(enum.Enum): class ConstraintKindEnum(enum.Enum):
CUSTOM = 'custom' CUSTOM = 'custom'
SCHEDULE = 'schedule' SCHEDULE = 'schedule'
ENDPOINT_LOCATION = 'endpoint_location' ENDPOINT_LOCATION = 'endpoint_location'
ENDPOINT_PRIORITY = 'endpoint_priority' ENDPOINT_PRIORITY = 'endpoint_priority'
SLA_CAPACITY = 'sla_capacity' SLA_CAPACITY = 'sla_capacity'
SLA_LATENCY = 'sla_latency' SLA_LATENCY = 'sla_latency'
SLA_AVAILABILITY = 'sla_availability' SLA_AVAILABILITY = 'sla_availability'
SLA_ISOLATION_LEVEL = 'sla_isolation' SLA_ISOLATION = 'sla_isolation'
class ConstraintModel(_Base): class ConstraintModel(_Base):
__tablename__ = 'constraint' __tablename__ = 'constraint'
......
...@@ -157,7 +157,6 @@ ...@@ -157,7 +157,6 @@
<td>SLA Availability</td> <td>SLA Availability</td>
<td>-</td> <td>-</td>
<td> <td>
{{ constraint.sla_availability.availability }} %;
{{ constraint.sla_availability.num_disjoint_paths }} disjoint paths; {{ constraint.sla_availability.num_disjoint_paths }} disjoint paths;
{% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active {% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active
</td> </td>
......
...@@ -157,7 +157,6 @@ ...@@ -157,7 +157,6 @@
<td>SLA Availability</td> <td>SLA Availability</td>
<td>-</td> <td>-</td>
<td> <td>
{{ constraint.sla_availability.availability }} %;
{{ constraint.sla_availability.num_disjoint_paths }} disjoint paths; {{ constraint.sla_availability.num_disjoint_paths }} disjoint paths;
{% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active {% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active
</td> </td>
......
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