Commit f7d6a431 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Updated proto files: 

- formatted and corrected interdomain and slice proto files
- regenerated associated Python code files per component
parent afa196d7

proto/context.proto

+39 −0
Original line number Diff line number Diff line
@@ -253,6 +253,45 @@ message ServiceEvent { 
  ServiceId service_id = 2;

}



// ----- Slice ---------------------------------------------------------------------------------------------------------

message SliceId {

  ContextId context_id = 1;

  Uuid slice_uuid = 2;

}



message Slice {

  SliceId slice_id = 1;

  repeated EndPointId slice_endpoint_ids = 2;

  repeated Constraint slice_constraints = 3;

  repeated ServiceId slice_services = 4;

  repeated SliceId slice_subslice_ids = 5;

  SliceStatus slice_status = 6;

}



enum SliceStatusEnum {

  SLICESTATUS_UNDEFINED = 0;

  SLICESTATUS_PLANNED   = 1;

  SLICESTATUS_INIT      = 2;

  SLICESTATUS_ACTIVE    = 3;

  SLICESTATUS_DEINIT    = 4;

}



message SliceStatus {

  SliceStatusEnum slice_status = 1;

}



message SliceIdList {

  repeated SliceId slice_ids = 1;

}



message SliceList {

  repeated Slice slices = 1;

}



message SliceEvent {

  Event event = 1;

  SliceId slice_id = 2;

}



// ----- Connection ----------------------------------------------------------------------------------------------------

message ConnectionId {

proto/interdomain.proto

+3 −4
Original line number Diff line number Diff line
@@ -16,11 +16,10 @@ syntax = "proto3"; 
package interdomain;



import "context.proto";

import "slice.proto";



service InterdomainService {

  rpc Authenticate              (context.TeraFlowController) returns (context.AuthenticationResult) {}

  rpc LookUpSlice               (slice.TransportSlice      ) returns (slice.SliceId               ) {}

  rpc OrderSliceFromCatalog     (slice.TransportSlice      ) returns (slice.SliceStatus           ) {}

  rpc CreateSliceAndAddToCatalog(slice.TransportSlice      ) returns (slice.SliceStatus           ) {}

  rpc LookUpSlice               (context.Slice             ) returns (context.SliceId             ) {}

  rpc OrderSliceFromCatalog     (context.Slice             ) returns (context.Slice               ) {}

  rpc CreateSliceAndAddToCatalog(context.Slice             ) returns (context.Slice               ) {}

}

proto/slice.proto

+2 −32
Original line number Diff line number Diff line
@@ -18,36 +18,6 @@ package slice; 
import "context.proto";



service SliceService {

  rpc CreateUpdateSlice (TransportSlice) returns (SliceStatus  ) {}

  rpc DeleteSlice       (TransportSlice) returns (context.Empty) {}

}



message SliceEndpoint {

  context.EndPoint port_id = 1;

}



message TransportSlice {

  SliceId slice_id = 1;

  repeated slice.SliceEndpoint endpoints = 2;

  repeated context.Constraint constraints = 3;

  repeated context.ServiceId services = 4;

  repeated SliceId subSlicesId = 5;

  SliceStatus status = 6;

}



message SliceId {

  context.ContextId contextId = 1;

  context.Uuid slice_id = 2;

}



message SliceStatus {

  slice.SliceId slice_id = 1;

  SliceStatusEnum status = 2;

}



enum SliceStatusEnum {

  PLANNED = 0;

  INIT = 1;

  ACTIVE = 2;

  DEINIT = 3;

  rpc CreateUpdateSlice (context.Slice) returns (context.SliceId) {}

  rpc DeleteSlice       (context.Slice) returns (context.Empty  ) {}

}

src/compute/proto/__init__.py

+0 −14
Original line number Diff line number Diff line 
# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.

src/compute/proto/context_pb2.py

+386 −37

File changed.

Preview size limit exceeded, changes collapsed.