From e30d85bf2dee5cb72109fb26ed7f88256e1e5848 Mon Sep 17 00:00:00 2001
From: phamt <phamt@8638fb3e-16cb-4fca-ae20-7b5d299a9bcd>
Date: Thu, 4 Apr 2013 16:01:24 +0000
Subject: [PATCH] Fixed how default route was specified in autoyast template.
 Moved 'add SCSI' to disk panel on xCAT-UI because 'add SCSI' creates an EDEV.

git-svn-id: https://svn.code.sf.net/p/xcat/code/xcat-core/trunk@15827 8638fb3e-16cb-4fca-ae20-7b5d299a9bcd
---
 xCAT-UI/js/custom/zvmUtils.js                 | 38 +++++++++----------
 .../install/sles/compute.sles10.s390x.tmpl    |  2 +-
 .../install/sles/compute.sles11.s390x.tmpl    |  2 +-
 xCAT-server/share/xcat/scripts/mkay4z         |  6 +--
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/xCAT-UI/js/custom/zvmUtils.js b/xCAT-UI/js/custom/zvmUtils.js
index 56d9a34dd..f4be52952 100644
--- a/xCAT-UI/js/custom/zvmUtils.js
+++ b/xCAT-UI/js/custom/zvmUtils.js
@@ -2017,7 +2017,7 @@ function openAddScsi2SystemDialog(hcp) {
     hcp2zvm = getHcpZvmHash();
     
     // Create info bar
-    var info = createInfoBar('Dynamically add an SCSI disk to a running z/VM system.');
+    var info = createInfoBar('Dynamically add an SCSI disk to a running z/VM system as an EDEV.');
     addS2SForm.append(info);
     
     var system = $('<div><label>z/VM system:</label></div>');
@@ -2030,7 +2030,7 @@ function openAddScsi2SystemDialog(hcp) {
     	systemSelect.append($('<option value="' + hcp2zvm[hcp] + '">' + hcp2zvm[hcp] + '</option>'));
     }
         
-    var devNo = $('<div><label>FCP device:</label><input type="text" name="devNo" maxlength="4" title="The SCSI disk device number"/></div>');
+    var devNo = $('<div><label>Device number:</label><input type="text" name="devNo" maxlength="4" title="The SCSI disk device number"/></div>');
     var devPathLabel = $('<label>Device paths:</label>');
     var devPathCount = 1;
     var pathDiv = $('<div class="devPath" style="margin-left:125px;"></div>');
@@ -3436,6 +3436,18 @@ function loadDiskPoolTable(data) {
             openAddPageSpoolDialog(hcp);
         });
         
+        // Add EDEV to system
+        var addEdevLnk = $('<a>Add EDEV</a>');
+        addEdevLnk.bind('click', function(event){
+            openAddScsi2SystemDialog(hcp);
+        });
+        
+        // Remove EDEV
+        var removeEdevLnk = $('<a>Remove EDEV</a>');
+        removeEdevLnk.bind('click', function(event){
+            openRemoveScsiDialog(hcp);
+        });
+                
         // Indicate disk is to be shared with various users
         var shareLnk = $('<a>Share disk</a>');
         shareLnk.bind('click', function(event){
@@ -3445,7 +3457,7 @@ function loadDiskPoolTable(data) {
         
         // Advanced menu
         var advancedLnk = '<a>Advanced</a>';
-        var advancedMenu = createMenu([addEckdLnk, addPageSpoolLnk, shareLnk]);
+        var advancedMenu = createMenu([addEckdLnk, addPageSpoolLnk, addEdevLnk, removeEdevLnk, shareLnk]);
         
         // Create action bar
         var actionBar = $('<div id="zvmDiskResourceActions" class="actionBar"></div>').css("width", "450px");
@@ -3598,28 +3610,12 @@ function loadZfcpPoolTable(data) {
                 });
             }    
         });
-        
-        // Add SCSI to system
-        var addScsiLnk = $('<a>Add SCSI</a>');
-        addScsiLnk.bind('click', function(event){
-            openAddScsi2SystemDialog(hcp);
-        });
-        
-        // Remove SCSI
-        var removeScsiLnk = $('<a>Remove SCSI</a>');
-        removeScsiLnk.bind('click', function(event){
-            openRemoveScsiDialog(hcp);
-        });
-        
-        // Advanced menu
-        var advancedLnk = '<a>Advanced</a>';
-        var advancedMenu = createMenu([addScsiLnk, removeScsiLnk]);
-        
+                
         // Create action bar
         var actionBar = $('<div id="zFcpResourceActions" class="actionBar"></div>').css("width", "450px");
         
         // Create an action menu
-        var actionsMenu = createMenu([addLnk, removeLnk, refreshLnk, [advancedLnk, advancedMenu]]);
+        var actionsMenu = createMenu([addLnk, removeLnk, refreshLnk]);
         actionsMenu.superfish();
         actionsMenu.css('display', 'inline-block');
         actionBar.append(actionsMenu);
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
index cb9ef51b8..69465f184 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles10.s390x.tmpl
@@ -327,7 +327,7 @@
           <destination>default</destination>
           <device>-</device>
           <gateway>replace_gateway</gateway>
-          <netmask>replace_netmask</netmask>
+          <netmask>-</netmask>
         </route>
       </routes>
     </routing>
diff --git a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
index cb9ef51b8..69465f184 100644
--- a/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
+++ b/xCAT-server/share/xcat/install/sles/compute.sles11.s390x.tmpl
@@ -327,7 +327,7 @@
           <destination>default</destination>
           <device>-</device>
           <gateway>replace_gateway</gateway>
-          <netmask>replace_netmask</netmask>
+          <netmask>-</netmask>
         </route>
       </routes>
     </routing>
diff --git a/xCAT-server/share/xcat/scripts/mkay4z b/xCAT-server/share/xcat/scripts/mkay4z
index 67c105ffd..7e5961b1a 100644
--- a/xCAT-server/share/xcat/scripts/mkay4z
+++ b/xCAT-server/share/xcat/scripts/mkay4z
@@ -1233,7 +1233,7 @@ sub createRoutes {
 	#   <routes config:type="list">
 	#   <route>
 	#     <destination>default</destination>
-	#     <device>eth0</device>
+	#     <device>-</device>
 	#     <gateway>10.1.100.1</gateway>
 	#     <netmask>-</netmask>
 	#   </route>
@@ -1256,9 +1256,9 @@ sub createRoutes {
 			$xml .= <<END;	
   <route>
     <destination>$dest</destination>
-    <device>$interfaces{$i}{'device'}</device>
+    <device>-</device>
     <gateway>$interfaces{$i}{'gateway'}</gateway>
-    <netmask>$interfaces{$i}{'netmask'}</netmask>
+    <netmask>-</netmask>
   </route>
 END
 		}