java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
| 19 +++++-----
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
| 2 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
| 14 +++----
java/code/src/com/redhat/rhn/manager/action/ActionManager.java
| 8 +++-
java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
| 2 -
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
| 4 +-
java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
| 2 -
java/code/webapp/WEB-INF/struts-config.xml
| 2 -
8 files changed, 30 insertions(+), 23 deletions(-)
New commits:
commit 66fe68b343f627399df15cdbc99e166567634d8e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 28 17:47:41 2011 +0200
fix never ending loop, when entering an invalid storage value
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
index 05b8dc3..b8ffb4e 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
@@ -272,6 +272,7 @@ public class ProvisionVirtualizationWizardAction extends
ScheduleKickstartWizard
catch (NumberFormatException e) {
errors.add(ActionErrors.GLOBAL_MESSAGE, new ActionMessage(
"frontend.actions.systems.virt.invalidstoragevalue"));
+ form.set(LOCAL_STORAGE_GB, "");
}
}
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index ce19863..77fbcdd 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -8297,7 +8297,7 @@ Follow this url to see the full list of inactive systems:
</trans-unit>
<trans-unit
id="frontend.actions.systems.virt.invalidstoragevalue">
- <source>Storage must be set to a value greater than 0.</source>
+ <source>Only natural numbers are accepted as storage
values.</source>
</trans-unit>
<trans-unit
id="frontend.actions.channels.manager.add.viewChannels">
commit 76571424e3edcc5bb862d52ef69fd33c4deb9c4e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Jun 28 17:14:50 2011 +0200
rename localStorageMegabytes -> localStorageGigabytes
diff --git
a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
index 0d552c8..05b8dc3 100644
---
a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
+++
b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/ProvisionVirtualizationWizardAction.java
@@ -51,7 +51,7 @@ public class ProvisionVirtualizationWizardAction extends
ScheduleKickstartWizard
public static final String VIRTUAL_CPUS = "virtualCpus";
public static final String VIRTUAL_BRIDGE = "virtBridge";
public static final String VIRTUAL_FILE_PATH = "diskPath";
- public static final String LOCAL_STORAGE_MB = "localStorageMegabytes";
+ public static final String LOCAL_STORAGE_GB = "localStorageGigabytes";
public static final String PROFILE = "cobbler_profile";
public static final String GUEST_NAME = "guestName";
@@ -74,8 +74,8 @@ public class ProvisionVirtualizationWizardAction extends
ScheduleKickstartWizard
form.set(VIRTUAL_CPUS, "");
}
- if (StringUtils.isEmpty(form.getString(LOCAL_STORAGE_MB))) {
- form.set(LOCAL_STORAGE_MB, "");
+ if (StringUtils.isEmpty(form.getString(LOCAL_STORAGE_GB))) {
+ form.set(LOCAL_STORAGE_GB, "");
}
return super.runFirst(mapping, form, ctx, response, step);
@@ -114,8 +114,8 @@ public class ProvisionVirtualizationWizardAction extends
ScheduleKickstartWizard
form.set(VIRTUAL_CPUS, String.valueOf(pf.getVirtCpus()));
}
- if (StringUtils.isEmpty(form.getString(LOCAL_STORAGE_MB))) {
- form.set(LOCAL_STORAGE_MB, String.valueOf(pf.getVirtFileSize()));
+ if (StringUtils.isEmpty(form.getString(LOCAL_STORAGE_GB))) {
+ form.set(LOCAL_STORAGE_GB, String.valueOf(pf.getVirtFileSize()));
}
if (StringUtils.isEmpty(form.getString(VIRTUAL_BRIDGE))) {
@@ -184,8 +184,8 @@ public class ProvisionVirtualizationWizardAction extends
ScheduleKickstartWizard
cmd.setVirtualCpus(new Long(this.getCobblerProfile(ctx).getVirtCpus()));
}
- if (!StringUtils.isEmpty(form.getString(LOCAL_STORAGE_MB))) {
- cmd.setLocalStorageSize(new Long(form.getString(LOCAL_STORAGE_MB)));
+ if (!StringUtils.isEmpty(form.getString(LOCAL_STORAGE_GB))) {
+ cmd.setLocalStorageSize(new Long(form.getString(LOCAL_STORAGE_GB)));
}
else {
cmd.setLocalStorageSize(new Long(
@@ -262,9 +262,9 @@ public class ProvisionVirtualizationWizardAction extends
ScheduleKickstartWizard
}
}
- if (!StringUtils.isEmpty(form.getString(LOCAL_STORAGE_MB))) {
+ if (!StringUtils.isEmpty(form.getString(LOCAL_STORAGE_GB))) {
try {
- Long storage = Long.parseLong(form.getString(LOCAL_STORAGE_MB));
+ Long storage = Long.parseLong(form.getString(LOCAL_STORAGE_GB));
if (storage <= 0) {
throw new NumberFormatException();
}
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 0b4d2d6..541a4eb 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -2217,7 +2217,7 @@ public class SystemHandler extends BaseHandler {
* @param profileName of Kickstart Profile to use.
* @param memoryMb to allocate to the guest (maxMemory)
* @param vcpus to assign
- * @param storageMb to assign to disk
+ * @param storageGb to assign to disk
* @return Returns 1 if successful, exception otherwise
*
* @xmlrpc.doc Provision a guest on the host specified. This schedules the guest
@@ -2231,11 +2231,11 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.param #param_desc("int", "memoryMb", "Memory to
allocate to the guest")
* @xmlrpc.param #param_desc("int", "vcpus", "Number of
virtual CPUs to allocate to
* the guest.")
- * @xmlrpc.param #param_desc("int", "storageMb", "Size of
the guests disk image.")
+ * @xmlrpc.param #param_desc("int", "storageGb", "Size of
the guests disk image.")
* @xmlrpc.returntype #return_int_success()
*/
public int provisionVirtualGuest(String sessionKey, Integer sid, String guestName,
- String profileName, Integer memoryMb, Integer vcpus, Integer storageMb) {
+ String profileName, Integer memoryMb, Integer vcpus, Integer storageGb) {
log.debug("provisionVirtualGuest called.");
User loggedInUser = getLoggedInUser(sessionKey);
// Lookup the server so we can validate it exists and throw error if not.
@@ -2279,7 +2279,7 @@ public class SystemHandler extends BaseHandler {
cmd.setGuestName(guestName);
cmd.setMemoryAllocation(new Long(memoryMb));
cmd.setVirtualCpus(new Long(vcpus.toString()));
- cmd.setLocalStorageSize(new Long(storageMb));
+ cmd.setLocalStorageSize(new Long(storageGb));
// setting an empty string generates a default virt path
cmd.setFilePath("");
// Store the new KickstartSession to the DB.
diff --git
a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
index af95f4e..9fddb88 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/ProvisionVirtualInstanceCommand.java
@@ -254,7 +254,7 @@ public class ProvisionVirtualInstanceCommand extends
KickstartScheduleCommand {
}
/**
- * @return Returns the localStorageMb
+ * @return Returns the localStorage in GB
*/
public Long getLocalStorageSize() {
return localStorage;
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
index 364c576..e554ad7 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/ks-wizard.jspf
@@ -23,7 +23,7 @@
<!-- Store guest provisioning info -->
<input type="hidden" name="memoryAllocation"
value="${form.memoryAllocation}" />
<input type="hidden" name="virtualCpus"
value="${form.virtualCpus}" />
- <input type="hidden" name="localStorageMegabytes"
value="${form.localStorageMegabytes}" />
+ <input type="hidden" name="localStorageGigabytes"
value="${form.localStorageGigabytes}" />
<input type="hidden" name="diskPath"
value="${form.diskPath}" />
</c:if>
<%@ include
file="/WEB-INF/pages/common/fragments/kickstart/schedule/proxy-options.jspf"
%>
@@ -43,4 +43,4 @@
</td>
</tr>
</table>
- </c:if>
\ No newline at end of file
+ </c:if>
diff --git
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
index 2341873..dc8df8e 100644
---
a/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
+++
b/java/code/webapp/WEB-INF/pages/common/fragments/kickstart/schedule/virt-options.jspf
@@ -27,7 +27,7 @@
<th><bean:message
key="virtualization.provision.first.jsp.storage"/></th>
<td>
<bean:message
key="virtualization.provision.first.jsp.storage.local.message1"/>
- <html:text styleId="localStorageMegabytesId"
property="localStorageMegabytes"
+ <html:text styleId="localStorageGigabytesId"
property="localStorageGigabytes"
maxlength="20" size="6"/>
<bean:message
key="virtualization.provision.first.jsp.storage.local.gigabytes"/>
</td>
diff --git a/java/code/webapp/WEB-INF/struts-config.xml
b/java/code/webapp/WEB-INF/struts-config.xml
index 021f6f7..ee6f3ac 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -814,7 +814,7 @@
<form-property name="virtBridge" type="java.lang.String"
/>
<form-property name="diskPath" type="java.lang.String"
/>
<form-property name="storageType" type="java.lang.String"
/>
- <form-property name="localStorageMegabytes"
type="java.lang.String" />
+ <form-property name="localStorageGigabytes"
type="java.lang.String" />
<form-property name="guestName" type="java.lang.String"
/>
commit 2a66c63b49c80d545b66a6c6763c1784a4fb2640
Author: Uwe Gansert <ug(a)suse.de>
Date: Tue Jun 28 18:20:12 2011 +0200
storage isn't set in MB, but in GB
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 0bedfc6..0b4d2d6 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -2079,7 +2079,7 @@ public class SystemHandler extends BaseHandler {
/**
*
* Provision a guest on the server specified. Defaults to: memory=256MB, vcpu=1,
- * storage=2048MB.
+ * storage=2GB.
*
* @param sessionKey of user making call
* @param sid of server to provision guest on
@@ -2088,7 +2088,7 @@ public class SystemHandler extends BaseHandler {
* @return Returns 1 if successful, exception otherwise
*
* @xmlrpc.doc Provision a guest on the host specified. Defaults to:
- * memory=256MB, vcpu=1, storage=2048MB.
+ * memory=256MB, vcpu=1, storage=2GB.
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.param #param("int", "serverId") - ID of host to
provision guest on.
* @xmlrpc.param #param("string", "guestName")
@@ -2098,7 +2098,7 @@ public class SystemHandler extends BaseHandler {
public int provisionVirtualGuest(String sessionKey, Integer sid, String guestName,
String profileName) {
return provisionVirtualGuest(sessionKey, sid, guestName, profileName,
- new Integer(256), new Integer(1), new Integer(2048));
+ new Integer(256), new Integer(1), new Integer(2));
}
/**
commit 619818bacae4d5e988d2959ffce76feed1562a31
Author: Uwe Gansert <ug(a)suse.de>
Date: Tue Jun 28 18:19:06 2011 +0200
prevent setting virtual bridge to null
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 2f737e1..a003a81 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1528,7 +1528,6 @@ public class ActionManager extends BaseManager {
kad.setDiskGb(pcmd.getLocalStorageSize());
kad.setMemMb(pcmd.getMemoryAllocation().longValue());
- kad.setVirtBridge(pcmd.getVirtBridge());
kad.setDiskPath(pcmd.getFilePath());
kad.setVcpus(new Long(pcmd.getVirtualCpus()));
kad.setGuestName(pcmd.getGuestName());
@@ -1536,6 +1535,13 @@ public class ActionManager extends BaseManager {
Profile cProfile = Profile.lookupById(CobblerXMLRPCHelper.getConnection(
pcmd.getUser()), pcmd.getKsdata().getCobblerId());
+ if (pcmd.getVirtBridge() == null) {
+ kad.setVirtBridge(cProfile.getVirtBridge());
+ }
+ else {
+ kad.setVirtBridge(pcmd.getVirtBridge());
+ }
+
CobblerVirtualSystemCommand vcmd = new CobblerVirtualSystemCommand(
pcmd.getServer(), cProfile.getName(), pcmd.getGuestName(),
pcmd.getKsdata());