Consolidate the netgear_lte configuration

homeassistant/components/netgear_lte/__init__.py

@@ -17,6 +17,8 @@
 from homeassistant.helpers.aiohttp_client import async_create_clientsession
 from homeassistant.util import Throttle
 
+from . import sensor_types
+
 REQUIREMENTS = ['eternalegypt==0.0.5']
 
 _LOGGER = logging.getLogger(__name__)
@@ -35,16 +37,21 @@
 
 SENSOR_SCHEMA = vol.Schema({
     vol.Required(CONF_MONITORED_CONDITIONS):
-        vol.All(cv.ensure_list, [cv.string]),
+        vol.All(cv.ensure_list, [vol.In(sensor_types.ALL_SENSORS)]),
 })
 
+DEFAULT_SENSOR = {
+    CONF_MONITORED_CONDITIONS: sensor_types.DEFAULT_SENSORS
+}
+
 CONFIG_SCHEMA = vol.Schema({
     DOMAIN: vol.All(cv.ensure_list, [vol.Schema({
         vol.Required(CONF_HOST): cv.string,
         vol.Required(CONF_PASSWORD): cv.string,
         vol.Optional(NOTIFY_DOMAIN, default={}):
             vol.All(cv.ensure_list, [NOTIFY_SCHEMA]),
-        vol.Optional(SENSOR_DOMAIN): SENSOR_SCHEMA,
+        vol.Optional(SENSOR_DOMAIN, default=DEFAULT_SENSOR):
+            SENSOR_SCHEMA,
     })])
 }, extra=vol.ALLOW_EXTRA)
 

homeassistant/components/netgear_lte/sensor.py

@@ -8,16 +8,12 @@
 from homeassistant.helpers.entity import Entity
 
 from . import CONF_MONITORED_CONDITIONS, DATA_KEY
+from .sensor_types import SENSOR_SMS, SENSOR_USAGE
 
 DEPENDENCIES = ['netgear_lte']
 
 _LOGGER = logging.getLogger(__name__)
 
-SENSOR_SMS = 'sms'
-SENSOR_USAGE = 'usage'
-
-DEFAULT_SENSORS = [SENSOR_SMS, SENSOR_USAGE]
-
 
 async def async_setup_platform(
         hass, config, async_add_entities, discovery_info):
@@ -31,19 +27,14 @@ async def async_setup_platform(
         raise PlatformNotReady
 
     sensor_conf = discovery_info[DOMAIN]
-    if sensor_conf:
-        monitored_conditions = sensor_conf[CONF_MONITORED_CONDITIONS]
-    else:
-        monitored_conditions = DEFAULT_SENSORS
+    monitored_conditions = sensor_conf[CONF_MONITORED_CONDITIONS]
 
     sensors = []
     for sensor_type in monitored_conditions:
         if sensor_type == SENSOR_SMS:
             sensors.append(SMSSensor(modem_data, sensor_type))
         elif sensor_type == SENSOR_USAGE:
             sensors.append(UsageSensor(modem_data, sensor_type))
-        else:
-            _LOGGER.error("Unknown sensor type '%s'", sensor_type)
 
     async_add_entities(sensors, True)
 

homeassistant/components/netgear_lte/sensor_types.py

@@ -0,0 +1,8 @@
+"""Define possible sensor types."""
+
+SENSOR_SMS = 'sms'
+SENSOR_USAGE = 'usage'
+
+ALL_SENSORS = [SENSOR_SMS, SENSOR_USAGE]
+
+DEFAULT_SENSORS = [SENSOR_USAGE]