Linux Archive

Linux Archive (http://www.linux-archive.org/)
-   Launchpad User (http://www.linux-archive.org/launchpad-user/)
-   -   PATCH: fix RHEL53 non iBFT iscsi use (http://www.linux-archive.org/launchpad-user/199996-patch-fix-rhel53-non-ibft-iscsi-use.html)

Hans de Goede 11-26-2008 10:00 AM

PATCH: fix RHEL53 non iBFT iscsi use
 
Hi all,

Commit 697500585760b703f1ddc86db9d2871953cb2ab6 removes the addTarget function
from iscsi.py as that is no longer needed for iBFT based iscsi use, but it is
still needed for non iBFT based iscsi use, so this patch re-adds it (reverting
part of 697500585760b703f1ddc86db9d2871953cb2ab6).


Regards,

Hans
diff --git a/iscsi.py b/iscsi.py
index b765fc8..37366cb 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -450,6 +450,94 @@ class iscsi(object):
if intf:
w.pop()

+ def addTarget(self, ipaddr, port="3260", user=None, pw=None,
+ user_in=None, pw_in=None, intf=None):
+ if not self.iscsidStarted:
+ self.startup(intf)
+ if not self.iscsidStarted:
+ # can't start for some reason.... just fallback I guess
+ return
+
+ commentUser = '#'
+ commentUser_in = '#'
+
+ if user is not None or pw is not None:
+ commentUser = '
+ if user is None:
+ raise ValueError, "user is required"
+ if pw is None:
+ raise ValueError, "pw is required"
+
+ if user_in is not None or pw_in is not None:
+ commentUser_in = '
+ if user_in is None:
+ raise ValueError, "user_in is required"
+ if pw_in is None:
+ raise ValueError, "pw_in is required"
+
+ # If either a user/pw pair was specified or a user_in/pw_in was
+ # specified, then CHAP is specified.
+ if commentUser == ' or commentUser_in == ':
+ commentChap = '
+ else:
+ commentChap = '#'
+
+
+ oldIscsidFile = []
+ try:
+ f = open(ISCSID_CONF, "r")
+ oldIscsidFile = f.readlines()
+ f.close()
+ except IOError, x:
+ if x.errno != errno.ENOENT:
+ raise RuntimeError, "Cannot open %s for read." % (ISCSID_CONF,)
+
+ try:
+ f = open(ISCSID_CONF, "w")
+ except:
+ raise RuntimeError, "Cannot open %s for write." % (ISCSID_CONF,)
+
+ vals = {
+ "node.session.auth.authmethod = ": [commentChap, "CHAP"],
+ "node.session.auth.username = ": [commentUser, user],
+ "node.session.auth.password = ": [commentUser, pw],
+ "node.session.auth.username_in = ": [commentUser_in, user_in],
+ "node.session.auth.password_in = ": [commentUser_in, pw_in],
+ "discovery.sendtargets.auth.authmethod = ": [commentChap, "CHAP"],
+ "discovery.sendtargets.auth.username = ": [commentUser, user],
+ "discovery.sendtargets.auth.password = ": [commentUser, pw],
+ "discovery.sendtargets.auth.username_in = ":
+ [commentUser_in, user_in],
+ "discovery.sendtargets.auth.password_in = ":
+ [commentUser_in, pw_in],
+ }
+
+ for line in oldIscsidFile:
+ s = line.strip()
+ # grab the cr/lf/cr+lf
+ nl = line[line.find(s)+len(s):]
+ found = False
+ for (k, (c, v)) in vals.items():
+ if line.find(k) != -1:
+ f.write("%s%s%s%s" % (c, k, v, nl))
+ found=True
+ del vals[k]
+ break
+ if not found:
+ f.write(line)
+
+ for (k, (c, v)) in vals.items():
+ f.write("%s%s%s
" % (c, k, v))
+ f.close ()
+
+ t = iscsiTarget(ipaddr, port, user, pw, user_in, pw_in)
+ if not t.discover():
+ return
+ if not t.login():
+ return
+ self.targets.append(t)
+ return
+
def writeKS(self, f):
if not self.initiatorSet:
return
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

Martin Sivak 11-26-2008 11:59 AM

PATCH: fix RHEL53 non iBFT iscsi use
 
Yep, we still need the addTarget to add new iSCSI drives from the GUI.
Looks OK.

----- Original Message -----
From: "Hans de Goede" <hdegoede@redhat.com>
To: "Discussion of Development and Customization of the Red Hat Linux Installer" <anaconda-devel-list@redhat.com>
Sent: Wednesday, November 26, 2008 12:00:25 PM GMT +01:00 Amsterdam / Berlin / Bern / Rome / Stockholm / Vienna
Subject: PATCH: fix RHEL53 non iBFT iscsi use

Hi all,

Commit 697500585760b703f1ddc86db9d2871953cb2ab6 removes the addTarget function
from iscsi.py as that is no longer needed for iBFT based iscsi use, but it is
still needed for non iBFT based iscsi use, so this patch re-adds it (reverting
part of 697500585760b703f1ddc86db9d2871953cb2ab6).

Regards,

Hans

diff --git a/iscsi.py b/iscsi.py
index b765fc8..37366cb 100644
--- a/iscsi.py
+++ b/iscsi.py
@@ -450,6 +450,94 @@ class iscsi(object):
if intf:
w.pop()

+ def addTarget(self, ipaddr, port="3260", user=None, pw=None,
+ user_in=None, pw_in=None, intf=None):
+ if not self.iscsidStarted:
+ self.startup(intf)
+ if not self.iscsidStarted:
+ # can't start for some reason.... just fallback I guess
+ return
+
+ commentUser = '#'
+ commentUser_in = '#'
+
+ if user is not None or pw is not None:
+ commentUser = '
+ if user is None:
+ raise ValueError, "user is required"
+ if pw is None:
+ raise ValueError, "pw is required"
+
+ if user_in is not None or pw_in is not None:
+ commentUser_in = '
+ if user_in is None:
+ raise ValueError, "user_in is required"
+ if pw_in is None:
+ raise ValueError, "pw_in is required"
+
+ # If either a user/pw pair was specified or a user_in/pw_in was
+ # specified, then CHAP is specified.
+ if commentUser == ' or commentUser_in == ':
+ commentChap = '
+ else:
+ commentChap = '#'
+
+
+ oldIscsidFile = []
+ try:
+ f = open(ISCSID_CONF, "r")
+ oldIscsidFile = f.readlines()
+ f.close()
+ except IOError, x:
+ if x.errno != errno.ENOENT:
+ raise RuntimeError, "Cannot open %s for read." % (ISCSID_CONF,)
+
+ try:
+ f = open(ISCSID_CONF, "w")
+ except:
+ raise RuntimeError, "Cannot open %s for write." % (ISCSID_CONF,)
+
+ vals = {
+ "node.session.auth.authmethod = ": [commentChap, "CHAP"],
+ "node.session.auth.username = ": [commentUser, user],
+ "node.session.auth.password = ": [commentUser, pw],
+ "node.session.auth.username_in = ": [commentUser_in, user_in],
+ "node.session.auth.password_in = ": [commentUser_in, pw_in],
+ "discovery.sendtargets.auth.authmethod = ": [commentChap, "CHAP"],
+ "discovery.sendtargets.auth.username = ": [commentUser, user],
+ "discovery.sendtargets.auth.password = ": [commentUser, pw],
+ "discovery.sendtargets.auth.username_in = ":
+ [commentUser_in, user_in],
+ "discovery.sendtargets.auth.password_in = ":
+ [commentUser_in, pw_in],
+ }
+
+ for line in oldIscsidFile:
+ s = line.strip()
+ # grab the cr/lf/cr+lf
+ nl = line[line.find(s)+len(s):]
+ found = False
+ for (k, (c, v)) in vals.items():
+ if line.find(k) != -1:
+ f.write("%s%s%s%s" % (c, k, v, nl))
+ found=True
+ del vals[k]
+ break
+ if not found:
+ f.write(line)
+
+ for (k, (c, v)) in vals.items():
+ f.write("%s%s%s
" % (c, k, v))
+ f.close ()
+
+ t = iscsiTarget(ipaddr, port, user, pw, user_in, pw_in)
+ if not t.discover():
+ return
+ if not t.login():
+ return
+ self.targets.append(t)
+ return
+
def writeKS(self, f):
if not self.initiatorSet:
return

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list


All times are GMT. The time now is 02:13 PM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.