Commit 3b7838c5 authored by ldemarcosm's avatar ldemarcosm
Browse files

Fixing minor issues 2

parent b0938294

src/l3_attackmitigator/service/__main__.py

+2 −2
Original line number Diff line number Diff line
@@ -34,11 +34,11 @@ def main(): 
    start_http_server(metrics_port)



    # Get database instance

    database = get_database()

    #database = get_database()



    # Starting l3_attackmitigator service

    grpc_service = l3_attackmitigatorService(

        database, port=service_port, max_workers=max_workers, grace_period=grace_period)

        port=service_port, max_workers=max_workers, grace_period=grace_period)

    grpc_service.start()



    # Wait for Ctrl+C or termination signal

src/l3_attackmitigator/service/l3_attackmitigatorService.py

+1 −3
Original line number Diff line number Diff line
@@ -23,13 +23,11 @@ LOGGER = logging.getLogger(__name__) 
class l3_attackmitigatorService:

    def __init__(

        self,

        database,

        address=BIND_ADDRESS,

        port=GRPC_SERVICE_PORT,

        max_workers=GRPC_MAX_WORKERS,

        grace_period=GRPC_GRACE_PERIOD,

    ):

        self.database = database

        self.address = address

        self.port = port

        self.endpoint = None
@@ -52,7 +50,7 @@ class l3_attackmitigatorService: 
        self.server = grpc.server(self.pool)  # , interceptors=(tracer_interceptor,))



        self.l3_attackmitigator_servicer = (

            l3_attackmitigatorServiceServicerImpl(self.database)

            l3_attackmitigatorServiceServicerImpl()

        )

        add_L3AttackmitigatorServicer_to_server(

            self.l3_attackmitigator_servicer, self.server

src/l3_attackmitigator/service/l3_attackmitigatorServiceServicerImpl.py

+1 −3
Original line number Diff line number Diff line
@@ -27,10 +27,8 @@ LAST_VALUE = -1 


class l3_attackmitigatorServiceServicerImpl(L3AttackmitigatorServicer):



    def __init__(self, database: Database):

    def __init__(self):

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

        self.database = database

        LOGGER.debug("Servicer Created")

    

    class Mitigator(L3AttackmitigatorServicer):

        def send_output(self, request, context):

src/l3_attackmitigator/tests/test_unitary.py

+4 −10
Original line number Diff line number Diff line
@@ -25,15 +25,9 @@ LOGGER.setLevel(logging.DEBUG) 




@pytest.fixture(scope='session')

def database():

    _database = get_database(engine=DatabaseEngineEnum.INMEMORY)

    return _database





@pytest.fixture(scope='session')

def l3_attackmitigator_service(database):

def l3_attackmitigator_service():

    _service = l3_attackmitigatorService(

        database, port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)

        port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)

    _service.start()

    yield _service

    _service.stop()
@@ -49,10 +43,10 @@ def test_demo(): 
    print('Demo Test')

    pass



def test_grpc_server(database):

def test_grpc_server():

    print('Starting AM')

    _service = l3_attackmitigatorService(

        database, port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)

        port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)

    p1 = multiprocessing.Process(target=_service.start, args=())

    #_service.start()

    p1.start()

src/l3_centralizedattackdetector/service/__main__.py

+1 −3
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ def main(): 
    # Start metrics server

    start_http_server(metrics_port)



    # Get database instance

    database = get_database()



    # Starting l3_centralizedattackdetector service

    grpc_service = l3_centralizedattackdetectorService(

        database, port=service_port, max_workers=max_workers, grace_period=grace_period)

        port=service_port, max_workers=max_workers, grace_period=grace_period)

    grpc_service.start()



    # Wait for Ctrl+C or termination signal