etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

bug 7803: Fixed use case where virtual networking is unavailable. We will now default the first dedicated network first before others.

This commit is contained in:
will 2011-01-12 17:17:39 -08:00
parent 63978f09ea
commit 443d733665
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ui/jsp/instance.jsp
View File

@ -356,7 +356,7 @@
<!-- VM Primary Network Template (begin) -->
<div class="vmpopup_offeringbox" id="wizard_network_direct_template" style="display:none">
<input type="radio" name="primary_network" class="radio" id="network_direct_checkbox" />
<input type="radio" name="primary_network" class="radio" id="network_direct_checkbox" checked="checked" />
<label class="label" id="network_direct_name">
</label>
<div class="vmpopup_offdescriptionbox">

16
ui/scripts/cloud.core.instance.js
View File

@ -849,6 +849,7 @@ function initVMWizard() {
// Setup Virtual Networks
var requiredVirtual = false;
var defaultNetworkAdded = false;
if (virtualNetwork == null) {
$.ajax({
data: createURL("command=listNetworkOfferings&traffictype=Guest"),
@ -872,6 +873,7 @@ function initVMWizard() {
requiredVirtual = true;
$virtualNetworkElement.find("#network_virtual").attr('disabled', true);
}
defaultNetworkAdded = true;
$virtualNetworkElement.find("#network_virtual").data("id", network.id).data("jsonObj", network);
} else {
$virtualNetworkElement.hide();
@ -890,6 +892,7 @@ function initVMWizard() {
requiredVirtual = true;
$virtualNetworkElement.find("#network_virtual").attr('disabled', true);
}
defaultNetworkAdded = true;
$virtualNetworkElement.data("id", virtualNetwork.id);
$virtualNetworkElement.find("#network_virtual").data("id", virtualNetwork.id).data("jsonObj", virtualNetwork);
} else {
@ -902,8 +905,7 @@ function initVMWizard() {
var $networkSecondaryDirectTemplate = $("#wizard_network_direct_secondary_template");
var $networkDirectContainer = $("#network_direct_container").empty();
var $networkDirectSecondaryContainer = $("#network_direct_secondary_container").empty();
var availableSecondary = false;
var defaultNetworkAdded = false;
if (networks != null && networks.length > 0) {
for (var i = 0; i < networks.length; i++) {
if (networks[i].type != 'Direct') {
@ -915,10 +917,11 @@ function initVMWizard() {
continue;
}
$directNetworkElement = $networkDirectTemplate.clone().attr("id", "direct"+networks[i].id);
if (i == 0) {
if (defaultNetworkAdded || i > 0) {
// Only check the first default network
$directNetworkElement.find("#network_direct_checkbox").attr("checked", "checked");
$directNetworkElement.find("#network_direct_checkbox").removeAttr("checked");
}
defaultNetworkAdded = true;
} else {
$directNetworkElement = $networkSecondaryDirectTemplate.clone().attr("id", "direct"+networks[i].id);
}
@ -951,10 +954,11 @@ function initVMWizard() {
continue;
}
$directNetworkElement = $networkDirectTemplate.clone().attr("id", "direct"+sharedNetworks[i].id);
if (i == 0) {
if (defaultNetworkAdded || i > 0) {
// Only check the first default network
$directNetworkElement.find("#network_direct_checkbox").attr("checked", "checked");
$directNetworkElement.find("#network_direct_checkbox").removeAttr("checked");
}
defaultNetworkAdded = true;
} else {
$directNetworkElement = $networkSecondaryDirectTemplate.clone().attr("id", "direct"+sharedNetworks[i].id);
}