validation error added for session_id check

EcoG-io · Aug 10, 2022 · 35fdfcd · 35fdfcd
1 parent 0be1f20
commit 35fdfcd
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 17 deletions.
diff --git a/iso15118/shared/messages/din_spec/body.py b/iso15118/shared/messages/din_spec/body.py
@@ -92,9 +92,10 @@ def check_sessionid_is_hexbinary(cls, value):
             int(value, 16)
             return value
         except ValueError as exc:
-            raise ValueError(
+            raise V2GMessageValidationError(
                 f"Invalid value '{value}' for EVCCID (must be "
-                f"hexadecimal representation of max 6 bytes)"
+                f"hexadecimal representation of max 6 bytes)",
+                ResponseCode.FAILED_SEQUENCE_ERROR, None
             ) from exc
 
 

diff --git a/iso15118/shared/messages/din_spec/header.py b/iso15118/shared/messages/din_spec/header.py
@@ -14,8 +14,9 @@
 
 from pydantic import Field, validator
 
+from iso15118.shared.exceptions import V2GMessageValidationError
 from iso15118.shared.messages import BaseModel
-from iso15118.shared.messages.din_spec.datatypes import Notification
+from iso15118.shared.messages.din_spec.datatypes import Notification, ResponseCode
 from iso15118.shared.messages.xmldsig import Signature
 
 
@@ -43,7 +44,8 @@ def check_sessionid_is_hexbinary(cls, value):
             int(value, 16)
             return value
         except ValueError as exc:
-            raise ValueError(
+            raise V2GMessageValidationError(
                 f"Invalid value '{value}' for SessionID (must be "
-                f"hexadecimal representation of max 8 bytes)"
+                f"hexadecimal representation of max 8 bytes)",
+                ResponseCode.FAILED_SEQUENCE_ERROR, None
             ) from exc
diff --git a/iso15118/shared/messages/iso15118_2/body.py b/iso15118/shared/messages/iso15118_2/body.py
@@ -433,9 +433,10 @@ def check_sessionid_is_hexbinary(cls, value):
             int(value, 16)
             return value
         except ValueError as exc:
-            raise ValueError(
+            raise V2GMessageValidationError(
                 f"Invalid value '{value}' for SessionID (must be "
-                f"hexadecimal representation of max 8 bytes)"
+                f"hexadecimal representation of max 8 bytes)",
+                ResponseCode.FAILED_SEQUENCE_ERROR, None
             ) from exc
 
 
@@ -609,9 +610,10 @@ def check_sessionid_is_hexbinary(cls, value):
             int(value, 16)
             return value
         except ValueError as exc:
-            raise ValueError(
+            raise V2GMessageValidationError(
                 f"Invalid value '{value}' for EVCCID (must be "
-                f"hexadecimal representation of max 6 bytes)"
+                f"hexadecimal representation of max 6 bytes)",
+                ResponseCode.FAILED_SEQUENCE_ERROR, None
             ) from exc
 
 

diff --git a/iso15118/shared/messages/iso15118_2/header.py b/iso15118/shared/messages/iso15118_2/header.py
@@ -14,8 +14,9 @@
 
 from pydantic import Field, validator
 
+from iso15118.shared.exceptions import V2GMessageValidationError
 from iso15118.shared.messages import BaseModel
-from iso15118.shared.messages.iso15118_2.datatypes import Notification
+from iso15118.shared.messages.iso15118_2.datatypes import Notification, ResponseCode
 from iso15118.shared.messages.xmldsig import Signature
 
 
@@ -43,7 +44,8 @@ def check_sessionid_is_hexbinary(cls, value):
             int(value, 16)
             return value
         except ValueError as exc:
-            raise ValueError(
+            raise V2GMessageValidationError(
                 f"Invalid value '{value}' for SessionID (must be "
-                f"hexadecimal representation of max 8 bytes)"
+                f"hexadecimal representation of max 8 bytes)",
+                ResponseCode.FAILED_SEQUENCE_ERROR, None
             ) from exc
diff --git a/iso15118/shared/messages/iso15118_20/common_messages.py b/iso15118/shared/messages/iso15118_20/common_messages.py
@@ -16,6 +16,7 @@
 
 from pydantic import Field, root_validator, validator
 
+from iso15118.shared.exceptions import V2GMessageValidationError
 from iso15118.shared.messages import BaseModel
 from iso15118.shared.messages.enums import (
     INT_8_MAX,
@@ -41,7 +42,7 @@
     Receipt,
     RootCertificateIDList,
     V2GRequest,
-    V2GResponse,
+    V2GResponse, ResponseCode,
 )
 from iso15118.shared.validators import one_field_must_be_set
 
@@ -1092,9 +1093,10 @@ def check_sessionid_is_hexbinary(cls, value):
                 int(value, 16)
                 return value
             except ValueError as exc:
-                raise ValueError(
+                raise V2GMessageValidationError(
                     f"Invalid value '{value}' for SessionID (must be "
-                    f"hexadecimal representation of max 8 bytes)"
+                    f"hexadecimal representation of max 8 bytes)",
+                    ResponseCode.FAILED_SEQUENCE_ERROR, None
                 ) from exc
 
 

diff --git a/iso15118/shared/messages/iso15118_20/common_types.py b/iso15118/shared/messages/iso15118_20/common_types.py
@@ -16,6 +16,7 @@
 
 from pydantic import Field, conbytes, conint, constr, validator
 
+from iso15118.shared.exceptions import V2GMessageValidationError
 from iso15118.shared.messages import BaseModel
 from iso15118.shared.messages.enums import (
     INT_8_MAX,
@@ -63,9 +64,10 @@ def check_sessionid_is_hexbinary(cls, value):
             int(value, 16)
             return value
         except ValueError as exc:
-            raise ValueError(
+            raise V2GMessageValidationError(
                 f"Invalid value '{value}' for SessionID (must be "
-                f"hexadecimal representation of max 8 bytes)"
+                f"hexadecimal representation of max 8 bytes)",
+                ResponseCode.FAILED_SEQUENCE_ERROR, None
             ) from exc