java/code/src/com/redhat/rhn/common/conf/Config.java | 10 ++++++ java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java | 15 ++++++++++ java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java | 13 ++++++++ java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java | 4 +- java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java | 2 - 5 files changed, 41 insertions(+), 3 deletions(-)
New commits: commit 827aefe6a7b13bff7b6b9db297f975dc7b7bf46d Author: Mike McCune mmccune@gibson.pdx.redhat.com Date: Tue Jun 30 11:44:03 2009 -0700
508790 - use virbr0 for KVM guest defaults
diff --git a/java/code/src/com/redhat/rhn/common/conf/Config.java b/java/code/src/com/redhat/rhn/common/conf/Config.java index ad40462..5106870 100644 --- a/java/code/src/com/redhat/rhn/common/conf/Config.java +++ b/java/code/src/com/redhat/rhn/common/conf/Config.java @@ -794,6 +794,16 @@ public class Config { public String getDefaultXenVirtBridge() { return getString(VIRT_BRIDGE, "xenbr0"); } + + /** + * Returns the default value for the xen virt bridge + * @return the value for virt bridge. + */ + public String getDefaultKVMVirtBridge() { + return getString(VIRT_BRIDGE, "virbr0"); + } + + /** * Returns the default virt disk size in GBs * @return the virt disk size diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java index b1d4c91..88feacc 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/KickstartData.java @@ -1483,4 +1483,19 @@ public class KickstartData { this.kickstartType = kickstartTypeIn; }
+ /** + * Get the default virt bridge for this KickstartData object. + * + * @return String virt bridge (xenbr0, virbr0) + */ + public String getDefaultVirtBridge() { + if (this.getKickstartDefaults().getVirtualizationType().getLabel() + .equals(KickstartVirtualizationType.KVM_FULLYVIRT)) { + return Config.get().getDefaultKVMVirtBridge(); + } + else { + return Config.get().getDefaultXenVirtBridge(); + } + } + } diff --git a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java index a75cbc3..317055d 100644 --- a/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java +++ b/java/code/src/com/redhat/rhn/domain/kickstart/test/KickstartDataTest.java @@ -757,4 +757,17 @@ public class KickstartDataTest extends BaseTestCaseWithUser { assertTrue(k.isRhel5OrGreater()); assertFalse(k.isRhel5()); } + + public void testDefaultBridge() throws Exception { + KickstartData k = createKickstartWithChannel(user.getOrg()); + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.kvmGuest()); + + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultKVMVirtBridge())); + + k.getKickstartDefaults(). + setVirtualizationType(KickstartVirtualizationType.xenPV()); + + assertTrue(k.getDefaultVirtBridge().equals(Config.get().getDefaultXenVirtBridge())); + } } diff --git a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java index 1e65b36..e2fb148 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/kickstart/KickstartDetailsEditAction.java @@ -152,14 +152,14 @@ public class KickstartDetailsEditAction extends BaseKickstartEditAction { if (!type.equals(KickstartVirtualizationType.paraHost()) && !type.equals(KickstartVirtualizationType.none())) { if (prof == null) { - form.set(VIRT_BRIDGE, Config.get().getDefaultXenVirtBridge()); + form.set(VIRT_BRIDGE, data.getDefaultVirtBridge()); form.set(VIRT_CPU, Config.get().getDefaultVirtCpus()); form.set(VIRT_DISK_SIZE, Config.get().getDefaultVirtDiskSize()); form.set(VIRT_MEMORY, Config.get().getDefaultVirtMemorySize()); } else { setFormValueOrDefault(form, VIRT_BRIDGE, prof.getVirtBridge(), - Config.get().getDefaultXenVirtBridge()); + data.getDefaultVirtBridge()); setFormValueOrDefault(form, VIRT_CPU, prof.getVirtCpus(), Config.get().getDefaultVirtCpus()); setFormValueOrDefault(form, VIRT_DISK_SIZE, prof.getVirtFileSize(), diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java index 510967c..6f52d29 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerProfileCreateCommand.java @@ -75,7 +75,7 @@ public class CobblerProfileCreateCommand extends CobblerProfileCommand { meta.put("org", ksData.getOrg().getId().toString()); prof.setKsMeta(meta); KickstartFactory.saveKickstartData(this.ksData); - prof.setVirtBridge(Config.get().getDefaultXenVirtBridge()); + prof.setVirtBridge(this.ksData.getDefaultVirtBridge()); prof.setVirtCpus(Config.get().getDefaultVirtCpus()); prof.setVirtRam(Config.get().getDefaultVirtMemorySize()); prof.setVirtFileSize(Config.get().getDefaultVirtDiskSize());
spacewalk-commits@lists.fedorahosted.org