Update server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java

harikrishna-patnala · weizhouapache · web-flow · commit 128449a773ff · 2026-05-13T12:17:59.000+05:30
Co-authored-by: Wei Zhou &lt;weizhou@apache.org&gt;
diff --git a/server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java b/server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java
@@ -989,7 +989,8 @@ public boolean applyRoutingFirewallRule(long id) {
     @Override
     public boolean isVirtualRouterGateway(Network network) {
         return isRoutedNetwork(network)
-                && (networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), Service.Gateway, Provider.VirtualRouter));
+                && (networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), Service.Gateway, Provider.VirtualRouter)
+                || networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), Service.Gateway, Provider.VPCVirtualRouter));
     }
 
     @Override

Original file line number	Diff line number	Diff line change
`@@ -989,7 +989,8 @@ public boolean applyRoutingFirewallRule(long id) {`
`989`	`989`	`@Override`
`990`	`990`	`public boolean isVirtualRouterGateway(Network network) {`
`991`	`991`	`return isRoutedNetwork(network)`
`992`		`- && (networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), Service.Gateway, Provider.VirtualRouter));`
	`992`	`+ && (networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), Service.Gateway, Provider.VirtualRouter)`
	`993`	`+ \|\| networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(), Service.Gateway, Provider.VPCVirtualRouter));`
`993`	`994`	`}`
`994`	`995`
`995`	`996`	`@Override`