Fix: enable resolve MAC address in ARP proxy mode at gateway node
Change-Id: I43e8e9542e9ff946f44d94990d440e7c401b4956
(cherry picked from commit 0665396cec8341749cd86900fce74173f1ff568c)
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
index 0cdb78b..e71cd1b 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingArpHandler.java
@@ -447,10 +447,6 @@
}
private void setDefaultArpRule(OpenstackNode openstackNode, boolean install) {
- if (openstackNode.type().equals(GATEWAY)) {
- return;
- }
-
if (arpMode.equals(ARP_PROXY_MODE)) {
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchEthType(EthType.EtherType.ARP.ethType().toShort())
@@ -470,6 +466,12 @@
install
);
} else if (arpMode.equals(ARP_BROADCAST_MODE)) {
+ // TODO: currently, do not install any rules to GW in broadcast mode;
+ // need to add Floating IP to MAC mapping flow rules
+ if (openstackNode.type().equals(GATEWAY)) {
+ return;
+ }
+
TrafficSelector selector = DefaultTrafficSelector.builder()
.matchEthType(EthType.EtherType.ARP.ethType().toShort())
.matchArpOp(ARP.OP_REQUEST)