From 4d2877305081bbd3e42b2bbd0fed0c75fbf005b3 Mon Sep 17 00:00:00 2001
From: sangho <sangho@onlab.us>
Date: Thu, 4 Aug 2016 23:24:13 +0900
Subject: [PATCH] [ONOS-5038] Bug fix for "pending_add" flow rules

Corrects deviceIds when build Nicira extension flow rules.

Change-Id: I8dc196d36e5518fe172769b2b957c929a7136d52
---
 .../routing/OpenstackFloatingIpManager.java                   | 4 ++--
 .../openstacknetworking/routing/OpenstackPnatHandler.java     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java b/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
index 236d04d793..b984ecc574 100644
--- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
+++ b/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackFloatingIpManager.java
@@ -241,8 +241,8 @@ public class OpenstackFloatingIpManager implements OpenstackFloatingIpService {
                     .setEthDst(associatedVm.mac())
                     .setIpDst(associatedVm.ipAddresses().stream().findFirst().get())
                     .setTunnelId(Long.valueOf(associatedVm.annotations().value(VXLAN_ID)))
-                    .extension(buildExtension(deviceService, cnodeId, dataIp.get().getIp4Address()),
-                               cnodeId)
+                    .extension(buildExtension(deviceService, gnodeId, dataIp.get().getIp4Address()),
+                               gnodeId)
                     .setOutput(nodeService.tunnelPort(gnodeId).get())
                     .build();
 
diff --git a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java b/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java
index b6c998a6bd..9431e4fc77 100644
--- a/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java
+++ b/apps/openstacknetworking/routing/src/main/java/org/onosproject/openstacknetworking/routing/OpenstackPnatHandler.java
@@ -316,7 +316,7 @@ public class OpenstackPnatHandler {
 
         tBuilder.setIpSrc(externalIp);
         gatewayService.getGatewayNodes().stream().forEach(gateway -> {
-            TrafficTreatment.Builder tmpBuilder = tBuilder;
+            TrafficTreatment.Builder tmpBuilder = DefaultTrafficTreatment.builder(tBuilder.build());
             tmpBuilder.setOutput(gatewayService.getUplinkPort(gateway.getGatewayDeviceId()));
             ForwardingObjective fo = DefaultForwardingObjective.builder()
                     .withSelector(sBuilder.build())
@@ -376,7 +376,7 @@ public class OpenstackPnatHandler {
 
         gatewayService.getGatewayDeviceIds().stream().forEach(deviceId -> {
             DeviceId srcDeviceId = srcVm.get().location().deviceId();
-            TrafficTreatment.Builder tmpBuilder = tBuilder;
+            TrafficTreatment.Builder tmpBuilder = DefaultTrafficTreatment.builder(tBuilder.build());
             tmpBuilder.extension(RulePopulatorUtil.buildExtension(
                     deviceService,
                     deviceId,