Chuangmi V1 and V3 merge completed.

miio/chuangmi_plug.py

@@ -44,14 +44,14 @@ def temperature(self) -> int:
     @property
     def load_power(self) -> Optional[int]:
         """Current power load, if available."""
-        if self.data["load_power"] is not None:
+        if "load_power" in self.data and self.data["load_power"] is not None:
             return self.data["load_power"]
         return None
 
     @property
     def wifi_led(self) -> Optional[bool]:
         """True if the wifi led is turned on."""
-        if self.data["wifi_led"] is not None:
+        if "wifi_led" in self.data and self.data["wifi_led"] is not None:
             return self.data["wifi_led"] == "on"
         return None
 
@@ -100,10 +100,16 @@ def status(self) -> ChuangmiPlugStatus:
 
     def on(self):
         """Power on."""
+        if self.model == MODEL_CHUANGMI_PLUG_V3:
+            return self.send("set_power", ["on"])
+
         return self.send("set_on", [])
 
     def off(self):
         """Power off."""
+        if self.model == MODEL_CHUANGMI_PLUG_V3:
+            return self.send("set_power", ["off"])
+
         return self.send("set_off", [])
 
     def usb_on(self):

miio/tests/test_chuangmi_plug.py

@@ -1,6 +1,6 @@
 from unittest import TestCase
 from miio import ChuangmiPlug
-from miio.chuangmi_plug import (ChuangmiPlugV1Status, MODEL_CHUANGMI_PLUG_V1,
+from miio.chuangmi_plug import (ChuangmiPlugStatus, MODEL_CHUANGMI_PLUG_V1,
                                 MODEL_CHUANGMI_PLUG_V3, )
 from .dummies import DummyDevice
 import pytest
@@ -158,7 +158,7 @@ def test_status(self):
         start_state_extended = self.device.start_state.copy()
         start_state_extended['load_power'] = load_power
         assert repr(self.state()) == repr(
-            ChuangmiPlugV3Status(start_state_extended))
+            ChuangmiPlugStatus(start_state_extended))
 
         assert self.is_on() is True
         assert self.state().usb_power is True