Mailinglist Archive: yast-commit (98 mails)

[fehr@xxxxxxxxxxxxxxxxx]

Author: fehr
Date: Wed Dec 21 14:28:46 2011
New Revision: 67056

URL: http://svn.opensuse.org/viewcvs/yast?rev=67056&view=rev
Log:
- undo change from Fri Nov 25 17:09:26 
  the entry scanned from firmware cannot be used the same way
  as entries detected by discovery command
  real fix for the problems with be2iscsi was fixing module
  names on Mon Nov 28 16:35:51

Modified:
    
branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes
    branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp

Modified: 
branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes?rev=67056&r1=67055&r2=67056&view=diff
==============================================================================
--- 
branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes
 (original)
+++ 
branches/SuSE-Code-11-SP2-Branch/iscsi-client/package/yast2-iscsi-client.changes
 Wed Dec 21 14:28:46 2011
@@ -1,4 +1,13 @@
 -------------------------------------------------------------------
+Wed Dec 21 14:23:39 CET 2011 - fehr@xxxxxxx
+
+- undo change from Fri Nov 25 17:09:26 
+  the entry scanned from firmware cannot be used the same way
+  as entries detected by discovery command
+  real fix for the problems with be2iscsi was fixing module
+  names on Mon Nov 28 16:35:51
+
+-------------------------------------------------------------------
 Mon Nov 28 16:35:51 CET 2011 - aschnell@xxxxxxx
 
 - fixed module names

Modified: branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp?rev=67056&r1=67055&r2=67056&view=diff
==============================================================================
--- branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp 
(original)
+++ branches/SuSE-Code-11-SP2-Branch/iscsi-client/src/IscsiClientLib.ycp Wed 
Dec 21 14:28:46 2011
@@ -69,49 +69,6 @@
 }
 
 
-list< map<string, any> > parse_m_fw(list<string> lines)
-{
-    // y2milestone("lines:%1", lines);
-    list< map<string, any> > entries = [];
-
-    map<string, any> entry = $[];
-
-    foreach(string line, lines, {
-
-       if (String::StartsWith(line, "# BEGIN RECORD"))
-       {
-           entry = $[];
-       }
-       else if (String::StartsWith(line, "# END RECORD"))
-       {
-           entries = add(entries, entry);
-       }
-       else
-       {
-           list<string> key_value = splitstring(line, "=");
-           string key = String::CutBlanks(key_value[0]:"");
-           string value = String::CutBlanks(key_value[1]:"");
-           entry[key] = value;
-       }    
-    });
-
-    return entries;
-}
-
-
-list< map<string, any> > parse_m_iface(list<string> lines)
-{
-    list< map<string, any> > entries = [];
-
-    foreach(string line, lines, {
-       list<string> tmp = splitstring(line, ",");
-       entries = add(entries, $[ "name" : tmp[0]:"", "hwaddress" : tmp[1]:"" 
]);
-    });
-
-    return entries;
-}
-
-
 /**
  * get iBFT (available only on some special hardware)
  */
@@ -329,34 +286,6 @@
        {
        discovered = ScanDiscovered( splitstring(retcode["stdout"]:"","\n") );
        }
-
-    retcode = (map<string, any>) SCR::Execute(.target.bash_output, 
GetAdmCmd("-m fw"));
-    if (isempty(retcode["stderr"]:""))
-    {
-       list< map<string, any> > iscsi_adm_m_fw = 
parse_m_fw(splitstring(retcode["stdout"]:"", "\n"));
-
-       retcode = (map<string, any>) SCR::Execute(.target.bash_output, 
GetAdmCmd("-m iface"));
-       if (isempty(retcode["stderr"]:""))
-       {
-           list< map<string, any> > iscsi_adm_m_iface = 
parse_m_iface(splitstring(retcode["stdout"]:"", "\n"));
-
-           foreach (map<string, any> tmp1, iscsi_adm_m_fw, {
-
-               string interface = "unknown";
-
-               foreach (map<string, any> iface, iscsi_adm_m_iface, {
-                   if (iface["hwaddress"]:"" == tmp1["iface.hwaddress"]:"" &&
-                       String::StartsWith(iface["name"]:"", "eth"))
-                       interface = iface["name"]:"";
-               });
-
-               string tmp2 = tmp1["node.conn[0].address"]:"" + ":" + 
tmp1["node.conn[0].port"]:"" + " " + 
-                   tmp1["node.name"]:"" + " " + interface;
-               discovered = add(discovered, tmp2);
-           });
-       }
-    }
-
     return discovered;
     }
 

-- 
To unsubscribe, e-mail: yast-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: yast-commit+help@xxxxxxxxxxxx