X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=neutron-ovsdb%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Fneutron%2Fovsdb%2FOvsdbNodeListener.java;h=09f8c2a23dc2a048170589747fddaaa6a9e33bd7;hb=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b;hp=9c8f220ecc6f72c62185f8dd1906fdaf425ed039;hpb=a6fb9c4ffb936edf441121fc2590a5711d914868;p=groupbasedpolicy.git

diff --git a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java
index 9c8f220ec..09f8c2a23 100644
--- a/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java
+++ b/neutron-ovsdb/src/main/java/org/opendaylight/groupbasedpolicy/neutron/ovsdb/OvsdbNodeListener.java
@@ -7,7 +7,14 @@
  */
 package org.opendaylight.groupbasedpolicy.neutron.ovsdb;
 
-import javax.annotation.Nonnull;
+import com.google.common.base.Function;
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableList;
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.FutureCallback;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
+
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
@@ -15,13 +22,8 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
 
-import com.google.common.base.Function;
-import com.google.common.base.Strings;
-import com.google.common.collect.ImmutableList;
-import com.google.common.collect.Lists;
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.util.concurrent.Futures;
-import org.opendaylight.controller.config.yang.config.neutron_ovsdb.impl.IntegrationBridgeSetting;
+import javax.annotation.Nonnull;
+
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.binding.api.DataObjectModification;
 import org.opendaylight.controller.md.sal.binding.api.DataTreeIdentifier;
@@ -32,6 +34,7 @@ import org.opendaylight.groupbasedpolicy.neutron.ovsdb.util.NeutronOvsdbIidFacto
 import org.opendaylight.groupbasedpolicy.util.DataTreeChangeHandler;
 import org.opendaylight.ovsdb.southbound.SouthboundConstants;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Uri;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.groupbasedpolicy.neutron.ovsdb.params.rev160812.IntegrationBridgeSetting;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeConnectorId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.DatapathTypeSystem;
@@ -89,7 +92,8 @@ public class OvsdbNodeListener extends DataTreeChangeHandler<Node> {
         OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class);
         if (ovsdbNode != null) {
             LOG.trace("OVSDB node created: {} \n {}", rootIdentifier, node);
-            DataObjectModification<OpenvswitchOtherConfigs> ovsOtherConfigModification = getProviderMappingsModification(rootNode);
+            DataObjectModification<OpenvswitchOtherConfigs>
+                ovsOtherConfigModification = getProviderMappingsModification(rootNode);
             boolean integrationBridgePresent = false;
             if (isProviderPortNameChanged(ovsOtherConfigModification) && ovsdbNode.getManagedNodeEntry() != null) {
                 String newProviderPortName = getProviderPortName(ovsOtherConfigModification.getDataAfter());
@@ -100,7 +104,8 @@ public class OvsdbNodeListener extends DataTreeChangeHandler<Node> {
                     LOG.trace("Added Provider port name {} by OVSDB bridge ref {}", newProviderPortName,
                             mngdNodeEntry.getBridgeRef());
                     NodeKey managedNodeKey = bridgeRef.getValue().firstKeyOf(Node.class);
-                    if (intBrSettings != null && managedNodeKey.getNodeId().getValue().equals(intBrSettings.getName())) {
+                    if (intBrSettings != null && managedNodeKey.getNodeId().getValue()
+                        .equals(intBrSettings.getName())) {
                         integrationBridgePresent = true;
                     }
                 }
@@ -110,9 +115,9 @@ public class OvsdbNodeListener extends DataTreeChangeHandler<Node> {
                         managerToControllerEntries(ovsdbNode.getManagerEntry()), intBrSettings.getName());
                 InstanceIdentifier<Node> bridgeNodeIid = NeutronOvsdbIidFactory.nodeIid(
                         rootIdentifier.firstKeyOf(Topology.class).getTopologyId(), bridge.getNodeId());
-                WriteTransaction wTx = dataProvider.newWriteOnlyTransaction();
-                wTx.merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true);
-                Futures.addCallback(wTx.submit(), new FutureCallback<Void>() {
+                WriteTransaction writeTx = dataProvider.newWriteOnlyTransaction();
+                writeTx.merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true);
+                Futures.addCallback(writeTx.submit(), new FutureCallback<Void>() {
 
                     @Override
                     public void onSuccess(Void result) {
@@ -120,11 +125,11 @@ public class OvsdbNodeListener extends DataTreeChangeHandler<Node> {
                     }
 
                     @Override
-                    public void onFailure(Throwable t) {
+                    public void onFailure(Throwable throwable) {
                         LOG.error("Failed to write bridge {}. Message: {}" + bridge.getNodeId().getValue(),
-                                t.getMessage());
+                                throwable.getMessage());
                     }
-                });
+                }, MoreExecutors.directExecutor());
             }
         }
         OvsdbBridgeAugmentation ovsdbBridge = node.getAugmentation(OvsdbBridgeAugmentation.class);
@@ -328,7 +333,7 @@ public class OvsdbNodeListener extends DataTreeChangeHandler<Node> {
     }
 
     /**
-     * Extracts IP address from URI
+     * Extracts IP address from URI.
      *
      * @param uri in format protocol:ip:port
      * @return IPv4 or IPv6 address as {@link String}.