Fix vpc provider on service in the offering

Author: harikrishna-patnala

engine/schema/src/main/java/com/cloud/upgrade/DatabaseUpgradeChecker.java

@@ -327,7 +327,10 @@ protected void executeProcedureScripts() {
             Connection conn = txn.getConnection();
 
             for (String filePath : filesPathUnderViewsDirectory) {
-                LOGGER.debug("Executing PROCEDURE script [{}].", filePath);
+                LOGGER.debug(String.format("Executing PROCEDURE script [%s].", filePath));
+                if (filePath.startsWith("/")) {
+                    filePath = filePath.substring(1);
+                }
 
                 InputStream viewScript = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
                 runScript(conn, viewScript);
@@ -439,7 +442,10 @@ protected void executeViewScripts() {
             Connection conn = txn.getConnection();
 
             for (String filePath : filesPathUnderViewsDirectory) {
-                LOGGER.debug("Executing VIEW script [{}].", filePath);
+                LOGGER.debug(String.format("Executing VIEW script [%s].", filePath));
+                if (filePath.startsWith("/")) {
+                    filePath = filePath.substring(1);
+                }
 
                 InputStream viewScript = Thread.currentThread().getContextClassLoader().getResourceAsStream(filePath);
                 runScript(conn, viewScript);

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

@@ -438,7 +438,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                     final Map<Service, Set<Provider>> svcProviderMap = new HashMap<Service, Set<Provider>>();
                     final Set<Provider> defaultProviders = Set.of(Provider.Nsx);
                     for (final Service svc : getSupportedServices()) {
-                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns).contains(svc)) {
+                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns, Service.Firewall).contains(svc)) {
                             final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
                             svcProviderMap.put(svc, userDataProvider);
                         } else {
@@ -456,7 +456,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                     final Map<Service, Set<Provider>> svcProviderMap = new HashMap<>();
                     final Set<Provider> defaultProviders = Set.of(Provider.Nsx);
                     for (final Service svc : getSupportedServices()) {
-                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns).contains(svc)) {
+                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns, Service.Firewall).contains(svc)) {
                             final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
                             svcProviderMap.put(svc, userDataProvider);
                         } else if (List.of(Service.SourceNat, Service.NetworkACL).contains(svc)){
@@ -492,7 +492,7 @@ public void doInTransactionWithoutResult(final TransactionStatus status) {
                     final Map<Service, Set<Provider>> svcProviderMap = new HashMap<>();
                     final Set<Provider> defaultProviders = Set.of(Provider.Netris);
                     for (final Service svc : getSupportedServices()) {
-                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns, Service.Vpn).contains(svc)) {
+                        if (List.of(Service.UserData, Service.Dhcp, Service.Dns, Service.Vpn, Service.Firewall).contains(svc)) {
                             final Set<Provider> userDataProvider = Set.of(Provider.VPCVirtualRouter);
                             svcProviderMap.put(svc, userDataProvider);
                         } else {
@@ -1973,7 +1973,7 @@ protected List<Service> getSupportedServices() {
         services.add(Network.Service.StaticNat);
         services.add(Network.Service.Gateway);
         services.add(Network.Service.Vpn);
-        services.add(Service.Firewall);
+        services.add(Network.Service.Firewall);
         return services;
     }
 

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

@@ -1260,7 +1260,7 @@ private Map<Service, Provider> getServicesAndProvidersForProviderNetwork(Network
         if (forVpc) {
             serviceProviderMap.put(Service.NetworkACL, provider);
         }
-        serviceProviderMap.put(Service.Firewall, provider);
+        serviceProviderMap.put(Service.Firewall, routerProvider);
         if (networkMode == NetworkOffering.NetworkMode.NATTED) {
             serviceProviderMap.put(Service.SourceNat, provider);
             serviceProviderMap.put(Service.StaticNat, provider);