diff options
| author | Zuul <zuul@review.opendev.org> | 2020-08-11 10:40:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-08-11 10:40:14 +0000 |
| commit | 84af06b19980e70cea920bfd55dd13981c846bb3 (patch) | |
| tree | 4047b031a4c7c1b7dd633b56d8f494dd7288a08a /ironic | |
| parent | 06094e16585357f0efde9344f40f14665f755c57 (diff) | |
| parent | 00a23de3aef65947a3a308baa592e40b95259352 (diff) | |
| download | ironic-84af06b19980e70cea920bfd55dd13981c846bb3.tar.gz | |
Merge "Use property plus abstractmethod for abstractproperty"
Diffstat (limited to 'ironic')
| -rw-r--r-- | ironic/drivers/hardware_type.py | 12 | ||||
| -rw-r--r-- | ironic/drivers/modules/snmp.py | 9 |
2 files changed, 14 insertions, 7 deletions
diff --git a/ironic/drivers/hardware_type.py b/ironic/drivers/hardware_type.py index 0ec71210e..df5f43782 100644 --- a/ironic/drivers/hardware_type.py +++ b/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.""" diff --git a/ironic/drivers/modules/snmp.py b/ironic/drivers/modules/snmp.py index 008886b90..ab6c3ade4 100644 --- a/ironic/drivers/modules/snmp.py +++ b/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.""" |