Revert "Fix: only reply ARP request from external router"
This reverts commit 8fb1ef7a00a5b0c9703dae13ce3a342d4b7aa86b.
Change-Id: I2e8c9f0344e0ad80a2d289779a54f13fc7775375
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
index 5b5e8a7..6e9d71b 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackRoutingFloatingIpHandler.java
@@ -507,17 +507,15 @@
GW_COMMON_TABLE,
install);
- setArpRule(floatingIp, instPort.macAddress(), externalPeerRouter, selectedGatewayNode, install);
+ setArpRule(floatingIp, instPort.macAddress(), selectedGatewayNode, install);
}
private void setArpRule(NetFloatingIP floatingIp, MacAddress targetMac,
- ExternalPeerRouter externalPeerRouter,
OpenstackNode gateway, boolean install) {
- if (ARP_BROADCAST_MODE.equals(getArpMode()) && externalPeerRouter.ipAddress() != null) {
+ if (ARP_BROADCAST_MODE.equals(getArpMode())) {
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchInPort(gateway.uplinkPortNum())
.matchEthType(EthType.EtherType.ARP.ethType().toShort())
- .matchArpSpa(Ip4Address.valueOf(externalPeerRouter.ipAddress().toString()))
.matchArpOp(ARP.OP_REQUEST)
.matchArpTpa(Ip4Address.valueOf(floatingIp.getFloatingIpAddress()))
.build();