Commit fe18f601 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 96d5f39d 97f4422f

src/common/tools/object_factory/Constraint.py

+2 −2
Original line number Diff line number Diff line
@@ -29,9 +29,9 @@ 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, availability : float) -> Dict:

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, 'availability': availability

        'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active

    }}



def json_constraint_sla_capacity(capacity_gbps : float) -> Dict:

src/load_generator/load_gen/RequestGenerator.py

+3 −6
Original line number Diff line number Diff line
@@ -230,12 +230,11 @@ class RequestGenerator: 
        ]



        if request_type == RequestType.SERVICE_L2NM:

            availability   = round(random.uniform(0.0,  99.99), ndigits=2)

            capacity_gbps  = round(random.uniform(0.1, 100.00), ndigits=2)

            e2e_latency_ms = round(random.uniform(5.0, 100.00), ndigits=2)



            constraints = [

                json_constraint_sla_availability(1, True, availability),

                json_constraint_sla_availability(1, True),

                json_constraint_sla_capacity(capacity_gbps),

                json_constraint_sla_isolation([IsolationLevelEnum.NO_ISOLATION]),

                json_constraint_sla_latency(e2e_latency_ms),
@@ -275,12 +274,11 @@ class RequestGenerator: 
                request_uuid, endpoint_ids=endpoint_ids, constraints=constraints, config_rules=config_rules)



        elif request_type == RequestType.SERVICE_L3NM:

            availability   = round(random.uniform(0.0,  99.99), ndigits=2)

            capacity_gbps  = round(random.uniform(0.1, 100.00), ndigits=2)

            e2e_latency_ms = round(random.uniform(5.0, 100.00), ndigits=2)



            constraints = [

                json_constraint_sla_availability(1, True, availability),

                json_constraint_sla_availability(1, True),

                json_constraint_sla_capacity(capacity_gbps),

                json_constraint_sla_isolation([IsolationLevelEnum.NO_ISOLATION]),

                json_constraint_sla_latency(e2e_latency_ms),
@@ -380,11 +378,10 @@ class RequestGenerator: 
            json_endpoint_id(json_device_id(dst_device_uuid), dst_endpoint_uuid),

        ]



        availability   = round(random.uniform(0.0,  99.99), ndigits=2)

        capacity_gbps  = round(random.uniform(0.1, 100.00), ndigits=2)

        e2e_latency_ms = round(random.uniform(5.0, 100.00), ndigits=2)

        constraints = [

            json_constraint_sla_availability(1, True, availability),

            json_constraint_sla_availability(1, True),

            json_constraint_sla_capacity(capacity_gbps),

            json_constraint_sla_isolation([IsolationLevelEnum.NO_ISOLATION]),

            json_constraint_sla_latency(e2e_latency_ms),

src/pathcomp/frontend/tests/test_unitary.py

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ def test_request_service_kdisjointpath( 
    endpoint_ids, constraints = [], [

        json_constraint_sla_capacity(10.0),

        json_constraint_sla_latency(12.0),

        json_constraint_sla_availability(2, True, 50.0),

        json_constraint_sla_availability(2, True),

        json_constraint_custom('diversity', {'end-to-end-diverse': 'all-other-accesses'}),

    ]