From 443d7336659c0b80a1a1433583ac8a697fd7f048 Mon Sep 17 00:00:00 2001
From: will <will@cloud.com>
Date: Wed, 12 Jan 2011 17:17:39 -0800
Subject: [PATCH] bug 7803: Fixed use case where virtual networking is
 unavailable.  We will now default the first dedicated network first before
 others.

---
 ui/jsp/instance.jsp               |  2 +-
 ui/scripts/cloud.core.instance.js | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ui/jsp/instance.jsp b/ui/jsp/instance.jsp
index 2442cd37fce..0695126ca78 100644
--- a/ui/jsp/instance.jsp
+++ b/ui/jsp/instance.jsp
@@ -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">
diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index abc90b9cafd..eadb5c67569 100644
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -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);
 										}