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

update vlan uris 

Conflicts:
	engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
This commit is contained in:
Daan Hoogland 2014-05-30 22:32:37 +02:00
parent ab89eb106f
commit 44012ddadf
1 changed files with 37 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
engine/schema/src/com/cloud/upgrade/dao/Upgrade430to440.java
View File

@ -26,6 +26,7 @@ import java.sql.SQLException;
import org.apache.log4j.Logger;
import com.cloud.network.Network;
import com.cloud.network.Networks.BroadcastDomainType;
import com.cloud.utils.exception.CloudRuntimeException;
import com.cloud.utils.script.Script;
@ -62,7 +63,7 @@ public class Upgrade430to440 implements DbUpgrade {
secondaryIpsAccountAndDomainIdsUpdate(conn);
moveCidrsToTheirOwnTable(conn);
addExtractTemplateAndVolumeColumns(conn);
updateVlanUris(conn);
}
private void addExtractTemplateAndVolumeColumns(Connection conn) {
@ -284,6 +285,41 @@ public class Upgrade430to440 implements DbUpgrade {
s_logger.debug("Done moving network acl item cidrs to a row per cidr");
}
private void updateVlanUris(Connection conn) {
s_logger.debug("updating vlan URIs");
PreparedStatement pstmt = null;
ResultSet rs = null;
try {
pstmt = conn.prepareStatement("SELECT id, vlan_id FROM `cloud`.`vlan` where vlan_id not like '%:%'");
rs = pstmt.executeQuery();
while (rs.next()) {
long id = rs.getLong(1);
String vlan = rs.getString(2);
if (vlan == null || "".equals(vlan)) {
continue;
}
String vlanUri = BroadcastDomainType.Vlan.toUri(vlan).toString();
pstmt = conn.prepareStatement("update `cloud`.`vlan` set vlan_id=? where id=?");
pstmt.setString(1, vlanUri);
pstmt.setLong(2, id);
pstmt.executeUpdate();
}
} catch (SQLException e) {
throw new CloudRuntimeException("Unable to update vlan URIs ", e);
} finally {
try {
if (rs != null) {
rs.close();
}
if (pstmt != null) {
pstmt.close();
}
} catch (SQLException e) {
}
}
s_logger.debug("Done updateing vlan URIs");
}
@Override
public File[] getCleanupScripts() {