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

src/context/service/database/Constraint.py

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ def compose_constraints_data( 
            constraint_name = '{:s}:{:s}:{:s}'.format(parent_kind, kind.value, endpoint_uuid)

        elif kind in {

            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)

        else:

src/context/service/database/models/ConstraintModel.py

+10 −8
Original line number Diff line number Diff line
@@ -19,6 +19,8 @@ from typing import Dict 
from ._Base import _Base



# 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):

    CUSTOM            = 'custom'

    SCHEDULE          = 'schedule'
@@ -27,7 +29,7 @@ class ConstraintKindEnum(enum.Enum): 
    SLA_CAPACITY      = 'sla_capacity'

    SLA_LATENCY       = 'sla_latency'

    SLA_AVAILABILITY  = 'sla_availability'

    SLA_ISOLATION_LEVEL = 'sla_isolation'

    SLA_ISOLATION     = 'sla_isolation'



class ConstraintModel(_Base):

    __tablename__ = 'constraint'

src/webui/service/templates/service/detail.html

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
            <td>SLA Availability</td>

            <td>-</td>

            <td>

                {{ constraint.sla_availability.availability }} %;

                {{ constraint.sla_availability.num_disjoint_paths }} disjoint paths;

                {% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active

            </td>

src/webui/service/templates/slice/detail.html

+0 −1
Original line number Diff line number Diff line
@@ -157,7 +157,6 @@ 
            <td>SLA Availability</td>

            <td>-</td>

            <td>

                {{ constraint.sla_availability.availability }} %;

                {{ constraint.sla_availability.num_disjoint_paths }} disjoint paths;

                {% if constraint.sla_availability.all_active %}all{% else %}single{% endif %}-active

            </td>