Commit 86aa6cd4 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Including the optical attack mitigator.

parent de05c982

manifests/opticalattackmitigatorservice.yaml

+30 −2
Original line number Diff line number Diff line
@@ -32,6 +32,7 @@ spec: 
        imagePullPolicy: Always

        ports:

        - containerPort: 10007

        - containerPort: 9192

        env:

        - name: LOG_LEVEL

          value: "DEBUG"
@@ -44,15 +45,17 @@ spec: 
        resources:

          requests:

            cpu: 250m

            memory: 512Mi

            memory: 128Mi

          limits:

            cpu: 700m

            cpu: 1000m

            memory: 1024Mi

---

apiVersion: v1

kind: Service

metadata:

  name: opticalattackmitigatorservice

  labels:

    app: opticalattackmitigatorservice

spec:

  type: ClusterIP

  selector:
@@ -61,3 +64,28 @@ spec: 
  - name: grpc

    port: 10007

    targetPort: 10007

  - name: metrics

    port: 9192

    targetPort: 9192

---

apiVersion: autoscaling/v2

kind: HorizontalPodAutoscaler

metadata:

  name: opticalattackmitigatorservice-hpa

spec:

  scaleTargetRef:

    apiVersion: apps/v1

    kind: Deployment

    name: opticalattackmitigatorservice

  minReplicas: 1

  maxReplicas: 20

  metrics:

  - type: Resource

    resource:

      name: cpu

      target:

        type: Utilization

        averageUtilization: 80

  #behavior:

  #  scaleDown:

  #    stabilizationWindowSeconds: 30

manifests/servicemonitors.yaml

+29 −0
Original line number Diff line number Diff line
@@ -388,3 +388,32 @@ spec: 
    any: false

    matchNames:

    - tfs # namespace where the app is running

---

apiVersion: monitoring.coreos.com/v1

kind: ServiceMonitor

metadata:

  namespace: monitoring # namespace where prometheus is running

  name: tfs-opticalattackmitigatorservice-metric

  labels:

    app: opticalattackmitigatorservice

    #release: prometheus

    #release: prom  # name of the release 

    # ( VERY IMPORTANT: You need to know the correct release name by viewing 

    #   the servicemonitor of Prometheus itself: Without the correct name, 

    #   Prometheus cannot identify the metrics of the Flask app as the target.)

spec:

  selector:

    matchLabels:

      # Target app service

      #namespace: tfs

      app: opticalattackmitigatorservice # same as above

      #release: prometheus # same as above

  endpoints:

  - port: metrics # named port in target app

    scheme: http

    path: /metrics # path to scrape

    interval: 5s # scrape interval

  namespaceSelector:

    any: false

    matchNames:

    - tfs # namespace where the app is running
 
 No newline at end of file

src/dbscanserving/genproto.sh

deleted100644 → 0
+0 −43
Original line number Diff line number Diff line 
#!/bin/bash -eu

#

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# Make folder containing the script the root folder for its execution

cd $(dirname $0)



rm -rf proto/*.py

rm -rf proto/__pycache__

tee proto/__init__.py << EOF > /dev/null

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



EOF



# building current service protos

python -m grpc_tools.protoc -I../../proto --python_out=proto --grpc_python_out=proto dbscanserving.proto



sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' proto/dbscanserving_pb2.py

sed -i -E 's/(import\ .*)_pb2/from . \1_pb2/g' proto/dbscanserving_pb2_grpc.py

src/opticalattackmitigator/.gitlab-ci.yml

+4 −5
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -21,7 +21,7 @@ build opticalattackmitigator: 
  before_script:

    - docker login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" $CI_REGISTRY

  script:

    - docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile ./src/

    - docker build -t "$IMAGE_NAME:$IMAGE_TAG" -f ./src/$IMAGE_NAME/Dockerfile .

    - docker tag "$IMAGE_NAME:$IMAGE_TAG" "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker push "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

  after_script:
@@ -51,11 +51,10 @@ unit test opticalattackmitigator: 
    - if docker container ls | grep $IMAGE_NAME; then docker rm -f $IMAGE_NAME; else echo "$IMAGE_NAME image is not in the system"; fi

  script:

    - docker pull "$CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG"

    - docker run --name $IMAGE_NAME -d -p 10007:10007 -v "$PWD/src/$IMAGE_NAME/tests:/opt/results" --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - docker run --name $IMAGE_NAME -d -p 10007:10007 -v "$PWD/src/$IMAGE_NAME/tests:/home/${IMAGE_NAME}/results" --network=teraflowbridge --rm $CI_REGISTRY_IMAGE/$IMAGE_NAME:$IMAGE_TAG

    - sleep 5

    - docker ps -a

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=INFO --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/opt/results/${IMAGE_NAME}_report.xml"

    - docker exec -i $IMAGE_NAME bash -c "coverage report --include='${IMAGE_NAME}/*' --show-missing"

    - docker exec -i $IMAGE_NAME bash -c "coverage run -m pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_unitary.py --junitxml=/home/${IMAGE_NAME}/results/${IMAGE_NAME}_report.xml; coverage xml -o /home/${IMAGE_NAME}/results/${IMAGE_NAME}_coverage.xml; coverage report --include='${IMAGE_NAME}/*' --show-missing"

  coverage: '/TOTAL\s+\d+\s+\d+\s+(\d+%)/'

  after_script:

    - docker rm -f $IMAGE_NAME

src/opticalattackmitigator/Config.py

+1 −3
Original line number Diff line number Diff line 
# Copyright 2022-2023 ETSI TeraFlowSDN - TFS OSG (https://tfs.etsi.org/)

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.
@@ -19,8 +19,6 @@ LOG_LEVEL = logging.DEBUG 


# gRPC settings

GRPC_SERVICE_PORT = 10007

GRPC_MAX_WORKERS  = 10

GRPC_GRACE_PERIOD = 60



# Prometheus settings

METRICS_PORT = 9192