Commit f3ccc525 authored by Pablo Armingol's avatar Pablo Armingol
Browse files

Merge branch 'feat/tid_L3SM' of https://labs.etsi.org/rep/tfs/controller into feat/tid-alto

parents ee0e4179 f6f6a068

manifests/deviceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ spec: 
            - containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "INFO"

              value: "DEBUG"

          startupProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:2020"]

manifests/serviceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ spec: 
            - containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "INFO"

              value: "DEBUG"

          readinessProbe:

            exec:

              command: ["/bin/grpc_health_probe", "-addr=:3030"]

manifests/webuiservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -39,7 +39,7 @@ spec: 
            - containerPort: 8004

          env:

            - name: LOG_LEVEL

              value: "INFO"

              value: "DEBUG"

            - name: WEBUISERVICE_SERVICE_BASEURL_HTTP

              value: "/webui/"

          readinessProbe:

my_deploy.sh

+2 −2
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ export CRDB_DATABASE="tfs" 
export CRDB_DEPLOY_MODE="single"



# Disable flag for dropping database, if it exists.

export CRDB_DROP_DATABASE_IF_EXISTS=""

export CRDB_DROP_DATABASE_IF_EXISTS="YES"



# Disable flag for re-deploying CockroachDB from scratch.

export CRDB_REDEPLOY=""
@@ -154,7 +154,7 @@ export QDB_TABLE_MONITORING_KPIS="tfs_monitoring_kpis" 
export QDB_TABLE_SLICE_GROUPS="tfs_slice_groups"



# Disable flag for dropping tables if they exist.

export QDB_DROP_TABLES_IF_EXIST=""

export QDB_DROP_TABLES_IF_EXIST="YES"



# Disable flag for re-deploying QuestDB from scratch.

export QDB_REDEPLOY=""

proto/context.proto

+9 −2
Original line number Diff line number Diff line
@@ -300,6 +300,7 @@ enum ServiceTypeEnum { 
  SERVICETYPE_TE = 4;

  SERVICETYPE_E2E = 5;

  SERVICETYPE_OPTICAL_CONNECTIVITY = 6;

  SERVICETYPE_IPLINK = 7;

}



enum ServiceStatusEnum {
@@ -512,11 +513,17 @@ message ConfigRule_ACL { 
  acl.AclRuleSet rule_set = 2;

}



message ConfigRule_IP_LIK {

  EndPointId endpoint_id = 1;

  string  subnet_ip = 2;

}



message ConfigRule {

  ConfigActionEnum action = 1;

  oneof config_rule {

    ConfigRule_Custom custom  = 2;

    ConfigRule_ACL acl        = 3;

    ConfigRule_IP_LIK ip_link = 4;

  }

}