X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=neutron-ovsdb%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fgroupbasedpolicy%2Fneutron%2Fovsdb%2FOvsdbNodeListener.java;h=09f8c2a23dc2a048170589747fddaaa6a9e33bd7;hb=02dd576a2ff7d7a8c304bd74a239c150be1ddd2b;hp=18018fe1c03c77ea27d45669da52b7a1525f08dc;hpb=41c7620f8b7f2d5bb6ee18ad4e274a5b1d25ad6d;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 18018fe1c..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,15 +7,6 @@ */ package org.opendaylight.groupbasedpolicy.neutron.ovsdb; -import javax.annotation.Nonnull; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -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; @@ -24,6 +15,15 @@ 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; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +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; @@ -92,7 +92,8 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); if (ovsdbNode != null) { LOG.trace("OVSDB node created: {} \n {}", rootIdentifier, node); - DataObjectModification ovsOtherConfigModification = getProviderMappingsModification(rootNode); + DataObjectModification + ovsOtherConfigModification = getProviderMappingsModification(rootNode); boolean integrationBridgePresent = false; if (isProviderPortNameChanged(ovsOtherConfigModification) && ovsdbNode.getManagedNodeEntry() != null) { String newProviderPortName = getProviderPortName(ovsOtherConfigModification.getDataAfter()); @@ -103,7 +104,8 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { 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; } } @@ -113,9 +115,9 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { managerToControllerEntries(ovsdbNode.getManagerEntry()), intBrSettings.getName()); InstanceIdentifier 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() { + WriteTransaction writeTx = dataProvider.newWriteOnlyTransaction(); + writeTx.merge(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid, bridge, true); + Futures.addCallback(writeTx.submit(), new FutureCallback() { @Override public void onSuccess(Void result) { @@ -123,9 +125,9 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { } @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()); } @@ -331,7 +333,7 @@ public class OvsdbNodeListener extends DataTreeChangeHandler { } /** - * 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}.