Merge "Use property plus abstractmethod for abstractproperty"

ironic/drivers/hardware_type.py

@@ -42,19 +42,23 @@ class AbstractHardwareType(object, metaclass=abc.ABCMeta):
 
     # Required hardware interfaces
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def supported_boot_interfaces(self):
         """List of supported boot interfaces."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def supported_deploy_interfaces(self):
         """List of supported deploy interfaces."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def supported_management_interfaces(self):
         """List of supported management interfaces."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def supported_power_interfaces(self):
         """List of supported power interfaces."""
 

ironic/drivers/modules/snmp.py

@@ -554,15 +554,18 @@ class SNMPDriverSimple(SNMPDriverBase):
         super(SNMPDriverSimple, self).__init__(*args, **kwargs)
         self.oid = self._snmp_oid()
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def oid_device(self):
         """Device dependent portion of the power state object OID."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def value_power_on(self):
         """Value representing power on state."""
 
-    @abc.abstractproperty
+    @property
+    @abc.abstractmethod
     def value_power_off(self):
         """Value representing power off state."""