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

Merge branch '3.0.3' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.3 

Reviewed-By:Sanjay
This commit is contained in:
Pranav Saxena 2012-07-10 23:58:08 +05:30
parent 8a0b910194 65d43a37da
commit a9ccb3a74a
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
server/src/com/cloud/upgrade/dao/Upgrade2214to30.java
View File

@ -193,6 +193,7 @@ public class Upgrade2214to30 extends Upgrade30xBase implements DbUpgrade {
//Clean up any vnets that have no live networks/nics
pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL");
pstmt4.setLong(1, zoneId);
rsVNet = pstmt4.executeQuery();
while(rsVNet.next()){
Long vnet_id = rsVNet.getLong(1);

1
server/src/com/cloud/upgrade/dao/Upgrade303to304.java
View File

@ -173,6 +173,7 @@ public class Upgrade303to304 extends Upgrade30xBase implements DbUpgrade {
//Clean up any vnets that have no live networks/nics
pstmt4 = conn.prepareStatement("SELECT v.id, v.vnet, v.reservation_id FROM `cloud`.`op_dc_vnet_alloc` v LEFT JOIN networks n ON CONCAT('vlan://' , v.vnet) = n.broadcast_uri WHERE v.taken IS NOT NULL AND v.data_center_id = ? AND n.broadcast_uri IS NULL AND n.removed IS NULL");
pstmt4.setLong(1, zoneId);
rsVNet = pstmt4.executeQuery();
while(rsVNet.next()){
Long vnet_id = rsVNet.getLong(1);