apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Bug 13099 - table physical-network-traffic-types needs to be updated when xen network device setting is modified in the global settings

Browse Source 
Changes:
- DB upgrade changes
-- make the global setting hidden.
-- During upgrade set network labels from global config
This commit is contained in:
prachi 2012-02-07 18:40:32 -08:00
parent dbe2305352
commit d0e63bc377
3 changed files with 83 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,41 +109,19 @@ public class Upgrade2214to30 implements DbUpgrade {
// Load all DataCenters
String getNextNetworkSequenceSql = "SELECT value from sequence where name='physical_networks_seq'";
String advanceNetworkSequenceSql = "UPDATE sequence set value=value+1 where name='physical_networks_seq'";
pstmt = conn.prepareStatement("SELECT value FROM configuration where name = 'xen.public.network.device'");
rs = pstmt.executeQuery();
String xenPublicLabel = null;
if (rs.next()) {
xenPublicLabel = rs.getString(1);
}
rs.close();
pstmt.close();
pstmt = conn.prepareStatement("SELECT value FROM configuration where name = 'xen.private.network.device'");
rs = pstmt.executeQuery();
String xenPrivateLabel = null;
if (rs.next()) {
xenPrivateLabel = rs.getString(1);
}
rs.close();
pstmt.close();
String xenPublicLabel = getNetworkLabelFromConfig(conn, "xen.public.network.device");
String xenPrivateLabel = getNetworkLabelFromConfig(conn, "xen.private.network.device");
String xenStorageLabel = getNetworkLabelFromConfig(conn, "xen.storage.network.device1");
String xenGuestLabel = getNetworkLabelFromConfig(conn, "xen.guest.network.device");
pstmt = conn.prepareStatement("SELECT value FROM configuration where name = 'xen.storage.network.device1'");
rs = pstmt.executeQuery();
String xenStorageLabel = null;
if (rs.next()) {
xenStorageLabel = rs.getString(1);
}
rs.close();
pstmt.close();
String kvmPublicLabel = getNetworkLabelFromConfig(conn, "kvm.public.network.device");
String kvmPrivateLabel = getNetworkLabelFromConfig(conn, "kvm.private.network.device");
String kvmGuestLabel = getNetworkLabelFromConfig(conn, "kvm.guest.network.device");
pstmt = conn.prepareStatement("SELECT value FROM configuration where name = 'xen.guest.network.device'");
rs = pstmt.executeQuery();
String xenGuestLabel = null;
if (rs.next()) {
xenGuestLabel = rs.getString(1);
}
rs.close();
pstmt.close();
String vmwarePublicLabel = getNetworkLabelFromConfig(conn, "vmware.public.vswitch");
String vmwarePrivateLabel = getNetworkLabelFromConfig(conn, "vmware.private.vswitch");
String vmwareGuestLabel = getNetworkLabelFromConfig(conn, "vmware.guest.vswitch");
pstmt = conn.prepareStatement("SELECT id, domain_id, networktype, vnet, name FROM data_center");
rs = pstmt.executeQuery();
@ -192,12 +170,14 @@ public class Upgrade2214to30 implements DbUpgrade {
// add traffic types
s_logger.debug("Adding PhysicalNetwork traffic types");
String insertTraficType = "INSERT INTO `cloud`.`physical_network_traffic_types` (physical_network_id, traffic_type, xen_network_label, uuid) VALUES ( ?, ?, ?, ?)";
String insertTraficType = "INSERT INTO `cloud`.`physical_network_traffic_types` (physical_network_id, traffic_type, xen_network_label, kvm_network_label, vmware_network_label, uuid) VALUES ( ?, ?, ?, ?, ?, ?)";
pstmtUpdate = conn.prepareStatement(insertTraficType);
pstmtUpdate.setLong(1, physicalNetworkId);
pstmtUpdate.setString(2, "Public");
pstmtUpdate.setString(3, xenPublicLabel);
pstmtUpdate.setString(4, UUID.randomUUID().toString());
pstmtUpdate.setString(4, kvmPublicLabel);
pstmtUpdate.setString(5, vmwarePublicLabel);
pstmtUpdate.setString(6, UUID.randomUUID().toString());
pstmtUpdate.executeUpdate();
pstmtUpdate.close();
@ -205,7 +185,9 @@ public class Upgrade2214to30 implements DbUpgrade {
pstmtUpdate.setLong(1, physicalNetworkId);
pstmtUpdate.setString(2, "Management");
pstmtUpdate.setString(3, xenPrivateLabel);
pstmtUpdate.setString(4, UUID.randomUUID().toString());
pstmtUpdate.setString(4, kvmPrivateLabel);
pstmtUpdate.setString(5, vmwarePrivateLabel);
pstmtUpdate.setString(6, UUID.randomUUID().toString());
pstmtUpdate.executeUpdate();
pstmtUpdate.close();
@ -213,7 +195,9 @@ public class Upgrade2214to30 implements DbUpgrade {
pstmtUpdate.setLong(1, physicalNetworkId);
pstmtUpdate.setString(2, "Storage");
pstmtUpdate.setString(3, xenStorageLabel);
pstmtUpdate.setString(4, UUID.randomUUID().toString());
pstmtUpdate.setString(4, null);
pstmtUpdate.setString(5, null);
pstmtUpdate.setString(6, UUID.randomUUID().toString());
pstmtUpdate.executeUpdate();
pstmtUpdate.close();
@ -221,7 +205,9 @@ public class Upgrade2214to30 implements DbUpgrade {
pstmtUpdate.setLong(1, physicalNetworkId);
pstmtUpdate.setString(2, "Guest");
pstmtUpdate.setString(3, xenGuestLabel);
pstmtUpdate.setString(4, UUID.randomUUID().toString());
pstmtUpdate.setString(4, kvmGuestLabel);
pstmtUpdate.setString(5, vmwareGuestLabel);
pstmtUpdate.setString(6, UUID.randomUUID().toString());
pstmtUpdate.executeUpdate();
pstmtUpdate.close();
@ -324,6 +310,36 @@ public class Upgrade2214to30 implements DbUpgrade {
}
}
private String getNetworkLabelFromConfig(Connection conn, String name){
String sql = "SELECT value FROM configuration where name = '"+name+"'";
String networkLabel = null;
PreparedStatement pstmt = null;
ResultSet rs = null;
try{
pstmt = conn.prepareStatement(sql);
rs = pstmt.executeQuery();
if (rs.next()) {
networkLabel = rs.getString(1);
}
}catch (SQLException e) {
throw new CloudRuntimeException("Unable to fetch network label from configuration", e);
}finally{
if (rs != null) {
try {
rs.close();
} catch (SQLException e) {
}
}
if (pstmt != null) {
try {
pstmt.close();
} catch (SQLException e) {
}
}
}
return networkLabel;
}
private void encryptData(Connection conn) {
encryptConfigValues(conn);

12
server/test/com/cloud/network/MockNetworkManagerImpl.java
View File

@ -833,4 +833,16 @@ public class MockNetworkManagerImpl implements NetworkManager, Manager, NetworkS
return false;
}
@Override
public String getDefaultManagementTrafficLabel(long zoneId, HypervisorType hypervisorType) {
// TODO Auto-generated method stub
return null;
}
@Override
public String getDefaultStorageTrafficLabel(long zoneId, HypervisorType hypervisorType) {
// TODO Auto-generated method stub
return null;
}
}

18
setup/db/db/schema-2214to30.sql
View File

@ -630,3 +630,21 @@ UPDATE `cloud`.`networks` SET specify_ip_ranges=(SELECT specify_ip_ranges FROM n
ALTER TABLE `cloud`.`networks` ADD COLUMN `specified_cidr` int(1) unsigned NOT NULL DEFAULT 0 COMMENT '1 if the CIDR/gateway/vlan are specified in this network';
DELETE FROM `cloud`.`configuration` WHERE name='network.redundantrouter';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'xen.public.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'xen.storage.network.device1';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'xen.storage.network.device2';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'xen.private.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'xen.guest.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'vmware.private.vswitch';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'vmware.public.vswitch';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'vmware.guest.vswitch';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'ovm.public.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'ovm.private.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'ovm.guest.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'kvm.public.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'kvm.private.network.device';
UPDATE `cloud`.`configuration` SET category = 'Hidden' WHERE name = 'kvm.guest.network.device';