Updating AM and DAD services

src/l3_attackmitigator/.gitlab-ci.yml

@@ -34,6 +34,7 @@ unit_test l3_attackmitigator:
     - docker ps -a
     - sleep 5
     - docker ps -a
+    - docker port $IMAGE_NAME
     - docker logs $IMAGE_NAME
     - docker exec -i $IMAGE_NAME bash -c "pytest --log-level=DEBUG --verbose $IMAGE_NAME/tests/test_unitary.py"
   after_script:

src/l3_attackmitigator/tests/test_unitary.py

@@ -8,8 +8,6 @@ from l3_attackmitigator.proto.monitoring_pb2 import Kpi, KpiList
 from common.orm.Factory import get_database_backend as get_database, BackendEnum as DatabaseEngineEnum
 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
-from l3_attackmitigator.proto.service_pb2 import Service
 from l3_attackmitigator.service.l3_attackmitigatorService import l3_attackmitigatorService
 from l3_attackmitigator.proto.l3_attackmitigator_pb2 import (
     Output,
@@ -23,7 +21,7 @@ port = 10000 + GRPC_SERVICE_PORT  # avoid privileged ports
 LOGGER = logging.getLogger(__name__)
 LOGGER.setLevel(logging.DEBUG)
 
-
+'''
 @pytest.fixture(scope='session')
 def database():
     _database = get_database(engine=DatabaseEngineEnum.INMEMORY)
@@ -44,18 +42,21 @@ def l3_attackmitigator_client(l3_attackmitigator_service):
     _client = l3_attackmitigatorClient(address='127.0.0.1', port=port)
     yield _client
     _client.close()
+'''
 
 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)
     p1 = multiprocessing.Process(target=_service.start, args=())
     #_service.start()
     p1.start()
+    '''
     print('Test Started')
     time.sleep(10)
     output_message = {
@@ -80,9 +81,9 @@ def test_grpc_server(database):
     try:
         open_channel(Output(**output_message))
     except:
-        p1.terminate()
+        #p1.terminate()
         assert 0=="Couldn't open channel"
 
-    p1.terminate()
+    #p1.terminate()
     print('Test Stopped')
     #_service.stop()

src/l3_distributedattackdetector/service/l3_distributedattackdetectorServiceServicerImpl.py

@@ -116,7 +116,7 @@ class l3_distributedattackdetectorServiceServicerImpl():
     def open_channel(self, input_information):
         with grpc.insecure_channel("localhost:10001") as channel:
             stub = L3CentralizedattackdetectorStub(channel)
-            response = stub.send_input(
+            response = stub.SendInput(
                 ModelInput(**input_information))
             logging.debug("Inferencer send_input sent and received: ",
                         response.message)

src/l3_distributedattackdetector/tests/test_unitary.py

@@ -37,17 +37,18 @@ def test_demo():
     pass
 
 def test_tstat():
+    '''
     print('Starting DAD')
     _service = l3_distributedattackdetectorService(
         port=port, max_workers=GRPC_MAX_WORKERS, grace_period=GRPC_GRACE_PERIOD)
     p1 = multiprocessing.Process(target=_service.start, args=())
     p1.start()
-
+    '''
     here = os.path.dirname(os.path.abspath(__file__))
     generator_filename = os.path.join(here, 'data_generator.py')
     p2 = Popen(["python3",generator_filename], stdout=DEVNULL)
     print('Started')
     sleep(15)
-    p1.terminate()
+    #p1.terminate()
     os.system("kill %s" % (p2.pid, ))
     print('Ended Successfully')