Gitweb: http://git.fedorahosted.org/git/?p=fence-agents.git;a=commitdiff;h=471c42106... Commit: 471c42106a8d2fbf168bd08e97cf46766ab06bc3 Parent: f136b9d40d79ffa57f384c8b896f71466ab7b554 Author: Marek 'marx' Grac mgrac@redhat.com AuthorDate: Wed Apr 9 23:28:46 2014 +0200 Committer: Marek 'marx' Grac mgrac@redhat.com CommitterDate: Fri Apr 11 09:38:30 2014 +0200
[cleanup] Define parent class even if it is object
Resolve warning: old-style-class --- fence/agents/apc_snmp/fence_apc_snmp.py | 8 ++++---- fence/agents/eaton_snmp/fence_eaton_snmp.py | 4 ++-- fence/agents/ipdu/fence_ipdu.py | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/fence/agents/apc_snmp/fence_apc_snmp.py b/fence/agents/apc_snmp/fence_apc_snmp.py index 1810247..0a0d409 100644 --- a/fence/agents/apc_snmp/fence_apc_snmp.py +++ b/fence/agents/apc_snmp/fence_apc_snmp.py @@ -39,7 +39,7 @@ port_id = None switch_id = None
# Classes describing Device params -class TripplitePDU: +class TripplitePDU(object): # Rack PDU status_oid = '.1.3.6.1.4.1.850.10.2.3.5.1.2.1.%d' control_oid = '.1.3.6.1.4.1.850.10.2.3.5.1.4.1.%d' @@ -51,7 +51,7 @@ class TripplitePDU: turn_off = 1 has_switches = False
-class ApcRPDU: +class ApcRPDU(object): # Rack PDU status_oid = '.1.3.6.1.4.1.318.1.1.12.3.5.1.1.4.%d' control_oid = '.1.3.6.1.4.1.318.1.1.12.3.3.1.1.4.%d' @@ -63,7 +63,7 @@ class ApcRPDU: turn_off = 2 has_switches = False
-class ApcMSP: +class ApcMSP(object): # Master Switch+ status_oid = '.1.3.6.1.4.1.318.1.1.6.7.1.1.5.%d.1.%d' control_oid = '.1.3.6.1.4.1.318.1.1.6.5.1.1.5.%d.1.%d' @@ -75,7 +75,7 @@ class ApcMSP: turn_off = 3 has_switches = True
-class ApcMS: +class ApcMS(object): # Master Switch - seems oldest, but supported on every APC PDU status_oid = '.1.3.6.1.4.1.318.1.1.4.4.2.1.3.%d' control_oid = '.1.3.6.1.4.1.318.1.1.4.4.2.1.3.%d' diff --git a/fence/agents/eaton_snmp/fence_eaton_snmp.py b/fence/agents/eaton_snmp/fence_eaton_snmp.py index b14eef4..24dfd9e 100644 --- a/fence/agents/eaton_snmp/fence_eaton_snmp.py +++ b/fence/agents/eaton_snmp/fence_eaton_snmp.py @@ -37,7 +37,7 @@ after_set = False
# Classes describing Device params # Managed ePDU -class EatonManagedePDU: +class EatonManagedePDU(object): status_oid = '.1.3.6.1.4.1.534.6.6.6.1.2.2.1.3.%d' control_oid = '.1.3.6.1.4.1.534.6.6.6.1.2.2.1.3.%d' outlet_table_oid = '.1.3.6.1.4.1.534.6.6.6.1.2.2.1.1' @@ -52,7 +52,7 @@ class EatonManagedePDU:
# Switched ePDU (Pulizzi 2) # NOTE: sysOID reports "20677.1", while data are actually at "20677.2" -class EatonSwitchedePDU: +class EatonSwitchedePDU(object): status_oid = '.1.3.6.1.4.1.20677.2.6.3.%d.0' control_oid = '.1.3.6.1.4.1.20677.2.6.2.%d.0' outlet_table_oid = '.1.3.6.1.4.1.20677.2.6.3' diff --git a/fence/agents/ipdu/fence_ipdu.py b/fence/agents/ipdu/fence_ipdu.py index 479e9b8..913322d 100644 --- a/fence/agents/ipdu/fence_ipdu.py +++ b/fence/agents/ipdu/fence_ipdu.py @@ -32,7 +32,7 @@ port_id = None switch_id = None
# Classes describing Device params -class IBMiPDU: +class IBMiPDU(object): # iPDU status_oid = '.1.3.6.1.4.1.2.6.223.8.2.2.1.11.%d' control_oid = '.1.3.6.1.4.1.2.6.223.8.2.2.1.11.%d'