From 930dadb7226c111658d691c13f2a46d9019d9ea7 Mon Sep 17 00:00:00 2001
From: majuss <biomajuss@gmail.com>
Date: Tue, 24 Sep 2019 13:10:03 +0200
Subject: [PATCH] Move elv integration to component and bump pypca (#26552)

* fixing elv integration

* black formatting

* linting

* rebase

* removed logger warning for failed conf

* rebase; coverage
---
 .coveragerc                                |  2 +-
 homeassistant/components/elv/__init__.py   | 36 ++++++++++++++++++++++
 homeassistant/components/elv/manifest.json |  4 +--
 homeassistant/components/elv/switch.py     | 36 ++++++++--------------
 requirements_all.txt                       |  2 +-
 5 files changed, 53 insertions(+), 27 deletions(-)

diff --git a/.coveragerc b/.coveragerc
index 88fdbd45f9a..a4d6d0d201e 100644
--- a/.coveragerc
+++ b/.coveragerc
@@ -165,7 +165,7 @@ omit =
     homeassistant/components/eight_sleep/*
     homeassistant/components/eliqonline/sensor.py
     homeassistant/components/elkm1/*
-    homeassistant/components/elv/switch.py
+    homeassistant/components/elv/*
     homeassistant/components/emby/media_player.py
     homeassistant/components/emoncms/sensor.py
     homeassistant/components/emoncms_history/*
diff --git a/homeassistant/components/elv/__init__.py b/homeassistant/components/elv/__init__.py
index 13ade253ff6..b6097737414 100644
--- a/homeassistant/components/elv/__init__.py
+++ b/homeassistant/components/elv/__init__.py
@@ -1 +1,37 @@
 """The Elv integration."""
+
+import logging
+
+import voluptuous as vol
+
+from homeassistant.helpers import discovery
+from homeassistant.const import CONF_DEVICE
+import homeassistant.helpers.config_validation as cv
+
+_LOGGER = logging.getLogger(__name__)
+
+DOMAIN = "elv"
+
+DEFAULT_DEVICE = "/dev/ttyUSB0"
+
+ELV_PLATFORMS = ["switch"]
+
+CONFIG_SCHEMA = vol.Schema(
+    {
+        DOMAIN: vol.Schema(
+            {vol.Optional(CONF_DEVICE, default=DEFAULT_DEVICE): cv.string}
+        )
+    },
+    extra=vol.ALLOW_EXTRA,
+)
+
+
+def setup(hass, config):
+    """Set up the PCA switch platform."""
+
+    for platform in ELV_PLATFORMS:
+        discovery.load_platform(
+            hass, platform, DOMAIN, {"device": config[DOMAIN][CONF_DEVICE]}, config
+        )
+
+    return True
diff --git a/homeassistant/components/elv/manifest.json b/homeassistant/components/elv/manifest.json
index 4c9ed56352e..04d38441621 100644
--- a/homeassistant/components/elv/manifest.json
+++ b/homeassistant/components/elv/manifest.json
@@ -4,5 +4,5 @@
     "documentation": "https://www.home-assistant.io/components/pca",
     "dependencies": [],
     "codeowners": ["@majuss"],
-    "requirements": ["pypca==0.0.4"]
-  }
\ No newline at end of file
+    "requirements": ["pypca==0.0.5"]
+  }
diff --git a/homeassistant/components/elv/switch.py b/homeassistant/components/elv/switch.py
index c6258e244e9..362424c7fac 100644
--- a/homeassistant/components/elv/switch.py
+++ b/homeassistant/components/elv/switch.py
@@ -1,15 +1,11 @@
 """Support for PCA 301 smart switch."""
 import logging
 
-import voluptuous as vol
+import pypca
+from serial import SerialException
 
-from homeassistant.components.switch import (
-    SwitchDevice,
-    PLATFORM_SCHEMA,
-    ATTR_CURRENT_POWER_W,
-)
-from homeassistant.const import CONF_NAME, CONF_DEVICE, EVENT_HOMEASSISTANT_STOP
-import homeassistant.helpers.config_validation as cv
+from homeassistant.components.switch import SwitchDevice, ATTR_CURRENT_POWER_W
+from homeassistant.const import EVENT_HOMEASSISTANT_STOP
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -17,26 +13,20 @@ ATTR_TOTAL_ENERGY_KWH = "total_energy_kwh"
 
 DEFAULT_NAME = "PCA 301"
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
-    {
-        vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
-        vol.Required(CONF_DEVICE): cv.string,
-    }
-)
-
 
 def setup_platform(hass, config, add_entities, discovery_info=None):
     """Set up the PCA switch platform."""
-    import pypca
-    from serial import SerialException
 
-    name = config[CONF_NAME]
-    usb_device = config[CONF_DEVICE]
+    if discovery_info is None:
+        return
+
+    serial_device = discovery_info["device"]
 
     try:
-        pca = pypca.PCA(usb_device)
+        pca = pypca.PCA(serial_device)
         pca.open()
-        entities = [SmartPlugSwitch(pca, device, name) for device in pca.get_devices()]
+
+        entities = [SmartPlugSwitch(pca, device) for device in pca.get_devices()]
         add_entities(entities, True)
 
     except SerialException as exc:
@@ -51,10 +41,10 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
 class SmartPlugSwitch(SwitchDevice):
     """Representation of a PCA Smart Plug switch."""
 
-    def __init__(self, pca, device_id, name):
+    def __init__(self, pca, device_id):
         """Initialize the switch."""
         self._device_id = device_id
-        self._name = name
+        self._name = "PCA 301"
         self._state = None
         self._available = True
         self._emeter_params = {}
diff --git a/requirements_all.txt b/requirements_all.txt
index 037fb1fcd2a..b8d4a158655 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -1375,7 +1375,7 @@ pyowlet==1.0.2
 pyowm==2.10.0
 
 # homeassistant.components.elv
-pypca==0.0.4
+pypca==0.0.5
 
 # homeassistant.components.lcn
 pypck==0.6.3