Commit bb58b02c authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Adjusting the gitlab CI file.

parents c161869a ab2131ca

.gitlab-ci.yml

+10 −12
Original line number Diff line number Diff line
@@ -8,20 +8,18 @@ stages: 
  - deploy

  - funct_test





# include the individual .gitlab-ci.yml of each micro-service

include:

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

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

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

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

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

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

  - local: '/src/opticalcentralizedattackdetector/.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/opticalcentralizedattackdetector/.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'

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

+1 −1
Original line number Diff line number Diff line
@@ -243,6 +243,7 @@ message EndPointId { 
message EndPoint {

  EndPointId endpoint_id = 1;

  string endpoint_type = 2;

  repeated kpi_sample_types.KpiSampleType kpi_sample_types = 3;

}
@@ -257,7 +258,6 @@ message ConfigRule { 
  ConfigActionEnum action = 1;

  string resource_key = 2;

  string resource_value = 3;

  kpi_sample_types.KpiSampleType kpi_sample_type = 4;

}

proto/kpi_sample_types.proto

+5 −5
Original line number Diff line number Diff line
@@ -2,9 +2,9 @@ syntax = "proto3"; 
package kpi_sample_types;



enum KpiSampleType {

    UNKNOWN = 0;

    PACKETS_TRANSMITTED = 101;

    PACKETS_RECEIVED    = 102;

    BYTES_TRANSMITTED   = 201;

    BYTES_RECEIVED      = 202;

    KPISAMPLETYPE_UNKNOWN = 0;

    KPISAMPLETYPE_PACKETS_TRANSMITTED = 101;

    KPISAMPLETYPE_PACKETS_RECEIVED    = 102;

    KPISAMPLETYPE_BYTES_TRANSMITTED   = 201;

    KPISAMPLETYPE_BYTES_RECEIVED      = 202;

}

proto/l3_attackmitigator.proto

+8 −11
Original line number Diff line number Diff line 
syntax = "proto3";



import "context.proto";



service L3Attackmitigator{

  // Sends a greeting

  rpc SendOutput (Output) returns (EmptyMitigator) {}

  rpc SendOutput (L3AttackmitigatorOutput) returns (context.Empty) {}

  // Sends another greeting

  rpc GetMitigation (EmptyMitigator) returns (EmptyMitigator) {}

}





message EmptyMitigator {

	optional string message = 1;

  rpc GetMitigation (context.Empty) returns (context.Empty) {}

}





message Output {

message L3AttackmitigatorOutput {

	float confidence = 1;

	string timestamp = 2;

	string ip_o = 3;
@@ -22,7 +19,7 @@ message Output { 
	string flow_id = 6;

	string protocol = 7;

	string port_d = 8;

	optional string ml_id = 9;

	optional float time_start = 10;

	optional float time_end = 11;

	string ml_id = 9;

	float time_start = 10;

	float time_end = 11;

}