Commit 9a469631 authored by ldemarcosm's avatar ldemarcosm
Browse files

Fixied minor issues

parent 1e2cb9a8

src/l3_attackmitigator/client/l3_attackmitigatorClient.py

+2 −2
Original line number Diff line number Diff line 
import grpc, logging

from common.tools.client.RetryDecorator import retry, delay_exponential

from l3_attackmitigator.proto.l3_attackmitigator_pb2_grpc import (

    l3_attackmitigatorStub,

    L3AttackmitigatorStub,

)



LOGGER = logging.getLogger(__name__)
@@ -20,7 +20,7 @@ class l3_attackmitigatorClient: 


    def connect(self):

        self.channel = grpc.insecure_channel(self.endpoint)

        self.stub = l3_attackmitigatorStub(self.channel)

        self.stub = L3AttackmitigatorStub(self.channel)



    def close(self):

        if self.channel is not None:

src/l3_attackmitigator/proto/l3_attackmitigator_pb2_grpc.py

+2 −1
Original line number Diff line number Diff line
@@ -2,7 +2,8 @@ 
"""Client and server classes corresponding to protobuf-defined services."""

import grpc



import l3_attackmitigator_pb2 as l3__attackmitigator__pb2



from . import l3_attackmitigator_pb2 as l3__attackmitigator__pb2





class L3AttackmitigatorStub(object):

src/l3_attackmitigator/service/l3_attackmitigatorService.py

+2 −2
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ from grpc_health.v1.health import HealthServicer, OVERALL_HEALTH 
from grpc_health.v1.health_pb2 import HealthCheckResponse

from grpc_health.v1.health_pb2_grpc import add_HealthServicer_to_server

from l3_attackmitigator.proto.l3_attackmitigator_pb2_grpc import (

    add_l3_attackmitigatorServicer_to_server,

    add_L3AttackmitigatorServicer_to_server,

)

from l3_attackmitigator.service.l3_attackmitigatorServiceServicerImpl import (

    l3_attackmitigatorServiceServicerImpl,
@@ -54,7 +54,7 @@ class l3_attackmitigatorService: 
        self.l3_attackmitigator_servicer = (

            l3_attackmitigatorServiceServicerImpl(self.database)

        )

        add_l3_attackmitigatorServicer_to_server(

        add_L3AttackmitigatorServicer_to_server(

            self.l3_attackmitigator_servicer, self.server

        )

src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py

+6 −5
Original line number Diff line number Diff line
@@ -16,22 +16,23 @@ from l3_attackmitigator.proto.l3_attackmitigator_pb2 import ( 
    EmptyMitigator

)

from l3_attackmitigator.proto.l3_attackmitigator_pb2_grpc import (

    l3_attackmitigatorServicer,

    add_l3_attackmitigatorServicer_to_server

    L3AttackmitigatorServicer,

    add_L3AttackmitigatorServicer_to_server

)



LOGGER = logging.getLogger(__name__)



LAST_VALUE = -1



class l3_attackmitigatorServiceServicerImpl(l3_attackmitigatorServicer):



class l3_attackmitigatorServiceServicerImpl(L3AttackmitigatorServicer):



    def __init__(self, database: Database):

        LOGGER.debug("Creating Servicer...")

        self.database = database

        LOGGER.debug("Servicer Created")

    

    class Mitigator(l3_attackmitigatorServicer):

    class Mitigator(L3AttackmitigatorServicer):

        def send_output(self, request, context):

            # SEND CONFIDENCE TO MITIGATION SERVER

            logging.debug("")
@@ -55,7 +56,7 @@ class l3_attackmitigatorServiceServicerImpl(l3_attackmitigatorServicer): 


    def serve(self):

        server = grpc.server(futures.ThreadPoolExecutor(max_workers=10))

        add_l3_attackmitigatorServicer_to_server(self.Mitigator(), server)

        add_L3AttackmitigatorServicer_to_server(self.Mitigator(), server)

        server.add_insecure_port('[::]:10002')

        server.start()

        print('Server Started')

src/l3_attackmitigator/tests/test_unitary.py

+2 −11
Original line number Diff line number Diff line
@@ -5,16 +5,7 @@ import pytest 
import multiprocessing

import time

from l3_attackmitigator.proto.monitoring_pb2 import Kpi, KpiList

from google.protobuf.json_format import MessageToDict

from common.orm.Factory import get_database_backend as get_database, BackendEnum as DatabaseEngineEnum

'''

from common.database.Factory import get_database, DatabaseEngineEnum

from common.database.api.Database import Database

from common.database.api.context.Constants import DEFAULT_CONTEXT_ID, DEFAULT_TOPOLOGY_ID

from common.database.tests.script import populate_example

from common.tests.Assertions import validate_empty, validate_service, validate_service_id, \

    validate_service_list_is_empty, validate_service_list_is_not_empty

'''

from l3_attackmitigator.Config import GRPC_SERVICE_PORT, GRPC_MAX_WORKERS, GRPC_GRACE_PERIOD

from l3_attackmitigator.client.l3_attackmitigatorClient import l3_attackmitigatorClient

from l3_attackmitigator.proto.context_pb2 import Empty
@@ -24,7 +15,7 @@ from l3_attackmitigator.proto.l3_attackmitigator_pb2 import ( 
    Output,

)

from l3_attackmitigator.proto.l3_attackmitigator_pb2_grpc import (

    l3_attackmitigatorStub,

    L3AttackmitigatorStub,

)



port = 10000 + GRPC_SERVICE_PORT  # avoid privileged ports
@@ -83,7 +74,7 @@ def test_grpc_server(database): 
    

    def open_channel(input_information):

        with grpc.insecure_channel("localhost:10002") as channel:

            stub = l3_attackmitigatorStub(channel)

            stub = L3AttackmitigatorStub(channel)

            response = stub.SendOutput(input_information)

            print("Inferencer send_input sent and received: ",response.message)

    try: