|
 |
e4ffb1 |
commit a4cbf5ba86d196b236cc58ad2dee2f3317e1ee10
|
|
|
e4ffb1 |
Author: Marek 'marx' Grac <mgrac@redhat.com>
|
|
|
e4ffb1 |
Date: Mon Sep 8 15:02:53 2014 +0200
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
[clenaup] Fix whitespace convention issues
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
diff --git a/fence/agents/lib/fencing.py.py b/fence/agents/lib/fencing.py.py
|
|
|
e4ffb1 |
index 557358a..640f81a 100644
|
|
|
e4ffb1 |
--- a/fence/agents/lib/fencing.py.py
|
|
|
e4ffb1 |
+++ b/fence/agents/lib/fencing.py.py
|
|
|
e4ffb1 |
@@ -719,7 +719,6 @@ def check_input(device_opt, opt):
|
|
|
e4ffb1 |
logging.getLogger().addHandler(SyslogLibHandler())
|
|
|
e4ffb1 |
## add loggint to stderr
|
|
|
e4ffb1 |
logging.getLogger().addHandler(logging.StreamHandler(stream=sys.stderr))
|
|
|
e4ffb1 |
-
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
acceptable_actions = ["on", "off", "status", "list", "monitor"]
|
|
|
e4ffb1 |
if 1 == device_opt.count("fabric_fencing"):
|
|
|
e4ffb1 |
@@ -1159,9 +1158,8 @@ def fence_logout(conn, logout_string, sleep=0):
|
|
|
e4ffb1 |
def array_to_dict(ar):
|
|
|
e4ffb1 |
return dict([[x[0].split(".")[-1], x[1]] for x in ar])
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
-
|
|
|
e4ffb1 |
## Own logger handler that uses old-style syslog handler as otherwise everything is sourced
|
|
|
e4ffb1 |
-## from /dev/syslog
|
|
|
e4ffb1 |
+## from /dev/syslog
|
|
|
e4ffb1 |
class SyslogLibHandler(logging.StreamHandler):
|
|
|
e4ffb1 |
"""
|
|
|
e4ffb1 |
A handler class that correctly push messages into syslog
|
|
|
e4ffb1 |
diff --git a/fence/agents/vmware_soap/fence_vmware_soap.py b/fence/agents/vmware_soap/fence_vmware_soap.py
|
|
|
e4ffb1 |
index 2cea105..e47f11e 100644
|
|
|
e4ffb1 |
--- a/fence/agents/vmware_soap/fence_vmware_soap.py
|
|
|
e4ffb1 |
+++ b/fence/agents/vmware_soap/fence_vmware_soap.py
|
|
|
e4ffb1 |
@@ -11,7 +11,7 @@ from suds.sudsobject import Property
|
|
|
e4ffb1 |
from suds.transport.http import HttpAuthenticated
|
|
|
e4ffb1 |
from suds.transport import Reply, TransportError
|
|
|
e4ffb1 |
from fencing import *
|
|
|
e4ffb1 |
-from fencing import fail, EC_STATUS, EC_LOGIN_DENIED, EC_INVALID_PRIVILEGES, EC_WAITING_ON, EC_WAITING_OFF
|
|
|
e4ffb1 |
+from fencing import fail, fail_usage, EC_STATUS, EC_LOGIN_DENIED, EC_INVALID_PRIVILEGES, EC_WAITING_ON, EC_WAITING_OFF
|
|
|
e4ffb1 |
from fencing import run_delay
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
#BEGIN_VERSION_GENERATION
|
|
|
e4ffb1 |
@@ -33,7 +33,7 @@ class RequestsTransport(HttpAuthenticated):
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
def send(self, request):
|
|
|
e4ffb1 |
self.addcredentials(request)
|
|
|
e4ffb1 |
- resp = self.session.post(request.url, data = request.message, headers = request.headers, cert = self.cert, verify = self.verify)
|
|
|
e4ffb1 |
+ resp = self.session.post(request.url, data=request.message, headers=request.headers, cert=self.cert, verify=self.verify)
|
|
|
e4ffb1 |
result = Reply(resp.status_code, resp.headers, resp.content)
|
|
|
e4ffb1 |
return result
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
@@ -58,7 +58,7 @@ def soap_login(options):
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
try:
|
|
|
e4ffb1 |
headers = {"Content-Type" : "text/xml;charset=UTF-8", "SOAPAction" : ""}
|
|
|
e4ffb1 |
- conn = Client(url + "/vimService.wsdl", location = url, transport = RequestsTransport(verify = verify), headers = headers)
|
|
|
e4ffb1 |
+ conn = Client(url + "/vimService.wsdl", location=url, transport=RequestsTransport(verify=verify), headers=headers)
|
|
|
e4ffb1 |
|
|
|
e4ffb1 |
mo_ServiceInstance = Property('ServiceInstance')
|
|
|
e4ffb1 |
mo_ServiceInstance._type = 'ServiceInstance'
|