default offering changes

Author: harikrishna-patnala

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

@@ -51,11 +51,12 @@ public InputStream[] getPrepareScripts() {
 
     @Override
     public void performDataMigration(Connection conn) {
-        updateVpcDefaultOfferingsWithFirewallService(conn);
+        updateNetworkDefaultOfferingsForVPCWithFirewallService(conn);
+        updateVpcOfferingsWithFirewallService(conn);
     }
 
-    private void updateVpcDefaultOfferingsWithFirewallService(Connection conn) {
-        logger.debug("Updating default VPC offerings to add Firewall service with VpcVirtualRouter provider");
+    private void updateNetworkDefaultOfferingsForVPCWithFirewallService(Connection conn) {
+        logger.debug("Updating default Network offerings for VPC to add Firewall service with VpcVirtualRouter provider");
 
         final List<String> defaultVpcOfferingUniqueNames = Arrays.asList(
                 "DefaultIsolatedNetworkOfferingForVpcNetworks",
@@ -114,4 +115,63 @@ private void updateVpcDefaultOfferingsWithFirewallService(Connection conn) {
             logger.warn("Exception while updating VPC default offerings with Firewall service: " + e.getMessage(), e);
         }
     }
+
+    private void updateVpcOfferingsWithFirewallService(Connection conn) {
+        logger.debug("Updating default VPC offerings to add Firewall service with VpcVirtualRouter provider");
+
+        final List<String> vpcOfferingUniqueNames = Arrays.asList(
+                "Default VPC offering",
+                "Default VPC  offering with Netscaler",
+                "Redundant VPC offering",
+                "VPC offering with NSX - NAT Mode",
+                "VPC offering with NSX - Route Mode",
+                "VPC offering with Netris - Route Mode",
+                "VPC offering with Netris - NAT Mode"
+        );
+
+        try {
+            for (String uniqueName : vpcOfferingUniqueNames) {
+                PreparedStatement pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`vpc_offerings` WHERE unique_name = ?");
+                pstmt.setString(1, uniqueName);
+
+                ResultSet rs = pstmt.executeQuery();
+                if (!rs.next()) {
+                    continue;
+                }
+
+                long vpcOfferingId = rs.getLong(1);
+                rs.close();
+                pstmt.close();
+
+                // Insert into vpc_offering_service_map (if not exists)
+                pstmt = conn.prepareStatement("INSERT INTO `cloud`.`vpc_offering_service_map` " +
+                        "(vpc_offering_id, service, provider, created) " +
+                        "VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
+                pstmt.setLong(1, vpcOfferingId);
+                pstmt.executeUpdate();
+                pstmt.close();
+
+                // Update existing VPCs
+                pstmt = conn.prepareStatement("SELECT id FROM `cloud`.`vpcs` WHERE vpc_offering_id = ?");
+                pstmt.setLong(1, vpcOfferingId);
+
+                rs = pstmt.executeQuery();
+                while (rs.next()) {
+                    long vpcId = rs.getLong(1);
+                    PreparedStatement insertService = conn.prepareStatement("INSERT INTO `cloud`.`vpc_service_map` " +
+                            "(vpc_id, service, provider, created) " +
+                            "VALUES (?, 'Firewall', 'VpcVirtualRouter', now())");
+                    insertService.setLong(1, vpcId);
+                    insertService.executeUpdate();
+                    insertService.close();
+                }
+
+                rs.close();
+                pstmt.close();
+            }
+
+        } catch (SQLException e) {
+            logger.warn("Exception while updating VPC offerings with Firewall service: " + e.getMessage(), e);
+        }
+    }
 }

plugins/integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterManagerImpl.java

@@ -2713,8 +2713,8 @@ private void createNetworkOfferingForKubernetes(String offeringName, String offe
         defaultKubernetesServiceNetworkOfferingProviders.put(Service.UserData, provider);
         if (forVpc) {
             defaultKubernetesServiceNetworkOfferingProviders.put(Service.NetworkACL, forNsx ? Network.Provider.Nsx : provider);
+            defaultKubernetesServiceNetworkOfferingProviders.put(Service.Firewall, Network.Provider.VPCVirtualRouter);
         }
-        defaultKubernetesServiceNetworkOfferingProviders.put(Service.Firewall, forNsx ? Network.Provider.Nsx : provider);
         defaultKubernetesServiceNetworkOfferingProviders.put(Service.Lb, forNsx ? Network.Provider.Nsx : provider);
         defaultKubernetesServiceNetworkOfferingProviders.put(Service.SourceNat, forNsx ? Network.Provider.Nsx : provider);
         defaultKubernetesServiceNetworkOfferingProviders.put(Service.StaticNat, forNsx ? Network.Provider.Nsx : provider);

server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java

@@ -329,7 +329,7 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis
 
     private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker"));
     private List<VpcProvider> vpcElements = null;
-    private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall);
+    private final List<Service> nonSupportedServices = Arrays.asList(Service.SecurityGroup);
     private final List<Provider> supportedProviders = Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp, Provider.InternalLbVm, Provider.Netscaler,
             Provider.JuniperContrailVpcRouter, Provider.Ovs, Provider.BigSwitchBcf, Provider.ConfigDrive, Provider.Nsx, Provider.Netris);