Skip to content

Commit 662356f

Browse files
remove default offering changes
1 parent 8fec093 commit 662356f

1 file changed

Lines changed: 0 additions & 64 deletions

File tree

engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade42210to42300.java

Lines changed: 0 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
package com.cloud.upgrade.dao;
1818

1919
import java.io.InputStream;
20-
import java.util.Arrays;
21-
import java.util.List;
2220
import java.sql.Connection;
2321
import java.sql.PreparedStatement;
2422
import java.sql.ResultSet;
@@ -53,7 +51,6 @@ public InputStream[] getPrepareScripts() {
5351
@Override
5452
public void performDataMigration(Connection conn) {
5553
unhideJsInterpretationEnabled(conn);
56-
updateVpcDefaultOfferingsWithFirewallService(conn);
5754
}
5855

5956
protected void unhideJsInterpretationEnabled(Connection conn) {
@@ -92,65 +89,4 @@ protected void updateJsInterpretationEnabledFields(Connection conn, String encry
9289
logger.warn("Error while decrypting configuration 'js.interpretation.enabled'. The configuration may already be decrypted.");
9390
}
9491
}
95-
96-
private void updateVpcDefaultOfferingsWithFirewallService(Connection conn) {
97-
logger.debug("Updating default VPC offerings to add Firewall service with VpcVirtualRouter provider");
98-
99-
final List<String> defaultVpcOfferingUniqueNames = Arrays.asList(
100-
"DefaultIsolatedNetworkOfferingForVpcNetworks",
101-
"DefaultIsolatedNetworkOfferingForVpcNetworksNoLB",
102-
"DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB",
103-
"DefaultNATNSXNetworkOfferingForVpc",
104-
"DefaultRoutedNSXNetworkOfferingForVpc",
105-
"DefaultNATNSXNetworkOfferingForVpcWithInternalLB",
106-
"DefaultRoutedNetrisNetworkOfferingForVpc",
107-
"DefaultNATNetrisNetworkOfferingForVpc",
108-
"DefaultNSXVPCNetworkOfferingforKubernetesService"
109-
);
110-
111-
try {
112-
for (String uniqueName : defaultVpcOfferingUniqueNames) {
113-
PreparedStatement pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`network_offerings` WHERE unique_name = ?");
114-
pstmt.setString(1, uniqueName);
115-
116-
ResultSet rs = pstmt.executeQuery();
117-
if (!rs.next()) {
118-
continue;
119-
}
120-
121-
long offeringId = rs.getLong(1);
122-
rs.close();
123-
pstmt.close();
124-
125-
// Insert into ntwk_offering_service_map (if not exists)
126-
pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` " +
127-
"(network_offering_id, service, provider, created) " +
128-
"VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
129-
pstmt.setLong(1, offeringId);
130-
pstmt.executeUpdate();
131-
pstmt.close();
132-
133-
// Update existing networks (ntwk_service_map)
134-
pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`networks` WHERE network_offering_id = ?");
135-
pstmt.setLong(1, offeringId);
136-
137-
rs = pstmt.executeQuery();
138-
while (rs.next()) {
139-
long networkId = rs.getLong(1);
140-
PreparedStatement insertService = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_service_map` " +
141-
"(network_id, service, provider, created) " +
142-
"VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
143-
insertService.setLong(1, networkId);
144-
insertService.executeUpdate();
145-
insertService.close();
146-
}
147-
148-
rs.close();
149-
pstmt.close();
150-
}
151-
152-
} catch (SQLException e) {
153-
logger.warn("Exception while updating VPC default offerings with Firewall service: " + e.getMessage(), e);
154-
}
155-
}
15692
}

0 commit comments

Comments
 (0)