X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=tests%2Focpp-server%2Fserver.py;h=2905b09da68b24478bce8851bf5c5cd695d41ca6;hb=04578196600a49d2f03710ded6ba0548cbbd87ad;hp=991cef87d5ad426560b87d3051cca13373ec6857;hpb=349eacc2876d8baaeb99391ccd12a12c9e05caa1;p=e-mobility-charging-stations-simulator.git

diff --git a/tests/ocpp-server/server.py b/tests/ocpp-server/server.py
index 991cef87..2905b09d 100644
--- a/tests/ocpp-server/server.py
+++ b/tests/ocpp-server/server.py
@@ -1,8 +1,8 @@
+import argparse
 import asyncio
 import logging
 from datetime import datetime, timezone
 from threading import Timer
-import argparse
 
 import ocpp.v201
 import websockets
@@ -12,8 +12,8 @@ from ocpp.v201.enums import (
     AuthorizationStatusType,
     ClearCacheStatusType,
     RegistrationStatusType,
-    TransactionEventType,
     ReportBaseType,
+    TransactionEventType,
 )
 from websockets import ConnectionClosed
 
@@ -97,7 +97,7 @@ class ChargePoint(ocpp.v201.ChargePoint):
 
     @on(Action.GetBaseReport)
     async def on_get_base_report(self, request_id: int, report_base: ReportBaseType, **kwargs):
-        logging.info("Received GetBaseReport")
+        logging.info("Received %s", Action.GetBaseReport)
         return ocpp.v201.call_result.GetBaseReport(status="Accepted")
 
     # Request handlers to emit OCPP messages.
@@ -112,12 +112,16 @@ class ChargePoint(ocpp.v201.ChargePoint):
 
     async def send_get_base_report(self):
         logging.info("Executing send_get_base_report...")
-        request = ocpp.v201.call.GetBaseReport(reportBase=ReportBaseType.ConfigurationInventory)  # Use correct ReportBaseType
+        request = ocpp.v201.call.GetBaseReport(
+            reportBase=ReportBaseType.ConfigurationInventory
+        )  # Use correct ReportBaseType
         try:
             response = await self.call(request)
             logging.info("Send GetBaseReport")
 
-            if response.status == "Accepted":  # Adjust depending on the structure of your response
+            if (
+                response.status == "Accepted"
+            ):  # Adjust depending on the structure of your response
                 logging.info("Send GetBaseReport successful")
             else:
                 logging.info("Send GetBaseReport failed")
@@ -125,14 +129,16 @@ class ChargePoint(ocpp.v201.ChargePoint):
             logging.error(f"Send GetBaseReport failed: {str(e)}")
         logging.info("send_get_base_report done.")
 
+
 # Define argument parser
-parser = argparse.ArgumentParser(description='OCPP Charge Point Simulator')
-parser.add_argument('--request', type=str, help='OCPP 2 Command Name')
-parser.add_argument('--delay', type=int, help='Delay in seconds')
-parser.add_argument('--period', type=int, help='Period in seconds')
+parser = argparse.ArgumentParser(description="OCPP Charge Point Simulator")
+parser.add_argument("--request", type=str, help="OCPP 2 Command Name")
+parser.add_argument("--delay", type=int, help="Delay in seconds")
+parser.add_argument("--period", type=int, help="Period in seconds")
 
 args = parser.parse_args()
 
+
 # Function to send OCPP command
 async def send_ocpp_command(cp, command_name, delay=None, period=None):
     # If delay is not None, sleep for delay seconds
@@ -141,14 +147,30 @@ async def send_ocpp_command(cp, command_name, delay=None, period=None):
 
     # If period is not None, send command repeatedly with period interval
     if period:
-        while True:
-            if command_name == 'GetBaseReport':
-                logging.info("GetBaseReport parser working")
-                await cp.send_get_base_report()
+        async def send_command_repeatedly():
+            while True:
+                command_name = await charge_point.receive_command()
+                try:
+                    match command_name:
+                        case Action.ClearCache:
+                            logging.info("ClearCache parser working")
+                            await charge_point.send_clear_cache()
+                        case Action.GetBaseReport:
+                            logging.info("GetBaseReport parser working")
+                            await charge_point.send_get_base_report()
+                        case _:
+                            logging.warning(f"Unsupported command {command_name}")
+                except Exception as e:
+                    logging.exception(f"Failure while processing command {command_name}")
+                finally:
+                    await asyncio.sleep(period)
+
+        timer = RepeatTimer(period, send_command_repeatedly)
+        await timer.start()
+        await timer.wait_closed()  # Wait for timer to finish before exiting
 
-            await asyncio.sleep(period)
     else:
-        if command_name == 'GetBaseReport':
+        if command_name == "GetBaseReport":
             await cp.send_get_base_report()
 
 
@@ -176,23 +198,19 @@ async def on_connect(websocket, path):
     charge_point_id = path.strip("/")
     cp = ChargePoint(charge_point_id, websocket)
 
-     # Check if request argument is specified
-    if args.request:
-        asyncio.create_task(send_ocpp_command(cp, args.request, args.delay, args.period))
-
-    # Start the ChargePoint instance to listen for incoming messages.
-    await cp.start()
-
     ChargePoints.add(cp)
     try:
         await cp.start()
+        # Check if request argument is specified
+        if args.request:
+            asyncio.create_task(send_ocpp_command(cp, args.request, args.delay, args.period))
+
     except ConnectionClosed:
         logging.info("ChargePoint %s closed connection", cp.id)
         ChargePoints.remove(cp)
         logging.debug("Connected ChargePoint(s): %d", len(ChargePoints))
 
 
-
 # Main function to start the WebSocket server.
 async def main():
     # Create the WebSocket server and specify the handler for new connections.