test: Unit test for RemoteStartTransaction nested dataclass

docs/source/central_system.rst

@@ -97,7 +97,7 @@ Remove the `on_connect()` handler from the code above and replace it by the foll
 
 
    class MyChargePoint(cp):
-       @on(Action.BootNotification)
+       @on(Action.boot_notification)
        async def on_boot_notification(self, charge_point_vendor, charge_point_model, **kwargs):
            return call_result.BootNotificationPayload(
                current_time=datetime.utcnow().isoformat(),

examples/v16/central_system.py

@@ -22,7 +22,7 @@
 
 
 class ChargePoint(cp):
-    @on(Action.BootNotification)
+    @on(Action.boot_notification)
     def on_boot_notification(
         self, charge_point_vendor: str, charge_point_model: str, **kwargs
     ):

examples/v201/central_system.py

@@ -16,18 +16,19 @@
 from ocpp.routing import on
 from ocpp.v201 import ChargePoint as cp
 from ocpp.v201 import call_result
+from ocpp.v201.enums import Action
 
 logging.basicConfig(level=logging.INFO)
 
 
 class ChargePoint(cp):
-    @on("BootNotification")
+    @on(Action.boot_notification)
     def on_boot_notification(self, charging_station, reason, **kwargs):
         return call_result.BootNotificationPayload(
             current_time=datetime.utcnow().isoformat(), interval=10, status="Accepted"
         )
 
-    @on("Heartbeat")
+    @on(Action.heartbeat)
     def on_heartbeat(self):
         print("Got a Heartbeat!")
         return call_result.HeartbeatPayload(

ocpp/charge_point.py

@@ -170,20 +170,22 @@ def _raise_key_error(action, version):
     from ocpp.v201.enums import Action as v201_Action
 
     if version == "1.6":
-        if hasattr(v16_Action, action):
+        try:
+            v16_Action(action)
             raise NotImplementedError(
                 details={"cause": f"No handler for {action} registered."}
             )
-        else:
+        except ValueError:
             raise NotSupportedError(
                 details={"cause": f"{action} not supported by OCPP{version}."}
             )
     elif version in ["2.0", "2.0.1"]:
-        if hasattr(v201_Action, action):
+        try:
+            v201_Action(action)
             raise NotImplementedError(
                 details={"cause": f"No handler for {action} registered."}
             )
-        else:
+        except ValueError:
             raise NotSupportedError(
                 details={"cause": f"{action} not supported by OCPP{version}."}
             )

ocpp/routing.py

@@ -19,7 +19,7 @@ def on(action, *, skip_schema_validation=False):
 
     ```
     class MyChargePoint(cp):
-        @on(Action.BootNotification):
+        @on(Action.boot_notification):
         async def on_boot_notification(
             self,
             charge_point_model,
@@ -64,7 +64,7 @@ def after(action):
 
     It can be used like so:
 
-        @after(Action.BootNotification):
+        @after(Action.boot_notification):
         def after_boot_notification():
             pass
 
@@ -93,19 +93,19 @@ def create_route_map(obj):
 
         class ChargePoint:
 
-            @on(Action.BootNotification)
+            @on(Action.boot_notification)
             def on_boot_notification(self, *args, **kwargs):
                 pass
 
-            @after(Action.BootNotification)
+            @after(Action.boot_notification)
             def after_boot_notification(self, *args, **kwargs):
                 pass
 
 
     In this case this returns:
 
         {
-            Action.BootNotification: {
+            Action.boot_notification: {
                 '_on_action': <reference to 'on_boot_notification'>,
                 '_after_action': <reference to 'after_boot_notification'>,
                 '_skip_schema_validation': False,

ocpp/v16/call.py

@@ -1,7 +1,8 @@
 import warnings
 from dataclasses import dataclass, field
-from typing import Dict, List, Optional
+from typing import Dict, List, Optional, Union
 
+from ocpp.v16.datatypes import ChargingProfile
 from ocpp.v16.enums import (
     AvailabilityType,
     CertificateUse,
@@ -133,7 +134,7 @@ class InstallCertificate:
 class RemoteStartTransaction:
     id_tag: str
     connector_id: Optional[int] = None
-    charging_profile: Optional[Dict] = None
+    charging_profile: Optional[Union[Dict, ChargingProfile]] = None
 
 
 @dataclass
@@ -165,7 +166,7 @@ class SendLocalList:
 @dataclass
 class SetChargingProfile:
     connector_id: int
-    cs_charging_profiles: Dict
+    cs_charging_profiles: Union[ChargingProfile, Dict]
 
 
 @dataclass

ocpp/v16/enums.py

@@ -1,5 +1,3 @@
-from warnings import warn
-
 try:
     # breaking change introduced in python 3.11
     from enum import StrEnum
@@ -13,56 +11,6 @@ class StrEnum(str, Enum):  # pragma: no cover
 class Action(StrEnum):
     """An Action is a required part of a Call message."""
 
-    def __init__(self, *args, **kwargs):
-        warn(
-            message="Action enum contains deprecated members and will be removed in "
-            "the next major release, please use snake case members.",
-            category=DeprecationWarning,
-        )
-
-    # --------- Soon to be deprecated ---------------------
-    Authorize = "Authorize"
-    BootNotification = "BootNotification"
-    CancelReservation = "CancelReservation"
-    CertificateSigned = "CertificateSigned"
-    ChangeAvailability = "ChangeAvailability"
-    ChangeConfiguration = "ChangeConfiguration"
-    ClearCache = "ClearCache"
-    ClearChargingProfile = "ClearChargingProfile"
-    DataTransfer = "DataTransfer"
-    DeleteCertificate = "DeleteCertificate"
-    DiagnosticsStatusNotification = "DiagnosticsStatusNotification"
-    ExtendedTriggerMessage = "ExtendedTriggerMessage"
-    FirmwareStatusNotification = "FirmwareStatusNotification"
-    GetCompositeSchedule = "GetCompositeSchedule"
-    GetConfiguration = "GetConfiguration"
-    GetDiagnostics = "GetDiagnostics"
-    GetInstalledCertificateIds = "GetInstalledCertificateIds"
-    GetLocalListVersion = "GetLocalListVersion"
-    GetLog = "GetLog"
-    Heartbeat = "Heartbeat"
-    InstallCertificate = "InstallCertificate"
-    LogStatusNotification = "LogStatusNotification"
-    MeterValues = "MeterValues"
-    RemoteStartTransaction = "RemoteStartTransaction"
-    RemoteStopTransaction = "RemoteStopTransaction"
-    ReserveNow = "ReserveNow"
-    Reset = "Reset"
-    SecurityEventNotification = "SecurityEventNotification"
-    SendLocalList = "SendLocalList"
-    SetChargingProfile = "SetChargingProfile"
-    SignCertificate = "SignCertificate"
-    SignedFirmwareStatusNotification = "SignedFirmwareStatusNotification"
-    SignedUpdateFirmware = "SignedUpdateFirmware"
-    StartTransaction = "StartTransaction"
-    StatusNotification = "StatusNotification"
-    StopTransaction = "StopTransaction"
-    TriggerMessage = "TriggerMessage"
-    UnlockConnector = "UnlockConnector"
-    UpdateFirmware = "UpdateFirmware"
-
-    # --------------------------------------------------------
-
     authorize = "Authorize"
     boot_notification = "BootNotification"
     cancel_reservation = "CancelReservation"