weizhouapache commented on code in PR #12706:
URL: https://github.com/apache/cloudstack/pull/12706#discussion_r3232066812
##########
server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java:
##########
@@ -989,15 +989,13 @@ 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.VPCVirtualRouter);
+ &&
(networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(),
Service.Gateway, Provider.VirtualRouter));
Review Comment:
```suggestion
&&
(networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(),
Service.Gateway, Provider.VirtualRouter)
||
networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(),
Service.Gateway, Provider.VPCVirtualRouter));
```
##########
server/src/main/java/org/apache/cloudstack/network/RoutedIpv4ManagerImpl.java:
##########
@@ -989,15 +989,13 @@ 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.VPCVirtualRouter);
+ &&
(networkServiceMapDao.canProviderSupportServiceInNetwork(network.getId(),
Service.Gateway, Provider.VirtualRouter));
}
@Override
public boolean isVirtualRouterGateway(NetworkOffering networkOffering) {
return
NetworkOffering.NetworkMode.ROUTED.equals(networkOffering.getNetworkMode())
- &&
networkOfferingServiceMapDao.canProviderSupportServiceInNetworkOffering(networkOffering.getId(),
Service.Gateway, Provider.VirtualRouter)
- ||
networkOfferingServiceMapDao.canProviderSupportServiceInNetworkOffering(networkOffering.getId(),
Service.Gateway, Provider.VPCVirtualRouter);
+ &&
networkOfferingServiceMapDao.canProviderSupportServiceInNetworkOffering(networkOffering.getId(),
Service.Gateway, Provider.VirtualRouter);
Review Comment:
```suggestion
&&
(networkOfferingServiceMapDao.canProviderSupportServiceInNetworkOffering(networkOffering.getId(),
Service.Gateway, Provider.VirtualRouter)
||
networkOfferingServiceMapDao.canProviderSupportServiceInNetworkOffering(networkOffering.getId(),
Service.Gateway, Provider.VPCVirtualRouter));
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
