Commit 59d63ea4 authored by Ricard Vilalta's avatar Ricard Vilalta
Browse files

Merge branch 'master' of https://gitlab.com/teraflow-h2020/controller

parents 9b31843c 87253730

proto/automation.proto

+0 −1
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
syntax = "proto3";

package automation;



//import "google/protobuf/empty.proto";

import "context.proto";



service AutomationService {

proto/centralized_cybersecurity.proto

+5 −5
Original line number Diff line number Diff line
@@ -2,22 +2,22 @@ 
syntax = "proto3";

package centralized_cybersecurity;



import "google/protobuf/empty.proto";

import "context.proto";

import "service.proto";

import "monitoring.proto";





service CentralizedCyberSecurityService {



  rpc NotifyServiceUpdate (service.Service) returns (google.protobuf.Empty) {}

  rpc NotifyServiceUpdate (service.Service) returns (context.Empty) {}

  

  // rpc that triggers the attack detection loop

  rpc DetectAttack (google.protobuf.Empty) returns (google.protobuf.Empty) {}

  rpc DetectAttack (context.Empty) returns (context.Empty) {}



  // rpc called by the distributed component to report KPIs

  rpc ReportSummarizedKpi (monitoring.KpiList) returns (google.protobuf.Empty) {}

  rpc ReportSummarizedKpi (monitoring.KpiList) returns (context.Empty) {}



  rpc ReportKpi (monitoring.KpiList) returns (google.protobuf.Empty) {}

  rpc ReportKpi (monitoring.KpiList) returns (context.Empty) {}



}

proto/compute.proto

+3 −4
Original line number Diff line number Diff line
@@ -2,7 +2,6 @@ 
syntax = "proto3";

package compute;



import "google/protobuf/empty.proto";

import "context.proto";

import "service.proto";
@@ -11,9 +10,9 @@ service ComputeService { 
  rpc get_connectivity_service_status ( service.ServiceId ) returns (service.ServiceState) {}

  rpc create_connectivity_service ( service.Service ) returns (service.ServiceId) {}

  rpc edit_connectivity_service ( service.Service ) returns (service.ServiceId) {}

  rpc delete_connectivity_service ( service.Service ) returns ( google.protobuf.Empty ) {}

  rpc get_all_active_connectivity_services ( google.protobuf.Empty ) returns ( service.ServiceIdList ) {}

  rpc clear_all_connectivity_services ( google.protobuf.Empty ) returns (google.protobuf.Empty ) {}

  rpc delete_connectivity_service ( service.Service ) returns ( context.Empty ) {}

  rpc get_all_active_connectivity_services ( context.Empty ) returns ( service.ServiceIdList ) {}

  rpc clear_all_connectivity_services ( context.Empty ) returns ( context.Empty ) {}

}

proto/context.proto

+4 −2
Original line number Diff line number Diff line
@@ -2,13 +2,15 @@ 
syntax = "proto3";

package context;



import "google/protobuf/empty.proto";



service ContextService {

  rpc GetTopology (google.protobuf.Empty) returns (Topology) {}

  rpc GetTopology (Empty) returns (Topology) {}

  

}



message Empty {



}



message Context {

  Topology topo = 1;

proto/device.proto

+1 −2
Original line number Diff line number Diff line
@@ -2,13 +2,12 @@ 
syntax = "proto3";

package device;



import "google/protobuf/empty.proto";

import "context.proto";



service DeviceService {

  rpc AddDevice(context.Device) returns (context.DeviceId) {}

  rpc ConfigureDevice(context.DeviceConfig) returns (context.DeviceId) {}

  rpc DeleteDevice(context.DeviceId) returns (google.protobuf.Empty) {}

  rpc DeleteDevice(context.DeviceId) returns (context.Empty) {}

}