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

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

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/microk8s-deployment
parents 0af10e19 151b2f10

proto/policy.proto

+1 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ message PolicyRuleState { 
// Basic policy rule attributes

message PolicyRuleBasic {

  PolicyRuleId policyRuleId = 1;

  optional PolicyRuleState policyRuleState = 2;

  PolicyRuleState policyRuleState = 2; //policy.proto:58:12: Explicit 'optional' labels are disallowed in the Proto3 syntax. To define 'optional' fields in Proto3, simply remove the 'optional' label, as fields are 'optional' by default.

  uint32 priority = 3;



  // Event-Condition-Action (ECA) model

proto/uml/pathcomp.png

0 → 100644
+35 KiB
Loading image diff...

proto/uml/policy.png

−611 B (131 KiB)
Loading image diff...

src/automation/pom.xml

+1 −0
Original line number Diff line number Diff line
@@ -297,6 +297,7 @@ 
            <exclude>device/*</exclude>

            <exclude>monitoring/*</exclude>

            <exclude>kpi_sample_types/*</exclude>

            <exclude>acl/*</exclude>

          </excludes>

          </configuration>

          <executions>

src/automation/src/main/java/eu/teraflow/automation/AutomationGatewayImpl.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package eu.teraflow.automation; 


import automation.Automation;

import context.ContextOuterClass;

import eu.teraflow.automation.device.model.Device;

import eu.teraflow.automation.context.model.Device;

import eu.teraflow.automation.model.DeviceRoleId;

import io.quarkus.grpc.GrpcService;

import io.smallrye.mutiny.Uni;