fix: remove OrganizationName from ISO15118Ctrlr (spec says SecurityCtrlr only)

Per OCPP 2.0.1 appendix section 3.1.15, OrganizationName belongs to
SecurityCtrlr only. The duplicate entry under ISO15118Ctrlr was not
in the spec and shadowed the SecurityCtrlr default value.

diff --git a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts
index 3e5f3899e99224ecec54eccdf06413ca245fc797..4ff7a3666bc060b243dd053a668157655c61557b 100644 (file)
--- a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts
+++ b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts
@@ -1074,18 +1074,6 @@ export const VARIABLE_REGISTRY: Record<string, VariableMetadata> = {
     supportedAttributes: [AttributeEnumType.Actual],
     variable: 'MaxScheduleEntries',
   },
-  [buildRegistryKey(OCPP20ComponentName.ISO15118Ctrlr as string, 'OrganizationName')]: {
-    component: OCPP20ComponentName.ISO15118Ctrlr as string,
-    dataType: DataEnumType.string,
-    defaultValue: 'Example Charging Services Ltd',
-    description:
-      'The organizationName of the CSO operating the charging station. It is used as the organizationName (O) of the SECC leaf certificate.',
-    maxLength: 64,
-    mutability: MutabilityEnumType.ReadWrite,
-    persistence: PersistenceEnumType.Persistent,
-    supportedAttributes: [AttributeEnumType.Actual],
-    variable: OCPP20RequiredVariableName.OrganizationName,
-  },
   [buildRegistryKey(OCPP20ComponentName.ISO15118Ctrlr as string, 'PnCEnabled')]: {
     component: OCPP20ComponentName.ISO15118Ctrlr as string,
     dataType: DataEnumType.boolean,

diff --git a/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts b/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts
index e85094ec3c23c571349026886c75c5e4720d7bf8..1bd20781bd87f411f26cfd72b4bf5b1855137896 100644 (file)
--- a/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts
+++ b/tests/charging-station/ocpp/2.0/OCPP20VariableManager.test.ts
@@ -1877,13 +1877,13 @@ await describe('B05 - OCPP20VariableManager', async () => {
         },
       ])[0]
       assert.strictEqual(res.attributeStatus, GetVariableStatusEnumType.Accepted)
-      assert.strictEqual(res.attributeValue, 'Example Charging Services Ltd')
+      assert.strictEqual(res.attributeValue, 'ChangeMeOrg')
       const after = getConfigurationKey(
         station,
         OCPP20RequiredVariableName.OrganizationName as unknown as VariableType['name']
       )
       assert.notStrictEqual(after, undefined)
-      assert.strictEqual(after?.value, 'Example Charging Services Ltd')
+      assert.strictEqual(after?.value, 'ChangeMeOrg')
     })
 
     await it('should accept setting OrganizationName and require reboot per OCPP 2.0.1 specification', () => {