Commit 8416bab4 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 299f5ebe 9dd7b10b

hackfest/tfs-descriptors/old/service.json

+2 −2
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ 
                {"device_id":{"device_uuid":{"uuid":"R2"}},"endpoint_uuid":{"uuid":"1/3"}}

            ],

            "service_constraints":[

                {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "10.0"}},

                {"custom": {"constraint_type": "latency[ms]", "constraint_value": "20.0"}}

                {"sla_capacity": {"capacity_gbps": 10.0}},

                {"sla_latency": {"e2e_latency_ms": 20.0}}

            ],

            "service_config":{"config_rules":[]}

        }

hackfest/tfs-descriptors/service-l3vpn.json

+2 −2
Original line number Diff line number Diff line
@@ -12,8 +12,8 @@ 
                {"device_id": {"device_uuid": {"uuid": "R3"}}, "endpoint_uuid": {"uuid": "1/2"}}

            ],

            "service_constraints": [

                {"custom": {"constraint_type": "bandwidth[gbps]", "constraint_value": "10.0"}},

                {"custom": {"constraint_type": "latency[ms]", "constraint_value": "15.2"}}

                {"sla_capacity": {"capacity_gbps": 10.0}},

                {"sla_latency": {"e2e_latency_ms": 15.2}}

            ],

            "service_config": {"config_rules": [

                {"action": 1, "custom": {"resource_key": "/settings", "resource_value": {

src/common/tools/context_queries/InterDomain.py

+4 −6
Original line number Diff line number Diff line
@@ -136,13 +136,11 @@ def compute_interdomain_path( 
        service_endpoint_id = pathcomp_req_svc.service_endpoint_ids.add()

        service_endpoint_id.CopyFrom(endpoint_id)

    

    constraint_bw = pathcomp_req_svc.service_constraints.add()

    constraint_bw.custom.constraint_type = 'bandwidth[gbps]'

    constraint_bw.custom.constraint_value = '10.0'

    constraint_sla_capacity = pathcomp_req_svc.service_constraints.add()

    constraint_sla_capacity.sla_capacity.capacity_gbps = 10.0



    constraint_lat = pathcomp_req_svc.service_constraints.add()

    constraint_lat.custom.constraint_type = 'latency[ms]'

    constraint_lat.custom.constraint_value = '100.0'

    constraint_sla_latency = pathcomp_req_svc.service_constraints.add()

    constraint_sla_latency.sla_latency.e2e_latency_ms = 100.0



    LOGGER.debug('pathcomp_req = {:s}'.format(grpc_message_to_json_string(pathcomp_req)))

    pathcomp_rep = pathcomp_client.Compute(pathcomp_req)

src/context/service/database/Slice.py

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ def slice_unset(db_engine : Engine, request : Slice) -> Tuple[Dict, bool]: 


    if len(request.slice_constraints) > 0:         raise NotImplementedError('UnsetSlice: removal of constraints')

    if len(request.slice_config.config_rules) > 0: raise NotImplementedError('UnsetSlice: removal of config rules')

    if len(request.slice_endpoint_ids) > 0:        raise NotImplementedError('UnsetSlice: removal of endpoints')

    #if len(request.slice_endpoint_ids) > 0:        raise NotImplementedError('UnsetSlice: removal of endpoints')



    slice_endpoint_uuids : Set[str] = set()

    for i,endpoint_id in enumerate(request.slice_endpoint_ids):

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

+2 −2
Original line number Diff line number Diff line
@@ -99,7 +99,7 @@ class SliceSubSliceModel(_Base): 
    __tablename__ = 'slice_subslice'



    slice_uuid    = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE'), primary_key=True)

    subslice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='RESTRICT'), primary_key=True)

    subslice_uuid = Column(ForeignKey('slice.slice_uuid', ondelete='CASCADE'), primary_key=True)



    slice    = relationship(

        'SliceModel', foreign_keys='SliceSubSliceModel.slice_uuid', back_populates='slice_subslices', lazy='joined')