Commit 6d3d2383 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/ecoc22-dc-interconnect-disjoint
parents 6a4ae5fe 237821ca

deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -165,7 +165,7 @@ for COMPONENT in $TFS_COMPONENTS; do 
    printf "\n"

done



if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then

if [[ "$TFS_COMPONENTS" == *"webui"* ]] && [[ "$TFS_COMPONENTS" == *"monitoring"* ]]; then

    echo "Configuring WebUI DataStores and Dashboards..."

    sleep 3

expose_ingress_grpc.sh

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ for COMPONENT in $TFS_COMPONENTS; do 
        continue;

    fi



    PATCH='{"data": {"'${SERVICE_GRPC_PORT}'": "'$TFS_K8S_NAMESPACE'/'${COMPONENT}service':'${SERVICE_GRPC_PORT}'"}}'

    COMPONENT_OBJNAME=$(echo "${COMPONENT}" | sed "s/\_/-/")

    PATCH='{"data": {"'${SERVICE_GRPC_PORT}'": "'$TFS_K8S_NAMESPACE'/'${COMPONENT_OBJNAME}service':'${SERVICE_GRPC_PORT}'"}}'

    #echo "PATCH: ${PATCH}"

    kubectl patch configmap nginx-ingress-tcp-microk8s-conf --namespace ingress --patch "${PATCH}"

proto/automation.proto

+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;

proto/policy.proto

+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) {}