Commit 0dd209be authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

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

parents 7bad8bf2 1acb70b3

.gitlab-ci.yml

+8 −9
Original line number Diff line number Diff line
@@ -12,14 +12,13 @@ stages: 
include:

  - local: '/manifests/.gitlab-ci.yml'

  - local: '/src/monitoring/.gitlab-ci.yml'

  - local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/context/.gitlab-ci.yml'

  - local: '/src/device/.gitlab-ci.yml'

  - local: '/src/service/.gitlab-ci.yml'

  - local: '/src/tester_integration/.gitlab-ci.yml'

  - local: '/src/tester_functional/.gitlab-ci.yml'

  - local: '/src/automation/.gitlab-ci.yml'

  - local: '/src/policy/.gitlab-ci.yml'

  - local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  - local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  - local: '/src/l3_attackmitigator/.gitlab-ci.yml'
 
  #- local: '/src/tester_integration/.gitlab-ci.yml'

  #- local: '/src/tester_functional/.gitlab-ci.yml'

  #- local: '/src/automation/.gitlab-ci.yml'

  #- local: '/src/l3_distributedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_centralizedattackdetector/.gitlab-ci.yml'

  #- local: '/src/l3_attackmitigator/.gitlab-ci.yml'

deploy_in_kubernetes.sh

+5 −0
Original line number Diff line number Diff line
@@ -38,6 +38,11 @@ kubectl delete namespace $K8S_NAMESPACE 
kubectl create namespace $K8S_NAMESPACE

printf "\n"



# creating the secrets for the influxdb deployment

#TODO: make sure to change this when having a production deployment

kubectl create secret generic influxdb-secrets --namespace=$K8S_NAMESPACE --from-literal=INFLUXDB_DB="monitoring" --from-literal=INFLUXDB_ADMIN_USER="teraflow" --from-literal=INFLUXDB_ADMIN_PASSWORD="teraflow" --from-literal=INFLUXDB_HTTP_AUTH_ENABLED="True"

kubectl create secret generic monitoring-secrets --namespace=$K8S_NAMESPACE --from-literal=INFLUXDB_DATABASE="monitoring" --from-literal=INFLUXDB_USER="teraflow" --from-literal=INFLUXDB_PASSWORD="teraflow" --from-literal=INFLUXDB_HOSTNAME="localhost"



for COMPONENT in $COMPONENTS; do

    echo "Processing '$COMPONENT' component..."

    IMAGE_NAME="$COMPONENT:$IMAGE_TAG"

proto/automation.proto

+1 −4
Original line number Diff line number Diff line 
//Example of topology

syntax = "proto3";

package automation;
@@ -40,7 +39,7 @@ message DeviceRoleState { 
}



message DeviceDeletionResult {

  repeated bool deleted = 1;

  repeated string deleted = 1;

}



message Empty {}
@@ -51,5 +50,3 @@ enum ZtpDeviceState { 
  ZTP_DEV_STATE_UPDATED  = 2;

  ZTP_DEV_STATE_DELETED  = 3;

}

proto/compile.sh

+1 −1
Original line number Diff line number Diff line 
#!/bin/bash

python3 -m grpc_tools.protoc -I=./ --python_out=src/ --grpc_python_out=src/ *.proto

python3 -m grpc_tools.protoc -I=./ --python_out=../src/ --grpc_python_out=../src/ *.proto

#requires installation of protoc-gen-uml

export PATH=${HOME}/protoc-gen-uml/target/universal/stage/bin:$PATH

protoc --uml_out=uml/ -I ./ *.proto

proto/context.proto

+2 −2
Original line number Diff line number Diff line 
syntax = "proto3";

package context;



//import "kpi_sample_types.proto";

import "kpi_sample_types.proto";



service ContextService {

  rpc ListContextIds   (Empty     ) returns (       ContextIdList ) {}
@@ -243,7 +243,7 @@ message EndPointId { 
message EndPoint {

  EndPointId endpoint_id = 1;

  string endpoint_type = 2;

  //repeated kpi_sample_types.KpiSampleType kpi_sample_types = 3;

  repeated kpi_sample_types.KpiSampleType kpi_sample_types = 3;

}