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

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/tutorial

parents c81712b6 0727f86c
Loading
Loading
Loading
Loading
+1 −3
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ service AutomationService {
  rpc ZtpAdd(DeviceRole) returns (DeviceRoleState) {}
  rpc ZtpUpdate(DeviceRole) returns (DeviceRoleState) {}
  rpc ZtpDelete(DeviceRole) returns (DeviceRoleState) {}
  rpc ZtpDeleteAll(Empty) returns (DeviceDeletionResult) {}
  rpc ZtpDeleteAll(context.Empty) returns (DeviceDeletionResult) {}
}

enum DeviceRoleType {
@@ -56,8 +56,6 @@ message DeviceDeletionResult {
  repeated string deleted = 1;
}

message Empty {}

enum ZtpDeviceState {
  ZTP_DEV_STATE_UNDEFINED = 0;
  ZTP_DEV_STATE_CREATED  = 1;
+2 −2
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ syntax = "proto3";
package policy;

import "context.proto";
import "policy-condition.proto";
import "policy-action.proto";
import "policy_condition.proto";
import "policy_action.proto";

service PolicyService {
  rpc PolicyAddService (PolicyRuleService) returns (PolicyRuleState) {}
Loading