From 0a933d050d90a2b0dd393b92bb4d2cfbe459d3b3 Mon Sep 17 00:00:00 2001 From: karanrajsingh Date: Tue, 8 Dec 2015 12:14:53 +0530 Subject: [PATCH] ManagerUpdate/Remove Command Manager Update and Remove Commands done.Updated as per the comments. Redundant HwvtepTunnelUpdateCommand.java removed.Tunnel updates would be handled as a part of PhysicalSwitchUpdate. Updated as per comment for Patchset4 and Patschset6. VlanBindings deletion updated in PhysicalPortUpdateCommand. Updated for comments in Patchset7 Change-Id: I081935a1adbe237e14efb16a0e694e8f912ab617 Signed-off-by: karanrajsingh --- .../HwvtepSouthboundMapper.java | 10 +++ .../md/HwvtepManagerRemoveCommand.java | 48 ++++++++++++ .../md/HwvtepManagerUpdateCommand.java | 73 +++++++++++++++++-- .../HwvtepOperationalCommandAggregator.java | 2 +- .../md/HwvtepTunnelUpdateCommand.java | 41 ----------- .../md/PhysicalPortUpdateCommand.java | 59 ++++++++++----- 6 files changed, 169 insertions(+), 64 deletions(-) create mode 100644 hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerRemoveCommand.java delete mode 100644 hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java index 9ea64e887..cf0cd7a57 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundMapper.java @@ -26,10 +26,13 @@ import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types. import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.ConnectionInfo; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitches; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LogicalSwitchesKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.port.attributes.VlanBindings; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.physical.port.attributes.VlanBindingsKey; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.EncapsulationTypeBase; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.EncapsulationTypeVxlanOverIpv4; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepNodeName; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalPortAugmentation; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.ConnectionInfoBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; @@ -192,4 +195,11 @@ public class HwvtepSouthboundMapper { public static String getRandomUUID() { return "Random_" + java.util.UUID.randomUUID().toString().replace("-", ""); } + + public static InstanceIdentifier createInstanceIdentifier(HwvtepConnectionInstance client, + InstanceIdentifier tpPath, VlanBindings vBindings) { + return tpPath.augmentation(HwvtepPhysicalPortAugmentation.class) .child(VlanBindings.class, + new VlanBindingsKey(vBindings.getKey())); + + } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerRemoveCommand.java new file mode 100644 index 000000000..9e2ba7e6c --- /dev/null +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerRemoveCommand.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ + +package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md; + +import java.util.Collection; +import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; +import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionInstance; +import org.opendaylight.ovsdb.lib.message.TableUpdates; +import org.opendaylight.ovsdb.lib.schema.DatabaseSchema; +import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; +import org.opendaylight.ovsdb.schema.hardwarevtep.Manager; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.Managers; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.ManagersKey; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + +public class HwvtepManagerRemoveCommand extends AbstractTransactionCommand { + + private static final Logger LOG = LoggerFactory.getLogger(HwvtepManagerRemoveCommand.class); + + public HwvtepManagerRemoveCommand(HwvtepConnectionInstance key, TableUpdates updates, + DatabaseSchema dbSchema) { + super(key, updates, dbSchema); + } + + @Override + public void execute(ReadWriteTransaction transaction) { + Collection deletedManagerRows = TyperUtils.extractRowsRemoved(Manager.class, getUpdates(),getDbSchema()).values(); + for (Manager manager : deletedManagerRows) { + InstanceIdentifier managerIid = getOvsdbConnectionInstance().getInstanceIdentifier() + .augmentation(HwvtepGlobalAugmentation.class) + .child(Managers.class, new ManagersKey(new Uri(manager.getTargetColumn().getData()))); + // TODO Delete any references + transaction.delete(LogicalDatastoreType.OPERATIONAL, managerIid); + } + } + +} diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java index 8c8710baf..a037332e4 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepManagerUpdateCommand.java @@ -8,14 +8,31 @@ package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md; +import com.google.common.base.Optional; +import java.util.ArrayList; +import java.util.List; import java.util.Map; +import java.util.Map.Entry; import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; +import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionInstance; +import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundUtil; import org.opendaylight.ovsdb.lib.message.TableUpdates; import org.opendaylight.ovsdb.lib.notation.UUID; import org.opendaylight.ovsdb.lib.schema.DatabaseSchema; import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; import org.opendaylight.ovsdb.schema.hardwarevtep.Manager; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.Managers; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.ManagersBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.managers.ManagerOtherConfigs; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.managers.ManagerOtherConfigsBuilder; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; +import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; +import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -25,16 +42,62 @@ public class HwvtepManagerUpdateCommand extends AbstractTransactionCommand { private Map updatedMgrRows; private Map oldMgrRows; - public HwvtepManagerUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates, - DatabaseSchema dbSchema) { + public HwvtepManagerUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates, DatabaseSchema dbSchema) { super(key, updates, dbSchema); - updatedMgrRows = TyperUtils.extractRowsUpdated(Manager.class, getUpdates(),getDbSchema()); - oldMgrRows = TyperUtils.extractRowsOld(Manager.class, getUpdates(),getDbSchema()); + updatedMgrRows = TyperUtils.extractRowsUpdated(Manager.class, getUpdates(), getDbSchema()); + oldMgrRows = TyperUtils.extractRowsOld(Manager.class, getUpdates(), getDbSchema()); } @Override public void execute(ReadWriteTransaction transaction) { - // TODO Auto-generated method stub + for (Manager manager : updatedMgrRows.values()) { + updateManager(transaction, manager); + } + } + + private void updateManager(ReadWriteTransaction transaction, Manager manager) { + final InstanceIdentifier connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier(); + Optional connection = HwvtepSouthboundUtil.readNode(transaction, connectionIId); + if (connection.isPresent()) { + LOG.debug("Connection {} is present", connection.get()); + Node connectionNode = buildConnectionNode(manager); + transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode); + // TODO: Delete entries that are no longer needed + } + } + + private Node buildConnectionNode(Manager manager) { + // Update node with Manager reference + NodeBuilder connectionNode = new NodeBuilder(); + connectionNode.setNodeId(getOvsdbConnectionInstance().getNodeId()); + HwvtepGlobalAugmentationBuilder hgAugmentationBuilder = new HwvtepGlobalAugmentationBuilder(); + List mList = new ArrayList<>(); + ManagersBuilder mBuilder = new ManagersBuilder(); + if (manager.getTargetColumn().getData() != null && !manager.getTargetColumn().getData().isEmpty()) { + mBuilder.setTarget(new Uri(manager.getTargetColumn().getData())); + } + if (manager.getIsConnectedColumn().getData() != null) { + mBuilder.setIsConnected(manager.getIsConnectedColumn().getData()); + } + ManagerOtherConfigsBuilder mocBuilder = new ManagerOtherConfigsBuilder(); + if (manager.getOtherConfigColumn().getData() != null && !manager.getOtherConfigColumn().getData().isEmpty()) { + List mocList = new ArrayList<>(); + Map ocList = manager.getOtherConfigColumn().getData(); + for (Entry otherConfigEntry : ocList.entrySet()) { + mocBuilder.setOtherConfigKey(otherConfigEntry.getKey()); + mocBuilder.setOtherConfigValue(otherConfigEntry.getValue()); + mocList.add(mocBuilder.build()); + } + mBuilder.setManagerOtherConfigs(mocList); + } + mBuilder.setManagerUuid(new Uuid(manager.getUuid().toString())); + mList.add(mBuilder.build()); + hgAugmentationBuilder.setManagers(mList); + connectionNode.addAugmentation(HwvtepGlobalAugmentation.class, hgAugmentationBuilder.build()); + return connectionNode.build(); + // TODO Deletion of other config } } + + diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepOperationalCommandAggregator.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepOperationalCommandAggregator.java index 747b4b102..2f8d65cb5 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepOperationalCommandAggregator.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepOperationalCommandAggregator.java @@ -26,11 +26,11 @@ public class HwvtepOperationalCommandAggregator implements TransactionCommand { commands.add(new PhysicalSwitchUpdateCommand(key, updates, dbSchema)); commands.add(new PhysicalSwitchRemoveCommand(key, updates, dbSchema)); commands.add(new HwvtepManagerUpdateCommand(key, updates, dbSchema)); + commands.add(new HwvtepManagerRemoveCommand(key, updates, dbSchema)); commands.add(new LogicalSwitchUpdateCommand(key, updates, dbSchema)); commands.add(new LogicalSwitchRemoveCommand(key, updates, dbSchema)); commands.add(new PhysicalPortUpdateCommand(key, updates, dbSchema)); commands.add(new PhysicalPortRemoveCommand(key, updates, dbSchema)); - commands.add(new HwvtepTunnelUpdateCommand(key, updates, dbSchema)); commands.add(new PhysicalLocatorUpdateCommand(key, updates, dbSchema)); commands.add(new PhysicalLocatorRemoveCommand(key, updates, dbSchema)); commands.add(new UcastMacsLocalUpdateCommand(key, updates, dbSchema)); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java deleted file mode 100644 index 3c51cace6..000000000 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepTunnelUpdateCommand.java +++ /dev/null @@ -1,41 +0,0 @@ -/* - * Copyright (c) 2015 Ericsson India Global Services Pvt Ltd. and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ - -package org.opendaylight.ovsdb.hwvtepsouthbound.transactions.md; - -import java.util.Map; - -import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction; -import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionInstance; -import org.opendaylight.ovsdb.lib.message.TableUpdates; -import org.opendaylight.ovsdb.lib.notation.UUID; -import org.opendaylight.ovsdb.lib.schema.DatabaseSchema; -import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils; -import org.opendaylight.ovsdb.schema.hardwarevtep.Tunnel; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -public class HwvtepTunnelUpdateCommand extends AbstractTransactionCommand { - - private static final Logger LOG = LoggerFactory.getLogger(HwvtepTunnelUpdateCommand.class); - private Map updatedTunnelRows; - private Map oldTunnelRows; - - public HwvtepTunnelUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates, - DatabaseSchema dbSchema) { - super(key, updates, dbSchema); - updatedTunnelRows = TyperUtils.extractRowsUpdated(Tunnel.class, getUpdates(),getDbSchema()); - oldTunnelRows = TyperUtils.extractRowsOld(Tunnel.class, getUpdates(),getDbSchema()); - } - - @Override - public void execute(ReadWriteTransaction transaction) { - // TODO Auto-generated method stub - } - -} diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java index dee84a676..b044b548e 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/PhysicalPortUpdateCommand.java @@ -42,6 +42,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPointKey; +import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -74,7 +75,7 @@ public class PhysicalPortUpdateCommand extends AbstractTransactionCommand { Optional node = HwvtepSouthboundUtil.readNode(transaction, connectionIId); if (node.isPresent()) { updateTerminationPoints(transaction, node.get()); - //TODO: Handle Deletion of VLAN Bindings + // TODO: Handle Deletion of VLAN Bindings } } @@ -97,38 +98,62 @@ public class PhysicalPortUpdateCommand extends AbstractTransactionCommand { buildTerminationPoint(tpAugmentationBuilder, pPortUpdate); tpBuilder.addAugmentation(HwvtepPhysicalPortAugmentation.class, tpAugmentationBuilder.build()); if (oldPPRows.containsKey(pPortUpdateEntry.getKey())) { - transaction.merge(LogicalDatastoreType.OPERATIONAL, - tpPath, tpBuilder.build()); + transaction.merge(LogicalDatastoreType.OPERATIONAL, tpPath, tpBuilder.build()); } else { - transaction.put(LogicalDatastoreType.OPERATIONAL, - tpPath, tpBuilder.build()); + transaction.put(LogicalDatastoreType.OPERATIONAL, tpPath, tpBuilder.build()); + } + // Update with Deleted VlanBindings + if (oldPPRows.get(pPortUpdateEntry.getKey()) != null) { + List> vBIiList = new ArrayList<>(); + Map oldVb = oldPPRows.get(pPortUpdateEntry.getKey()).getVlanBindingsColumn().getData(); + Map updatedVb = pPortUpdateEntry.getValue().getVlanBindingsColumn().getData(); + for (Map.Entry oldVbEntry : oldVb.entrySet()) { + Long key = oldVbEntry.getKey(); + if (!updatedVb.containsKey(key)) { + VlanBindings vBindings = createVlanBinding(key, oldVbEntry.getValue()); + InstanceIdentifier vBid = getInstanceIdentifier(tpPath, vBindings); + vBIiList.add(vBid); + } + deleteEntries(transaction, vBIiList); + } } } } } - private void buildTerminationPoint( - HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder, PhysicalPort portUpdate) { + private void deleteEntries(ReadWriteTransaction transaction, + List> entryIids) { + for (InstanceIdentifier entryIid : entryIids) { + transaction.delete(LogicalDatastoreType.OPERATIONAL, entryIid); + } + } + + private InstanceIdentifier getInstanceIdentifier(InstanceIdentifier tpPath, + VlanBindings vBindings) { + return HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), tpPath, vBindings); + } + + private void buildTerminationPoint(HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder, + PhysicalPort portUpdate) { updatePhysicalPortId(portUpdate, tpAugmentationBuilder); updatePort(portUpdate, tpAugmentationBuilder); } - private void updatePort( - PhysicalPort portUpdate, HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) { + private void updatePort(PhysicalPort portUpdate, HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) { updateVlanBindings(portUpdate, tpAugmentationBuilder); tpAugmentationBuilder.setPhysicalPortUuid(new Uuid(portUpdate.getUuid().toString())); } - private void updatePhysicalPortId( - PhysicalPort portUpdate, HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) { + private void updatePhysicalPortId(PhysicalPort portUpdate, + HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) { tpAugmentationBuilder.setHwvtepNodeName(new HwvtepNodeName(portUpdate.getName())); if (portUpdate.getDescription() != null) { tpAugmentationBuilder.setHwvtepNodeDescription(portUpdate.getDescription()); } } - private void updateVlanBindings( - PhysicalPort portUpdate, HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) { + private void updateVlanBindings(PhysicalPort portUpdate, + HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder) { Map vlanBindings = portUpdate.getVlanBindingsColumn().getData(); if (vlanBindings != null && !vlanBindings.isEmpty()) { List vlanBindingsList = new ArrayList<>(); @@ -170,14 +195,14 @@ public class PhysicalPortUpdateCommand extends AbstractTransactionCommand { return Optional.absent(); } - private Optional> getTerminationPointSwitch( - final ReadWriteTransaction transaction, Node node, String tpName) { + private Optional> getTerminationPointSwitch(final ReadWriteTransaction transaction, + Node node, String tpName) { HwvtepGlobalAugmentation hwvtepNode = node.getAugmentation(HwvtepGlobalAugmentation.class); List switchNodes = hwvtepNode.getSwitches(); for (Switches managedNodeEntry : switchNodes) { @SuppressWarnings("unchecked") - Node switchNode = HwvtepSouthboundUtil.readNode(transaction, - (InstanceIdentifier) managedNodeEntry.getSwitchRef().getValue()).get(); + Node switchNode = HwvtepSouthboundUtil + .readNode(transaction, (InstanceIdentifier) managedNodeEntry.getSwitchRef().getValue()).get(); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); TerminationPointKey tpKey = new TerminationPointKey(new TpId(tpName)); tpBuilder.setKey(tpKey); -- 2.36.6