commit 75e3d7f7bd5dcf278b0e3c0588bcdb091e0108e3
author Daniel Park <dan.park@sk.com> Tue May 29 14:43:53 2018 +0900
committer Daniel Park <dan.park@sk.com> Tue May 29 14:43:53 2018 +0900
tree c9552bea7efe4fd7b434bce6aadd2a75a4c9f24d
parent 5cdf3ac81005008edafefbb6260e89d4197ca6aa

Fixes OpenstackRoutingFloatingIpHandler don't create illegal upstream rules in case of multiple gateway nodes.

Change-Id: Icf831e4d08873370ef2cba0a82c73941f5676731

apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java

diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
index 5dab60f..205602d 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackNetworkManager.java
@@ -393,19 +393,13 @@
             return;
         }
 
-        String upLinkPort = gatewayNode.uplinkPort();
-
-        org.onosproject.net.Port port = deviceService.getPorts(gatewayNode.intgBridge()).stream()
-                .filter(p -> Objects.equals(p.annotations().value(PORT_NAME), upLinkPort))
-                .findAny().orElse(null);
-
-        if (port == null) {
+        if (gatewayNode.uplinkPortNum() == null) {
             log.warn("There's no uplink port for gateway node {}", gatewayNode.toString());
             return;
         }
 
         TrafficTreatment treatment = DefaultTrafficTreatment.builder()
-                .setOutput(port.number())
+                .setOutput(gatewayNode.uplinkPortNum())
                 .build();
 
         packetService.emit(new DefaultOutboundPacket(