Mailinglist Archive: yast-commit (214 mails)

[fehr@xxxxxxxxxxxxxxxxx]

Author: fehr
Date: Mon Feb  6 14:35:49 2012
New Revision: 67371

URL: http://svn.opensuse.org/viewcvs/yast?rev=67371&view=rev
Log:
change detection of qla iscsi devices (bnc#745201)

Modified:
    trunk/iscsi-client/package/yast2-iscsi-client.changes
    trunk/iscsi-client/src/IscsiClientLib.ycp

Modified: trunk/iscsi-client/package/yast2-iscsi-client.changes
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/package/yast2-iscsi-client.changes?rev=67371&r1=67370&r2=67371&view=diff
==============================================================================
--- trunk/iscsi-client/package/yast2-iscsi-client.changes (original)
+++ trunk/iscsi-client/package/yast2-iscsi-client.changes Mon Feb  6 14:35:49 
2012
@@ -1,4 +1,9 @@
 -------------------------------------------------------------------
+Mon Feb  6 14:05:22 CET 2012 - fehr@xxxxxxx
+
+- change detection of qla iscsi devices (bnc#745201)
+
+-------------------------------------------------------------------
 Thu Feb  2 16:03:22 CET 2012 - fehr@xxxxxxx
 
 - call "iscsiadm -m iface" if /etc/iscsi/ifaces is empty (bnc#742570)

Modified: trunk/iscsi-client/src/IscsiClientLib.ycp
URL: 
http://svn.opensuse.org/viewcvs/yast/trunk/iscsi-client/src/IscsiClientLib.ycp?rev=67371&r1=67370&r2=67371&view=diff
==============================================================================
--- trunk/iscsi-client/src/IscsiClientLib.ycp (original)
+++ trunk/iscsi-client/src/IscsiClientLib.ycp Mon Feb  6 14:35:49 2012
@@ -651,7 +651,7 @@
        [ "bnx2", "bnx2/bnx2i/bnx2x", [ "bnx2", "bnx2i", "bnx2x" ], [ "bnx2i" ] 
],
        [ "cxgb3", "cxgb3/cxgb3i", [ "cxgb3", "cxgb3i" ], [ "cxgb3i" ] ],
        [ "enic", "enic/cnic/fnic", [ "enic", "fnic" ], [ "fnic" ] ],
-       [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx" ], [ "qla4xxx" ] 
],
+       [ "qla4xxx", "qla3xxx/qla4xxx", [ "qla4xxx", "qla3xxx", "qlcnic" ], [ 
"qla4xxx" ] ],
        [ "be2net", "be2net/be2iscsi", [ "be2net", "be2iscsi" ], [ "be2iscsi"] ]
     ];
 
@@ -698,11 +698,12 @@
            y2milestone( "GetOffloadItems card:%1", c );
            list<list> tmp = maplist( map m, c["drivers"]:[], 
                                      ``(flatten((list<list>)m["modules"]:[])));
-           return( $["modules":maplist( list ml, tmp, ``(ml[0]:"")),
+           map r = $["modules":maplist( list ml, tmp, ``(ml[0]:"")),
                      "iface":c["dev_name"]:"",
-                     "macaddr":c["resource","hwaddr",0,"addr"]:""]);
+                     "macaddr":c["resource","hwaddr",0,"addr"]:""];
+           y2milestone( "GetOffloadItems cinf:%1", r );
+           return( r );
            });
-       y2milestone( "GetOffloadItems hw_mods:%1", hw_mods );
        integer idx = 0;
        foreach( list<any> l, offload, 
            ``{
@@ -714,8 +715,12 @@
                foreach( map hw, hw_mods, 
                    ``{
                    if( 
size(multiset::intersection(mod,(list<string>)sort(hw["modules"]:[])))>0 )
+                       {
+                       y2milestone( "GetOffloadItems l:%1", l );
+                       y2milestone( "GetOffloadItems valid:%1", hw );
                        offload_valid[idx] = add( offload_valid[idx]:[], 
                                                  [ hw["iface"]:"", 
hw["macaddr"]:"", hw["iface"]:""+"-"+l[3,0]:""] );
+                       }
                    });
                }
            idx = idx+1;
@@ -729,7 +734,8 @@
                cmd = offboard_script + " " + l[0]:"" + " | grep ..:..:..:..";
                y2milestone( "GetOffloadItems cmd:%1", cmd );
                map out = (map) SCR::Execute (.target.bash_output, cmd );
-               y2milestone( "GetOffloadItems iscsi_offload out:%1", out );
+               y2milestone( "GetOffloadItems iscsi_offload out:%1", 
+                            SCR::Execute (.target.bash_output, offboard_script 
+ " " + l[0]:"" ));
                offload_res[l[0]:""] = $[];
                offload_res[l[0]:"","exit"] = out["exit"]:1;
                list<string> sl = [];

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