Github user jayapalu commented on a diff in the pull request:
https://github.com/apache/cloudstack/pull/1908#discussion_r110112007
--- Diff: server/src/com/cloud/network/router/CommandSetupHelper.java ---
@@ -848,13 +849,37 @@ public int compare(final PublicIpAddress o1, final
PublicIpAddress o2) {
associatedWithNetworkId = ipAddrList.get(0).getNetworkId();
}
+ // for network if the ips does not have any rules, then only
last ip
+ List<IPAddressVO> userIps =
_ipAddressDao.listByAssociatedNetwork(associatedWithNetworkId, null);
+
+ int ipsWithrules = 0;
+ int ipsStaticNat = 0;
+ for (IPAddressVO ip : userIps) {
+ if ( _rulesDao.countRulesByIpIdAndState(ip.getId(),
FirewallRule.State.Active) > 0 ) {
+ ipsWithrules++;
+ }
+
+ // check onetoonenat and also check if the ip "add":false.
If there are 2 PF remove 1 static nat add
+ if (ip.isOneToOneNat() && ip.getRuleState() == null) {
+ ipsStaticNat++;
+ }
+ }
+
final IpAssocCommand cmd = new IpAssocCommand(ipsToSend);
cmd.setAccessDetail(NetworkElementCommand.ROUTER_IP,
_routerControlHelper.getRouterControlIp(router.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_GUEST_IP,
_routerControlHelper.getRouterIpInNetwork(associatedWithNetworkId,
router.getId()));
cmd.setAccessDetail(NetworkElementCommand.ROUTER_NAME,
router.getInstanceName());
final DataCenterVO dcVo =
_dcDao.findById(router.getDataCenterId());
cmd.setAccessDetail(NetworkElementCommand.ZONE_NETWORK_TYPE,
dcVo.getNetworkType().toString());
+ // if there 1 static nat then it will be checked for remove at
the resource
+ if (ipsWithrules == 0 && ipsStaticNat == 0 ) {
--- End diff --
If we check the ipsStaticNat=1 then we will miss the case of disabling
static nat on network with 1 with static nat.
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
