---
storage/zfcp.py | 67 ++++++++++++++++++++++++++----------------------------
1 files changed, 32 insertions(+), 35 deletions(-)
diff --git a/storage/zfcp.py b/storage/zfcp.py
index 47271b9..a1e5606 100644
--- a/storage/zfcp.py
+++ b/storage/zfcp.py
@@ -47,11 +47,11 @@ class ZFCPDevice:
self.fcplun = self.sanitizeFCPLInput(fcplun)
if not self.checkValidDevice(self.devnum):
- raise ValueError, _("You have not specified a device number or the number is invalid")
+ raise ValueError, "You have not specified a device number or the number is invalid"
if not self.checkValidWWPN(self.wwpn):
- raise ValueError, _("You have not specified a worldwide port name or the name is invalid.")
+ raise ValueError, "You have not specified a worldwide port name or the name is invalid."
if not self.checkValidFCPLun(self.fcplun):
- raise ValueError, _("You have not specified a FCP LUN or the number is invalid.")
+ raise ValueError, "You have not specified a FCP LUN or the number is invalid."
def __str__(self):
return "%s %s %s" %(self.devnum, self.wwpn, self.fcplun)
@@ -128,14 +128,13 @@ class ZFCPDevice:
"free %s" %(self.devnum,))
udev_settle()
except IOError as e:
- raise ValueError, _("Could not free zFCP device %(devnum)s from "
- "device ignore list (%(e)s).") \
+ raise ValueError, "Could not free zFCP device %(devnum)s from " \
+ "device ignore list (%(e)s)." \
% {'devnum': self.devnum, 'e': e}
if not os.path.exists(online):
- raise ValueError, _(
- "zFCP device %s not found, not even in device ignore list."
- %(self.devnum,))
+ raise ValueError, "zFCP device %s not found, not even in device " \
+ "ignore list." % (self.devnum,)
try:
f = open(online, "r")
@@ -146,8 +145,8 @@ class ZFCPDevice:
else:
log.info("zFCP device %s already online." %(self.devnum,))
except IOError as e:
- raise ValueError, _("Could not set zFCP device %(devnum)s "
- "online (%(e)s).") \
+ raise ValueError, "Could not set zFCP device %(devnum)s " \
+ "online (%(e)s)." \
% {'devnum': self.devnum, 'e': e}
if not os.path.exists(portdir):
@@ -157,16 +156,16 @@ class ZFCPDevice:
loggedWriteLineToFile(portadd, self.wwpn)
udev_settle()
except IOError as e:
- raise ValueError, _("Could not add WWPN %(wwpn)s to zFCP "
- "device %(devnum)s (%(e)s).") \
+ raise ValueError, "Could not add WWPN %(wwpn)s to zFCP " \
+ "device %(devnum)s (%(e)s)." \
% {'wwpn': self.wwpn,
'devnum': self.devnum,
'e': e}
else:
# newer zfcp sysfs interface with auto port scan
- raise ValueError, _("WWPN %(wwpn)s not found at zFCP device "
- "%(devnum)s.") % {'wwpn': self.wwpn,
- 'devnum': self.devnum}
+ raise ValueError, "WWPN %(wwpn)s not found at zFCP device " \
+ "%(devnum)s." % {'wwpn': self.wwpn,
+ 'devnum': self.devnum}
else:
if os.path.exists(portadd):
# older zfcp sysfs interface
@@ -179,14 +178,14 @@ class ZFCPDevice:
loggedWriteLineToFile(unitadd, self.fcplun)
udev_settle()
except IOError as e:
- raise ValueError, _("Could not add LUN %(fcplun)s to WWPN "
- "%(wwpn)s on zFCP device %(devnum)s "
- "(%(e)s).") \
+ raise ValueError, "Could not add LUN %(fcplun)s to WWPN " \
+ "%(wwpn)s on zFCP device %(devnum)s " \
+ "(%(e)s)." \
% {'fcplun': self.fcplun, 'wwpn': self.wwpn,
'devnum': self.devnum, 'e': e}
else:
- raise ValueError, _("LUN %(fcplun)s at WWPN %(wwpn)s on zFCP "
- "device %(devnum)s already configured.") \
+ raise ValueError, "LUN %(fcplun)s at WWPN %(wwpn)s on zFCP " \
+ "device %(devnum)s already configured." \
% {'fcplun': self.fcplun,
'wwpn': self.wwpn,
'devnum': self.devnum}
@@ -197,17 +196,17 @@ class ZFCPDevice:
fail = f.readline().strip()
f.close()
except IOError as e:
- raise ValueError, _("Could not read failed attribute of LUN "
- "%(fcplun)s at WWPN %(wwpn)s on zFCP device "
- "%(devnum)s (%(e)s).") \
+ raise ValueError, "Could not read failed attribute of LUN " \
+ "%(fcplun)s at WWPN %(wwpn)s on zFCP device " \
+ "%(devnum)s (%(e)s)." \
% {'fcplun': self.fcplun,
'wwpn': self.wwpn,
'devnum': self.devnum,
'e': e}
if fail != "0":
self.offlineDevice()
- raise ValueError, _("Failed LUN %(fcplun)s at WWPN %(wwpn)s on "
- "zFCP device %(devnum)s removed again.") \
+ raise ValueError, "Failed LUN %(fcplun)s at WWPN %(wwpn)s on " \
+ "zFCP device %(devnum)s removed again." \
% {'fcplun': self.fcplun,
'wwpn': self.wwpn,
'devnum': self.devnum}
@@ -263,18 +262,16 @@ class ZFCPDevice:
try:
self.offlineSCSIDevice()
except IOError as e:
- raise ValueError, _("Could not correctly delete SCSI device of "
- "zFCP %(devnum)s %(wwpn)s %(fcplun)s "
- "(%(e)s).") \
+ raise ValueError, "Could not correctly delete SCSI device of " \
+ "zFCP %(devnum)s %(wwpn)s %(fcplun)s (%(e)s)." \
% {'devnum': self.devnum, 'wwpn': self.wwpn,
'fcplun': self.fcplun, 'e': e}
try:
loggedWriteLineToFile(unitremove, self.fcplun)
except IOError as e:
- raise ValueError, _("Could not remove LUN %(fcplun)s at WWPN "
- "%(wwpn)s on zFCP device %(devnum)s "
- "(%(e)s).") \
+ raise ValueError, "Could not remove LUN %(fcplun)s at WWPN " \
+ "%(wwpn)s on zFCP device %(devnum)s (%(e)s)." \
% {'fcplun': self.fcplun, 'wwpn': self.wwpn,
'devnum': self.devnum, 'e': e}
@@ -290,8 +287,8 @@ class ZFCPDevice:
try:
loggedWriteLineToFile(portremove, self.wwpn)
except IOError as e:
- raise ValueError, _("Could not remove WWPN %(wwpn)s on zFCP "
- "device %(devnum)s (%(e)s).") \
+ raise ValueError, "Could not remove WWPN %(wwpn)s on zFCP " \
+ "device %(devnum)s (%(e)s)." \
% {'wwpn': self.wwpn,
'devnum': self.devnum, 'e': e}
@@ -316,8 +313,8 @@ class ZFCPDevice:
try:
loggedWriteLineToFile(offline, "0")
except IOError as e:
- raise ValueError, _("Could not set zFCP device %(devnum)s "
- "offline (%(e)s).") \
+ raise ValueError, "Could not set zFCP device %(devnum)s " \
+ "offline (%(e)s)." \
% {'devnum': self.devnum, 'e': e}
return True
