on Monday 27 June 2011 Uwe Gansert wrote:
> Do you have an idea how to fix that in a clean way?
I attach a new patch suggestion here. It's a version I'm more happy with than
with the patch yesterday..
I test the virt_bridge now before it goes into the database and in case it
null, I set it to the value from the profile.
The 2048GB patch is attached too.
--
ciao, Uwe Gansert
Uwe Gansert
SUSE LINUX Products GmbH, HRB 16746 (AG Nürnberg)
GF: Jeff Hawn, Jennifer Guild, Felix Imendörffer
Home: http://www.suse.de/~ug - Blog: http://suse.gansert.net
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 d67598e..7055f3b 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
@@ -2078,7 +2078,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
@@ -2087,7 +2087,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")
@@ -2097,7 +2097,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));
}
/**
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..6e77c54 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,12 @@ 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());
_______________________________________________
Spacewalk-devel mailing list
[email protected]
https://www.redhat.com/mailman/listinfo/spacewalk-devel
