From fcdf79164555ad65cc5a9e625c8a99b9b686f782 Mon Sep 17 00:00:00 2001 From: alena Date: Fri, 15 Apr 2011 12:00:41 -0700 Subject: [PATCH] bug 9475: don't update vlan in "networks" tab for non-implemented guest networks status 9475: resolved fixed --- server/src/com/cloud/upgrade/dao/Upgrade218to22.java | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/server/src/com/cloud/upgrade/dao/Upgrade218to22.java b/server/src/com/cloud/upgrade/dao/Upgrade218to22.java index 6377fa490dc..3b1e1af173b 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade218to22.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade218to22.java @@ -987,9 +987,15 @@ public class Upgrade218to22 implements DbUpgrade { reservationId = dcId + "-" + vnet; state = "Implemented"; } - long virtualNetworkId = insertNetwork(conn, "VirtualNetwork" + router[0], "Virtual Network for " + router[0], "Guest", "Vlan", "vlan://" + vnet, (String) router[3], - (String) dc[1], "Dhcp", 6, dcId, "ExternalGuestNetworkGuru", state, (Long) router[1], (Long) router[2], (String) router[5], (String) router[6], "Virtual", false, - (String) router[4], true, reservationId); + + String vlan = null; + if (vnet != null) { + vlan = "vlan://" + vnet; + } + + long virtualNetworkId = insertNetwork(conn, "VirtualNetwork" + router[0], "Virtual Network for " + router[0], "Guest", "Vlan", vlan, (String) router[3], (String) dc[1], + "Dhcp", 6, dcId, "ExternalGuestNetworkGuru", state, (Long) router[1], (Long) router[2], (String) router[5], (String) router[6], "Virtual", false, (String) router[4], + true, reservationId); pstmt = conn.prepareStatement("UPDATE domain_router SET network_id = ? wHERE id = ? "); pstmt.setLong(1, virtualNetworkId); pstmt.setLong(2, (Long) router[0]);