Support for multiple connectors per charger (#1689)

* Update .gitignore for HA dev. Use symlinks for integration.

* Handle multiple connectors, initial framework.

* Fix sensor updates and placement on proper devices.

* Add test for v2x multi connector. Handle meter values properly. max_current working per connector.

* Fix per connector set charge rate. Clean up swenglish comments.

* Remove separate connector device breaking change. Fix test race condition. CodeRabbit fixes.

* Fix max_current per connector bug. Remove ChargerSession sensors (used for debugging). Fix Charge Control naming when only one connector. More CodeRabbit suggestions.

* Fix Connector naming. More CodeRabbit suggestions.

* Add more tests. More CodeRabbit suggestions.

* Test fixes. CodeRabbit suggestions.

* Fix tests.

* Split stop transaction test in separate tests.

* Change entity id to include charger. Add session sensors to connectors. Clear charger-level entities after connector creation. Add num_connector changes to reload logic. Remove not used functions from chargepoint.py. Revert to original config flow due to automatic discovery of number of connectors. Add more tests.

* Change port on test to fix crash.

* Add missing sensors. Convert features value in sensor. Add num_connectors to config entry. Migration to config 2.1.

---------

Co-authored-by: Jan Thunqvist <[email protected]>
Co-authored-by: lbbrhzn <[email protected]>
Co-authored-by: drc38 <[email protected]>

Author: 4 people

.gitignore

@@ -127,3 +127,7 @@ dmypy.json
 
 # Pyre type checker
 .pyre/
+
+# HA Development
+/config/
+.DS_Store

custom_components/ocpp/__init__.py

@@ -25,6 +25,7 @@
     CONF_METER_INTERVAL,
     CONF_MONITORED_VARIABLES,
     CONF_MONITORED_VARIABLES_AUTOCONFIG,
+    CONF_NUM_CONNECTORS,
     CONF_SKIP_SCHEMA_VALIDATION,
     CONF_FORCE_SMART_CHARGING,
     CONF_HOST,
@@ -44,6 +45,7 @@
     DEFAULT_METER_INTERVAL,
     DEFAULT_MONITORED_VARIABLES,
     DEFAULT_MONITORED_VARIABLES_AUTOCONFIG,
+    DEFAULT_NUM_CONNECTORS,
     DEFAULT_SKIP_SCHEMA_VALIDATION,
     DEFAULT_FORCE_SMART_CHARGING,
     DEFAULT_HOST,
@@ -192,6 +194,36 @@ async def async_migrate_entry(hass, config_entry: ConfigEntry):
             config_entry, data=new_data, minor_version=0, version=2
         )
 
+    if config_entry.version == 2 and config_entry.minor_version == 0:
+        data = {**config_entry.data}
+        cpids = data.get(CONF_CPIDS, [])
+
+        changed = False
+        for idx, cp_map in enumerate(cpids):
+            if not isinstance(cp_map, dict) or not cp_map:
+                continue
+            cp_id, cp_data = next(iter(cp_map.items()))
+            if CONF_NUM_CONNECTORS not in cp_data:
+                cp_data = {**cp_data, CONF_NUM_CONNECTORS: DEFAULT_NUM_CONNECTORS}
+                cpids[idx] = {cp_id: cp_data}
+                changed = True
+
+        if changed:
+            data[CONF_CPIDS] = cpids
+            hass.config_entries.async_update_entry(
+                config_entry,
+                data=data,
+                version=2,
+                minor_version=1,
+            )
+        else:
+            hass.config_entries.async_update_entry(
+                config_entry,
+                data=data,
+                version=2,
+                minor_version=1,
+            )
+
     _LOGGER.info(
         "Migration to configuration version %s.%s successful",
         config_entry.version,