From: Vishal Thapar Date: Tue, 15 May 2018 17:07:23 +0000 (+0530) Subject: TSC-101: Fixup Augmentable and Identifiable methods change X-Git-Tag: release/fluorine~36 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=8268b2a995fad8fc9b64671f3e46c046d0c4ba99;p=ovsdb.git TSC-101: Fixup Augmentable and Identifiable methods change This is a fixup of the change in binding codegen, adjusting: - getKey() -> key() - setKey() -> withKey() - getAugmentation() -> augmentation() Change-Id: I5158dd9f133470150c80bf5cc20766c58fdbbf4b Signed-off-by: Vishal Thapar --- diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java index c6a52d9a2..8a7514aa4 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepConnectionManager.java @@ -266,8 +266,8 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo public HwvtepConnectionInstance getConnectionInstance(Node node) { Preconditions.checkNotNull(node); - HwvtepGlobalAugmentation hwvtepGlobal = node.getAugmentation(HwvtepGlobalAugmentation.class); - PhysicalSwitchAugmentation switchNode = node.getAugmentation(PhysicalSwitchAugmentation.class); + HwvtepGlobalAugmentation hwvtepGlobal = node.augmentation(HwvtepGlobalAugmentation.class); + PhysicalSwitchAugmentation switchNode = node.augmentation(PhysicalSwitchAugmentation.class); if (hwvtepGlobal != null) { if (hwvtepGlobal.getConnectionInfo() != null) { return getConnectionInstance(hwvtepGlobal.getConnectionInfo()); @@ -505,7 +505,7 @@ public class HwvtepConnectionManager implements OvsdbConnectionListener, AutoClo public void onSuccess(@Nonnull Optional node) { if (node.isPresent()) { HwvtepGlobalAugmentation augmentation = node.get() - .getAugmentation(HwvtepGlobalAugmentation.class); + .augmentation(HwvtepGlobalAugmentation.class); if (augmentation == null || augmentation.getConnectionInfo() == null) { return; } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListener.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListener.java index 2305bae5e..2a0442bc8 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListener.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepDataChangeListener.java @@ -116,7 +116,7 @@ public class HwvtepDataChangeListener implements ClusteredDataTreeChangeListener final DataObjectModification mod = change.getRootNode(); Node node = getCreated(mod); if (node != null) { - HwvtepGlobalAugmentation hwvtepGlobal = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hwvtepGlobal = node.augmentation(HwvtepGlobalAugmentation.class); // We can only connect if user configured connection info if (hwvtepGlobal != null && hwvtepGlobal.getConnectionInfo() != null) { ConnectionInfo connection = hwvtepGlobal.getConnectionInfo(); @@ -143,8 +143,8 @@ public class HwvtepDataChangeListener implements ClusteredDataTreeChangeListener Node updated = getUpdated(mod); if (updated != null) { Node original = getOriginal(mod); - HwvtepGlobalAugmentation hgUpdated = updated.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation hgOriginal = original.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hgUpdated = updated.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hgOriginal = original.augmentation(HwvtepGlobalAugmentation.class); // Check if user has updated connection information if (hgUpdated != null && hgOriginal != null && hgUpdated.getConnectionInfo() != null && !hgUpdated.getConnectionInfo().equals(hgOriginal.getConnectionInfo())) { @@ -187,7 +187,7 @@ public class HwvtepDataChangeListener implements ClusteredDataTreeChangeListener final DataObjectModification mod = change.getRootNode(); Node deleted = getRemoved(mod); if (deleted != null) { - HwvtepGlobalAugmentation hgDeleted = deleted.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hgDeleted = deleted.augmentation(HwvtepGlobalAugmentation.class); if (hgDeleted != null) { try { hcm.disconnect(hgDeleted); @@ -275,7 +275,7 @@ public class HwvtepDataChangeListener implements ClusteredDataTreeChangeListener result.get(connection).add(change); } } else { - LOG.warn("Failed to get the connection of changed node: {}", node.getKey().getNodeId().getValue()); + LOG.warn("Failed to get the connection of changed node: {}", node.key().getNodeId().getValue()); } } LOG.trace("Connection Change Map: {}", result); 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 6e90b233a..259df1fb0 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 @@ -142,7 +142,7 @@ public final class HwvtepSouthboundMapper { public static InstanceIdentifier createInstanceIdentifier(HwvtepConnectionInstance client, InstanceIdentifier tpPath, VlanBindings vlanBindings) { return tpPath.augmentation(HwvtepPhysicalPortAugmentation.class).child(VlanBindings.class, - new VlanBindingsKey(vlanBindings.getKey())); + new VlanBindingsKey(vlanBindings.key())); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java index 22708262a..a6598d7fd 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepSouthboundUtil.java @@ -110,7 +110,7 @@ public final class HwvtepSouthboundUtil { if (node instanceof HwvtepGlobalAugmentation) { hwvtepNode = (HwvtepGlobalAugmentation) node; } else if (node != null) { - hwvtepNode = node.getAugmentation(HwvtepGlobalAugmentation.class); + hwvtepNode = node.augmentation(HwvtepGlobalAugmentation.class); } if (hwvtepNode != null) { return Optional.of(hwvtepNode); @@ -202,7 +202,7 @@ public final class HwvtepSouthboundUtil { } public static Integer getRemotePort(Node node) { - HwvtepGlobalAugmentation augmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getConnectionInfo() != null) { return augmentation.getConnectionInfo().getRemotePort().getValue(); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/GlobalConfigOperationalChangeGetter.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/GlobalConfigOperationalChangeGetter.java index 41ad9072b..977346943 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/GlobalConfigOperationalChangeGetter.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/GlobalConfigOperationalChangeGetter.java @@ -34,8 +34,8 @@ public final class GlobalConfigOperationalChangeGetter { NodeBuilder newNodeBuilder = getNodeBuilderFromNode(configNode); NodeBuilder oldNodeBuilder = getNodeBuilderFromNode(opNode); - HwvtepGlobalAugmentationBuilder newAugmentation = getAugmentationFromNode(configNode); - HwvtepGlobalAugmentationBuilder oldAugmentation = getAugmentationFromNode(opNode); + HwvtepGlobalAugmentationBuilder newAugmentation = augmentationFromNode(configNode); + HwvtepGlobalAugmentationBuilder oldAugmentation = augmentationFromNode(opNode); //fire removal of local ucast macs so that logical switches will be deleted fillLocalMacsToBeRemoved(oldAugmentation, configNode, opNode); @@ -59,10 +59,10 @@ public final class GlobalConfigOperationalChangeGetter { } static List getLocalUcastMacsToBeRemoved(Node opNode, final Set removedSwitchNames) { - if (opNode == null || opNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (opNode == null || opNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return null; } - List localUcastMacs = opNode.getAugmentation(HwvtepGlobalAugmentation.class) + List localUcastMacs = opNode.augmentation(HwvtepGlobalAugmentation.class) .getLocalUcastMacs(); if (localUcastMacs == null) { return null; @@ -75,10 +75,10 @@ public final class GlobalConfigOperationalChangeGetter { } static List getLocalMcastMacsToBeRemoved(Node opNode, final Set removedSwitchNames) { - if (opNode == null || opNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (opNode == null || opNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return null; } - List localMcastMacs = opNode.getAugmentation(HwvtepGlobalAugmentation.class) + List localMcastMacs = opNode.augmentation(HwvtepGlobalAugmentation.class) .getLocalMcastMacs(); if (localMcastMacs == null) { return null; @@ -96,11 +96,11 @@ public final class GlobalConfigOperationalChangeGetter { List cfgLogicalSwitches = new ArrayList<>(); List opLogicalSwitches = new ArrayList<>(); - if (opNode != null && opNode.getAugmentation(HwvtepGlobalAugmentation.class) != null) { - opLogicalSwitches = opNode.getAugmentation(HwvtepGlobalAugmentation.class).getLogicalSwitches(); + if (opNode != null && opNode.augmentation(HwvtepGlobalAugmentation.class) != null) { + opLogicalSwitches = opNode.augmentation(HwvtepGlobalAugmentation.class).getLogicalSwitches(); } - if (configNode != null && configNode.getAugmentation(HwvtepGlobalAugmentation.class) != null) { - cfgLogicalSwitches = configNode.getAugmentation(HwvtepGlobalAugmentation.class).getLogicalSwitches(); + if (configNode != null && configNode.augmentation(HwvtepGlobalAugmentation.class) != null) { + cfgLogicalSwitches = configNode.augmentation(HwvtepGlobalAugmentation.class).getLogicalSwitches(); } if (opLogicalSwitches != null) { for (LogicalSwitches ls : opLogicalSwitches) { @@ -116,11 +116,11 @@ public final class GlobalConfigOperationalChangeGetter { return removedSwitchNames; } - static HwvtepGlobalAugmentationBuilder getAugmentationFromNode(Node node) { + static HwvtepGlobalAugmentationBuilder augmentationFromNode(Node node) { if (node == null) { return new HwvtepGlobalAugmentationBuilder(); } - HwvtepGlobalAugmentation src = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation src = node.augmentation(HwvtepGlobalAugmentation.class); HwvtepGlobalAugmentationBuilder builder = new HwvtepGlobalAugmentationBuilder(); if (src != null) { builder.setLogicalSwitches(src.getLogicalSwitches()); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationManager.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationManager.java index 5f55a23b4..ed95d7ae8 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationManager.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationManager.java @@ -60,8 +60,8 @@ public class HwvtepReconciliationManager implements ClusteredDataTreeChangeListe final DataObjectModification mod = change.getRootNode(); Node deleted = getRemoved(mod); if (deleted != null) { - if (deleted.getAugmentation(HwvtepGlobalAugmentation.class) != null) { - LOG.trace("Cancel config reconciliation for node {}", deleted.getKey()); + if (deleted.augmentation(HwvtepGlobalAugmentation.class) != null) { + LOG.trace("Cancel config reconciliation for node {}", deleted.key()); hcm.stopConfigurationReconciliation(key); } } @@ -73,12 +73,12 @@ public class HwvtepReconciliationManager implements ClusteredDataTreeChangeListe DataObjectModification mod = change.getRootNode(); Node node = getCreated(mod); if (node != null) { - PhysicalSwitchAugmentation physicalSwitch = node.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation physicalSwitch = node.augmentation(PhysicalSwitchAugmentation.class); if (physicalSwitch != null) { HwvtepConnectionInstance connection = hcm.getConnectionInstance(physicalSwitch); if (connection != null) { - LOG.trace("Reconcile config for node {}, IP : {}", node.getKey(), + LOG.trace("Reconcile config for node {}, IP : {}", node.key(), connection.getConnectionInfo().getRemoteAddress()); hcm.reconcileConfigurations(connection, node); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java index 939ebef1f..ab94f6bc0 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/HwvtepReconciliationTask.java @@ -74,13 +74,13 @@ public class HwvtepReconciliationTask extends ReconciliationTask { changes.add(change); if (globalConfigNode != null) { - HwvtepGlobalAugmentation augmentation = globalConfigNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = globalConfigNode.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null) { if (augmentation.getLogicalSwitches() != null) { for (LogicalSwitches logicalSwitches : augmentation.getLogicalSwitches()) { connectionInstance.getDeviceInfo().updateConfigData(LogicalSwitches.class, nodeId.augmentation(HwvtepGlobalAugmentation.class).child(LogicalSwitches.class, - logicalSwitches.getKey()), logicalSwitches); + logicalSwitches.key()), logicalSwitches); } } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/SwitchConfigOperationalChangeGetter.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/SwitchConfigOperationalChangeGetter.java index 17dd3a531..9de05bcf1 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/SwitchConfigOperationalChangeGetter.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/reconciliation/configuration/SwitchConfigOperationalChangeGetter.java @@ -68,7 +68,7 @@ public final class SwitchConfigOperationalChangeGetter { TerminationPointBuilder terminationPointBuilder = new TerminationPointBuilder(tp); terminationPointBuilder.removeAugmentation(HwvtepPhysicalPortAugmentation.class); - HwvtepPhysicalPortAugmentation augmentation = tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + HwvtepPhysicalPortAugmentation augmentation = tp.augmentation(HwvtepPhysicalPortAugmentation.class); HwvtepPhysicalPortAugmentationBuilder builder = new HwvtepPhysicalPortAugmentationBuilder(); if (augmentation != null) { builder = new HwvtepPhysicalPortAugmentationBuilder(augmentation); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java index 8086cb6c4..e4503bbc8 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/AbstractTransactCommand.java @@ -180,14 +180,14 @@ public abstract class AbstractTransactCommand> augType = (Class>) parameterizedType.getActualTypeArguments()[1]; - Augmentation augmentation = node.getAugmentation(augType); + Augmentation augmentation = node.augmentation(augType); return (A) augmentation; } @@ -196,7 +196,7 @@ public abstract class AbstractTransactCommand getData(Node node) { - A augmentation = getAugmentation(node); + A augmentation = augmentation(node); if (augmentation != null) { List data = getData(augmentation); if (data != null) { @@ -317,7 +317,7 @@ public abstract class AbstractTransactCommand) @@ -145,9 +145,9 @@ public class HwvtepOperationalState { if (readNode.isPresent()) { operationalNodes.put(entry.getKey(), readNode.get()); HwvtepGlobalAugmentation hgAugmentation = - readNode.get().getAugmentation(HwvtepGlobalAugmentation.class); + readNode.get().augmentation(HwvtepGlobalAugmentation.class); PhysicalSwitchAugmentation psAugmentation = - readNode.get().getAugmentation(PhysicalSwitchAugmentation.class); + readNode.get().augmentation(PhysicalSwitchAugmentation.class); if (hgAugmentation != null && hgAugmentation.getSwitches() != null) { for (Switches pswitch : hgAugmentation.getSwitches()) { @SuppressWarnings("unchecked") @@ -184,7 +184,7 @@ public class HwvtepOperationalState { Preconditions.checkNotNull(iid); Optional nodeOptional = getGlobalNode(iid); if (nodeOptional.isPresent()) { - return Optional.fromNullable(nodeOptional.get().getAugmentation(HwvtepGlobalAugmentation.class)); + return Optional.fromNullable(nodeOptional.get().augmentation(HwvtepGlobalAugmentation.class)); } return Optional.absent(); } @@ -193,7 +193,7 @@ public class HwvtepOperationalState { Preconditions.checkNotNull(iid); Optional nodeOptional = getGlobalNode(iid); if (nodeOptional.isPresent()) { - return Optional.fromNullable(nodeOptional.get().getAugmentation(PhysicalSwitchAugmentation.class)); + return Optional.fromNullable(nodeOptional.get().augmentation(PhysicalSwitchAugmentation.class)); } return Optional.absent(); } @@ -219,7 +219,7 @@ public class HwvtepOperationalState { } if (lswitchList != null) { for (LogicalSwitches lswitch: lswitchList) { - if (lswitch.getKey().equals(logicalSwitchesKey)) { + if (lswitch.key().equals(logicalSwitchesKey)) { return Optional.fromNullable(lswitch); } } @@ -244,7 +244,7 @@ public class HwvtepOperationalState { } if (tunnelList != null) { for (Tunnels tunnel: tunnelList) { - if (tunnel.getKey().equals(tunnelsKey)) { + if (tunnel.key().equals(tunnelsKey)) { return Optional.fromNullable(tunnel); } } @@ -266,7 +266,7 @@ public class HwvtepOperationalState { List tpList = nodeOptional.get(); for (TerminationPoint tp : tpList) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null && hppAugmentation.getHwvtepNodeName().equals(hwvtepNodeName)) { return Optional.fromNullable(hppAugmentation); } @@ -283,7 +283,7 @@ public class HwvtepOperationalState { List tpList = nodeOptional.get(); for (TerminationPoint tp : tpList) { HwvtepPhysicalLocatorAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalLocatorAugmentation.class); + tp.augmentation(HwvtepPhysicalLocatorAugmentation.class); if (hppAugmentation != null && hppAugmentation.getDstIp().equals(dstIp) && hppAugmentation.getEncapsulationType().equals(encapType)) { return Optional.fromNullable(hppAugmentation); @@ -297,7 +297,7 @@ public class HwvtepOperationalState { getPhysicalLocatorAugmentation(InstanceIdentifier iid) { Optional tp = new MdsalUtils(db).readOptional(LogicalDatastoreType.OPERATIONAL, iid); if (tp.isPresent()) { - return Optional.fromNullable(tp.get().getAugmentation(HwvtepPhysicalLocatorAugmentation.class)); + return Optional.fromNullable(tp.get().augmentation(HwvtepPhysicalLocatorAugmentation.class)); } return Optional.absent(); } @@ -313,7 +313,7 @@ public class HwvtepOperationalState { } if (macList != null) { for (LocalMcastMacs mac: macList) { - if (mac.getKey().equals(key)) { + if (mac.key().equals(key)) { return Optional.fromNullable(mac); } } @@ -333,7 +333,7 @@ public class HwvtepOperationalState { } if (macList != null) { for (RemoteMcastMacs mac: macList) { - if (mac.getKey().equals(key)) { + if (mac.key().equals(key)) { return Optional.fromNullable(mac); } } @@ -353,7 +353,7 @@ public class HwvtepOperationalState { } if (macList != null) { for (LocalUcastMacs mac: macList) { - if (mac.getKey().equals(key)) { + if (mac.key().equals(key)) { return Optional.fromNullable(mac); } } @@ -373,7 +373,7 @@ public class HwvtepOperationalState { } if (macList != null) { for (RemoteUcastMacs mac: macList) { - if (mac.getKey().equals(key)) { + if (mac.key().equals(key)) { return Optional.fromNullable(mac); } } @@ -390,7 +390,7 @@ public class HwvtepOperationalState { HwvtepGlobalAugmentation hgAugmentation = nodeOptional.get(); if (hgAugmentation != null && hgAugmentation.getLogicalRouters() != null) { for (LogicalRouters lrouter: hgAugmentation.getLogicalRouters()) { - if (lrouter.getKey().equals(logicalRoutersKey)) { + if (lrouter.key().equals(logicalRoutersKey)) { return Optional.fromNullable(lrouter); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java index 5224ee686..ffad4ed9b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalRouterRemoveCommand.java @@ -77,7 +77,7 @@ public class LogicalRouterRemoveCommand extends AbstractTransactCommand operationalRouterOptional = - getOperationalState().getLogicalRouters(instanceIdentifier, lrouter.getKey()); + getOperationalState().getLogicalRouters(instanceIdentifier, lrouter.key()); if (operationalRouterOptional.isPresent() && operationalRouterOptional.get().getLogicalRouterUuid() != null) { @@ -101,6 +101,6 @@ public class LogicalRouterRemoveCommand extends AbstractTransactCommand routerList) { for (LogicalRouters lrouter: routerList) { InstanceIdentifier routerKey = instanceIdentifier - .augmentation(HwvtepGlobalAugmentation.class).child(LogicalRouters.class, lrouter.getKey()); + .augmentation(HwvtepGlobalAugmentation.class).child(LogicalRouters.class, lrouter.key()); LOG.debug("Creating logical router named: {}", lrouter.getHwvtepNodeName()); final Optional operationalRouterOptional = - getOperationalState().getLogicalRouters(instanceIdentifier, lrouter.getKey()); + getOperationalState().getLogicalRouters(instanceIdentifier, lrouter.key()); LogicalRouter logicalRouter = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), LogicalRouter.class); setDescription(logicalRouter, lrouter); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java index d73da13d7..7bd5cdbaf 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/LogicalSwitchRemoveCommand.java @@ -81,7 +81,7 @@ public class LogicalSwitchRemoveCommand extends AbstractTransactCommand nodeIid, final List lswitchList) { for (LogicalSwitches lswitch: lswitchList) { InstanceIdentifier lsKey = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(LogicalSwitches.class, lswitch.getKey()); + .child(LogicalSwitches.class, lswitch.key()); onConfigUpdate(transaction, nodeIid, lswitch, lsKey); } } @@ -146,7 +146,7 @@ public class LogicalSwitchRemoveCommand extends AbstractTransactCommand nodeIid, final List lswitchList) { for (LogicalSwitches lswitch: lswitchList) { InstanceIdentifier lsKey = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(LogicalSwitches.class, lswitch.getKey()); + .child(LogicalSwitches.class, lswitch.key()); onConfigUpdate(transaction, nodeIid, lswitch, lsKey); } } @@ -148,6 +148,6 @@ public class LogicalSwitchUpdateCommand extends AbstractTransactCommand operationalMacOptional = - getOperationalState().getLocalMcastMacs(instanceIdentifier, mac.getKey()); + getOperationalState().getLocalMcastMacs(instanceIdentifier, mac.key()); McastMacsLocal mcastMacsLocal = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), McastMacsLocal.class, null); if (operationalMacOptional.isPresent() && operationalMacOptional.get().getMacEntryUuid() != null) { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java index b07a193c4..8a8ed9bb7 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsLocalUpdateCommand.java @@ -55,7 +55,7 @@ public class McastMacsLocalUpdateCommand extends AbstractTransactCommand operationalMacOptional = - getOperationalState().getLocalMcastMacs(instanceIdentifier, localMcastMac.getKey()); + getOperationalState().getLocalMcastMacs(instanceIdentifier, localMcastMac.key()); McastMacsLocal mcastMacsLocal = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), McastMacsLocal.class); setIpAddress(mcastMacsLocal, localMcastMac); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java index af57c2e52..640f60a43 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/McastMacsRemoteRemoveCommand.java @@ -73,7 +73,7 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand nodeIid, final List macList) { for (RemoteMcastMacs mac : macList) { InstanceIdentifier macKey = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(RemoteMcastMacs.class, mac.getKey()); + .child(RemoteMcastMacs.class, mac.key()); onConfigUpdate(transaction, nodeIid, mac, macKey); } } @@ -120,7 +120,7 @@ public class McastMacsRemoteRemoveCommand extends AbstractTransactCommand macIid = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(RemoteMcastMacs.class, remoteMcastMac.getKey()); + .child(RemoteMcastMacs.class, remoteMcastMac.key()); processDependencies(MCAST_MAC_DATA_VALIDATOR, transaction, nodeIid, macIid, remoteMcastMac); } @@ -158,7 +158,7 @@ public class McastMacsRemoteUpdateCommand extends AbstractTransactCommand { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java index 21b3adfba..5860036e8 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortRemoveCommand.java @@ -94,7 +94,7 @@ public class PhysicalPortRemoveCommand extends AbstractTransactCommand { if (removed.getTerminationPoint() != null) { for (TerminationPoint tp : removed.getTerminationPoint()) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null) { lswitchListRemoved.add(hppAugmentation); } @@ -115,7 +115,7 @@ public class PhysicalPortRemoveCommand extends AbstractTransactCommand { if (updated.getTerminationPoint() != null) { for (TerminationPoint tp : updated.getTerminationPoint()) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null) { portListUpdated.add(hppAugmentation); } @@ -124,7 +124,7 @@ public class PhysicalPortRemoveCommand extends AbstractTransactCommand { if (before.getTerminationPoint() != null) { for (TerminationPoint tp : before.getTerminationPoint()) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null) { portListBefore.add(hppAugmentation); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java index 3cc5d61c8..7a23175d1 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalPortUpdateCommand.java @@ -225,7 +225,7 @@ public class PhysicalPortUpdateCommand extends AbstractTransactCommand { if (created.getTerminationPoint() != null) { for (TerminationPoint tp : created.getTerminationPoint()) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null) { portListUpdated.add(hppAugmentation); } @@ -253,7 +253,7 @@ public class PhysicalPortUpdateCommand extends AbstractTransactCommand { if (updated.getTerminationPoint() != null) { for (TerminationPoint tp : updated.getTerminationPoint()) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null) { portListUpdated.add(hppAugmentation); } @@ -262,7 +262,7 @@ public class PhysicalPortUpdateCommand extends AbstractTransactCommand { if (before.getTerminationPoint() != null) { for (TerminationPoint tp : before.getTerminationPoint()) { HwvtepPhysicalPortAugmentation hppAugmentation = - tp.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tp.augmentation(HwvtepPhysicalPortAugmentation.class); if (hppAugmentation != null) { portListBefore.add(hppAugmentation); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java index d7fbb4a95..f28a29fd9 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchRemoveCommand.java @@ -88,7 +88,7 @@ public class PhysicalSwitchRemoveCommand extends AbstractTransactCommand { Node removed = TransactUtils.getRemoved(mod); if (removed != null) { PhysicalSwitchAugmentation physicalSwitch = - removed.getAugmentation(PhysicalSwitchAugmentation.class); + removed.augmentation(PhysicalSwitchAugmentation.class); if (physicalSwitch != null) { result.put(key, physicalSwitch); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java index 22ecb3140..1e8f0b0c1 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/PhysicalSwitchUpdateCommand.java @@ -178,7 +178,7 @@ public class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { //TODO: needs more testing if (physicalSwitchAugmentation.getTunnels() != null) { for (Tunnels tunnel : physicalSwitchAugmentation.getTunnels()) { - Optional opTunnelOpt = getOperationalState().getTunnels(iid, tunnel.getKey()); + Optional opTunnelOpt = getOperationalState().getTunnels(iid, tunnel.key()); Tunnel newTunnel = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Tunnel.class); UUID localUUID = getLocatorUUID(transaction, @@ -306,7 +306,7 @@ public class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { Node created = TransactUtils.getCreated(mod); if (created != null) { PhysicalSwitchAugmentation physicalSwitch = - created.getAugmentation(PhysicalSwitchAugmentation.class); + created.augmentation(PhysicalSwitchAugmentation.class); if (physicalSwitch != null) { result.put(key, physicalSwitch); } @@ -326,7 +326,7 @@ public class PhysicalSwitchUpdateCommand extends AbstractTransactCommand { Node updated = TransactUtils.getUpdated(mod); if (updated != null) { PhysicalSwitchAugmentation physicalSwitch = - updated.getAugmentation(PhysicalSwitchAugmentation.class); + updated.augmentation(PhysicalSwitchAugmentation.class); if (physicalSwitch != null) { result.put(key, physicalSwitch); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java index aaebf21cf..d7142d01c 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalRemoveCommand.java @@ -53,7 +53,7 @@ public class UcastMacsLocalRemoveCommand extends AbstractTransactCommand operationalMacOptional = - getOperationalState().getLocalUcastMacs(instanceIdentifier, mac.getKey()); + getOperationalState().getLocalUcastMacs(instanceIdentifier, mac.key()); UcastMacsLocal ucastMacsLocal = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), UcastMacsLocal.class, null); if (operationalMacOptional.isPresent() && operationalMacOptional.get().getMacEntryUuid() != null) { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java index 49a363712..52b20d5b6 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsLocalUpdateCommand.java @@ -58,7 +58,7 @@ public class UcastMacsLocalUpdateCommand extends AbstractTransactCommand operationalMacOptional = - getOperationalState().getLocalUcastMacs(instanceIdentifier, localUcastMac.getKey()); + getOperationalState().getLocalUcastMacs(instanceIdentifier, localUcastMac.key()); UcastMacsLocal ucastMacsLocal = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), UcastMacsLocal.class); setIpAddress(ucastMacsLocal, localUcastMac); @@ -125,7 +125,7 @@ public class UcastMacsLocalUpdateCommand extends AbstractTransactCommand macIid = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(RemoteUcastMacs.class, remoteUcastMacs.getKey()); + .child(RemoteUcastMacs.class, remoteUcastMacs.key()); processDependencies(null, transaction, nodeIid, macIid, remoteUcastMacs); } @@ -76,7 +76,7 @@ public class UcastMacsRemoteRemoveCommand extends AbstractTransactCommand macIid = instanceIdentifier.augmentation(HwvtepGlobalAugmentation.class) - .child(RemoteUcastMacs.class, mac.getKey()); + .child(RemoteUcastMacs.class, mac.key()); HwvtepDeviceInfo.DeviceData deviceData = getOperationalState().getDeviceInfo().getDeviceOperData(RemoteUcastMacs.class, macIid); UcastMacsRemote ucastMacsRemote = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java index 898a00341..b8f46140a 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transact/UcastMacsRemoteUpdateCommand.java @@ -69,7 +69,7 @@ public class UcastMacsRemoteUpdateCommand extends AbstractTransactCommand macIid = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(RemoteUcastMacs.class, remoteUcastMacs.getKey()); + .child(RemoteUcastMacs.class, remoteUcastMacs.key()); processDependencies(UCAST_MAC_DATA_VALIDATOR, transaction, nodeIid, macIid, remoteUcastMacs); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java index 998348eec..2249ef95f 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepGlobalRemoveCommand.java @@ -49,7 +49,7 @@ public class HwvtepGlobalRemoveCommand extends AbstractTransactionCommand { Optional hwvtepGlobalOptional = hwvtepGlobalFuture.get(); if (hwvtepGlobalOptional.isPresent()) { Node hwvtepNode = hwvtepGlobalOptional.get(); - HwvtepGlobalAugmentation hgAugmentation = hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hgAugmentation = hwvtepNode.augmentation(HwvtepGlobalAugmentation.class); if (checkIfOnlyConnectedManager(hgAugmentation)) { if (hgAugmentation != null) { if (hgAugmentation.getSwitches() != null) { diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalRouterUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalRouterUpdateCommand.java index c389a3709..46fcb5d0b 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalRouterUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalRouterUpdateCommand.java @@ -94,7 +94,7 @@ public class HwvtepLogicalRouterUpdateCommand extends AbstractTransactionCommand lrBuilder.setHwvtepNodeDescription(router.getDescription()); HwvtepNodeName hwvtepName = new HwvtepNodeName(router.getName()); lrBuilder.setHwvtepNodeName(hwvtepName); - lrBuilder.setKey(new LogicalRoutersKey(hwvtepName)); + lrBuilder.withKey(new LogicalRoutersKey(hwvtepName)); setSwitchBindings(router, lrBuilder); setStaticRoutes(router, lrBuilder); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalSwitchUpdateCommand.java index 5ef23b09a..ed6bee039 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalSwitchUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepLogicalSwitchUpdateCommand.java @@ -93,7 +93,7 @@ public class HwvtepLogicalSwitchUpdateCommand extends AbstractTransactionCommand } HwvtepNodeName hwvtepName = new HwvtepNodeName(logicalSwitch.getName()); lsBuilder.setHwvtepNodeName(hwvtepName); - lsBuilder.setKey(new LogicalSwitchesKey(hwvtepName)); + lsBuilder.withKey(new LogicalSwitchesKey(hwvtepName)); if (logicalSwitch.getTunnelKeyColumn().getData() != null && !logicalSwitch.getTunnelKeyColumn().getData().isEmpty()) { lsBuilder.setTunnelKey(logicalSwitch.getTunnelKeyColumn().getData().iterator().next().toString()); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepMcastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepMcastMacsRemoteUpdateCommand.java index cdb26a723..0ca381133 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepMcastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepMcastMacsRemoteUpdateCommand.java @@ -75,7 +75,7 @@ public class HwvtepMcastMacsRemoteUpdateCommand extends AbstractTransactionComma InstanceIdentifier getMacIid(InstanceIdentifier connectionIId, Node connectionNode) { RemoteMcastMacsKey macsKey = - connectionNode.getAugmentation(HwvtepGlobalAugmentation.class).getRemoteMcastMacs().get(0).getKey(); + connectionNode.augmentation(HwvtepGlobalAugmentation.class).getRemoteMcastMacs().get(0).key(); InstanceIdentifier key = connectionIId.augmentation(HwvtepGlobalAugmentation.class) .child(RemoteMcastMacs.class, macsKey); return key; diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java index 917c78d2a..24badcd5d 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalLocatorUpdateCommand.java @@ -62,7 +62,7 @@ public class HwvtepPhysicalLocatorUpdateCommand extends AbstractTransactionComma TerminationPointKey tpKey = HwvtepSouthboundMapper.getTerminationPointKey(locator); if (nodeIid != null && tpKey != null) { TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); InstanceIdentifier tpPath = HwvtepSouthboundMapper.createInstanceIdentifier(nodeIid, locator); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java index 8fe06bc50..47bf5db6a 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalPortUpdateCommand.java @@ -118,7 +118,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand if (switchIid.isPresent()) { TerminationPointKey tpKey = new TerminationPointKey(new TpId(portName)); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); InstanceIdentifier tpPath = getInstanceIdentifier(switchIid.get(), portUpdate); HwvtepPhysicalPortAugmentationBuilder tpAugmentationBuilder = @@ -180,7 +180,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand new FutureCallback>() { @Override public void onSuccess(@Nonnull Optional optionalConfigTp) { - if (!optionalConfigTp.isPresent() || optionalConfigTp.get().getAugmentation( + if (!optionalConfigTp.isPresent() || optionalConfigTp.get().augmentation( HwvtepPhysicalPortAugmentation.class) == null) { //TODO port came with some vlan bindings clean them up use PortRemovedCommand return; @@ -196,7 +196,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand PhysicalPortUpdateCommand portUpdateCommand = new PhysicalPortUpdateCommand( operState, Collections.EMPTY_LIST); portUpdateCommand.updatePhysicalPort(transactionBuilder, psIid, - Lists.newArrayList(configTp.getAugmentation(HwvtepPhysicalPortAugmentation.class))); + Lists.newArrayList(configTp.augmentation(HwvtepPhysicalPortAugmentation.class))); }); } @@ -261,7 +261,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand private VlanBindings createVlanBinding(Long key, UUID value) { VlanBindingsBuilder vbBuilder = new VlanBindingsBuilder(); VlanBindingsKey vbKey = new VlanBindingsKey(new VlanId(key.intValue())); - vbBuilder.setKey(vbKey); + vbBuilder.withKey(vbKey); vbBuilder.setVlanIdKey(vbKey.getVlanIdKey()); HwvtepLogicalSwitchRef switchRef = this.getLogicalSwitchRef(value); vbBuilder.setLogicalSwitchRef(switchRef); @@ -293,7 +293,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand private Optional> getTerminationPointSwitch(final ReadWriteTransaction transaction, Node node, String tpName) { - HwvtepGlobalAugmentation hwvtepNode = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hwvtepNode = node.augmentation(HwvtepGlobalAugmentation.class); List switchNodes = hwvtepNode.getSwitches(); for (Switches managedNodeEntry : switchNodes) { @SuppressWarnings("unchecked") @@ -302,7 +302,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand TerminationPointKey tpKey = new TerminationPointKey(new TpId(tpName)); if (switchNode.getTerminationPoint() != null) { for (TerminationPoint terminationPoint : switchNode.getTerminationPoint()) { - if (terminationPoint.getKey().equals(tpKey)) { + if (terminationPoint.key().equals(tpKey)) { return Optional.of((InstanceIdentifier) managedNodeEntry.getSwitchRef().getValue()); } } @@ -317,7 +317,7 @@ public class HwvtepPhysicalPortUpdateCommand extends AbstractTransactionCommand && !portUpdate.getPortFaultStatusColumn().getData().isEmpty()) { List portFaultStatusLst = new ArrayList<>(); for (String portFaultStatus : portUpdate.getPortFaultStatusColumn().getData()) { - portFaultStatusLst.add(new PortFaultStatusBuilder().setKey(new PortFaultStatusKey(portFaultStatus)) + portFaultStatusLst.add(new PortFaultStatusBuilder().withKey(new PortFaultStatusKey(portFaultStatus)) .setPortFaultStatusKey(portFaultStatus).build()); } tpAugmentationBuilder.setPortFaultStatus(portFaultStatusLst); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java index 644757df6..b6a156807 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepPhysicalSwitchUpdateCommand.java @@ -115,8 +115,8 @@ public class HwvtepPhysicalSwitchUpdateCommand extends AbstractTransactionComman private InstanceIdentifier getTunnelIpIid(final String tunnelIp, final InstanceIdentifier psIid) { IpAddress ip = new IpAddress(tunnelIp.toCharArray()); - TunnelIps tunnelIps = new TunnelIpsBuilder().setKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build(); - return psIid.augmentation(PhysicalSwitchAugmentation.class).child(TunnelIps.class, tunnelIps.getKey()); + TunnelIps tunnelIps = new TunnelIpsBuilder().withKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build(); + return psIid.augmentation(PhysicalSwitchAugmentation.class).child(TunnelIps.class, tunnelIps.key()); } private void updateTunnelIps(@Nonnull final PhysicalSwitch newPSwitch, @Nullable final PhysicalSwitch oldPSwitch, @@ -137,7 +137,7 @@ public class HwvtepPhysicalSwitchUpdateCommand extends AbstractTransactionComman for (String tunnelIp : addedTunnelIps) { IpAddress ip = new IpAddress(tunnelIp.toCharArray()); InstanceIdentifier tunnelIpsInstanceIdentifier = getTunnelIpIid(tunnelIp, psIid); - TunnelIps tunnelIps = new TunnelIpsBuilder().setKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build(); + TunnelIps tunnelIps = new TunnelIpsBuilder().withKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build(); transaction.put(LogicalDatastoreType.OPERATIONAL, tunnelIpsInstanceIdentifier, tunnelIps, true); } } @@ -192,7 +192,7 @@ public class HwvtepPhysicalSwitchUpdateCommand extends AbstractTransactionComman for (String mgmtIp : phySwitch.getManagementIpsColumn().getData()) { IpAddress ip = new IpAddress(mgmtIp.toCharArray()); mgmtIps.add( - new ManagementIpsBuilder().setKey(new ManagementIpsKey(ip)).setManagementIpsKey(ip).build()); + new ManagementIpsBuilder().withKey(new ManagementIpsKey(ip)).setManagementIpsKey(ip).build()); } psAugmentationBuilder.setManagementIps(mgmtIps); } @@ -259,7 +259,7 @@ public class HwvtepPhysicalSwitchUpdateCommand extends AbstractTransactionComman List switchFaultStatusLst = new ArrayList<>(); for (String switchFaultStatus : phySwitch.getSwitchFaultStatusColumn().getData()) { switchFaultStatusLst - .add(new SwitchFaultStatusBuilder().setKey(new SwitchFaultStatusKey(switchFaultStatus)) + .add(new SwitchFaultStatusBuilder().withKey(new SwitchFaultStatusKey(switchFaultStatus)) .setSwitchFaultStatusKey(switchFaultStatus).build()); } psAugmentationBuilder.setSwitchFaultStatus(switchFaultStatusLst); diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepUcastMacsRemoteUpdateCommand.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepUcastMacsRemoteUpdateCommand.java index 7b0cbb854..3a0752a78 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepUcastMacsRemoteUpdateCommand.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/main/java/org/opendaylight/ovsdb/hwvtepsouthbound/transactions/md/HwvtepUcastMacsRemoteUpdateCommand.java @@ -115,6 +115,6 @@ public class HwvtepUcastMacsRemoteUpdateCommand extends AbstractTransactionComma private InstanceIdentifier getMacIid(final RemoteUcastMacs remoteUcastMacs) { return getOvsdbConnectionInstance().getInstanceIdentifier() - .augmentation(HwvtepGlobalAugmentation.class).child(RemoteUcastMacs.class, remoteUcastMacs.getKey()); + .augmentation(HwvtepGlobalAugmentation.class).child(RemoteUcastMacs.class, remoteUcastMacs.key()); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java index cfc6b0627..800a065de 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DataChangeListenerTestBase.java @@ -289,7 +289,7 @@ public class DataChangeListenerTestBase extends AbstractDataBrokerTest { for (LogicalSwitches ls : logicalSwitches) { InstanceIdentifier key = - nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(LogicalSwitches.class, ls.getKey()); + nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(LogicalSwitches.class, ls.key()); tx.delete(logicalDatastoreType, key); } } @@ -300,7 +300,7 @@ public class DataChangeListenerTestBase extends AbstractDataBrokerTest { List macs = TestBuilders.addRemoteUcastMacs(nodeIid, builder, data); for (RemoteUcastMacs mac : macs) { InstanceIdentifier key = - nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(RemoteUcastMacs.class, mac.getKey()); + nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(RemoteUcastMacs.class, mac.key()); tx.delete(logicalDatastoreType, key); } } @@ -308,7 +308,7 @@ public class DataChangeListenerTestBase extends AbstractDataBrokerTest { List macs = TestBuilders.addRemoteMcastMacs(nodeIid, builder, data); for (RemoteMcastMacs mac : macs) { InstanceIdentifier key = - nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(RemoteMcastMacs.class, mac.getKey()); + nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(RemoteMcastMacs.class, mac.key()); tx.delete(logicalDatastoreType, key); } } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java index ad512ae6f..914980586 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/DependencyQueueTest.java @@ -65,7 +65,7 @@ public class DependencyQueueTest extends DataChangeListenerTestBase { lsIid = nodeIid.augmentation(HwvtepGlobalAugmentation.class) .child(LogicalSwitches.class, new LogicalSwitchesKey(new HwvtepNodeName("ls0"))); macIid = nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(RemoteMcastMacs.class, new RemoteMcastMacsKey(mac.getKey())); + .child(RemoteMcastMacs.class, new RemoteMcastMacsKey(mac.key())); setFinalStatic(DependencyQueue.class, "EXECUTOR_SERVICE", PowerMockito.mock(SameThreadScheduledExecutor.class, Mockito.CALLS_REAL_METHODS)); } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java index 6574274f7..cbfa8bcef 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/HwvtepOperationalDataChangeListener.java @@ -116,19 +116,19 @@ public class HwvtepOperationalDataChangeListener implements ClusteredDataTreeCha if (LogicalSwitches.class == childClass) { LogicalSwitches ls = (LogicalSwitches)data; instanceIdentifier = key.augmentation(HwvtepGlobalAugmentation.class).child(LogicalSwitches.class, - ls.getKey()); + ls.key()); } else if (org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology .topology.node.TerminationPoint.class == childClass) { TerminationPoint tp = (TerminationPoint)data; - instanceIdentifier = key.child(TerminationPoint.class, tp.getKey()); + instanceIdentifier = key.child(TerminationPoint.class, tp.key()); } else if (RemoteUcastMacs.class == childClass) { RemoteUcastMacs mac = (RemoteUcastMacs)data; instanceIdentifier = key.augmentation(HwvtepGlobalAugmentation.class).child(RemoteUcastMacs.class, - mac.getKey()); + mac.key()); } else if (RemoteMcastMacs.class == childClass) { RemoteMcastMacs mac = (RemoteMcastMacs)data; instanceIdentifier = key.augmentation(HwvtepGlobalAugmentation.class).child(RemoteMcastMacs.class, - mac.getKey()); + mac.key()); } return instanceIdentifier; } diff --git a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/TestBuilders.java b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/TestBuilders.java index 8002de1a5..fab3290dd 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/TestBuilders.java +++ b/hwvtepsouthbound/hwvtepsouthbound-impl/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/TestBuilders.java @@ -109,7 +109,7 @@ public final class TestBuilders { TerminationPointKey tpKey = new TerminationPointKey(new TpId("vxlan_over_ipv4:" + ip)); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); if (nodeIid != null) { - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); HwvtepPhysicalLocatorAugmentationBuilder tpAugmentationBuilder = new HwvtepPhysicalLocatorAugmentationBuilder(); @@ -125,7 +125,7 @@ public final class TestBuilders { String logicalSwitch = keys[0]; String tunnelKey = keys[1]; LogicalSwitchesBuilder logicalSwitchesBuilder = new LogicalSwitchesBuilder(); - logicalSwitchesBuilder.setKey(new LogicalSwitchesKey(new HwvtepNodeName(logicalSwitch))); + logicalSwitchesBuilder.withKey(new LogicalSwitchesKey(new HwvtepNodeName(logicalSwitch))); logicalSwitchesBuilder.setHwvtepNodeName(new HwvtepNodeName(logicalSwitch)); logicalSwitchesBuilder.setTunnelKey(tunnelKey); Uuid uuid = getUUid(logicalSwitch); diff --git a/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java b/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java index 31e01863f..32282999a 100644 --- a/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java +++ b/hwvtepsouthbound/hwvtepsouthbound-it/src/test/java/org/opendaylight/ovsdb/hwvtepsouthbound/it/HwvtepSouthboundIT.java @@ -519,7 +519,7 @@ public class HwvtepSouthboundIT extends AbstractMdsalTestBase { LogicalDatastoreType dataStore) { Node psNode = getPhysicalSwitchNode(connectionInfo, psName, dataStore); Assert.assertNotNull(psNode); - PhysicalSwitchAugmentation psAugmentation = psNode.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation psAugmentation = psNode.augmentation(PhysicalSwitchAugmentation.class); Assert.assertNotNull(psAugmentation); return psAugmentation; } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java index bc27a7eed..ac2fee021 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java @@ -293,8 +293,8 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos public OvsdbConnectionInstance getConnectionInstance(Node node) { Preconditions.checkNotNull(node); - OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); - OvsdbBridgeAugmentation ovsdbManagedNode = node.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); + OvsdbBridgeAugmentation ovsdbManagedNode = node.augmentation(OvsdbBridgeAugmentation.class); if (ovsdbNode != null) { return getConnectionInstance(ovsdbNode.getConnectionInfo()); } else if (ovsdbManagedNode != null) { @@ -446,7 +446,7 @@ public class OvsdbConnectionManager implements OvsdbConnectionListener, AutoClos Optional ovsdbNodeOpt = SouthboundUtil.readNode(transaction, nodeIid); if (ovsdbNodeOpt.isPresent()) { Node ovsdbNode = ovsdbNodeOpt.get(); - OvsdbNodeAugmentation nodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation nodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); if (nodeAugmentation != null) { if (nodeAugmentation.getManagedNodeEntry() != null) { for (ManagedNodeEntry managedNode : nodeAugmentation.getManagedNodeEntry()) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListener.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListener.java index 33a203b53..03e35676e 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListener.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbDataTreeChangeListener.java @@ -225,9 +225,9 @@ public class OvsdbDataTreeChangeListener implements ClusteredDataTreeChangeListe ? change.getRootNode().getDataAfter() : change.getRootNode().getDataBefore(); if (node != null) { InstanceIdentifier nodeIid; - Augmentation nodeAug = node.getAugmentation(OvsdbNodeAugmentation.class) != null - ? node.getAugmentation(OvsdbNodeAugmentation.class) - : node.getAugmentation(OvsdbBridgeAugmentation.class); + Augmentation nodeAug = node.augmentation(OvsdbNodeAugmentation.class) != null + ? node.augmentation(OvsdbNodeAugmentation.class) + : node.augmentation(OvsdbBridgeAugmentation.class); if (nodeAug instanceof OvsdbNodeAugmentation) { OvsdbNodeAugmentation ovsdbNode = (OvsdbNodeAugmentation) nodeAug; diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java index 4c56e6f40..7b0f86b0e 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundMapper.java @@ -300,7 +300,7 @@ public final class SouthboundMapper { bridgeNode, updatedControllerRows); final List controllerEntriesCreated = new ArrayList<>(); final OvsdbBridgeAugmentation ovsdbBridgeAugmentation = - bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); + bridgeNode.augmentation(OvsdbBridgeAugmentation.class); if (ovsdbBridgeAugmentation == null) { return controllerEntriesCreated; } @@ -421,7 +421,7 @@ public final class SouthboundMapper { ovsdbNode, updatedManagerRows); final List managerEntriesCreated = new ArrayList<>(); final OvsdbNodeAugmentation ovsdbNodeAugmentation = - ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + ovsdbNode.augmentation(OvsdbNodeAugmentation.class); if (ovsdbNodeAugmentation == null) { return managerEntriesCreated; } @@ -534,7 +534,7 @@ public final class SouthboundMapper { if (terminationPoints != null && !terminationPoints.isEmpty()) { for (TerminationPoint tp : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - tp.getAugmentation(OvsdbTerminationPointAugmentation.class); + tp.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation != null) { final InstanceIdentifier tpIid = bridgeNodeIid diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java index b3f659dec..051672854 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundUtil.java @@ -61,7 +61,7 @@ public final class SouthboundUtil { if (node instanceof OvsdbNodeAugmentation) { ovsdbNode = (OvsdbNodeAugmentation) node; } else if (node != null) { - ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); + ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); } if (ovsdbNode != null) { return Optional.of(ovsdbNode); @@ -123,7 +123,7 @@ public final class SouthboundUtil { public static String getControllerTarget(Node ovsdbNode) { String target = null; String ipAddr = null; - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); ConnectionInfo connectionInfo = ovsdbNodeAugmentation.getConnectionInfo(); LOG.info("connectionInfo: {}", connectionInfo); if (connectionInfo != null && connectionInfo.getLocalIp() != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java index 18d36e857..0f382fa33 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachRemovedCommand.java @@ -81,7 +81,7 @@ public class AutoAttachRemovedCommand implements TransactCommand { return; } final OvsdbNodeAugmentation currentOvsdbNode = - state.getBridgeNode(ovsdbNodeIid).get().getAugmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(ovsdbNodeIid).get().augmentation(OvsdbNodeAugmentation.class); final List currentAutoAttach = currentOvsdbNode.getAutoattach(); for (final Autoattach origAutoattach : origAutoattachList) { final Uri autoAttachId = origAutoattach.getAutoattachId(); @@ -146,7 +146,7 @@ public class AutoAttachRemovedCommand implements TransactCommand { final Optional nodeOptional = transaction.read(LogicalDatastoreType.OPERATIONAL, nodeIid).get(); if (nodeOptional.isPresent()) { final List managedNodes = - nodeOptional.get().getAugmentation(OvsdbNodeAugmentation.class).getManagedNodeEntry(); + nodeOptional.get().augmentation(OvsdbNodeAugmentation.class).getManagedNodeEntry(); for (final ManagedNodeEntry managedNode : managedNodes) { final OvsdbBridgeRef ovsdbBridgeRef = managedNode.getBridgeRef(); final InstanceIdentifier brIid = ovsdbBridgeRef.getValue() diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java index f1e5e7a0b..06ec6bdb2 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/AutoAttachUpdateCommand.java @@ -91,7 +91,7 @@ public class AutoAttachUpdateCommand implements TransactCommand { } final OvsdbNodeAugmentation currentOvsdbNode = - state.getBridgeNode(iid).get().getAugmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class); final List currentAutoAttach = currentOvsdbNode.getAutoattach(); for (final Autoattach autoAttach : autoAttachList) { final AutoAttach autoAttachWrapper = diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java index c4b45da56..271740cd2 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalState.java @@ -82,7 +82,7 @@ public class BridgeOperationalState { public Optional getOvsdbBridgeAugmentation(InstanceIdentifier iid) { Optional nodeOptional = getBridgeNode(iid); if (nodeOptional.isPresent()) { - return Optional.fromNullable(nodeOptional.get().getAugmentation(OvsdbBridgeAugmentation.class)); + return Optional.fromNullable(nodeOptional.get().augmentation(OvsdbBridgeAugmentation.class)); } return Optional.absent(); } @@ -94,7 +94,7 @@ public class BridgeOperationalState { TerminationPointKey key = iid.firstKeyOf(TerminationPoint.class); if (key != null) { for (TerminationPoint tp:nodeOptional.get().getTerminationPoint()) { - if (tp.getKey().equals(key)) { + if (tp.key().equals(key)) { return Optional.of(tp); } } @@ -109,7 +109,7 @@ public class BridgeOperationalState { public Optional getOvsdbTerminationPointAugmentation(InstanceIdentifier iid) { Optional tpOptional = getBridgeTerminationPoint(iid); if (tpOptional.isPresent()) { - return Optional.fromNullable(tpOptional.get().getAugmentation(OvsdbTerminationPointAugmentation.class)); + return Optional.fromNullable(tpOptional.get().augmentation(OvsdbTerminationPointAugmentation.class)); } return Optional.absent(); } @@ -121,7 +121,7 @@ public class BridgeOperationalState { ControllerEntryKey key = iid.firstKeyOf(ControllerEntry.class); if (key != null) { for (ControllerEntry entry: ovsdbBridgeOptional.get().getControllerEntry()) { - if (entry.getKey().equals(key)) { + if (entry.key().equals(key)) { return Optional.of(entry); } } @@ -138,7 +138,7 @@ public class BridgeOperationalState { ProtocolEntryKey key = iid.firstKeyOf(ProtocolEntry.class); if (key != null) { for (ProtocolEntry entry: ovsdbBridgeOptional.get().getProtocolEntry()) { - if (entry.getKey().equals(key)) { + if (entry.key().equals(key)) { return Optional.of(entry); } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java index 8cdf33a7b..c1e58f711 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/DataChangesManagedByOvsdbNodeEvent.java @@ -123,7 +123,7 @@ public class DataChangesManagedByOvsdbNodeEvent implements DataChangeEvent { Optional bridgeNode = SouthboundUtil.readNode(db.newReadWriteTransaction(),nodeEntryIid); if (bridgeNode.isPresent() && bridgeNode.get() instanceof Node) { Node node = (Node)bridgeNode.get(); - OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbBridgeAugmentation bridge = node.augmentation(OvsdbBridgeAugmentation.class); if (bridge != null && bridge.getManagedBy() != null) { return bridge.getManagedBy().getValue(); } @@ -144,7 +144,7 @@ public class DataChangesManagedByOvsdbNodeEvent implements DataChangeEvent { // If we are contained in a bridge managed by this iid if (dataObject != null && dataObject instanceof Node) { Node node = (Node)dataObject; - OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbBridgeAugmentation bridge = node.augmentation(OvsdbBridgeAugmentation.class); if (bridge != null && bridge.getManagedBy() != null && bridge.getManagedBy().getValue().equals(this.iid)) { return bridge.getManagedBy().getValue(); } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java index caa4aa910..63d38df49 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosRemovedCommand.java @@ -62,7 +62,7 @@ public class QosRemovedCommand implements TransactCommand { if (origQosEntries != null && !origQosEntries.isEmpty()) { for (QosEntries origQosEntry : origQosEntries) { OvsdbNodeAugmentation operNode = - state.getBridgeNode(ovsdbNodeIid).get().getAugmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(ovsdbNodeIid).get().augmentation(OvsdbNodeAugmentation.class); List operQosEntries = operNode.getQosEntries(); boolean found = false; diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java index d9273bc8b..210429c11 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QosUpdateCommand.java @@ -67,7 +67,7 @@ public class QosUpdateCommand implements TransactCommand { return; } OvsdbNodeAugmentation operNode = - state.getBridgeNode(iid).get().getAugmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class); QosEntries qosEntry = qosMapEntry.getValue(); Qos qos = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Qos.class); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java index ee6c76b69..002197896 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueRemovedCommand.java @@ -60,7 +60,7 @@ public class QueueRemovedCommand implements TransactCommand { if (origQueues != null && !origQueues.isEmpty()) { for (Queues origQueue : origQueues) { OvsdbNodeAugmentation operNode = - state.getBridgeNode(ovsdbNodeIid).get().getAugmentation( + state.getBridgeNode(ovsdbNodeIid).get().augmentation( OvsdbNodeAugmentation.class); List operQueues = operNode.getQueues(); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java index d7bed607e..927c45b45 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/QueueUpdateCommand.java @@ -100,7 +100,7 @@ public class QueueUpdateCommand implements TransactCommand { } OvsdbNodeAugmentation operNode = - state.getBridgeNode(iid).get().getAugmentation(OvsdbNodeAugmentation.class); + state.getBridgeNode(iid).get().augmentation(OvsdbNodeAugmentation.class); Uuid operQueueUuid = getQueueEntryUuid(operNode.getQueues(), queueEntry.getQueueId()); if (operQueueUuid == null) { UUID namedUuid = new UUID(SouthboundConstants.QUEUE_NAMED_UUID_PREFIX diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java index 6f2aafd90..de0758134 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointCreateCommand.java @@ -341,7 +341,7 @@ public class TerminationPointCreateCommand implements TransactCommand { InstanceIdentifier nodeIid = key.firstIdentifierOf(Node.class); if (nodes != null && nodes.get(nodeIid) != null) { Node node = nodes.get(nodeIid); - bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); + bridge = node.augmentation(OvsdbBridgeAugmentation.class); if (bridge == null) { ReadOnlyTransaction transaction = SouthboundProvider.getDb().newReadOnlyTransaction(); CheckedFuture, ReadFailedException> future = @@ -349,7 +349,7 @@ public class TerminationPointCreateCommand implements TransactCommand { try { Optional nodeOptional = future.get(); if (nodeOptional.isPresent()) { - bridge = nodeOptional.get().getAugmentation(OvsdbBridgeAugmentation.class); + bridge = nodeOptional.get().augmentation(OvsdbBridgeAugmentation.class); } } catch (InterruptedException | ExecutionException e) { LOG.warn("Error reading from datastore",e); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java index e0878abdf..658920174 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointDeleteCommand.java @@ -66,7 +66,7 @@ public class TerminationPointDeleteCommand implements TransactCommand { OvsdbTerminationPointAugmentation original = originals.get(removedTpIid); Node originalNode = originalNodes.get(removedTpIid.firstIdentifierOf(Node.class)); OvsdbBridgeAugmentation originalOvsdbBridgeAugmentation = - originalNode.getAugmentation(OvsdbBridgeAugmentation.class); + originalNode.augmentation(OvsdbBridgeAugmentation.class); String bridgeName = null; if (originalOvsdbBridgeAugmentation != null) { bridgeName = originalOvsdbBridgeAugmentation.getBridgeName().getValue(); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java index 84ebe9622..f06b982a0 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommand.java @@ -198,7 +198,7 @@ public class TerminationPointUpdateCommand implements TransactCommand { try { Optional nodeOptional = future.get(); if (nodeOptional.isPresent()) { - operNode = nodeOptional.get().getAugmentation(OvsdbNodeAugmentation.class); + operNode = nodeOptional.get().augmentation(OvsdbNodeAugmentation.class); } } catch (InterruptedException | ExecutionException e) { LOG.warn("Error reading from datastore", e); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java index 95afbd6ca..5c578c9df 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/ReconciliationManager.java @@ -151,7 +151,7 @@ public class ReconciliationManager implements AutoCloseable { Preconditions.checkNotNull(bridgeNodes, "Bridge Node list must not be null"); if (!bridgeNodes.isEmpty()) { for (Node node : bridgeNodes) { - bridgeNodeCache.put(node.getKey(), + bridgeNodeCache.put(node.key(), new NodeConnectionMetadata(node, connectionManager, connectionInstance)); } registerBridgeCreatedDataTreeChangeListener(); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java index e0c915745..73b124fe9 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTask.java @@ -88,12 +88,12 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask { final List tpChanges = new ArrayList<>(); for (Node node : topology.getNode()) { LOG.debug("Reconcile Configuration for node {}", node.getNodeId()); - OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbBridgeAugmentation bridge = node.augmentation(OvsdbBridgeAugmentation.class); if (bridge != null && bridge.getManagedBy() != null && bridge.getManagedBy().getValue().equals(ndIid)) { brChanges.putAll(extractBridgeConfigurationChanges(node, bridge)); tpChanges.add(node); - } else if (node.getKey().getNodeId().getValue().startsWith( + } else if (node.key().getNodeId().getValue().startsWith( nodeIid.firstKeyOf(Node.class).getNodeId().getValue()) && node.getTerminationPoint() != null && !node.getTerminationPoint().isEmpty()) { tpChanges.add(node); @@ -134,7 +134,7 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask { for (ProtocolEntry protocol : ovsdbBridge.getProtocolEntry()) { if (SouthboundConstants.OVSDB_PROTOCOL_MAP.get(protocol.getProtocol()) != null) { KeyedInstanceIdentifier protocolIid = - ovsdbBridgeIid.child(ProtocolEntry.class, protocol.getKey()); + ovsdbBridgeIid.child(ProtocolEntry.class, protocol.key()); changes.put(protocolIid, protocol); } else { throw new IllegalArgumentException("Unknown protocol " + protocol.getProtocol()); @@ -145,7 +145,7 @@ public class BridgeConfigReconciliationTask extends ReconciliationTask { if (ovsdbBridge.getControllerEntry() != null) { for (ControllerEntry controller : ovsdbBridge.getControllerEntry()) { KeyedInstanceIdentifier controllerIid = - ovsdbBridgeIid.child(ControllerEntry.class, controller.getKey()); + ovsdbBridgeIid.child(ControllerEntry.class, controller.key()); changes.put(controllerIid, controller); } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java index 108d88fa8..ee0a32b7e 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommand.java @@ -71,14 +71,14 @@ public class OvsdbAutoAttachRemovedCommand extends AbstractTransactionCommand { } private AutoattachKey getAutoAttachKeyToRemove(Node node, UUID autoAttachUuid) { - final List autoAttachList = node.getAugmentation(OvsdbNodeAugmentation.class).getAutoattach(); + final List autoAttachList = node.augmentation(OvsdbNodeAugmentation.class).getAutoattach(); if (autoAttachList == null || autoAttachList.isEmpty()) { return null; } for (final Autoattach autoAttach : autoAttachList) { if (autoAttach.getAutoattachUuid() .equals(new Uuid(autoAttachUuid.toString()))) { - return autoAttach.getKey(); + return autoAttach.key(); } } return null; diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java index 5ab23ff8a..30882ca68 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachUpdateCommand.java @@ -102,7 +102,7 @@ public class OvsdbAutoAttachUpdateCommand extends AbstractTransactionCommand { : new AutoattachBuilder() .setAutoattachUuid(new Uuid(entry.getKey().toString())) .setAutoattachId(uri) - .setKey(new AutoattachKey(uri)); + .withKey(new AutoattachKey(uri)); if (autoAttach.getSystemNameColumn() != null && autoAttach.getSystemNameColumn().getData() != null @@ -127,7 +127,7 @@ public class OvsdbAutoAttachUpdateCommand extends AbstractTransactionCommand { ovsdbNode.get().getNodeId(), autoAttachEntry); final InstanceIdentifier iid = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(Autoattach.class, autoAttachEntry.getKey()); + .child(Autoattach.class, autoAttachEntry.key()); transaction.put(LogicalDatastoreType.OPERATIONAL, iid, autoAttachEntry); } @@ -143,7 +143,7 @@ public class OvsdbAutoAttachUpdateCommand extends AbstractTransactionCommand { final Integer mappingsValue = Integer.valueOf(entry.getValue().intValue()); if (mappingsKey != null) { mappingsList.add(new MappingsBuilder() - .setKey(new MappingsKey(mappingsKey)) + .withKey(new MappingsKey(mappingsKey)) .setMappingsKey(mappingsKey) .setMappingsValue(mappingsValue) .build()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java index 50e6a147a..37e957513 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommand.java @@ -121,7 +121,7 @@ public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { final InstanceIdentifier bridgeIid = bridgeNodeEntry.getKey(); InstanceIdentifier iid = bridgeIid .augmentation(OvsdbBridgeAugmentation.class) - .child(ControllerEntry.class, controllerEntry.getKey()); + .child(ControllerEntry.class, controllerEntry.key()); transaction.merge(LogicalDatastoreType.OPERATIONAL, iid, controllerEntry); } @@ -139,7 +139,7 @@ public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { final InstanceIdentifier connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier(); final Optional ovsdbNode = SouthboundUtil.readNode(transaction, connectionIId); if (ovsdbNode.isPresent()) { - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.get().getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.get().augmentation(OvsdbNodeAugmentation.class); if (ovsdbNodeAugmentation != null) { final List managedNodeEntries = ovsdbNodeAugmentation.getManagedNodeEntry(); for (ManagedNodeEntry managedNodeEntry : managedNodeEntries) { @@ -185,6 +185,6 @@ public class OvsdbControllerUpdateCommand extends AbstractTransactionCommand { return bridgeIid .augmentation(OvsdbBridgeAugmentation.class) - .child(ControllerEntry.class, controllerEntry.getKey()); + .child(ControllerEntry.class, controllerEntry.key()); } } diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java index 5e5f65ea0..2b1bffa19 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommand.java @@ -122,7 +122,7 @@ public class OvsdbManagersUpdateCommand extends AbstractTransactionCommand { for (ManagerEntry managerEntry : managerEntries) { InstanceIdentifier iid = connectionIId .augmentation(OvsdbNodeAugmentation.class) - .child(ManagerEntry.class, managerEntry.getKey()); + .child(ManagerEntry.class, managerEntry.key()); transaction.merge(LogicalDatastoreType.OPERATIONAL, iid, managerEntry); } @@ -148,7 +148,7 @@ public class OvsdbManagersUpdateCommand extends AbstractTransactionCommand { return ovsdbNodeIid .augmentation(OvsdbNodeAugmentation.class) - .child(ManagerEntry.class, managerEntry.getKey()); + .child(ManagerEntry.class, managerEntry.key()); } private Map getUriManagerMap(Map uuidManagerMap) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java index a5187f25a..8234871a4 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommand.java @@ -42,7 +42,7 @@ public class OvsdbNodeRemoveCommand extends AbstractTransactionCommand { ovsdbNodeOptional = ovsdbNodeFuture.get(); if (ovsdbNodeOptional.isPresent()) { Node ovsdbNode = ovsdbNodeOptional.get(); - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); if (checkIfOnlyConnectedManager(ovsdbNodeAugmentation)) { if (ovsdbNodeAugmentation != null) { if (ovsdbNodeAugmentation.getManagedNodeEntry() != null) { diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java index bc9be6945..a3beb5455 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommand.java @@ -135,7 +135,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { if (bridgeIid.isPresent()) { TerminationPointKey tpKey = new TerminationPointKey(new TpId(portName)); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); InstanceIdentifier tpPath = getInstanceIdentifier(bridgeIid.get(), portUpdate.getValue()); @@ -165,7 +165,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { if (bridgeIid.isPresent()) { TerminationPointKey tpKey = new TerminationPointKey(new TpId(interfaceName)); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); @@ -234,7 +234,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { @SuppressWarnings("unchecked") private Optional> getTerminationPointBridge( final ReadWriteTransaction transaction, Node node, String tpName) { - OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); List managedNodes = ovsdbNode.getManagedNodeEntry(); TpId tpId = new TpId(tpName); for (ManagedNodeEntry managedNodeEntry : managedNodes) { @@ -356,7 +356,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { UUID qosUuid = qosUuidCol.iterator().next(); NodeId nodeId = node.getNodeId(); - OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); // Delete an older QoS entry if (portOldRows.containsKey(port.getKey()) && portOldRows.get(port.getKey()).getQosColumn() != null) { @@ -381,7 +381,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { List qosList = new ArrayList<>(); OvsdbQosRef qosRef = new OvsdbQosRef(qosIid); qosList.add(new QosEntryBuilder() - .setKey(new QosEntryKey(Long.valueOf(SouthboundConstants.PORT_QOS_LIST_KEY))) + .withKey(new QosEntryKey(Long.valueOf(SouthboundConstants.PORT_QOS_LIST_KEY))) .setQosRef(qosRef).build()); ovsdbTerminationPointBuilder.setQosEntry(qosList); } @@ -570,7 +570,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { if (optionsKeyString != null && optionsValueString != null) { OptionsKey optionsKey = new OptionsKey(optionsKeyString); options.add(new OptionsBuilder() - .setKey(optionsKey) + .withKey(optionsKey) .setValue(optionsValueString).build()); } } @@ -609,7 +609,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { String interfaceLldpValueString = entry.getValue(); if (interfaceLldpKeyString != null && interfaceLldpValueString != null) { interfaceLldpList.add(new InterfaceLldpBuilder() - .setKey(new InterfaceLldpKey(interfaceLldpKeyString)) + .withKey(new InterfaceLldpKey(interfaceLldpKeyString)) .setLldpKey(interfaceLldpKeyString) .setLldpValue(interfaceLldpValueString) .build()); @@ -653,7 +653,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { String interfaceBfdStatusValueString = entry.getValue(); if (interfaceBfdStatusKeyString != null && interfaceBfdStatusValueString != null) { interfaceBfdStatusList.add(new InterfaceBfdStatusBuilder() - .setKey(new InterfaceBfdStatusKey(interfaceBfdStatusKeyString)) + .withKey(new InterfaceBfdStatusKey(interfaceBfdStatusKeyString)) .setBfdStatusKey(interfaceBfdStatusKeyString) .setBfdStatusValue(interfaceBfdStatusValueString) .build()); @@ -678,7 +678,7 @@ public class OvsdbPortUpdateCommand extends AbstractTransactionCommand { String interfaceBfdValueString = entry.getValue(); if (interfaceBfdKeyString != null && interfaceBfdValueString != null) { interfaceBfdList.add(new InterfaceBfdBuilder() - .setKey(new InterfaceBfdKey(interfaceBfdKeyString)) + .withKey(new InterfaceBfdKey(interfaceBfdKeyString)) .setBfdKey(interfaceBfdKeyString) .setBfdValue(interfaceBfdValueString) .build()); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java index d4cd67ae6..3fd87f9f4 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosRemovedCommand.java @@ -69,7 +69,7 @@ public class OvsdbQosRemovedCommand extends AbstractTransactionCommand { } private QosEntriesKey getQosEntriesKey(Node node, UUID qosUuid) { - List qosList = node.getAugmentation(OvsdbNodeAugmentation.class).getQosEntries(); + List qosList = node.augmentation(OvsdbNodeAugmentation.class).getQosEntries(); if (qosList == null || qosList.isEmpty()) { LOG.debug("Deleting Qos {}, Ovsdb Node {} does not have a Qos list.", qosUuid.toString(), node); return null; @@ -79,7 +79,7 @@ public class OvsdbQosRemovedCommand extends AbstractTransactionCommand { while (itr.hasNext()) { QosEntries qos = itr.next(); if (qos.getQosUuid().equals(quUuid)) { - return qos.getKey(); + return qos.key(); } } LOG.debug("Deleted Queue {} not found in Ovsdb Node {}", qosUuid.toString(), node); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java index ed9857c21..cc294b701 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQosUpdateCommand.java @@ -114,7 +114,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand { LOG.debug("Update Ovsdb Node {} with qos entries {}",ovsdbNode.get(), qosEntry); InstanceIdentifier iid = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosEntry.getKey()); + .child(QosEntries.class, qosEntry.key()); transaction.merge(LogicalDatastoreType.OPERATIONAL, iid, qosEntry); } @@ -160,7 +160,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand { return (InstanceIdentifier) instanceIdentifierCodec.bindingDeserializerOrNull( queue.getExternalIdsColumn().getData().get(SouthboundConstants.IID_EXTERNAL_ID_KEY)); } else { - OvsdbNodeAugmentation node = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation node = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); if (node.getQueues() != null && !node.getQueues().isEmpty()) { for (Queues q : node.getQueues()) { if (q.getQueueUuid().equals(new Uuid(queueUuid.toString()))) { @@ -203,7 +203,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand { Qos qos, InstanceIdentifier nodeIId) { InstanceIdentifier qosIId = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosEntryBuilder.build().getKey()); + .child(QosEntries.class, qosEntryBuilder.build().key()); Set otherConfigKeys = oldOtherConfigs.keySet(); for (String otherConfigKey : otherConfigKeys) { KeyedInstanceIdentifier otherIId = @@ -252,7 +252,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand { Qos qos, InstanceIdentifier nodeIId) { InstanceIdentifier qosIId = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosEntryBuilder.build().getKey()); + .child(QosEntries.class, qosEntryBuilder.build().key()); Set externalIdsKeys = oldExternalIds.keySet(); for (String extIdKey : externalIdsKeys) { KeyedInstanceIdentifier externalIId = @@ -301,7 +301,7 @@ public class OvsdbQosUpdateCommand extends AbstractTransactionCommand { Qos qos, InstanceIdentifier nodeIId) { InstanceIdentifier qosIId = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosEntryBuilder.build().getKey()); + .child(QosEntries.class, qosEntryBuilder.build().key()); Collection queueListKeys = oldQueueList.keySet(); for (Long queueListKey : queueListKeys) { KeyedInstanceIdentifier otherIId = diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java index 63b4ab985..d530e53d6 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueRemovedCommand.java @@ -69,7 +69,7 @@ public class OvsdbQueueRemovedCommand extends AbstractTransactionCommand { } private QueuesKey getQueueKey(Node node, UUID queueUuid) { - List queueList = node.getAugmentation(OvsdbNodeAugmentation.class).getQueues(); + List queueList = node.augmentation(OvsdbNodeAugmentation.class).getQueues(); if (queueList == null || queueList.isEmpty()) { LOG.debug("Deleting Queue {}, Ovsdb Node {} does not have a Queue list.", queueUuid.toString(), node); return null; @@ -79,7 +79,7 @@ public class OvsdbQueueRemovedCommand extends AbstractTransactionCommand { while (itr.hasNext()) { Queues queue = itr.next(); if (queue.getQueueUuid().equals(quUuid)) { - return queue.getKey(); + return queue.key(); } } LOG.debug("Deleted Queue {} not found in Ovsdb Node {}", queueUuid.toString(), node); diff --git a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java index 0ba2bff27..53230bc79 100644 --- a/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java +++ b/southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbQueueUpdateCommand.java @@ -101,7 +101,7 @@ public class OvsdbQueueUpdateCommand extends AbstractTransactionCommand { LOG.debug("Update Ovsdb Node {} with queue entries {}",ovsdbNode.get(), queues); InstanceIdentifier iid = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(Queues.class, queues.getKey()); + .child(Queues.class, queues.key()); transaction.merge(LogicalDatastoreType.OPERATIONAL, iid, queues); } @@ -155,7 +155,7 @@ public class OvsdbQueueUpdateCommand extends AbstractTransactionCommand { Queue queue, InstanceIdentifier nodeIId) { InstanceIdentifier queueIId = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(Queues.class, queuesBuilder.build().getKey()); + .child(Queues.class, queuesBuilder.build().key()); Set otherConfigKeys = oldOtherConfigs.keySet(); for (String otherConfigKey : otherConfigKeys) { KeyedInstanceIdentifier otherIId = @@ -204,7 +204,7 @@ public class OvsdbQueueUpdateCommand extends AbstractTransactionCommand { Queue queue, InstanceIdentifier nodeIId) { InstanceIdentifier queueIId = nodeIId .augmentation(OvsdbNodeAugmentation.class) - .child(Queues.class, queuesBuilder.build().getKey()); + .child(Queues.class, queuesBuilder.build().key()); Set externalIdsKeys = oldExternalIds.keySet(); for (String extIdKey : externalIdsKeys) { KeyedInstanceIdentifier externalIId = diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java index 614d642bf..465315458 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundMapperTest.java @@ -382,12 +382,12 @@ public class SouthboundMapperTest { List managerEntriesCreated = new ArrayList<>(); //ovsdbNodeAugmentation is null - when(ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(null); + when(ovsdbNode.augmentation(OvsdbNodeAugmentation.class)).thenReturn(null); assertEquals(managerEntriesCreated, SouthboundMapper.createManagerEntries(ovsdbNode, updatedManagerRows)); //ovsdbNodeAugmentation not null OvsdbNodeAugmentation ovsdbNodeAugmentation = mock(OvsdbNodeAugmentation.class); - when(ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); + when(ovsdbNode.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); List managerEntries = new ArrayList<>(); ManagerEntry managerEntry = mock(ManagerEntry.class); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java index 0a1895d1a..f54a5196d 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/SouthboundUtilTest.java @@ -74,7 +74,7 @@ public class SouthboundUtilTest { Node node = mock(Node.class); OvsdbNodeAugmentation ovsdbNode = mock(OvsdbNodeAugmentation.class); when(nf.get()).thenReturn(Optional.of(node)); - when(node.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNode); + when(node.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNode); assertEquals("Failed to return correct Optional object", Optional.of(ovsdbNode), SouthboundUtil.getManagingNode(db, mn)); @@ -136,7 +136,7 @@ public class SouthboundUtilTest { public void testGetControllerTarget() throws Exception { Node ovsdbNode = mock(Node.class); OvsdbNodeAugmentation ovsdbNodeAugmentation = mock(OvsdbNodeAugmentation.class); - when(ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); + when(ovsdbNode.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); ConnectionInfo connectionInfo = mock(ConnectionInfo.class, Mockito.RETURNS_DEEP_STUBS); when(ovsdbNodeAugmentation.getConnectionInfo()).thenReturn(connectionInfo); @@ -148,7 +148,7 @@ public class SouthboundUtilTest { String testTarget = SouthboundConstants.OPENFLOW_CONNECTION_PROTOCOL + ":" + String.valueOf(ipAddress) + ":" + SouthboundConstants.DEFAULT_OPENFLOW_PORT; assertEquals("Incorrect controller IP", testTarget, SouthboundUtil.getControllerTarget(ovsdbNode)); - verify(ovsdbNode).getAugmentation(OvsdbNodeAugmentation.class); + verify(ovsdbNode).augmentation(OvsdbNodeAugmentation.class); verify(ovsdbNodeAugmentation).getConnectionInfo(); //ipAddr null case diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java index 389e363fd..6471044d2 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/BridgeOperationalStateTest.java @@ -87,7 +87,7 @@ public class BridgeOperationalStateTest { Optional optNode = Optional.of(node); when(briOperationState.getBridgeNode(any(InstanceIdentifier.class))).thenReturn(optNode); OvsdbBridgeAugmentation ovsdbBriAug = mock(OvsdbBridgeAugmentation.class); - when(node.getAugmentation(OvsdbBridgeAugmentation.class)).thenReturn(ovsdbBriAug); + when(node.augmentation(OvsdbBridgeAugmentation.class)).thenReturn(ovsdbBriAug); Optional ovsdbBriAugOptional = briOperationState.getOvsdbBridgeAugmentation(iid); assertNotNull(ovsdbBriAugOptional); assertTrue(ovsdbBriAugOptional.get() instanceof OvsdbBridgeAugmentation); @@ -110,7 +110,7 @@ public class BridgeOperationalStateTest { when(briOperationState.getBridgeNode(any(InstanceIdentifier.class))).thenReturn(optNode); when(node.getTerminationPoint()).thenReturn(termPntList); TerminationPointKey termPntKey = mock(TerminationPointKey.class); - when(termPnt.getKey()).thenReturn(termPntKey); + when(termPnt.key()).thenReturn(termPntKey); final InstanceIdentifier iid2 = PowerMockito.mock(InstanceIdentifier.class); //PowerMockito.suppress(MemberMatcher.method(InstanceIdentifier.class, "firstKeyOf", Class.class, Class.class)); @@ -135,7 +135,7 @@ public class BridgeOperationalStateTest { Optional termPntOptional = Optional.of(termPoint); when(briOperationState.getBridgeTerminationPoint(any(InstanceIdentifier.class))).thenReturn(termPntOptional); OvsdbTerminationPointAugmentation ovsdbTermPntAug = mock(OvsdbTerminationPointAugmentation.class); - when(termPoint.getAugmentation(OvsdbTerminationPointAugmentation.class)).thenReturn(ovsdbTermPntAug); + when(termPoint.augmentation(OvsdbTerminationPointAugmentation.class)).thenReturn(ovsdbTermPntAug); Optional ovsdbTermPointOpt = briOperationState .getOvsdbTerminationPointAugmentation(iid); assertNotNull(ovsdbTermPointOpt); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java index 9ef1ab36d..34274c298 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/ovsdb/transact/TerminationPointUpdateCommandTest.java @@ -98,7 +98,7 @@ public class TerminationPointUpdateCommandTest { OvsdbTerminationPointAugmentation terminationPoint = mock(OvsdbTerminationPointAugmentation.class); when(terminationPoint.getName()).thenReturn(TERMINATION_POINT_NAME); Node node = mock(Node.class); - when(node.getAugmentation(OvsdbBridgeAugmentation.class)).thenReturn(mock(OvsdbBridgeAugmentation.class)); + when(node.augmentation(OvsdbBridgeAugmentation.class)).thenReturn(mock(OvsdbBridgeAugmentation.class)); Optional optNode = Optional.of(node); when(state.getBridgeNode(any(InstanceIdentifier.class))).thenReturn(optNode); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java index 06725c0ca..cb3ffb3d2 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/reconciliation/configuration/BridgeConfigReconciliationTaskTest.java @@ -121,18 +121,18 @@ public class BridgeConfigReconciliationTaskTest { when((InstanceIdentifier)ovsdbNodeRef.getValue()).thenReturn(iid); OvsdbBridgeName ovsdbBridgeName = new OvsdbBridgeName(bridgeName); - when(bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class)).thenReturn(ovsdbBridgeAugmentation); + when(bridgeNode.augmentation(OvsdbBridgeAugmentation.class)).thenReturn(ovsdbBridgeAugmentation); when(ovsdbBridgeAugmentation.getBridgeName()).thenReturn(ovsdbBridgeName); ProtocolEntry protocolEntry = mock(ProtocolEntry.class); ProtocolEntryKey protocolEntryKey = mock(ProtocolEntryKey.class); Mockito.when(protocolEntry.getProtocol()).thenAnswer( (Answer>) invocation -> OvsdbBridgeProtocolOpenflow10.class); - when(protocolEntry.getKey()).thenReturn(protocolEntryKey); + when(protocolEntry.key()).thenReturn(protocolEntryKey); when(ovsdbBridgeAugmentation.getProtocolEntry()).thenReturn(Collections.singletonList(protocolEntry)); ControllerEntry controllerEntry = mock(ControllerEntry.class); ControllerEntryKey controllerEntryKey = mock(ControllerEntryKey.class); - when(controllerEntry.getKey()).thenReturn(controllerEntryKey); + when(controllerEntry.key()).thenReturn(controllerEntryKey); when(ovsdbBridgeAugmentation.getControllerEntry()).thenReturn(Collections.singletonList(controllerEntry)); when(ovsdbBridgeAugmentation.getManagedBy()).thenReturn(ovsdbNodeRef); @@ -141,7 +141,7 @@ public class BridgeConfigReconciliationTaskTest { } private Map, DataObject> createExpectedConfigurationChanges(final Node bridgeNode) { - OvsdbBridgeAugmentation ovsdbBridge = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbBridgeAugmentation ovsdbBridge = bridgeNode.augmentation(OvsdbBridgeAugmentation.class); Map, DataObject> changes = new HashMap<>(); final InstanceIdentifier bridgeNodeIid = @@ -152,12 +152,12 @@ public class BridgeConfigReconciliationTaskTest { changes.put(ovsdbBridgeIid, ovsdbBridge); for (ProtocolEntry protocolEntry : ovsdbBridge.getProtocolEntry()) { KeyedInstanceIdentifier protocolIid = - ovsdbBridgeIid.child(ProtocolEntry.class, protocolEntry.getKey()); + ovsdbBridgeIid.child(ProtocolEntry.class, protocolEntry.key()); changes.put(protocolIid, protocolEntry); } for (ControllerEntry controller : ovsdbBridge.getControllerEntry()) { KeyedInstanceIdentifier controllerIid = - ovsdbBridgeIid.child(ControllerEntry.class, controller.getKey()); + ovsdbBridgeIid.child(ControllerEntry.class, controller.key()); changes.put(controllerIid, controller); } return changes; diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommandTest.java index 78fd5d28c..aefe00387 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbAutoAttachRemovedCommandTest.java @@ -96,13 +96,13 @@ public class OvsdbAutoAttachRemovedCommandTest { when(SouthboundMapper.createInstanceIdentifier(nodeId)).thenReturn(nodeIid); OvsdbNodeAugmentation ovsdbNodeAugmentation = mock(OvsdbNodeAugmentation.class); - when(node.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); + when(node.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); List autoAttachList = new ArrayList<>(); Autoattach aaEntry = mock(Autoattach.class); autoAttachList.add(aaEntry); when(aaEntry.getAutoattachUuid()).thenReturn(new Uuid(AUTOATTACH_UUID.toString())); when(ovsdbNodeAugmentation.getAutoattach()).thenReturn(autoAttachList); - when(aaEntry.getKey()).thenReturn(aaKey); + when(aaEntry.key()).thenReturn(aaKey); doNothing().when(transaction).delete(any(LogicalDatastoreType.class), any(InstanceIdentifier.class)); } diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java index c0e7ceb23..137bb06be 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbControllerUpdateCommandTest.java @@ -165,7 +165,7 @@ public class OvsdbControllerUpdateCommandTest { Optional ovsdbNode = Optional.of(node); when(SouthboundUtil.readNode(transaction, connectionIId)).thenReturn(ovsdbNode); OvsdbNodeAugmentation ovsdbNodeAugmentation = mock(OvsdbNodeAugmentation.class); - when(node.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); + when(node.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); List managedNodeEntries = new ArrayList<>(); ManagedNodeEntry managedNodeEntry = mock(ManagedNodeEntry.class); @@ -201,7 +201,7 @@ public class OvsdbControllerUpdateCommandTest { PowerMockito.whenNew(NodeKey.class).withAnyArguments().thenReturn(nodeKey); PowerMockito.whenNew(TopologyKey.class).withAnyArguments().thenReturn(mock(TopologyKey.class)); //PowerMockito.suppress(MemberMatcher.methodsDeclaredIn(InstanceIdentifier.class)); - when(controllerEntry.getKey()).thenReturn(mock(ControllerEntryKey.class)); + when(controllerEntry.key()).thenReturn(mock(ControllerEntryKey.class)); assertEquals(KeyedInstanceIdentifier.class, (Whitebox .invokeMethod(ovsdbControllerUpdateCommand, "getControllerEntryIid", controllerEntry, BRIDGE_NAME) .getClass())); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommandTest.java index cf638f734..714b2cf30 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbManagersUpdateCommandTest.java @@ -158,7 +158,7 @@ public class OvsdbManagersUpdateCommandTest { PowerMockito.whenNew(NodeId.class).withAnyArguments().thenReturn(nodeId); NodeKey nodeKey = mock(NodeKey.class); PowerMockito.whenNew(NodeKey.class).withAnyArguments().thenReturn(nodeKey); - when(managerEntry.getKey()).thenReturn(mock(ManagerEntryKey.class)); + when(managerEntry.key()).thenReturn(mock(ManagerEntryKey.class)); assertEquals(KeyedInstanceIdentifier.class, Whitebox.invokeMethod(ovsdbManagersUpdateCommand, "getManagerEntryIid", managerEntry).getClass()); } diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java index da19ccf7c..6d8439825 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbNodeRemoveCommandTest.java @@ -80,7 +80,7 @@ public class OvsdbNodeRemoveCommandTest { Optional ovsdbNodeOptional = Optional.of(ovsdbNode); when(ovsdbNodeFuture.get()).thenReturn(ovsdbNodeOptional); OvsdbNodeAugmentation ovsdbNodeAugmentation = mock(OvsdbNodeAugmentation.class); - when(ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); + when(ovsdbNode.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNodeAugmentation); PowerMockito.doReturn(true).when(ovsdbNodeRemoveCommand, "checkIfOnlyConnectedManager", any(OvsdbNodeAugmentation.class)); diff --git a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java index a08a3853c..7b8321efc 100644 --- a/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java +++ b/southbound/southbound-impl/src/test/java/org/opendaylight/ovsdb/southbound/transactions/md/OvsdbPortUpdateCommandTest.java @@ -189,7 +189,7 @@ public class OvsdbPortUpdateCommandTest { PowerMockito.whenNew(TerminationPointKey.class).withAnyArguments().thenReturn(tpKey); TerminationPointBuilder tpBuilder = mock(TerminationPointBuilder.class); PowerMockito.whenNew(TerminationPointBuilder.class).withNoArguments().thenReturn(tpBuilder); - when(tpBuilder.setKey(any(TerminationPointKey.class))).thenReturn(tpBuilder); + when(tpBuilder.withKey(any(TerminationPointKey.class))).thenReturn(tpBuilder); when(tpKey.getTpId()).thenReturn(mock(TpId.class)); when(tpBuilder.setTpId(any(TpId.class))).thenReturn(tpBuilder); InstanceIdentifier tpPath = mock(InstanceIdentifier.class); @@ -352,7 +352,7 @@ public class OvsdbPortUpdateCommandTest { public void testGetTerminationPointBridge1() throws Exception { Node node = mock(Node.class); OvsdbNodeAugmentation ovsdbNode = mock(OvsdbNodeAugmentation.class); - when(node.getAugmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNode); + when(node.augmentation(OvsdbNodeAugmentation.class)).thenReturn(ovsdbNode); List managedNodes = new ArrayList<>(); ManagedNodeEntry managedNodeEntry = mock(ManagedNodeEntry.class); managedNodes.add(managedNodeEntry); @@ -371,7 +371,7 @@ public class OvsdbPortUpdateCommandTest { PowerMockito.whenNew(TerminationPointBuilder.class).withNoArguments().thenReturn(tpBuilder); PowerMockito.whenNew(TpId.class).withAnyArguments().thenReturn(mock(TpId.class)); PowerMockito.whenNew(TerminationPointKey.class).withAnyArguments().thenReturn(mock(TerminationPointKey.class)); - when(tpBuilder.setKey(any(TerminationPointKey.class))).thenReturn(tpBuilder); + when(tpBuilder.withKey(any(TerminationPointKey.class))).thenReturn(tpBuilder); List terminationPointList = new ArrayList<>(); TerminationPoint terminationPoint = mock(TerminationPoint.class); @@ -379,7 +379,7 @@ public class OvsdbPortUpdateCommandTest { when(tpBuilder.build()).thenReturn(terminationPoint); when(managedNode.getTerminationPoint()).thenReturn(terminationPointList); - when(managedNode.getAugmentation(OvsdbBridgeAugmentation.class)) + when(managedNode.augmentation(OvsdbBridgeAugmentation.class)) .thenReturn(mock(OvsdbBridgeAugmentation.class)); TpId tpId = new TpId(TP_NAME); when(terminationPoint.getTpId()).thenReturn(tpId); diff --git a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java index 790b73875..bf98ea9ae 100644 --- a/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java +++ b/southbound/southbound-it/src/test/java/org/opendaylight/ovsdb/southbound/it/SouthboundIT.java @@ -432,7 +432,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { (InstanceIdentifier)iid), OPERATIONAL_LISTENER); ovsdbNode = connectOvsdbNode(connectionInfo); - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); assertNotNull("The OvsdbNodeAugmentation cannot be null", ovsdbNodeAugmentation); schemaVersion = Version.fromString(ovsdbNodeAugmentation.getDbVersion()); LOG.info("schemaVersion = {}", schemaVersion); @@ -623,7 +623,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { @Test public void testDpdkSwitch() throws InterruptedException { ConnectionInfo connectionInfo = getConnectionInfo(addressStr, portNumber); - List datapathTypeEntries = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class) + List datapathTypeEntries = ovsdbNode.augmentation(OvsdbNodeAugmentation.class) .getDatapathTypeEntry(); if (datapathTypeEntries == null) { LOG.info("DPDK not supported on this node."); @@ -678,7 +678,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = terminationPoint - .getAugmentation(OvsdbTerminationPointAugmentation.class); + .augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(testPortname)) { Class opPort = ovsdbTerminationPointAugmentation .getInterfaceType(); @@ -695,21 +695,21 @@ public class SouthboundIT extends AbstractMdsalTestBase { @Test public void testOvsdbNodeOvsVersion() throws InterruptedException { - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); Assert.assertNotNull(ovsdbNodeAugmentation); assertNotNull(ovsdbNodeAugmentation.getOvsVersion()); } @Test public void testOvsdbNodeDbVersion() throws InterruptedException { - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); Assert.assertNotNull(ovsdbNodeAugmentation); assertNotNull(ovsdbNodeAugmentation.getDbVersion()); } @Test public void testOpenVSwitchOtherConfig() throws InterruptedException { - OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = ovsdbNode.augmentation(OvsdbNodeAugmentation.class); Assert.assertNotNull(ovsdbNodeAugmentation); List otherConfigsList = ovsdbNodeAugmentation.getOpenvswitchOtherConfigs(); if (otherConfigsList != null) { @@ -820,7 +820,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { NodeId portNodeId = SouthboundMapper.createManagedNodeId(portIid); portNodeBuilder.setNodeId(portNodeId); TerminationPointBuilder entry = new TerminationPointBuilder(); - entry.setKey(new TerminationPointKey(new TpId(portName))); + entry.withKey(new TerminationPointKey(new TpId(portName))); entry.addAugmentation( OvsdbTerminationPointAugmentation.class, ovsdbTerminationPointAugmentationBuilder.build()); @@ -934,7 +934,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { .build(); InstanceIdentifier iid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(Autoattach.class, aaEntry.getKey()); + .child(Autoattach.class, aaEntry.key()); final NotifyingDataChangeListener aaOperationalListener = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL, iid); aaOperationalListener.registerDataChangeListener(); @@ -1013,7 +1013,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { .build(); InstanceIdentifier iid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(Autoattach.class, updatedAa.getKey()); + .child(Autoattach.class, updatedAa.key()); final NotifyingDataChangeListener aaOperationalListener = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL, iid); aaOperationalListener.registerDataChangeListener(); @@ -1074,7 +1074,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { if (ovsdbNodeAugmentation.getAutoattach() != null && !ovsdbNodeAugmentation.getAutoattach().isEmpty()) { for (Autoattach aa : ovsdbNodeAugmentation.getAutoattach()) { - if (aa.getKey().getAutoattachId().equals(uri)) { + if (aa.key().getAutoattachId().equals(uri)) { return aa; } } @@ -1111,7 +1111,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { .build(); InstanceIdentifier qeIid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosEntry.getKey()); + .child(QosEntries.class, qosEntry.key()); final NotifyingDataChangeListener qosOperationalListener = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL, qeIid); qosOperationalListener.registerDataChangeListener(); @@ -1176,7 +1176,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { .build(); queueIid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(Queues.class, queue.getKey()); + .child(Queues.class, queue.key()); final NotifyingDataChangeListener queueOperationalListener = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL, queueIid); queueOperationalListener.registerDataChangeListener(); @@ -1218,7 +1218,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { InstanceIdentifier nodeIid = SouthboundUtils.createInstanceIdentifier(connectionInfo); Node node = mdsalUtils.read(store, nodeIid); Assert.assertNotNull(node); - OvsdbNodeAugmentation ovsdbNodeAugmentation = node.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNodeAugmentation = node.augmentation(OvsdbNodeAugmentation.class); Assert.assertNotNull(ovsdbNodeAugmentation); return ovsdbNodeAugmentation; } @@ -1240,7 +1240,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { LogicalDatastoreType store) { Node bridgeNode = getBridgeNode(connectionInfo, bridgeName, store); Assert.assertNotNull(bridgeNode); - OvsdbBridgeAugmentation ovsdbBridgeAugmentation = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbBridgeAugmentation ovsdbBridgeAugmentation = bridgeNode.augmentation(OvsdbBridgeAugmentation.class); Assert.assertNotNull(ovsdbBridgeAugmentation); return ovsdbBridgeAugmentation; } @@ -1317,7 +1317,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { if (tpList == null) { return null; } - return tpList.get(index).getAugmentation(OvsdbTerminationPointAugmentation.class); + return tpList.get(index).augmentation(OvsdbTerminationPointAugmentation.class); } @Test @@ -1349,7 +1349,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { Long ifIndex = ovsdbTerminationPointAugmentation.getIfindex(); Assert.assertNotNull(ifIndex); @@ -1387,7 +1387,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { Long ofPort = ovsdbTerminationPointAugmentation.getOfport(); // if ephemeral port 45002 is in use, ofPort is set to 1 @@ -1433,7 +1433,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { Long ofPort = ovsdbTerminationPointAugmentation.getOfport(); // if ephemeral port 45008 is in use, ofPort is set to 1 @@ -1532,7 +1532,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); - tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(testBridgeAndPortName))); + tpUpdateBuilder.withKey(new TerminationPointKey(new TpId(testBridgeAndPortName))); tpUpdateBuilder.addAugmentation( OvsdbTerminationPointAugmentation.class, tpUpdateAugmentationBuilder.build()); @@ -1745,7 +1745,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation; for (TerminationPoint terminationPoint : terminationPoints) { - ovsdbTerminationPointAugmentation = terminationPoint.getAugmentation( + ovsdbTerminationPointAugmentation = terminationPoint.augmentation( OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { VlanId actualVlanId = ovsdbTerminationPointAugmentation.getVlanTag(); @@ -1765,7 +1765,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); - tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); + tpUpdateBuilder.withKey(new TerminationPointKey(new TpId(portName))); tpUpdateBuilder.addAugmentation( OvsdbTerminationPointAugmentation.class, tpUpdateAugmentationBuilder.build()); @@ -1778,7 +1778,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { terminationPointNode = mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, terminationPointIid); terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { - ovsdbTerminationPointAugmentation = terminationPoint.getAugmentation( + ovsdbTerminationPointAugmentation = terminationPoint.augmentation( OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { VlanId actualVlanId = ovsdbTerminationPointAugmentation.getVlanTag(); @@ -1818,7 +1818,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { //test Assert.assertTrue(ovsdbTerminationPointAugmentation.getVlanMode().equals(vlanMode)); @@ -1835,7 +1835,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); - tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); + tpUpdateBuilder.withKey(new TerminationPointKey(new TpId(portName))); tpUpdateBuilder.addAugmentation( OvsdbTerminationPointAugmentation.class, tpUpdateAugmentationBuilder.build()); @@ -1849,7 +1849,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { //test Assert.assertEquals(updatedVlanMode, ovsdbTerminationPointAugmentation.getVlanMode()); @@ -1908,7 +1908,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { List terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { List actualTrunks = ovsdbTerminationPointAugmentation.getTrunks(); for (Trunks trunk : trunks) { @@ -1928,7 +1928,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { NodeId portUpdateNodeId = SouthboundUtils.createManagedNodeId(portIid); portUpdateNodeBuilder.setNodeId(portUpdateNodeId); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); - tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); + tpUpdateBuilder.withKey(new TerminationPointKey(new TpId(portName))); tpUpdateBuilder.addAugmentation( OvsdbTerminationPointAugmentation.class, tpUpdateAugmentationBuilder.build()); @@ -1942,7 +1942,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { terminationPoints = terminationPointNode.getTerminationPoint(); for (TerminationPoint terminationPoint : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - terminationPoint.getAugmentation(OvsdbTerminationPointAugmentation.class); + terminationPoint.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { //test Assert.assertEquals(updatedTrunks, ovsdbTerminationPointAugmentation.getTrunks()); @@ -1991,7 +1991,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { new OvsdbTerminationPointAugmentationBuilder(); tpUpdateAugmentationBuilder.setName(portName); TerminationPointBuilder tpUpdateBuilder = new TerminationPointBuilder(); - tpUpdateBuilder.setKey(new TerminationPointKey(new TpId(portName))); + tpUpdateBuilder.withKey(new TerminationPointKey(new TpId(portName))); tpUpdateBuilder.addAugmentation( OvsdbTerminationPointAugmentation.class, tpUpdateAugmentationBuilder.build()); @@ -2094,7 +2094,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { final NodeBuilder bridgeUpdateNodeBuilder = new NodeBuilder(); final Node bridgeNode = getBridgeNode(connectionInfo, testBridgeName); bridgeUpdateNodeBuilder.setNodeId(bridgeNode.getNodeId()); - bridgeUpdateNodeBuilder.setKey(bridgeNode.getKey()); + bridgeUpdateNodeBuilder.withKey(bridgeNode.key()); bridgeUpdateNodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, bridgeUpdateAugmentationBuilder.build()); Assert.assertTrue(mdsalUtils.merge(LogicalDatastoreType.CONFIGURATION, bridgeIid, @@ -2202,7 +2202,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { private Queues getQueue(Uri queueId, OvsdbNodeAugmentation node) { for (Queues queue : node.getQueues()) { - if (queue.getKey().getQueueId().getValue().equals(queueId.getValue())) { + if (queue.key().getQueueId().getValue().equals(queueId.getValue())) { return queue; } } @@ -2241,7 +2241,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { private QosEntries getQos(Uri qosId, OvsdbNodeAugmentation node) { for (QosEntries qos : node.getQosEntries()) { - if (qos.getKey().getQosId().equals(qosId)) { + if (qos.key().getQosId().equals(qosId)) { return qos; } } @@ -2270,7 +2270,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { queuesBuilder.setQueueId(new Uri(testQueueId)); InstanceIdentifier queueIid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(Queues.class, queuesBuilder.build().getKey()); + .child(Queues.class, queuesBuilder.build().key()); final NotifyingDataChangeListener queueConfigurationListener = new NotifyingDataChangeListener(LogicalDatastoreType.CONFIGURATION, queueIid); queueConfigurationListener.registerDataChangeListener(); @@ -2364,7 +2364,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { queuesBuilder.setQueueId(new Uri(testQueueId)); InstanceIdentifier queueIid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(Queues.class, queuesBuilder.build().getKey()); + .child(Queues.class, queuesBuilder.build().key()); final NotifyingDataChangeListener queueOperationalListener = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL, queueIid); queueOperationalListener.registerDataChangeListener(); @@ -2412,7 +2412,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { qosBuilder.setQosId(new Uri(testQosId)); InstanceIdentifier qosIid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosBuilder.build().getKey()); + .child(QosEntries.class, qosBuilder.build().key()); final NotifyingDataChangeListener qosConfigurationListener = new NotifyingDataChangeListener(LogicalDatastoreType.CONFIGURATION, qosIid); qosConfigurationListener.registerDataChangeListener(); @@ -2507,7 +2507,7 @@ public class SouthboundIT extends AbstractMdsalTestBase { qosBuilder.setQosId(new Uri(testQosId)); InstanceIdentifier qosIid = SouthboundUtils.createInstanceIdentifier(connectionInfo) .augmentation(OvsdbNodeAugmentation.class) - .child(QosEntries.class, qosBuilder.build().getKey()); + .child(QosEntries.class, qosBuilder.build().key()); final NotifyingDataChangeListener qosOperationalListener = new NotifyingDataChangeListener(LogicalDatastoreType.OPERATIONAL, qosIid); qosOperationalListener.registerDataChangeListener(); diff --git a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java index 567de12ce..5c5f4c06e 100644 --- a/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java +++ b/utils/mdsal-utils/src/test/java/org/opendaylight/ovsdb/utils/mdsal/utils/MdsalUtilsAsyncTest.java @@ -52,7 +52,7 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest { private static final NodeId NODE_ID = new NodeId("test"); private static final NodeKey NODE_KEY = new NodeKey(NODE_ID); - private static final Node DATA = new NodeBuilder().setKey(NODE_KEY).setNodeId(NODE_ID).build(); + private static final Node DATA = new NodeBuilder().withKey(NODE_KEY).setNodeId(NODE_ID).build(); private static final InstanceIdentifier TEST_IID = InstanceIdentifier .create(NetworkTopology.class) @@ -99,9 +99,9 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest { @Test public void testPutWithoutCallback() { final String operationDesc = "testPut"; - final SupportingNode supportingNodeBuilder1 = new SupportingNodeBuilder().setKey( + final SupportingNode supportingNodeBuilder1 = new SupportingNodeBuilder().withKey( new SupportingNodeKey(new NodeId("id1"), TOPOLOGY_TEST)).build(); - final SupportingNode supportingNodeBuilder2 = new SupportingNodeBuilder().setKey( + final SupportingNode supportingNodeBuilder2 = new SupportingNodeBuilder().withKey( new SupportingNodeKey(new NodeId("id2"), TOPOLOGY_TEST)).build(); final Node data1 = new NodeBuilder(DATA).setSupportingNode( @@ -131,9 +131,9 @@ public class MdsalUtilsAsyncTest extends AbstractDataBrokerTest { @Test public void testMerge() { final String operationDesc = "testMerge"; - final SupportingNode supportingNodeBuilder1 = new SupportingNodeBuilder().setKey( + final SupportingNode supportingNodeBuilder1 = new SupportingNodeBuilder().withKey( new SupportingNodeKey(new NodeId("id1"), TOPOLOGY_TEST)).build(); - final SupportingNode supportingNodeBuilder2 = new SupportingNodeBuilder().setKey( + final SupportingNode supportingNodeBuilder2 = new SupportingNodeBuilder().withKey( new SupportingNodeKey(new NodeId("id2"), TOPOLOGY_TEST)).build(); final Node data1 = new NodeBuilder(DATA).setSupportingNode( diff --git a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java index b30c62623..1811a2456 100644 --- a/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java +++ b/utils/southbound-utils/src/main/java/org/opendaylight/ovsdb/utils/southbound/utils/SouthboundUtils.java @@ -225,7 +225,7 @@ public class SouthboundUtils { InstanceIdentifier terminationPointPath = InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(OVSDB_TOPOLOGY_ID)) - .child(Node.class,node.getKey()) + .child(Node.class,node.key()) .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); LOG.debug("Termination point InstanceIdentifier generated : {}",terminationPointPath); @@ -256,7 +256,7 @@ public class SouthboundUtils { } public OvsdbNodeAugmentation extractOvsdbNode(Node node) { - return node.getAugmentation(OvsdbNodeAugmentation.class); + return node.augmentation(OvsdbNodeAugmentation.class); } public static IpAddress createIpAddress(InetAddress address) { @@ -398,7 +398,7 @@ public class SouthboundUtils { OvsdbBridgeAugmentation ovsdbBridgeAugmentation = null; Node bridgeNode = getBridgeNode(connectionInfo, bridgeName, store); if (bridgeNode != null) { - ovsdbBridgeAugmentation = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); + ovsdbBridgeAugmentation = bridgeNode.augmentation(OvsdbBridgeAugmentation.class); } return ovsdbBridgeAugmentation; } @@ -451,21 +451,21 @@ public class SouthboundUtils { ConnectionInfo connectionInfo = getConnectionInfo(ovsdbNode); if (connectionInfo != null) { InstanceIdentifier bridgeIid = - createInstanceIdentifier(node.getKey(), name); + createInstanceIdentifier(node.key(), name); bridgeNode = mdsalUtils.read(LogicalDatastoreType.OPERATIONAL, bridgeIid); } return bridgeNode; } public OvsdbNodeAugmentation extractNodeAugmentation(Node node) { - return node.getAugmentation(OvsdbNodeAugmentation.class); + return node.augmentation(OvsdbNodeAugmentation.class); } public OvsdbBridgeAugmentation extractBridgeAugmentation(Node node) { if (node == null) { return null; } - return node.getAugmentation(OvsdbBridgeAugmentation.class); + return node.augmentation(OvsdbBridgeAugmentation.class); } public Node readOvsdbNode(Node bridgeNode) { @@ -606,7 +606,7 @@ public class SouthboundUtils { ConnectionInfo connectionInfo = getConnectionInfo(ovsdbNode); if (connectionInfo != null) { NodeBuilder bridgeNodeBuilder = new NodeBuilder(); - InstanceIdentifier bridgeIid = createInstanceIdentifier(ovsdbNode.getKey(), bridgeName); + InstanceIdentifier bridgeIid = createInstanceIdentifier(ovsdbNode.key(), bridgeName); NodeId bridgeNodeId = createManagedNodeId(bridgeIid); bridgeNodeBuilder.setNodeId(bridgeNodeId); OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder = new OvsdbBridgeAugmentationBuilder(); @@ -626,7 +626,7 @@ public class SouthboundUtils { bridgeOtherConfigsBuilder.setBridgeOtherConfigValue("true"); otherConfigs.add(bridgeOtherConfigsBuilder.build()); ovsdbBridgeAugmentationBuilder.setBridgeOtherConfigs(otherConfigs); - setManagedByForBridge(ovsdbBridgeAugmentationBuilder, ovsdbNode.getKey()); + setManagedByForBridge(ovsdbBridgeAugmentationBuilder, ovsdbNode.key()); if (dpType != null) { ovsdbBridgeAugmentationBuilder.setDatapathType(dpType); } @@ -671,7 +671,7 @@ public class SouthboundUtils { LOG.debug("setBridgeController: ovsdbNode: {}, bridgeNode: {}, controller(s): {}", ovsdbNode, bridgeName, controllers); - InstanceIdentifier bridgeNodeIid = createInstanceIdentifier(ovsdbNode.getKey(), bridgeName); + InstanceIdentifier bridgeNodeIid = createInstanceIdentifier(ovsdbNode.key(), bridgeName); Node bridgeNode = mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, bridgeNodeIid); if (bridgeNode == null) { LOG.info("setBridgeController could not find bridge in configuration {}", bridgeNodeIid); @@ -706,7 +706,7 @@ public class SouthboundUtils { augBuilder.setControllerEntry(newControllerEntries); nodeBuilder.addAugmentation(OvsdbBridgeAugmentation.class, augBuilder.build()); - InstanceIdentifier bridgeIid = createInstanceIdentifier(ovsdbNode.getKey(), bridgeName); + InstanceIdentifier bridgeIid = createInstanceIdentifier(ovsdbNode.key(), bridgeName); return mdsalUtils.merge(LogicalDatastoreType.CONFIGURATION, bridgeIid, nodeBuilder.build()); } @@ -737,7 +737,7 @@ public class SouthboundUtils { List optionsList = new ArrayList<>(); for (Map.Entry entry : options.entrySet()) { OptionsBuilder optionsBuilder = new OptionsBuilder(); - optionsBuilder.setKey(new OptionsKey(entry.getKey())); + optionsBuilder.withKey(new OptionsKey(entry.getKey())); optionsBuilder.setOption(entry.getKey()); optionsBuilder.setValue(entry.getValue()); optionsList.add(optionsBuilder.build()); @@ -749,7 +749,7 @@ public class SouthboundUtils { List externalIdsList = new ArrayList<>(); for (Map.Entry entry : externalIds.entrySet()) { InterfaceExternalIdsBuilder interfaceExternalIdsBuilder = new InterfaceExternalIdsBuilder(); - interfaceExternalIdsBuilder.setKey(new InterfaceExternalIdsKey(entry.getKey())); + interfaceExternalIdsBuilder.withKey(new InterfaceExternalIdsKey(entry.getKey())); interfaceExternalIdsBuilder.setExternalIdKey(entry.getKey()); interfaceExternalIdsBuilder.setExternalIdValue(entry.getValue()); externalIdsList.add(interfaceExternalIdsBuilder.build()); @@ -759,7 +759,7 @@ public class SouthboundUtils { TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); InstanceIdentifier tpIid = createTerminationPointInstanceIdentifier(bridgeNode, portName); - tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); + tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid)); tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); /* TODO SB_MIGRATION should this be merge or mdsalUtils.put */ return mdsalUtils.put(LogicalDatastoreType.CONFIGURATION, tpIid, tpBuilder.build()); @@ -781,7 +781,7 @@ public class SouthboundUtils { List optionsList = new ArrayList<>(); for (Map.Entry entry : options.entrySet()) { OptionsBuilder optionsBuilder = new OptionsBuilder(); - optionsBuilder.setKey(new OptionsKey(entry.getKey())); + optionsBuilder.withKey(new OptionsKey(entry.getKey())); optionsBuilder.setOption(entry.getKey()); optionsBuilder.setValue(entry.getValue()); optionsList.add(optionsBuilder.build()); @@ -790,7 +790,7 @@ public class SouthboundUtils { TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); InstanceIdentifier tpIid = createTerminationPointInstanceIdentifier(bridgeNode, portName); - tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); + tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid)); tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); /* TODO SB_MIGRATION should this be merge or mdsalUtils.put */ return mdsalUtils.put(LogicalDatastoreType.CONFIGURATION, tpIid, tpBuilder.build()); @@ -806,7 +806,7 @@ public class SouthboundUtils { tpAugmentationBuilder.setInterfaceType(OVSDB_INTERFACE_TYPE_MAP.get(type)); } TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); + tpBuilder.withKey(InstanceIdentifier.keyOf(tpIid)); tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); return mdsalUtils.put(LogicalDatastoreType.CONFIGURATION, tpIid, tpBuilder.build()); } @@ -974,7 +974,7 @@ public class SouthboundUtils { } public String getDatapathId(Node node) { - OvsdbBridgeAugmentation ovsdbBridgeAugmentation = node.getAugmentation(OvsdbBridgeAugmentation.class); + OvsdbBridgeAugmentation ovsdbBridgeAugmentation = node.augmentation(OvsdbBridgeAugmentation.class); return getDatapathId(ovsdbBridgeAugmentation); } @@ -987,7 +987,7 @@ public class SouthboundUtils { } public String extractBridgeName(Node node) { - return node.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue(); + return node.augmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue(); } public boolean isBridgeOnOvsdbNode(Node ovsdbNode, String bridgeName) { @@ -1011,10 +1011,10 @@ public class SouthboundUtils { public OvsdbBridgeAugmentation getBridgeFromConfig(Node node, String bridge) { OvsdbBridgeAugmentation ovsdbBridgeAugmentation = null; InstanceIdentifier bridgeIid = - createInstanceIdentifier(node.getKey(), bridge); + createInstanceIdentifier(node.key(), bridge); Node bridgeNode = mdsalUtils.read(LogicalDatastoreType.CONFIGURATION, bridgeIid); if (bridgeNode != null) { - ovsdbBridgeAugmentation = bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class); + ovsdbBridgeAugmentation = bridgeNode.augmentation(OvsdbBridgeAugmentation.class); } return ovsdbBridgeAugmentation; } @@ -1062,7 +1062,7 @@ public class SouthboundUtils { } public OvsdbTerminationPointAugmentation extractTerminationPointAugmentation(Node bridgeNode, String portName) { - if (bridgeNode.getAugmentation(OvsdbBridgeAugmentation.class) != null) { + if (bridgeNode.augmentation(OvsdbBridgeAugmentation.class) != null) { List tpAugmentations = extractTerminationPointAugmentations(bridgeNode); for (OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation : tpAugmentations) { if (ovsdbTerminationPointAugmentation.getName().equals(portName)) { @@ -1083,7 +1083,7 @@ public class SouthboundUtils { if (terminationPoints != null && !terminationPoints.isEmpty()) { for (TerminationPoint tp : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - tp.getAugmentation(OvsdbTerminationPointAugmentation.class); + tp.augmentation(OvsdbTerminationPointAugmentation.class); if (ovsdbTerminationPointAugmentation != null) { tpAugmentations.add(ovsdbTerminationPointAugmentation); } @@ -1147,11 +1147,11 @@ public class SouthboundUtils { * @return the value for key or null if key not found */ public String getOpenvswitchOtherConfig(Node node, String key) { - OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); if (ovsdbNode == null) { Node nodeFromReadOvsdbNode = readOvsdbNode(node); if (nodeFromReadOvsdbNode != null) { - ovsdbNode = nodeFromReadOvsdbNode.getAugmentation(OvsdbNodeAugmentation.class); + ovsdbNode = nodeFromReadOvsdbNode.augmentation(OvsdbNodeAugmentation.class); } } @@ -1169,7 +1169,7 @@ public class SouthboundUtils { public static TerminationPoint getTerminationPointByExternalId(final Node bridgeNode, final String interfaceName) { if (bridgeNode.getTerminationPoint() != null) { for (TerminationPoint tp : bridgeNode.getTerminationPoint()) { - OvsdbTerminationPointAugmentation ovsdbTp = tp.getAugmentation(OvsdbTerminationPointAugmentation.class); + OvsdbTerminationPointAugmentation ovsdbTp = tp.augmentation(OvsdbTerminationPointAugmentation.class); String externalIdValue = getExternalInterfaceIdValue(ovsdbTp); if (externalIdValue != null && externalIdValue.equals(interfaceName)) { LOG.debug("Found matching termination point with iface-id {} on bridgeNode {}, returning tp {}",