BUG-5291:Flows are not removed from control and compute nodes.

  * When the VM instance is deleted from control and compute nodes,
  * Found still flows are existed in table-40 and table-90 in L2 scenario.

Signed-off-by: hari.pr <hari.pr@hcl.com>
Change-Id: I6e0873e979cdbd8dc3037fe012477413faf95a92
(cherry picked from commit ad36780546ecbe1adbf9f081fca0f1eca7287713)

diff --git a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java
index cf425470994e2a841672a1dd57cfecb43d4bdeb2..b927cc06c34f91a081bca6854fde4fc987ff9df3 100644 (file)
--- a/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java
+++ b/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronSubnetInterface.java
@@ -147,7 +147,6 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Neu
         result.setNetworkUUID(subnet.getNetworkId().getValue());
         result.setIpVersion(IPV_MAP.get(subnet.getIpVersion()));
         result.setCidr(subnet.getCidr());
-        result.setGatewayIP(String.valueOf(subnet.getGatewayIp().getValue()));
         result.setIpV6RaMode(DHCPV6_MAP.get(subnet.getIpv6RaMode()));
         result.setIpV6AddressMode(DHCPV6_MAP.get(subnet.getIpv6AddressMode()));
         result.setEnableDHCP(subnet.isEnableDhcp());
@@ -177,6 +176,9 @@ public class NeutronSubnetInterface extends AbstractNeutronInterface<Subnet, Neu
             .fetchINeutronPortCRUD(this);
         INeutronPortCRUD portIf = interfaces.getPortInterface();
         for (NeutronPort port : portIf.getAllPorts()) {
+            if (port.getDeviceOwner().equalsIgnoreCase("network:router_interface")) {
+                result.setGatewayIP(String.valueOf(subnet.getGatewayIp().getValue()));
+            }
             if (port.getFixedIPs() != null) {
                 for (Neutron_IPs ip : port.getFixedIPs()) {
                     if (ip.getSubnetUUID().equals(result.getID())) {