user, password and url for dc adapter

packages/helpermodules/update_config.py

@@ -57,7 +57,7 @@
 
 class UpdateConfig:
 
-    DATASTORE_VERSION = 109
+    DATASTORE_VERSION = 110
 
     valid_topic = [
         "^openWB/bat/config/bat_control_permitted$",
@@ -2748,3 +2748,16 @@ def upgrade(topic: str, payload) -> Optional[dict]:
                 return new_topics if new_topics else None
         self._loop_all_received_topics(upgrade)
         self._append_datastore_version(109)
+
+    def upgrade_datastore_110(self) -> None:
+        def upgrade(topic: str, payload) -> Optional[dict]:
+            if re.search("openWB/chargepoint/[0-9]+/config", topic) is not None:
+                config = decode_payload(payload)
+                if config.get("type") == "openwb_dc_adapter":
+                    config["configuration"]["user"] = None
+                    config["configuration"]["password"] = None
+                    ip_address = config["configuration"].pop("ip_address")
+                    config["configuration"]["url"] = f'http://{ip_address}/connect.php'
+                    return {topic: config}
+        self._loop_all_received_topics(upgrade)
+        self._append_datastore_version(110)

packages/modules/chargepoints/openwb_dc_adapter/chargepoint_module.py

@@ -47,11 +47,11 @@ def __init__(self, config: OpenWBDcAdapter) -> None:
             raise Exception(
                 "DC-Laden muss durch den Support freigeschaltet werden. Bitte nehme Kontakt mit dem Support auf.")
         self.efficiency = None
+        if self.config.configuration.user and self.config.configuration.password:
+            self.__session.auth = (self.config.configuration.user, self.config.configuration.password)
 
         try:
-            self.__session.post(
-                f'http://{self.config.configuration.ip_address}/connect.php',
-                data={'heartbeatenabled': '1'})
+            self.__session.post(self.config.configuration.url, data={'heartbeatenabled': '1'})
         except Exception:
             log.exception(
                 f"Verbindung zum Ladepunkt {self.config.id} konnte nicht hergestellt werden. "
@@ -62,11 +62,10 @@ def set_current(self, current: float) -> None:
             current = 0
         with SingleComponentUpdateContext(self.fault_state, update_always=False):
             with self.client_error_context:
-                ip_address = self.config.configuration.ip_address
                 raw_current = self.subtract_conversion_loss_from_current(current)
                 raw_power = raw_current * 3 * 230
                 log.debug(f"DC-Stromstärke: {raw_current}A ≙ {raw_power / 1000}kW")
-                self.__session.post('http://'+ip_address+'/connect.php', data={'power': raw_power})
+                self.__session.post(self.config.configuration.url, data={'power': raw_power})
 
     def subtract_conversion_loss_from_current(self, current: float) -> float:
         return current * (self.efficiency if self.efficiency else 0.9)
@@ -77,8 +76,7 @@ def add_conversion_loss_to_current(self, current: float) -> float:
     def get_values(self) -> None:
         with SingleComponentUpdateContext(self.fault_state):
             with self.client_error_context:
-                ip_address = self.config.configuration.ip_address
-                json_rsp = self.__session.get('http://'+ip_address+'/connect.php').json()
+                json_rsp = self.__session.get(self.config.configuration.url).json()
 
                 if json_rsp["fault_state"] == 1:
                     self.fault_state.warning(json_rsp["fault_str"])

packages/modules/chargepoints/openwb_dc_adapter/config.py

@@ -5,8 +5,12 @@
 
 
 class OpenWBDcAdapterConfiguration:
-    def __init__(self, ip_address: Optional[str] = None):
-        self.ip_address = ip_address
+    def __init__(self, url: Optional[str] = None,
+                 user: Optional[str] = None,
+                 password: Optional[str] = None):
+        self.url = url
+        self.user = user
+        self.password = password
 
 
 class OpenWBDcAdapter(SetupChargepoint[OpenWBDcAdapterConfiguration]):