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

bug 9475: don't update vlan in "networks" tab for non-implemented guest networks 

status 9475: resolved fixed
This commit is contained in:
alena 2011-04-15 12:00:41 -07:00
parent c6fee4b718
commit fcdf791645
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
server/src/com/cloud/upgrade/dao/Upgrade218to22.java
View File

@ -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]);