Skip to content

Commit d4450b4

Browse files
harikrishna-patnalaharikrishna-patnala
committed
Fix default offerings
1 parent 2aaa7f7 commit d4450b4

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

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

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
import java.util.Arrays;
2525
import java.util.List;
2626

27+
import com.cloud.network.vpc.VpcOffering;
28+
import com.cloud.offering.NetworkOffering;
2729
import com.cloud.utils.exception.CloudRuntimeException;
2830

2931
public class Upgrade42210to42300 extends DbUpgradeAbstractImpl implements DbUpgrade, DbUpgradeSystemVmTemplate {
@@ -59,15 +61,14 @@ private void updateNetworkDefaultOfferingsForVPCWithFirewallService(Connection c
5961
logger.debug("Updating default Network offerings for VPC to add Firewall service with VpcVirtualRouter provider");
6062

6163
final List<String> defaultVpcOfferingUniqueNames = Arrays.asList(
62-
"DefaultIsolatedNetworkOfferingForVpcNetworks",
63-
"DefaultIsolatedNetworkOfferingForVpcNetworksNoLB",
64-
"DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB",
65-
"DefaultNATNSXNetworkOfferingForVpc",
66-
"DefaultRoutedNSXNetworkOfferingForVpc",
67-
"DefaultNATNSXNetworkOfferingForVpcWithInternalLB",
68-
"DefaultRoutedNetrisNetworkOfferingForVpc",
69-
"DefaultNATNetrisNetworkOfferingForVpc",
70-
"DefaultNSXVPCNetworkOfferingforKubernetesService"
64+
NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworks,
65+
NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksNoLB,
66+
NetworkOffering.DefaultIsolatedNetworkOfferingForVpcNetworksWithInternalLB,
67+
NetworkOffering.DEFAULT_NAT_NSX_OFFERING_FOR_VPC,
68+
NetworkOffering.DEFAULT_ROUTED_NSX_OFFERING_FOR_VPC,
69+
NetworkOffering.DEFAULT_NAT_NSX_OFFERING_FOR_VPC_WITH_ILB,
70+
NetworkOffering.DEFAULT_ROUTED_NETRIS_OFFERING_FOR_VPC,
71+
NetworkOffering.DEFAULT_NAT_NETRIS_OFFERING_FOR_VPC
7172
);
7273

7374
try {
@@ -84,8 +85,8 @@ private void updateNetworkDefaultOfferingsForVPCWithFirewallService(Connection c
8485
rs.close();
8586
pstmt.close();
8687

87-
// Insert into ntwk_offering_service_map (if not exists)
88-
pstmt = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_offering_service_map` " +
88+
// Insert into ntwk_offering_service_map
89+
pstmt = conn.prepareStatement("INSERT IGNORE INTO `cloud`.`ntwk_offering_service_map` " +
8990
"(network_offering_id, service, provider, created) " +
9091
"VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
9192
pstmt.setLong(1, offeringId);
@@ -99,7 +100,7 @@ private void updateNetworkDefaultOfferingsForVPCWithFirewallService(Connection c
99100
rs = pstmt.executeQuery();
100101
while (rs.next()) {
101102
long networkId = rs.getLong(1);
102-
PreparedStatement insertService = conn.prepareStatement("INSERT INTO `cloud`.`ntwk_service_map` " +
103+
PreparedStatement insertService = conn.prepareStatement("INSERT INGORE INTO `cloud`.`ntwk_service_map` " +
103104
"(network_id, service, provider, created) " +
104105
"VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
105106
insertService.setLong(1, networkId);
@@ -120,13 +121,13 @@ private void updateVpcOfferingsWithFirewallService(Connection conn) {
120121
logger.debug("Updating default VPC offerings to add Firewall service with VpcVirtualRouter provider");
121122

122123
final List<String> vpcOfferingUniqueNames = Arrays.asList(
123-
"Default VPC offering",
124-
"Default VPC offering with Netscaler",
125-
"Redundant VPC offering",
126-
"VPC offering with NSX - NAT Mode",
127-
"VPC offering with NSX - Route Mode",
128-
"VPC offering with Netris - Route Mode",
129-
"VPC offering with Netris - NAT Mode"
124+
VpcOffering.defaultVPCOfferingName,
125+
VpcOffering.defaultVPCNSOfferingName,
126+
VpcOffering.redundantVPCOfferingName,
127+
VpcOffering.DEFAULT_VPC_NAT_NSX_OFFERING_NAME,
128+
VpcOffering.DEFAULT_VPC_ROUTE_NSX_OFFERING_NAME,
129+
VpcOffering.DEFAULT_VPC_ROUTE_NETRIS_OFFERING_NAME,
130+
VpcOffering.DEFAULT_VPC_NAT_NETRIS_OFFERING_NAME
130131
);
131132

132133
try {
@@ -143,8 +144,8 @@ private void updateVpcOfferingsWithFirewallService(Connection conn) {
143144
rs.close();
144145
pstmt.close();
145146

146-
// Insert into vpc_offering_service_map (if not exists)
147-
pstmt = conn.prepareStatement("INSERT INTO `cloud`.`vpc_offering_service_map` " +
147+
// Insert into vpc_offering_service_map
148+
pstmt = conn.prepareStatement("INSERT IGNORE INTO `cloud`.`vpc_offering_service_map` " +
148149
"(vpc_offering_id, service, provider, created) " +
149150
"VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
150151
pstmt.setLong(1, vpcOfferingId);
@@ -158,7 +159,7 @@ private void updateVpcOfferingsWithFirewallService(Connection conn) {
158159
rs = pstmt.executeQuery();
159160
while (rs.next()) {
160161
long vpcId = rs.getLong(1);
161-
PreparedStatement insertService = conn.prepareStatement("INSERT INTO `cloud`.`vpc_service_map` " +
162+
PreparedStatement insertService = conn.prepareStatement("INSERT IGNORE INTO `cloud`.`vpc_service_map` " +
162163
"(vpc_id, service, provider, created) " +
163164
"VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
164165
insertService.setLong(1, vpcId);

‎server/src/main/java/com/cloud/server/ConfigurationServerImpl.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1134,6 +1134,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
11341134
defaultVpcNetworkOfferingProviders.put(Service.StaticNat, Provider.VPCVirtualRouter);
11351135
defaultVpcNetworkOfferingProviders.put(Service.PortForwarding, Provider.VPCVirtualRouter);
11361136
defaultVpcNetworkOfferingProviders.put(Service.Vpn, Provider.VPCVirtualRouter);
1137+
defaultVpcNetworkOfferingProviders.put(Service.Firewall, Provider.VPCVirtualRouter);
11371138

11381139
for (Map.Entry<Service,Provider> entry : defaultVpcNetworkOfferingProviders.entrySet()) {
11391140
NetworkOfferingServiceMapVO offService =
@@ -1161,6 +1162,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
11611162
defaultVpcNetworkOfferingProvidersNoLB.put(Service.StaticNat, Provider.VPCVirtualRouter);
11621163
defaultVpcNetworkOfferingProvidersNoLB.put(Service.PortForwarding, Provider.VPCVirtualRouter);
11631164
defaultVpcNetworkOfferingProvidersNoLB.put(Service.Vpn, Provider.VPCVirtualRouter);
1165+
defaultVpcNetworkOfferingProvidersNoLB.put(Service.Firewall, Provider.VPCVirtualRouter);
11641166

11651167
for (Map.Entry<Service,Provider> entry : defaultVpcNetworkOfferingProvidersNoLB.entrySet()) {
11661168
NetworkOfferingServiceMapVO offService =
@@ -1186,6 +1188,7 @@ public void doInTransactionWithoutResult(TransactionStatus status) {
11861188
internalLbOffProviders.put(Service.Gateway, Provider.VPCVirtualRouter);
11871189
internalLbOffProviders.put(Service.Lb, Provider.InternalLbVm);
11881190
internalLbOffProviders.put(Service.SourceNat, Provider.VPCVirtualRouter);
1191+
internalLbOffProviders.put(Service.Firewall, Provider.VPCVirtualRouter);
11891192

11901193
for (Service service : internalLbOffProviders.keySet()) {
11911194
NetworkOfferingServiceMapVO offService = new NetworkOfferingServiceMapVO(internalLbOff.getId(), service, internalLbOffProviders.get(service));
@@ -1256,7 +1259,6 @@ private Map<Service, Provider> getServicesAndProvidersForProviderNetwork(Network
12561259
serviceProviderMap.put(Service.UserData, routerProvider);
12571260
if (forVpc) {
12581261
serviceProviderMap.put(Service.NetworkACL, provider);
1259-
} else {
12601262
serviceProviderMap.put(Service.Firewall, provider);
12611263
}
12621264
if (networkMode == NetworkOffering.NetworkMode.NATTED) {

0 commit comments

Comments
 (0)