From f1107d55fa6670e6f4ae96a69de367c8ed4b2d2c Mon Sep 17 00:00:00 2001 From: =?utf8?q?J=C3=A9r=C3=B4me=20Benoit?= Date: Thu, 26 Mar 2026 23:55:28 +0100 Subject: [PATCH] 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. --- .../ocpp/2.0/OCPP20VariableRegistry.ts | 12 ------------ .../ocpp/2.0/OCPP20VariableManager.test.ts | 4 ++-- 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts b/src/charging-station/ocpp/2.0/OCPP20VariableRegistry.ts index 3e5f3899..4ff7a366 100644 --- 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 = { 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 e85094ec..1bd20781 100644 --- 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', () => { -- 2.43.0