Attachment 296401 Details for Bug 435451 – iscsi-target-node.patch

[patch] iscsi-target-node.patch

iscsi-target-node.patch (text/plain), 2.94 KB, created by James Laska on 2008-02-29 18:38:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: James Laska

Created: 2008-02-29 18:38:32 UTC

Size: 2.94 KB

patch

obsolete

>diff --git a/iscsi.py b/iscsi.py
>index d23f198..6e94b20 100644
>--- a/iscsi.py
>+++ b/iscsi.py
>@@ -60,7 +60,7 @@ def has_iscsi():
>     return True
> 
> class iscsiTarget:
>-    def __init__(self, ipaddr, port = None, user = None, pw = None):
>+    def __init__(self, ipaddr, port = None, user = None, pw = None, node = None):
>         # FIXME: validate ipaddr
>         self.ipaddr = ipaddr
>         if not port: # FIXME: hack hack hack
>@@ -70,6 +70,8 @@ class iscsiTarget:
>         self.password = pw
>         self._portal = None
>         self._nodes = []
>+        if node != None:
>+            self._nodes.append(node)
> 
>         find_iscsi_files()
> 
>@@ -91,7 +93,9 @@ class iscsiTarget:
>                 (portal, node) = pnlist
>                 if portal.startswith(self.ipaddr):
>                     self._portal = portal
>-                    self._nodes.append(node)
>+                    # FIXME - what if we only were asked about a specific node?
>+                    # should we add this and only use the requested nodes later?
>+                    # self._nodes.append(node)
>         return self._portal
>     portal = property(_getPortal)
> 
>@@ -348,7 +352,7 @@ class iscsi(object):
>         default = self.loginToDefaultDrive()
>         if not default is None:
>             (node, ipaddr, port) = default
>-            t = iscsiTarget(ipaddr, port, None, None)
>+            t = iscsiTarget(ipaddr, port, None, None, None)
>             # this actually creates the entries.
>             t.discover()
>             # and this sets them to auto-start
>@@ -363,20 +367,20 @@ class iscsi(object):
>             w.pop()
> 
>     def addTarget(self, ipaddr, port = "3260", user = None, pw = None,
>-                  intf = None):
>+                  intf = None, node = None):
>         if not self.iscsidStarted:
>             self.startup(intf)
>             if not self.iscsidStarted:
>                 # can't start for some reason.... just fallback I guess
>-                return
>+                return False
> 
>-        t = iscsiTarget(ipaddr, port, user, pw)
>+        t = iscsiTarget(ipaddr, port, user, pw, node)
>         if not t.discover():
>-            return
>+            return False
>         if not t.login():
>-            return
>+            return False
>         self.targets.append(t)
>-        return
>+        return True
> 
>     def writeKS(self, f):
>         if not self.initiatorSet:
>diff --git a/kickstart.py b/kickstart.py
>index 3c18853..b52fc1a 100644
>--- a/kickstart.py
>+++ b/kickstart.py
>@@ -180,7 +180,7 @@ class AnacondaKSHandlers(KickstartHandlers):
>         KickstartHandlers.doIscsi(self, args)
> 
>         for target in self.ksdata.iscsi:
>-            if self.id.iscsi.addTarget(target.ipaddr, target.port, target.user, target.password):
>+            if self.id.iscsi.addTarget(target.ipaddr, target.port, target.user, target.password, node=target.target):
>                 log.info("added iscsi target: %s" %(target.ipaddr,))
> 
>         # FIXME: flush the drive dict so we figure drives out again

Actions: View | Diff

Attachments on bug 435451: 296352 | 296401