From: Stephen Kitt Date: Thu, 31 May 2018 16:48:50 +0000 (+0200) Subject: Fixup Augmentable and Identifiable methods changing X-Git-Tag: release/fluorine~169 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=82fc8f6178fa492fc7aa52219a56f85f78316492;p=netvirt.git Fixup Augmentable and Identifiable methods changing This is a fixup of the change in binding codegen, adjusting: - getKey() -> key() - setKey() -> withKey() - getAugmentation() -> augmentation() Change-Id: I19a391660f0bc30b0ec8d043859d9d20b81f3dfd JIRA: TSC-101 Signed-off-by: Stephen Kitt --- diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java index d2282f9532..38e19785d2 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/AbstractAclServiceImpl.java @@ -400,7 +400,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener { List matches = entry.getValue(); matches.add(lportTagMatch); String flowId = flowName + this.directionString + "_" + port.getDpId() + "_" + port.getLPortTag() + "_" - + ace.getKey().getRuleName(); + + ace.key().getRuleName(); int operation = addOrRemove == NwConstants.MOD_FLOW ? NwConstants.DEL_FLOW : addOrRemove; syncFlow(port.getDpId(), getAclFilterCumDispatcherTable(), flowId, flowPriority, "ACL", 0, 0, @@ -432,7 +432,7 @@ public abstract class AbstractAclServiceImpl implements AclServiceListener { List matches = entry.getValue(); matches.addAll(lportAndAclMatches); String flowId = flowName + this.directionString + "_" + port.getDpId() + "_" + port.getLPortTag() + "_" - + ace.getKey().getRuleName(); + + ace.key().getRuleName(); int operation = addOrRemove == NwConstants.MOD_FLOW ? NwConstants.DEL_FLOW : addOrRemove; syncFlow(port.getDpId(), getAclRuleBasedFilterTable(), flowId, flowPriority, "ACL", 0, 0, diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java index bd437ecdd4..f97fa81a47 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclEventListener.java @@ -178,7 +178,7 @@ public class AclEventListener extends AsyncDataTreeChangeListenerBase key, Interface portBefore, Interface portAfter) { - if (portBefore.getAugmentation(ParentRefs.class) == null - && portAfter.getAugmentation(ParentRefs.class) != null) { + if (portBefore.augmentation(ParentRefs.class) == null + && portAfter.augmentation(ParentRefs.class) != null) { LOG.trace("Ignoring event for update in ParentRefs for {} ", portAfter.getName()); return; } LOG.trace("Received AclInterface update event, portBefore={}, portAfter={}", portBefore, portAfter); - InterfaceAcl aclInPortAfter = portAfter.getAugmentation(InterfaceAcl.class); - InterfaceAcl aclInPortBefore = portBefore.getAugmentation(InterfaceAcl.class); + InterfaceAcl aclInPortAfter = portAfter.augmentation(InterfaceAcl.class); + InterfaceAcl aclInPortBefore = portBefore.augmentation(InterfaceAcl.class); String interfaceId = portAfter.getName(); org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.state @@ -240,7 +240,7 @@ public class AclInterfaceListener extends AsyncDataTreeChangeListenerBase key, Interface port) { LOG.trace("Received AclInterface add event, port={}", port); - InterfaceAcl aclInPort = port.getAugmentation(InterfaceAcl.class); + InterfaceAcl aclInPort = port.augmentation(InterfaceAcl.class); if (aclInPort != null && aclInPort.isPortSecurityEnabled()) { String interfaceId = port.getName(); AclInterface aclInterface = addOrUpdateAclInterfaceCache(interfaceId, aclInPort); diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java index ee49260d36..4e92980c1d 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/listeners/AclInterfaceStateListener.java @@ -137,7 +137,7 @@ public class AclInterfaceStateListener extends AsyncDataTreeChangeListenerBase sgList = new ArrayList<>(interfaceAclBefore.getSecurityGroups()); sgList.remove(aclId); InterfaceAcl interfaceAclAfter = new InterfaceAclBuilder(interfaceAclBefore).setSecurityGroups(sgList) diff --git a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java index b64d68005b..b90dcecf00 100644 --- a/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java +++ b/aclservice/impl/src/main/java/org/opendaylight/netvirt/aclservice/utils/AclServiceUtils.java @@ -310,7 +310,7 @@ public final class AclServiceUtils { LOG.error("Port is Null"); return null; } - InterfaceAcl aclInPort = port.getAugmentation(InterfaceAcl.class); + InterfaceAcl aclInPort = port.augmentation(InterfaceAcl.class); if (aclInPort == null) { LOG.error("getSecurityGroupInPortList: no security group associated with port {}", port.getName()); @@ -329,7 +329,7 @@ public final class AclServiceUtils { LOG.error("Ace is Null"); return null; } - SecurityRuleAttr aceAttributes = ace.getAugmentation(SecurityRuleAttr.class); + SecurityRuleAttr aceAttributes = ace.augmentation(SecurityRuleAttr.class); if (aceAttributes == null) { LOG.error("Ace is null"); return null; @@ -441,7 +441,7 @@ public final class AclServiceUtils { BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority) .setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) + return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class) .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); } @@ -480,7 +480,7 @@ public final class AclServiceUtils { for (Iterator iterator = newAllowedAddressPairs.iterator(); iterator.hasNext();) { AllowedAddressPairs updatedAllowedAddressPair = iterator.next(); for (AllowedAddressPairs currentAllowedAddressPair : origAllowedAddressPairs) { - if (updatedAllowedAddressPair.getKey().equals(currentAllowedAddressPair.getKey())) { + if (updatedAllowedAddressPair.key().equals(currentAllowedAddressPair.key())) { iterator.remove(); break; } @@ -494,7 +494,7 @@ public final class AclServiceUtils { LOG.error("Port is Null"); return null; } - InterfaceAcl aclInPort = port.getAugmentation(InterfaceAcl.class); + InterfaceAcl aclInPort = port.augmentation(InterfaceAcl.class); if (aclInPort == null) { LOG.error("getSecurityGroupInPortList: no security group associated to Interface port: {}", port.getName()); return null; @@ -1118,7 +1118,7 @@ public final class AclServiceUtils { if (acl.getAccessListEntries() != null) { List aceList = acl.getAccessListEntries().getAce(); if (aceList != null && !aceList.isEmpty()) { - return aceList.get(0).getAugmentation(SecurityRuleAttr.class) != null; + return aceList.get(0).augmentation(SecurityRuleAttr.class) != null; } } return false; @@ -1314,7 +1314,7 @@ public final class AclServiceUtils { futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { for (AllowedAddressPairs aap : allowedAddresses) { PortIds portIdObj = - new PortIdsBuilder().setKey(new PortIdsKey(portId)).setPortId(portId).build(); + new PortIdsBuilder().withKey(new PortIdsKey(portId)).setPortId(portId).build(); InstanceIdentifier path = AclServiceUtils.getPortIdsPathInAclPortsLookup(aclName, aap.getIpAddress(), portId); tx.put(LogicalDatastoreType.OPERATIONAL, path, portIdObj, diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java index 32556c644a..678d081607 100644 --- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java +++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/AclServiceTestBase.java @@ -626,7 +626,7 @@ public abstract class AclServiceTestBase { protected static SubnetInfo buildSubnetInfo(Uuid subnetId, String ipPrefix, Class ipVersion, String gwIp) { - return new SubnetInfoBuilder().setKey(new SubnetInfoKey(subnetId)).setIpVersion(ipVersion) + return new SubnetInfoBuilder().withKey(new SubnetInfoKey(subnetId)).setIpVersion(ipVersion) .setIpPrefix(new IpPrefixOrAddress(ipPrefix.toCharArray())) .setGatewayIp(new IpAddress(gwIp.toCharArray())).build(); } diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.java index ba5d6eff31..a0be0564b6 100644 --- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.java +++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedAceBuilder.java @@ -57,7 +57,7 @@ public class IdentifiedAceBuilder implements DataTreeIdentifierDataObjectPairBui @Override public Ace dataObject() { return new AceBuilder() - .setKey(new AceKey(ruleName)) + .withKey(new AceKey(ruleName)) .setRuleName(ruleName) .setMatches(matches) .setActions(new ActionsBuilder() diff --git a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedPortSubnetBuilder.java b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedPortSubnetBuilder.java index ea2ad381e5..401d8331da 100644 --- a/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedPortSubnetBuilder.java +++ b/aclservice/impl/src/test/java/org/opendaylight/netvirt/aclservice/tests/IdentifiedPortSubnetBuilder.java @@ -30,7 +30,7 @@ public class IdentifiedPortSubnetBuilder implements DataTreeIdentifierDataObject @Override public PortSubnet dataObject() { return new PortSubnetBuilder() - .setKey(new PortSubnetKey(newInterfaceName)) + .withKey(new PortSubnetKey(newInterfaceName)) .setPortId(newInterfaceName) .setSubnetInfo(subnetInfoList) .build(); diff --git a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java index cad127397b..005b907f99 100755 --- a/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java +++ b/bgpmanager/impl/src/main/java/org/opendaylight/netvirt/bgpmanager/BgpUtil.java @@ -220,7 +220,7 @@ public class BgpUtil implements AutoCloseable { InstanceIdentifier externalTepsId = getExternalTepsIdentifier(elanName, tepIp); ExternalTepsBuilder externalTepsBuilder = new ExternalTepsBuilder(); ExternalTepsKey externalTepsKey = externalTepsId.firstKeyOf(ExternalTeps.class); - externalTepsBuilder.setKey(externalTepsKey); + externalTepsBuilder.withKey(externalTepsKey); externalTepsBuilder.setTepIp(externalTepsKey.getTepIp()); update(externalTepsId, externalTepsBuilder.build()); } diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java index 8459725e59..71bfd50e41 100644 --- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java +++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/jobs/AddVpnPseudoPortDataJob.java @@ -44,7 +44,7 @@ public class AddVpnPseudoPortDataJob extends VpnPseudoPortDataBaseJob { super.vpnRd, vpnPseudoLportTag, scfTag, scfTableIdToGo); VpnToPseudoPortData newValue = - new VpnToPseudoPortDataBuilder().setKey(new VpnToPseudoPortDataKey(super.vpnRd)).setVrfId(super.vpnRd) + new VpnToPseudoPortDataBuilder().withKey(new VpnToPseudoPortDataKey(super.vpnRd)).setVrfId(super.vpnRd) .setScfTableId(scfTableIdToGo).setScfTag(scfTag) .setVpnLportTag(vpnPseudoLportTag).build(); LOG.trace("Adding lportTag={} to VpnToLportTag map for VPN with rd={}", vpnPseudoLportTag, vpnRd); diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java index 872099f1cc..522bef3f1d 100644 --- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java +++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/listeners/CloudScVpnInterfaceListener.java @@ -77,7 +77,7 @@ public class CloudScVpnInterfaceListener } break; } - vpnScHandler.unbindScfOnVpnInterface(vpnIfaceRemoved.getKey().getName()); + vpnScHandler.unbindScfOnVpnInterface(vpnIfaceRemoved.key().getName()); } @Override @@ -99,7 +99,7 @@ public class CloudScVpnInterfaceListener LOG.trace("Vpn {} is not related to ServiceChaining. No further action", vpnName); return; } - vpnScHandler.bindScfOnVpnInterface(vpnIfaceAdded.getKey().getName(), + vpnScHandler.bindScfOnVpnInterface(vpnIfaceAdded.key().getName(), optScfInfoForVpn.get().getScfTag()); } catch (ReadFailedException e) { LOG.error("Error reading the SFC information for VPN {}", vpnName, e); diff --git a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java index 80c491ad89..677fb430de 100755 --- a/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java +++ b/cloud-servicechain/impl/src/main/java/org/opendaylight/netvirt/cloudservicechain/utils/ElanServiceChainUtils.java @@ -265,7 +265,7 @@ public final class ElanServiceChainUtils { if (addOrRemove == NwConstants.ADD_FLOW) { ElanToPseudoPortData newValue = - new ElanToPseudoPortDataBuilder().setKey(key).setElanLportTag(portTag) + new ElanToPseudoPortDataBuilder().withKey(key).setElanLportTag(portTag) .setScfTag(scfTag).build(); MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, path, newValue); } else { diff --git a/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java b/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java index ae757564dc..c420779d70 100755 --- a/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java +++ b/cloud-servicechain/impl/src/test/java/org/opendaylight/netvirt/cloudservicechain/VPNServiceChainHandlerTest.java @@ -149,7 +149,7 @@ public class VPNServiceChainHandlerTest { } private void stubGetRouteDistinguisher(String vpnName, String rd) throws Exception { - VpnInstance instance = new VpnInstanceBuilder().setKey(new VpnInstanceKey(vpnName)).setVrfId(rd) + VpnInstance instance = new VpnInstanceBuilder().withKey(new VpnInstanceKey(vpnName)).setVrfId(rd) .setVpnInstanceName(vpnName).build(); InstanceIdentifier id = VpnServiceChainUtils.getVpnInstanceToVpnIdIdentifier(vpnName); @@ -183,17 +183,17 @@ public class VPNServiceChainHandlerTest { private void stubGetVpnInstance(String rd, String ipAddress, String ifaceName) throws Exception { IpAddresses ipAddr = - new IpAddressesBuilder().setIpAddress(ipAddress).setKey(new IpAddressesKey(ipAddress)).build(); + new IpAddressesBuilder().setIpAddress(ipAddress).withKey(new IpAddressesKey(ipAddress)).build(); List ifacesList = Collections.singletonList(new VpnInterfacesBuilder().setInterfaceName(ifaceName).build()); VpnToDpnListBuilder vtdlb = - new VpnToDpnListBuilder().setKey(new VpnToDpnListKey(DPN_ID)) + new VpnToDpnListBuilder().withKey(new VpnToDpnListKey(DPN_ID)) .setDpnId(DPN_ID) .setIpAddresses(Collections.singletonList(ipAddr)) .setVpnInterfaces(ifacesList); VpnInstanceOpDataEntry vpnInstanceOpDataEntry = - new VpnInstanceOpDataEntryBuilder().setKey(new VpnInstanceOpDataEntryKey(rd)) + new VpnInstanceOpDataEntryBuilder().withKey(new VpnInstanceOpDataEntryKey(rd)) .setVpnId(VPN_ID) .setVpnToDpnList(Collections.singletonList(vtdlb.build())) .setVrfId("1").build(); @@ -206,7 +206,7 @@ public class VPNServiceChainHandlerTest { private void stubGetVrfEntries(String rd, List vrfEntryList) throws Exception { - VrfTables tables = new VrfTablesBuilder().setKey(new VrfTablesKey(rd)).setRouteDistinguisher(rd) + VrfTables tables = new VrfTablesBuilder().withKey(new VrfTablesKey(rd)).setRouteDistinguisher(rd) .setVrfEntry(vrfEntryList).build(); CheckedFuture chkdFuture = mock(CheckedFuture.class); when(chkdFuture.checkedGet()).thenReturn(Optional.of(tables)); @@ -220,7 +220,7 @@ public class VPNServiceChainHandlerTest { List vpnIfacesList = vpnIfacesOnDpn.stream() - .map((ifaceName) -> new VpnInterfacesBuilder().setKey(new VpnInterfacesKey(ifaceName)) + .map((ifaceName) -> new VpnInterfacesBuilder().withKey(new VpnInterfacesKey(ifaceName)) .setInterfaceName(ifaceName).build()) .collect(Collectors.toList()); diff --git a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java index ccc5221c3f..487fab62c5 100644 --- a/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java +++ b/coe/impl/src/main/java/org/opendaylight/netvirt/coe/utils/CoeUtils.java @@ -136,7 +136,7 @@ public final class CoeUtils { } elanInstanceBuilder.setExternal(isExternal); - elanInstanceBuilder.setKey(new ElanInstanceKey(elanInstanceName)); + elanInstanceBuilder.withKey(new ElanInstanceKey(elanInstanceName)); return elanInstanceBuilder.build(); } @@ -145,7 +145,7 @@ public final class CoeUtils { InstanceIdentifier id = InstanceIdentifier.builder(ElanInterfaces.class).child(ElanInterface .class, new ElanInterfaceKey(elanInterfaceName)).build(); ElanInterface elanInterface = new ElanInterfaceBuilder().setElanInstanceName(elanInstanceName) - .setName(elanInterfaceName).setKey(new ElanInterfaceKey(elanInterfaceName)).build(); + .setName(elanInterfaceName).withKey(new ElanInterfaceKey(elanInterfaceName)).build(); wrtConfigTxn.put(LogicalDatastoreType.CONFIGURATION, id, elanInterface); LOG.debug("Creating new ELAN Interface {}", elanInterface); } @@ -157,11 +157,11 @@ public final class CoeUtils { .class, new ElanInterfaceKey(elanInterfaceName)).build(); PhysAddress physAddress = PhysAddress.getDefaultInstance(macAddress); List staticMacEntriesList = new ArrayList<>(); - StaticMacEntries staticMacEntries = new StaticMacEntriesBuilder().setKey(new StaticMacEntriesKey( + StaticMacEntries staticMacEntries = new StaticMacEntriesBuilder().withKey(new StaticMacEntriesKey( physAddress)).setMacAddress(physAddress).setIpPrefix(ipAddress).build(); staticMacEntriesList.add(staticMacEntries); ElanInterface elanInterface = new ElanInterfaceBuilder().setName(elanInterfaceName) - .setKey(new ElanInterfaceKey(elanInterfaceName)).setStaticMacEntries(staticMacEntriesList).build(); + .withKey(new ElanInterfaceKey(elanInterfaceName)).setStaticMacEntries(staticMacEntriesList).build(); wrtConfigTxn.merge(LogicalDatastoreType.CONFIGURATION, id, elanInterface); LOG.debug("Updating ELAN Interface with static mac {}", elanInterface); } @@ -170,7 +170,7 @@ public final class CoeUtils { WriteTransaction writeTransaction) { InstanceIdentifier id = InstanceIdentifier.builder(PodidentifierInfo.class) .child(PodIdentifier.class, new PodIdentifierKey(podName)).build(); - PodIdentifier podIdentifier = new PodIdentifierBuilder().setKey(new PodIdentifierKey(podName)) + PodIdentifier podIdentifier = new PodIdentifierBuilder().withKey(new PodIdentifierKey(podName)) .setPodName(podName).setPodUuid(pod).build(); writeTransaction.put(LogicalDatastoreType.OPERATIONAL, id, podIdentifier); LOG.debug("Creating podnametouuid map {} to {}", podName, pod); @@ -297,7 +297,7 @@ public final class CoeUtils { List vpnTargetList = new ArrayList<>(); LOG.debug("Creating/Updating a new vpn-instance node: {} ", vpnName); - VpnInstanceBuilder builder = new VpnInstanceBuilder().setKey(new VpnInstanceKey(vpnName)) + VpnInstanceBuilder builder = new VpnInstanceBuilder().withKey(new VpnInstanceKey(vpnName)) .setVpnInstanceName(vpnName) .setType(type).setL3vni(l3vni); if (irt != null && !irt.isEmpty()) { @@ -309,14 +309,14 @@ public final class CoeUtils { irt.remove(common); ert.remove(common); VpnTarget vpnTarget = - new VpnTargetBuilder().setKey(new VpnTargetKey(common)).setVrfRTValue(common) + new VpnTargetBuilder().withKey(new VpnTargetKey(common)).setVrfRTValue(common) .setVrfRTType(VpnTarget.VrfRTType.Both).build(); vpnTargetList.add(vpnTarget); } } for (String importRT : irt) { VpnTarget vpnTarget = - new VpnTargetBuilder().setKey(new VpnTargetKey(importRT)).setVrfRTValue(importRT) + new VpnTargetBuilder().withKey(new VpnTargetKey(importRT)).setVrfRTValue(importRT) .setVrfRTType(VpnTarget.VrfRTType.ImportExtcommunity).build(); vpnTargetList.add(vpnTarget); } @@ -325,7 +325,7 @@ public final class CoeUtils { if (ert != null && !ert.isEmpty()) { for (String exportRT : ert) { VpnTarget vpnTarget = - new VpnTargetBuilder().setKey(new VpnTargetKey(exportRT)).setVrfRTValue(exportRT) + new VpnTargetBuilder().withKey(new VpnTargetKey(exportRT)).setVrfRTValue(exportRT) .setVrfRTType(VpnTarget.VrfRTType.ExportExtcommunity).build(); vpnTargetList.add(vpnTarget); } @@ -374,10 +374,10 @@ public final class CoeUtils { boolean isRouterInterface, WriteTransaction wrtConfigTxn) { LOG.trace("createVpnInterface for Port: {}, isRouterInterface: {}", interfaceName, isRouterInterface); List listVpn = new ArrayList<>(); - listVpn.add(new VpnInstanceNamesBuilder().setKey(new VpnInstanceNamesKey(vpnName)) + listVpn.add(new VpnInstanceNamesBuilder().withKey(new VpnInstanceNamesKey(vpnName)) .setVpnName(vpnName).setAssociatedSubnetType(VpnInstanceNames.AssociatedSubnetType .V4Subnet).build()); - VpnInterfaceBuilder vpnb = new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(interfaceName)) + VpnInterfaceBuilder vpnb = new VpnInterfaceBuilder().withKey(new VpnInterfaceKey(interfaceName)) .setName(interfaceName) .setVpnInstanceNames(listVpn) .setRouterInterface(isRouterInterface); @@ -408,7 +408,7 @@ public final class CoeUtils { String hostIp = new String(pod.getHostIpAddress().getValue()); UUID subnetId = UUID.nameUUIDFromBytes(hostIp.getBytes(StandardCharsets.UTF_8)); String gatewayIP = ipValue.replaceFirst("\\d+$", "1"); - Adjacency vmAdj = new AdjacencyBuilder().setKey(new AdjacencyKey(ipPrefix)).setIpAddress(ipPrefix) + Adjacency vmAdj = new AdjacencyBuilder().withKey(new AdjacencyKey(ipPrefix)).setIpAddress(ipPrefix) .setMacAddress(macAddress).setAdjacencyType(Adjacency.AdjacencyType.PrimaryAdjacency) .setSubnetId(new Uuid(subnetId.toString())).setSubnetGatewayIp(gatewayIP).build(); if (!adjList.contains(vmAdj)) { diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java index 71a4e11427..3dc0241bcc 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpExternalTunnelManager.java @@ -291,7 +291,7 @@ public class DhcpExternalTunnelManager implements IDhcpExternalTunnelManager { DesignatedSwitchForTunnel designatedSwitchForTunnel = new DesignatedSwitchForTunnelBuilder().setDpId(dpnId.longValue()) .setElanInstanceName(elanInstanceName).setTunnelRemoteIpAddress(tunnelIp) - .setKey(designatedSwitchForTunnelKey).build(); + .withKey(designatedSwitchForTunnelKey).build(); LOG.trace("Writing into CONFIG DS tunnelIp {}, elanInstanceName {}, dpnId {}", tunnelIp, elanInstanceName, dpnId); MDSALUtil.syncUpdate(broker, LogicalDatastoreType.CONFIGURATION, instanceIdentifier, designatedSwitchForTunnel); @@ -813,7 +813,7 @@ public class DhcpExternalTunnelManager implements IDhcpExternalTunnelManager { .setMacEntryKey(new MacAddress(UNKNOWN_DMAC)) .setLogicalSwitchRef(lsRef).build(); InstanceIdentifier iid = HwvtepSouthboundUtils.createRemoteMcastMacsInstanceIdentifier( - dstDevice.getNodeId(), remoteMcastMacs.getKey()); + dstDevice.getNodeId(), remoteMcastMacs.key()); ReadOnlyTransaction transaction = broker.newReadOnlyTransaction(); try { //TODO do async mdsal read @@ -870,7 +870,7 @@ public class DhcpExternalTunnelManager implements IDhcpExternalTunnelManager { } return Collections.singletonList(txRunner.callWithNewReadWriteTransactionAndSubmit( tx -> putRemoteMcastMac(tx, elanInstanceName, device, - tunnelInterface.getAugmentation(IfTunnel.class).getTunnelSource()))); + tunnelInterface.augmentation(IfTunnel.class).getTunnelSource()))); } return Collections.emptyList(); }); diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java index 5dbcd6bb64..0c18dbc308 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpInterfaceConfigListener.java @@ -59,12 +59,12 @@ public class DhcpInterfaceConfigListener @Override protected void remove(InstanceIdentifier identifier, Interface del) { jobCoordinator.enqueueJob(DhcpServiceUtils.getJobKey(del.getName()), () -> { - IfTunnel tunnelInterface = del.getAugmentation(IfTunnel.class); - IfL2vlan vlanInterface = del.getAugmentation(IfL2vlan.class); + IfTunnel tunnelInterface = del.augmentation(IfTunnel.class); + IfL2vlan vlanInterface = del.augmentation(IfL2vlan.class); String interfaceName = del.getName(); if (tunnelInterface != null && !tunnelInterface.isInternal()) { IpAddress tunnelIp = tunnelInterface.getTunnelDestination(); - ParentRefs interfce = del.getAugmentation(ParentRefs.class); + ParentRefs interfce = del.augmentation(ParentRefs.class); if (interfce != null) { if (LOG.isTraceEnabled()) { LOG.trace("Calling handleTunnelStateDown for tunnelIp {} and interface {}", @@ -91,7 +91,7 @@ public class DhcpInterfaceConfigListener protected void add(InstanceIdentifier identifier, Interface add) { jobCoordinator.enqueueJob(DhcpServiceUtils.getJobKey(add.getName()), () -> { String interfaceName = add.getName(); - IfL2vlan vlanInterface = add.getAugmentation(IfL2vlan.class); + IfL2vlan vlanInterface = add.augmentation(IfL2vlan.class); if (vlanInterface == null) { return Collections.emptyList(); } diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java index a9ca8421bb..bdef37d70f 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpL2GwUtil.java @@ -32,11 +32,11 @@ public class DhcpL2GwUtil { private static final Predicate> CONTAINS_GLOBAL_AUGMENTATION = (optionalNode) -> optionalNode.isPresent() - && optionalNode.get().getAugmentation(HwvtepGlobalAugmentation.class) != null; + && optionalNode.get().augmentation(HwvtepGlobalAugmentation.class) != null; private static final Predicate> CONTAINS_SWITCH_AUGMENTATION = (optionalNode) -> optionalNode.isPresent() - && optionalNode.get().getAugmentation(PhysicalSwitchAugmentation.class) != null; + && optionalNode.get().augmentation(PhysicalSwitchAugmentation.class) != null; private final DataBroker dataBroker; private final L2GatewayCache l2GatewayCache; @@ -66,7 +66,7 @@ public class DhcpL2GwUtil { if (!CONTAINS_GLOBAL_AUGMENTATION.test(nodeOptional)) { return null; } - List switchIids = nodeOptional.get().getAugmentation(HwvtepGlobalAugmentation.class).getSwitches(); + List switchIids = nodeOptional.get().augmentation(HwvtepGlobalAugmentation.class).getSwitches(); if (EMPTY_LIST.test(switchIids)) { return null; } @@ -75,11 +75,11 @@ public class DhcpL2GwUtil { if (!CONTAINS_SWITCH_AUGMENTATION.test(nodeOptional)) { return null; } - List tunnelIps = nodeOptional.get().getAugmentation(PhysicalSwitchAugmentation.class).getTunnelIps(); + List tunnelIps = nodeOptional.get().augmentation(PhysicalSwitchAugmentation.class).getTunnelIps(); if (EMPTY_LIST.test(tunnelIps)) { return null; } - return tunnelIps.get(0).getKey().getTunnelIpsKey(); + return tunnelIps.get(0).key().getTunnelIpsKey(); } } diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java index 5bfe0e4a75..394becb549 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpNeutronPortListener.java @@ -245,7 +245,7 @@ public class DhcpNeutronPortListener } private boolean isVnicTypeDirectOrMacVtap(Port port) { - PortBindingExtension portBinding = port.getAugmentation(PortBindingExtension.class); + PortBindingExtension portBinding = port.augmentation(PortBindingExtension.class); if (portBinding == null || portBinding.getVnicType() == null) { // By default, VNIC_TYPE is NORMAL return false; diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java index 378c5193c9..99311467be 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpServiceUtils.java @@ -375,7 +375,7 @@ public final class DhcpServiceUtils { BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie) .setFlowPriority(flowPriority).setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)) + return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)) .setServiceName(serviceName).setServicePriority(servicePriority) .setServiceType(ServiceTypeFlowBased.class) .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); @@ -460,7 +460,7 @@ public final class DhcpServiceUtils { static SubnetToDhcpPort getSubnetToDhcpPort(Port port, String subnetId, String ipAddress) { return new SubnetToDhcpPortBuilder() - .setKey(new SubnetToDhcpPortKey(subnetId)) + .withKey(new SubnetToDhcpPortKey(subnetId)) .setSubnetId(subnetId).setPortName(port.getUuid().getValue()) .setPortMacaddress(port.getMacAddress().getValue()).setPortFixedip(ipAddress).build(); } @@ -510,7 +510,7 @@ public final class DhcpServiceUtils { LOG.trace("Updating InterfaceNameVmMacAddress map with {}, {}", interfaceName,vmMacAddress); InterfaceNameMacAddress interfaceNameMacAddress = new InterfaceNameMacAddressBuilder() - .setKey(new InterfaceNameMacAddressKey(interfaceName)) + .withKey(new InterfaceNameMacAddressKey(interfaceName)) .setInterfaceName(interfaceName).setMacAddress(vmMacAddress).build(); tx.merge(LogicalDatastoreType.OPERATIONAL, instanceIdentifier, interfaceNameMacAddress, WriteTransaction.CREATE_MISSING_PARENTS); diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java index accb4f78f0..00b3d0ab26 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/DhcpSubnetListener.java @@ -244,7 +244,7 @@ public class DhcpSubnetListener extends AsyncClusteredDataTreeChangeListenerBase if (sn.isPresent()) { builder = new SubnetmapBuilder(sn.get()); } else { - builder = new SubnetmapBuilder().setKey(new SubnetmapKey(subnetId)).setId(subnetId); + builder = new SubnetmapBuilder().withKey(new SubnetmapKey(subnetId)).setId(subnetId); } return builder; } diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java index 337ad2bcc2..9e983f37f7 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceAddJob.java @@ -71,7 +71,7 @@ public class DhcpInterfaceAddJob implements Callable org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508.interfaces.Interface iface = interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName); if (iface != null) { - IfTunnel tunnelInterface = iface.getAugmentation(IfTunnel.class); + IfTunnel tunnelInterface = iface.augmentation(IfTunnel.class); if (tunnelInterface != null && !tunnelInterface.isInternal()) { IpAddress tunnelIp = tunnelInterface.getTunnelDestination(); List dpns = DhcpServiceUtils.getListOfDpns(dataBroker); diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java index 6f8e33400f..e1048eaf3a 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceRemoveJob.java @@ -86,7 +86,7 @@ public class DhcpInterfaceRemoveJob implements Callable dpns = DhcpServiceUtils.getListOfDpns(dataBroker); diff --git a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java index bd069d0147..5fd7914835 100644 --- a/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java +++ b/dhcpservice/impl/src/main/java/org/opendaylight/netvirt/dhcpservice/jobs/DhcpInterfaceUpdateJob.java @@ -53,7 +53,7 @@ public class DhcpInterfaceUpdateJob implements Callable dpns = DhcpServiceUtils.getListOfDpns(dataBroker); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java index c9a7fd151f..2755a1e52a 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cache/ElanInterfaceCache.java @@ -61,7 +61,7 @@ public class ElanInterfaceCache extends InstanceIdDataObjectCache public Optional getEtreeInterface(@Nonnull String interfaceName) { Optional elanInterface = get(interfaceName); return elanInterface.isPresent() ? Optional.fromNullable( - elanInterface.get().getAugmentation(EtreeInterface.class)) : Optional.absent(); + elanInterface.get().augmentation(EtreeInterface.class)) : Optional.absent(); } @Nonnull diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java index 1e6c7abfa2..b93bc924eb 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeGet.java @@ -36,7 +36,7 @@ public class EtreeGet extends OsgiCommandSupport { LOG.debug("Executing Get EtreeInstance command for {}", etreeName); if (etreeName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(etreeName); - if (elanInstance == null || elanInstance.getAugmentation(EtreeInstance.class) == null) { + if (elanInstance == null || elanInstance.augmentation(EtreeInstance.class) == null) { session.getConsole().println("No Etree Instance present with name:" + etreeName); } else { session.getConsole().println(getEtreeHeaderOutput()); @@ -51,11 +51,11 @@ public class EtreeGet extends OsgiCommandSupport { if (elanInstanceList != null && !elanInstanceList.isEmpty()) { session.getConsole().println(getEtreeHeaderOutput()); for (ElanInstance elanInstance : elanInstanceList) { - if (elanInstance.getAugmentation(EtreeInstance.class) != null) { + if (elanInstance.augmentation(EtreeInstance.class) != null) { session.getConsole().println(String.format(ElanCLIUtils.ETREE_INTERFACE_CLI_FORMAT, elanInstance.getElanInstanceName(), elanInstance.getMacTimeout(), elanInstance.getElanTag(), - elanInstance.getAugmentation(EtreeInstance.class).getEtreeLeafTagVal().getValue(), + elanInstance.augmentation(EtreeInstance.class).getEtreeLeafTagVal().getValue(), elanInstance.getDescription())); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java index 8fa054386a..633b6e269b 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceAdd.java @@ -59,7 +59,7 @@ public class EtreeInterfaceAdd extends OsgiCommandSupport { session.getConsole().println("Etree instance " + elanName + " does not exist."); return null; } else { - if (elanInstance.getAugmentation(EtreeInstance.class) == null) { + if (elanInstance.augmentation(EtreeInstance.class) == null) { session.getConsole().println("Etree instance " + elanName + " exists but isn't configured as Etree."); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java index 474c4f44d3..81273ea4f2 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceDelete.java @@ -35,7 +35,7 @@ public class EtreeInterfaceDelete extends OsgiCommandSupport { LOG.debug("Deleting EtreeInterface command etreeName:{}, interfaceName:{}", etreeName, interfaceName); ElanInterface existingInterface = elanProvider.getElanInterfaceByElanInterfaceName(interfaceName); - if (existingInterface == null || existingInterface.getAugmentation(EtreeInterface.class) == null) { + if (existingInterface == null || existingInterface.augmentation(EtreeInterface.class) == null) { session.getConsole() .println("Etree interface doesn't exist or isn't configured as etree: " + interfaceName); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java index 459a4a4cfd..2331afc197 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/etree/EtreeInterfaceGet.java @@ -44,7 +44,7 @@ public class EtreeInterfaceGet extends OsgiCommandSupport { LOG.debug("Executing Get EtreeInterface command for the corresponding Etree Instance {}", etreeName); if (etreeName != null) { ElanInstance elanInstance = elanProvider.getElanInstance(etreeName); - if (elanInstance == null || elanInstance.getAugmentation(EtreeInstance.class) == null) { + if (elanInstance == null || elanInstance.augmentation(EtreeInstance.class) == null) { session.getConsole().println("Etree instance doesn't exist or isn't configured as etree: " + etreeName); return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java index 14eacfffb0..75f007f364 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/L2GwValidateCli.java @@ -133,13 +133,13 @@ public class L2GwValidateCli extends OsgiCommandSupport { if (operationalTopoOptional.isPresent()) { for (Node node : operationalTopoOptional.get().getNode()) { - InstanceIdentifier nodeIid = topoId.child(Node.class, node.getKey()); + InstanceIdentifier nodeIid = topoId.child(Node.class, node.key()); operationalNodes.put(nodeIid, node); } } if (configTopoOptional.isPresent()) { for (Node node : configTopoOptional.get().getNode()) { - InstanceIdentifier nodeIid = topoId.child(Node.class, node.getKey()); + InstanceIdentifier nodeIid = topoId.child(Node.class, node.key()); configNodes.put(nodeIid, node); } } @@ -187,9 +187,9 @@ public class L2GwValidateCli extends OsgiCommandSupport { Node node = entry.getValue(); Map map = new HashMap<>(); dataMap.put(nodeId, map); - if (node.getAugmentation(HwvtepGlobalAugmentation.class) != null) { + if (node.augmentation(HwvtepGlobalAugmentation.class) != null) { for (MergeCommand command : globalCommands) { - List data = command.getData(node.getAugmentation(HwvtepGlobalAugmentation.class)); + List data = command.getData(node.augmentation(HwvtepGlobalAugmentation.class)); if (data != null) { for (DataObject dataObject : data) { map.put(command.generateId(nodeId, dataObject), dataObject); @@ -215,7 +215,7 @@ public class L2GwValidateCli extends OsgiCommandSupport { */ private void verifyConfigVsOperationalDiff() { for (Node cfgNode : configNodes.values()) { - InstanceIdentifier nodeId = topoIid.child(Node.class, cfgNode.getKey()); + InstanceIdentifier nodeId = topoIid.child(Node.class, cfgNode.key()); compareNodes(cfgNode, operationalNodes.get(nodeId), false, LogicalDatastoreType.CONFIGURATION); } } @@ -266,9 +266,9 @@ public class L2GwValidateCli extends OsgiCommandSupport { } private boolean containsLogicalSwitch(Node node) { - if (node == null || node.getAugmentation(HwvtepGlobalAugmentation.class) == null + if (node == null || node.augmentation(HwvtepGlobalAugmentation.class) == null || HwvtepHAUtil.isEmptyList( - node.getAugmentation(HwvtepGlobalAugmentation.class).getLogicalSwitches())) { + node.augmentation(HwvtepGlobalAugmentation.class).getLogicalSwitches())) { return false; } return true; @@ -286,11 +286,11 @@ public class L2GwValidateCli extends OsgiCommandSupport { NodeId nodeId1 = nodeIid1.firstKeyOf(Node.class).getNodeId(); NodeId nodeId2 = nodeIid2.firstKeyOf(Node.class).getNodeId(); - PhysicalSwitchAugmentation psAug1 = node1.getAugmentation(PhysicalSwitchAugmentation.class); - PhysicalSwitchAugmentation psAug2 = node2.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation psAug1 = node1.augmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation psAug2 = node2.augmentation(PhysicalSwitchAugmentation.class); - HwvtepGlobalAugmentation aug1 = node1.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation aug2 = node2.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation aug1 = node1.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation aug2 = node2.augmentation(HwvtepGlobalAugmentation.class); boolean globalNodes = psAug1 == null && psAug2 == null ? true : false; MergeCommand[] commands = globalNodes ? globalCommands : physicalSwitchCommands; @@ -469,7 +469,7 @@ public class L2GwValidateCli extends OsgiCommandSupport { RemoteMcastMacs remoteMcastMac = new RemoteMcastMacsBuilder() .setMacEntryKey(new MacAddress(ElanConstants.UNKNOWN_DMAC)).setLogicalSwitchRef(lsRef).build(); InstanceIdentifier mcastMacIid = HwvtepSouthboundUtils - .createRemoteMcastMacsInstanceIdentifier(new NodeId(new Uri(nodeId)), remoteMcastMac.getKey()); + .createRemoteMcastMacsInstanceIdentifier(new NodeId(new Uri(nodeId)), remoteMcastMac.key()); if (!isPresent(configNodesData, nodeIid, mcastMacIid)) { @@ -530,7 +530,7 @@ public class L2GwValidateCli extends OsgiCommandSupport { expectedVlans.add(HwvtepSouthboundUtils.createVlanBinding(nodeId, defaultVlanId, logicalSwitchName)); } - HwvtepPhysicalPortAugmentation portAugmentation = configTerminationPoint.getAugmentation( + HwvtepPhysicalPortAugmentation portAugmentation = configTerminationPoint.augmentation( HwvtepPhysicalPortAugmentation.class); if (portAugmentation == null || HwvtepHAUtil.isEmptyList(portAugmentation.getVlanBindings())) { pw.println("Failed to find the config vlan bindings for port " + deviceInterface.getInterfaceName() @@ -539,7 +539,7 @@ public class L2GwValidateCli extends OsgiCommandSupport { valid = false; continue; } - portAugmentation = operationalTerminationPoint.getAugmentation(HwvtepPhysicalPortAugmentation.class); + portAugmentation = operationalTerminationPoint.augmentation(HwvtepPhysicalPortAugmentation.class); if (portAugmentation == null || HwvtepHAUtil.isEmptyList(portAugmentation.getVlanBindings())) { pw.println("Failed to find the operational vlan bindings for port " + deviceInterface.getInterfaceName() + " for node " + hwVtepDevice.getDeviceName() + " for logical switch " + logicalSwitchName @@ -549,7 +549,7 @@ public class L2GwValidateCli extends OsgiCommandSupport { } VlanBindings expectedBindings = !expectedVlans.isEmpty() ? expectedVlans.get(0) : null; boolean foundBindings = false; - List vlanBindingses = configTerminationPoint.getAugmentation( + List vlanBindingses = configTerminationPoint.augmentation( HwvtepPhysicalPortAugmentation.class).getVlanBindings(); for (VlanBindings actual : vlanBindingses) { if (actual.equals(expectedBindings)) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java index 926ec7bcf5..a1368692d9 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/cli/l2gw/NetworkL2gwDeviceInfoCli.java @@ -190,11 +190,11 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { void printRemoteUcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("RemoteUCast macs :"); session.getConsole().println(HEADINGUCAST); - if (hwvtepNode == null || hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (hwvtepNode == null || hwvtepNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return; } List remoteUcastMacs = - hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getRemoteUcastMacs(); + hwvtepNode.augmentation(HwvtepGlobalAugmentation.class).getRemoteUcastMacs(); if (remoteUcastMacs == null || remoteUcastMacs.isEmpty()) { return; } @@ -214,11 +214,11 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { void printLocalUcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("LocalUCast macs :"); session.getConsole().println(HEADINGUCAST); - if (hwvtepNode == null || hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (hwvtepNode == null || hwvtepNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return; } List localUcastMacs = - hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getLocalUcastMacs(); + hwvtepNode.augmentation(HwvtepGlobalAugmentation.class).getLocalUcastMacs(); if (localUcastMacs == null || localUcastMacs.isEmpty()) { return; } @@ -238,11 +238,11 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { void printLocalMcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("LocalMcast macs :"); session.getConsole().println(HEADINGMCAST); - if (hwvtepNode == null || hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (hwvtepNode == null || hwvtepNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return; } List localMcastMacs = - hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getLocalMcastMacs(); + hwvtepNode.augmentation(HwvtepGlobalAugmentation.class).getLocalMcastMacs(); if (localMcastMacs == null || localMcastMacs.isEmpty()) { return; } @@ -265,11 +265,11 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { void printRemoteMcastMacs(Node hwvtepNode, String elanName) { session.getConsole().println("RemoteMCast macs :"); session.getConsole().println(HEADINGMCAST); - if (hwvtepNode == null || hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (hwvtepNode == null || hwvtepNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return; } List remoteMcastMacs = - hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getRemoteMcastMacs(); + hwvtepNode.augmentation(HwvtepGlobalAugmentation.class).getRemoteMcastMacs(); if (remoteMcastMacs == null || remoteMcastMacs.isEmpty()) { return; } @@ -301,7 +301,7 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } for (TerminationPoint terminationPoint : terminationPoints) { HwvtepPhysicalPortAugmentation aug = - terminationPoint.getAugmentation(HwvtepPhysicalPortAugmentation.class); + terminationPoint.augmentation(HwvtepPhysicalPortAugmentation.class); if (aug == null || aug.getVlanBindings() == null) { continue; } @@ -334,9 +334,9 @@ public class NetworkL2gwDeviceInfoCli extends OsgiCommandSupport { } Node getPSnode(Node hwvtepNode, LogicalDatastoreType datastoreType) { - if (hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) != null - && hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches() != null) { - for (Switches switches : hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches()) { + if (hwvtepNode.augmentation(HwvtepGlobalAugmentation.class) != null + && hwvtepNode.augmentation(HwvtepGlobalAugmentation.class).getSwitches() != null) { + for (Switches switches : hwvtepNode.augmentation(HwvtepGlobalAugmentation.class).getSwitches()) { NodeId psNodeId = switches.getSwitchRef().getValue().firstKeyOf(Node.class).getNodeId(); return HwvtepUtils.getHwVtepNode(dataBroker, datastoreType, psNodeId); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java index cdf478f52f..745d93ff31 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/listeners/EvpnElanInstanceListener.java @@ -69,13 +69,13 @@ public class EvpnElanInstanceListener extends AsyncDataTreeChangeListenerBase evpnUtils.bindElanServiceToExternalTunnel(elanName, interfaceName), mdsalManager::installFlow); } else if (evpnUtils.isAdvertiseEvpnRT2Routes(original, update)) { - evpnUtils.advertiseEvpnRT2Routes(update.getAugmentation(EvpnAugmentation.class), elanName); + evpnUtils.advertiseEvpnRT2Routes(update.augmentation(EvpnAugmentation.class), elanName); evpnMacVrfUtils.updateEvpnDmacFlows(update, true); evpnUtils.programEvpnL2vniDemuxTable(elanName, (elan, interfaceName) -> evpnUtils.unbindElanServiceFromExternalTunnel(elanName, interfaceName), diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java index 621192c23c..0d9d8555e4 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnMacVrfUtils.java @@ -108,7 +108,7 @@ public class EvpnMacVrfUtils { public InstanceIdentifier getMacVrfEntryIid(String rd, MacVrfEntry macVrfEntry) { return InstanceIdentifier.create(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)) - .child(MacVrfEntry.class, macVrfEntry.getKey()); + .child(MacVrfEntry.class, macVrfEntry.key()); } public void updateEvpnDmacFlows(final ElanInstance elanInstance, final boolean install) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java index 822f2f6205..7e41ff6b26 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/evpn/utils/EvpnUtils.java @@ -179,7 +179,7 @@ public class EvpnUtils { LOG.debug("getL3vpnNameFromElan :elanInfo is NULL"); return null; } - EvpnAugmentation evpnAugmentation = elanInfo.getAugmentation(EvpnAugmentation.class); + EvpnAugmentation evpnAugmentation = elanInfo.augmentation(EvpnAugmentation.class); return evpnAugmentation != null ? evpnAugmentation.getL3vpnName() : null; } @@ -188,7 +188,7 @@ public class EvpnUtils { LOG.debug("getEvpnNameFromElan :elanInfo is NULL"); return null; } - EvpnAugmentation evpnAugmentation = elanInfo.getAugmentation(EvpnAugmentation.class); + EvpnAugmentation evpnAugmentation = elanInfo.augmentation(EvpnAugmentation.class); return evpnAugmentation != null ? evpnAugmentation.getEvpnName() : null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java index 0585e17516..8e7d530ccd 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanBridgeManager.java @@ -271,7 +271,7 @@ public class ElanBridgeManager implements IElanBridgeManager { List newTerminationPoints = new ArrayList<>(); for (TerminationPoint tp : terminationPoints) { OvsdbTerminationPointAugmentation ovsdbTerminationPointAugmentation = - tp.getAugmentation(OvsdbTerminationPointAugmentation.class); + tp.augmentation(OvsdbTerminationPointAugmentation.class); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(tp); if (ovsdbTerminationPointAugmentation != null) { OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java index 5d4f4f7023..bfa9761707 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanDpnInterfaceClusteredListener.java @@ -121,7 +121,7 @@ public class ElanDpnInterfaceClusteredListener LOG.debug("dpninterfaces update fired new size {}", dpnInterfaces.getInterfaces().size()); if (dpnInterfaces.getInterfaces().isEmpty()) { elanInstanceDpnsCache.remove(getElanName(identifier), dpnInterfaces); - LOG.debug("dpninterfaces last dpn interface on this elan {} ", dpnInterfaces.getKey()); + LOG.debug("dpninterfaces last dpn interface on this elan {} ", dpnInterfaces.key()); // this is the last dpn interface on this elan handleUpdate(identifier, dpnInterfaces); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java index 2c1d9e6441..d7cfca1d9e 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanInstanceManager.java @@ -128,7 +128,7 @@ public class ElanInstanceManager extends AsyncDataTreeChangeListenerBase listBucket = new ArrayList<>(); int bucketId = 0; @@ -1309,7 +1309,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase interfaceNames, WriteTransaction tx) { DpnInterfaces dpnInterface = new DpnInterfacesBuilder().setDpId(dpId).setInterfaces(interfaceNames) - .setKey(new DpnInterfacesKey(dpId)).build(); + .withKey(new DpnInterfacesKey(dpId)).build(); tx.put(LogicalDatastoreType.OPERATIONAL, ElanUtils.getElanDpnInterfaceOperationalDataPath(elanInstanceName, dpId), dpnInterface, WriteTransaction.CREATE_MISSING_PARENTS); @@ -1502,7 +1502,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase interfaceNames = new ArrayList<>(); interfaceNames.add(interfaceName); DpnInterfaces dpnInterface = new DpnInterfacesBuilder().setDpId(dpId).setInterfaces(interfaceNames) - .setKey(new DpnInterfacesKey(dpId)).build(); + .withKey(new DpnInterfacesKey(dpId)).build(); tx.put(LogicalDatastoreType.OPERATIONAL, ElanUtils.getElanDpnInterfaceOperationalDataPath(elanInstanceName, dpId), dpnInterface, WriteTransaction.CREATE_MISSING_PARENTS); @@ -1518,7 +1518,7 @@ public class ElanInterfaceManager extends AsyncDataTreeChangeListenerBase macEntryId = ElanUtils .getInterfaceMacEntriesIdentifierOperationalDataPath(interfaceName, physAddress); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java index 6ad81a0fad..0a8c18fd66 100755 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanPacketInHandler.java @@ -121,12 +121,12 @@ public class ElanPacketInHandler implements PacketProcessingListener { BigInteger timeStamp = new BigInteger(String.valueOf(System.currentTimeMillis())); if (!srcIpAddress.isPresent()) { newMacEntry = new MacEntryBuilder().setInterface(interfaceName).setMacAddress(physAddress) - .setKey(new MacEntryKey(physAddress)) + .withKey(new MacEntryKey(physAddress)) .setControllerLearnedForwardingEntryTimestamp(timeStamp) .setIsStaticAddress(false).build(); } else { newMacEntry = new MacEntryBuilder().setInterface(interfaceName).setMacAddress(physAddress) - .setIpPrefix(srcIpAddress.get()).setKey(new MacEntryKey(physAddress)) + .setIpPrefix(srcIpAddress.get()).withKey(new MacEntryKey(physAddress)) .setControllerLearnedForwardingEntryTimestamp(timeStamp) .setIsStaticAddress(false).build(); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java index 84e07785e4..6a29bac0cb 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/internal/ElanServiceProvider.java @@ -178,7 +178,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi } else { ElanInstance updateElanInstance = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName) .setDescription(description).setMacTimeout(macTimeout) - .setKey(new ElanInstanceKey(elanInstanceName)).build(); + .withKey(new ElanInstanceKey(elanInstanceName)).build(); MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, ElanHelper.getElanInstanceConfigurationDataPath(elanInstanceName), updateElanInstance); LOG.debug("Updating the Elan Instance {} with MAC TIME-OUT {} and Description {}", @@ -186,8 +186,8 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi } } else { ElanInstance elanInstance = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName) - .setMacTimeout(macTimeout).setDescription(description).setKey(new ElanInstanceKey(elanInstanceName)) - .build(); + .setMacTimeout(macTimeout).setDescription(description) + .withKey(new ElanInstanceKey(elanInstanceName)).build(); MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, ElanHelper.getElanInstanceConfigurationDataPath(elanInstanceName), elanInstance); LOG.debug("Creating the new Elan Instance {}", elanInstance); @@ -207,7 +207,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi EtreeInstance etreeInstance = new EtreeInstanceBuilder().build(); ElanInstance updateElanInstance = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName) .setDescription(description).setMacTimeout(macTimeout) - .setKey(new ElanInstanceKey(elanInstanceName)) + .withKey(new ElanInstanceKey(elanInstanceName)) .addAugmentation(EtreeInstance.class, etreeInstance).build(); MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, ElanHelper.getElanInstanceConfigurationDataPath(elanInstanceName), updateElanInstance); @@ -217,7 +217,8 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi } else { EtreeInstance etreeInstance = new EtreeInstanceBuilder().build(); ElanInstance elanInstance = new ElanInstanceBuilder().setElanInstanceName(elanInstanceName) - .setMacTimeout(macTimeout).setDescription(description).setKey(new ElanInstanceKey(elanInstanceName)) + .setMacTimeout(macTimeout).setDescription(description) + .withKey(new ElanInstanceKey(elanInstanceName)) .addAugmentation(EtreeInstance.class, etreeInstance).build(); MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, ElanHelper.getElanInstanceConfigurationDataPath(elanInstanceName), elanInstance); @@ -271,19 +272,19 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi List staticMacAddresses, String description) { Optional existingElanInstance = elanInstanceCache.get(etreeInstanceName); if (existingElanInstance.isPresent() - && existingElanInstance.get().getAugmentation(EtreeInstance.class) != null) { + && existingElanInstance.get().augmentation(EtreeInstance.class) != null) { EtreeInterface etreeInterface = new EtreeInterfaceBuilder().setEtreeInterfaceType(interfaceType).build(); ElanInterface elanInterface; if (staticMacAddresses == null) { elanInterface = new ElanInterfaceBuilder().setElanInstanceName(etreeInstanceName) - .setDescription(description).setName(interfaceName).setKey(new ElanInterfaceKey(interfaceName)) + .setDescription(description).setName(interfaceName).withKey(new ElanInterfaceKey(interfaceName)) .addAugmentation(EtreeInterface.class, etreeInterface).build(); } else { List staticMacEntries = ElanUtils.getStaticMacEntries(staticMacAddresses); elanInterface = new ElanInterfaceBuilder().setElanInstanceName(etreeInstanceName) .setDescription(description).setName(interfaceName) .setStaticMacEntries(staticMacEntries) - .setKey(new ElanInterfaceKey(interfaceName)) + .withKey(new ElanInterfaceKey(interfaceName)) .addAugmentation(EtreeInterface.class, etreeInterface).build(); } MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, @@ -300,7 +301,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi ElanInterfaceBuilder elanInterfaceBuilder = new ElanInterfaceBuilder() .setElanInstanceName(elanInstanceName) .setDescription(description).setName(interfaceName) - .setKey(new ElanInterfaceKey(interfaceName)); + .withKey(new ElanInterfaceKey(interfaceName)); if (staticMacAddresses != null) { List staticMacEntries = ElanUtils.getStaticMacEntries(staticMacAddresses); elanInterfaceBuilder.setStaticMacEntries(staticMacEntries); @@ -324,7 +325,7 @@ public class ElanServiceProvider extends AbstractLifecycle implements IElanServi LOG.debug("updating the ElanInterface with new Mac Entries {}", updatedStaticMacAddresses); ElanInterface elanInterface = new ElanInterfaceBuilder().setElanInstanceName(elanInstanceName) .setName(interfaceName).setDescription(newDescription).setStaticMacEntries(updatedStaticMacEntries) - .setKey(new ElanInterfaceKey(interfaceName)).build(); + .withKey(new ElanInterfaceKey(interfaceName)).build(); MDSALUtil.syncWrite(broker, LogicalDatastoreType.CONFIGURATION, ElanUtils.getElanInterfaceConfigurationDataPathId(interfaceName), elanInterface); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java index 4653806a3d..48c67bd361 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/HwvtepHAUtil.java @@ -150,7 +150,7 @@ public final class HwvtepHAUtil { public static ManagerOtherConfigsBuilder getOtherConfigBuilder(String key, String val) { ManagerOtherConfigsBuilder otherConfigsBuilder = new ManagerOtherConfigsBuilder(); ManagerOtherConfigsKey otherConfigsKey = new ManagerOtherConfigsKey(key); - otherConfigsBuilder.setKey(otherConfigsKey); + otherConfigsBuilder.withKey(otherConfigsKey); otherConfigsBuilder.setOtherConfigKey(key); otherConfigsBuilder.setOtherConfigValue(val); return otherConfigsBuilder; @@ -313,10 +313,10 @@ public final class HwvtepHAUtil { } public static String getHAIdFromManagerOtherConfig(Node node) { - if (node.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (node.augmentation(HwvtepGlobalAugmentation.class) == null) { return null; } - HwvtepGlobalAugmentation globalAugmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation globalAugmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (globalAugmentation != null) { List managers = globalAugmentation.getManagers(); if (managers != null && managers.size() > 0 && managers.get(0).getManagerOtherConfigs() != null) { @@ -342,7 +342,7 @@ public final class HwvtepHAUtil { return childNodeIds; } HwvtepGlobalAugmentation augmentation = - haGlobalConfigNodeOptional.get().getAugmentation(HwvtepGlobalAugmentation.class); + haGlobalConfigNodeOptional.get().augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getManagers() != null && augmentation.getManagers().size() > 0) { Managers managers = augmentation.getManagers().get(0); @@ -368,7 +368,7 @@ public final class HwvtepHAUtil { public static HwvtepGlobalAugmentation getGlobalAugmentationOfNode(Node node) { HwvtepGlobalAugmentation result = null; if (node != null) { - result = node.getAugmentation(HwvtepGlobalAugmentation.class); + result = node.augmentation(HwvtepGlobalAugmentation.class); } if (result == null) { result = new HwvtepGlobalAugmentationBuilder().build(); @@ -379,7 +379,7 @@ public final class HwvtepHAUtil { public static PhysicalSwitchAugmentation getPhysicalSwitchAugmentationOfNode(Node psNode) { PhysicalSwitchAugmentation result = null; if (psNode != null) { - result = psNode.getAugmentation(PhysicalSwitchAugmentation.class); + result = psNode.augmentation(PhysicalSwitchAugmentation.class); } if (result == null) { result = new PhysicalSwitchAugmentationBuilder().build(); @@ -403,7 +403,7 @@ public final class HwvtepHAUtil { ManagersBuilder builder1 = new ManagersBuilder(); - builder1.setKey(new ManagersKey(new Uri(MANAGER_KEY))); + builder1.withKey(new ManagersKey(new Uri(MANAGER_KEY))); List otherConfigses = new ArrayList<>(); String children = nodeIds.stream().map(NodeId::getValue).collect(Collectors.joining(",")); otherConfigses.add(getOtherConfigBuilder(HA_CHILDREN, children).build()); @@ -428,7 +428,7 @@ public final class HwvtepHAUtil { boolean switchesAlreadyPresent = false; if (haNode.isPresent()) { Node node = haNode.get(); - HwvtepGlobalAugmentation augmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null) { if (augmentation.getSwitches() != null) { if (augmentation.getSwitches().size() > 0) { @@ -438,7 +438,7 @@ public final class HwvtepHAUtil { } } if (!switchesAlreadyPresent) { - HwvtepGlobalAugmentation augmentation = childNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = childNode.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getSwitches() != null) { List src = augmentation.getSwitches(); if (src != null && src.size() > 0) { @@ -495,7 +495,7 @@ public final class HwvtepHAUtil { ReadWriteTransaction tx) throws ReadFailedException { //read from switches attribute and clean up them - HwvtepGlobalAugmentation globalAugmentation = haNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation globalAugmentation = haNode.augmentation(HwvtepGlobalAugmentation.class); if (globalAugmentation == null) { return; } @@ -516,7 +516,7 @@ public final class HwvtepHAUtil { Topology topology = topologyOptional.get(); if (topology.getNode() != null) { for (Node psNode : topology.getNode()) { - PhysicalSwitchAugmentation ps = psNode.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation ps = psNode.augmentation(PhysicalSwitchAugmentation.class); if (ps != null) { InstanceIdentifier iid = (InstanceIdentifier)ps.getManagedBy().getValue(); String nodeIdVal = iid.firstKeyOf(Node.class).getNodeId().getValue(); @@ -549,7 +549,7 @@ public final class HwvtepHAUtil { return; } Node node = nodeOptional.get(); - HwvtepGlobalAugmentation globalAugmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation globalAugmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (globalAugmentation == null) { return; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java index 24e7502a59..962e65f00e 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalMcastCmd.java @@ -45,7 +45,7 @@ public class LocalMcastCmd @Override public InstanceIdentifier generateId(InstanceIdentifier id, LocalMcastMacs node) { - HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.getKey().getLogicalSwitchRef(), id); + HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.key().getLogicalSwitchRef(), id); LocalMcastMacsKey key = new LocalMcastMacsKey(lsRef, node.getMacEntryKey()); return id.augmentation(HwvtepGlobalAugmentation.class).child(LocalMcastMacs.class, key); @@ -64,14 +64,14 @@ public class LocalMcastCmd ucmlBuilder.setMacEntryUuid(HwvtepHAUtil.getUUid(src.getMacEntryKey().getValue())); LocalMcastMacsKey key = new LocalMcastMacsKey(ucmlBuilder.getLogicalSwitchRef(), ucmlBuilder.getMacEntryKey()); - ucmlBuilder.setKey(key); + ucmlBuilder.withKey(key); return ucmlBuilder.build(); } @Override public Identifier getKey(LocalMcastMacs mac) { - return mac.getKey(); + return mac.key(); } @Override diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java index 8491b27f8f..1599816d22 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LocalUcastCmd.java @@ -44,7 +44,7 @@ public class LocalUcastCmd @Override public InstanceIdentifier generateId(InstanceIdentifier id, LocalUcastMacs node) { - HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.getKey().getLogicalSwitchRef(), id); + HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.key().getLogicalSwitchRef(), id); LocalUcastMacsKey key = new LocalUcastMacsKey(lsRef, node.getMacEntryKey()); return id.augmentation(HwvtepGlobalAugmentation.class).child(LocalUcastMacs.class, key); @@ -58,13 +58,13 @@ public class LocalUcastCmd HwvtepHAUtil.convertLogicalSwitchRef(src.getLogicalSwitchRef(), nodePath)); ucmlBuilder.setMacEntryUuid(HwvtepHAUtil.getUUid(src.getMacEntryKey().getValue())); LocalUcastMacsKey key = new LocalUcastMacsKey(ucmlBuilder.getLogicalSwitchRef(), ucmlBuilder.getMacEntryKey()); - ucmlBuilder.setKey(key); + ucmlBuilder.withKey(key); return ucmlBuilder.build(); } @Override public Identifier getKey(LocalUcastMacs data) { - return data.getKey(); + return data.key(); } @Override diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java index 3b6a97cd1d..94de5168fb 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/LogicalSwitchesCmd.java @@ -38,7 +38,7 @@ public class LogicalSwitchesCmd extends MergeCommand generateId(InstanceIdentifier id, LogicalSwitches node) { - return id.augmentation(HwvtepGlobalAugmentation.class).child(LogicalSwitches.class, node.getKey()); + return id.augmentation(HwvtepGlobalAugmentation.class).child(LogicalSwitches.class, node.key()); } @Override @@ -50,7 +50,7 @@ public class LogicalSwitchesCmd extends MergeCommand generateId(InstanceIdentifier id, TerminationPoint node) { - return id.child(TerminationPoint.class, node.getKey()); + return id.child(TerminationPoint.class, node.key()); } @Override @@ -45,7 +45,7 @@ public class PhysicalLocatorCmd extends MergeCommand generateId(InstanceIdentifier id, RemoteMcastMacs node) { - HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.getKey().getLogicalSwitchRef(), id); + HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.key().getLogicalSwitchRef(), id); RemoteMcastMacsKey key = new RemoteMcastMacsKey(lsRef, node.getMacEntryKey()); return id.augmentation(HwvtepGlobalAugmentation.class).child(RemoteMcastMacs.class, key); @@ -65,14 +65,14 @@ public class RemoteMcastCmd extends RemoteMcastMacsKey key = new RemoteMcastMacsKey(ucmlBuilder.getLogicalSwitchRef(), ucmlBuilder.getMacEntryKey()); - ucmlBuilder.setKey(key); + ucmlBuilder.withKey(key); return ucmlBuilder.build(); } @Override public Identifier getKey(RemoteMcastMacs data) { - return data.getKey(); + return data.key(); } @Override diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java index 5627101ac7..f73e37d8d6 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/RemoteUcastCmd.java @@ -42,7 +42,7 @@ public class RemoteUcastCmd extends MergeCommand generateId(InstanceIdentifier id, RemoteUcastMacs node) { - HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.getKey().getLogicalSwitchRef(), id); + HwvtepLogicalSwitchRef lsRef = HwvtepHAUtil.convertLogicalSwitchRef(node.key().getLogicalSwitchRef(), id); RemoteUcastMacsKey key = new RemoteUcastMacsKey(lsRef, node.getMacEntryKey()); return id.augmentation(HwvtepGlobalAugmentation.class).child(RemoteUcastMacs.class, key); } @@ -56,14 +56,14 @@ public class RemoteUcastCmd extends MergeCommand generateId(InstanceIdentifier id, Switches node) { - SwitchesKey switchesKey = transform(id, node).getKey(); + SwitchesKey switchesKey = transform(id, node).key(); return id.augmentation(HwvtepGlobalAugmentation.class).child(Switches.class, switchesKey); } @@ -59,7 +59,7 @@ public class SwitchesCmd extends MergeCommand id2 = HwvtepHAUtil.convertToInstanceIdentifier(dstNodeId); builder.setSwitchRef(new HwvtepPhysicalSwitchRef(id2)); - builder.setKey(new SwitchesKey(new HwvtepPhysicalSwitchRef(id2))); + builder.withKey(new SwitchesKey(new HwvtepPhysicalSwitchRef(id2))); return builder.build(); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java index c09de14533..e2e80a8430 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/commands/TerminationPointCmd.java @@ -43,12 +43,12 @@ public class TerminationPointCmd extends MergeCommand generateId(InstanceIdentifier id, TerminationPoint node) { - return id.child(TerminationPoint.class, node.getKey()); + return id.child(TerminationPoint.class, node.key()); } @Override public TerminationPoint transform(InstanceIdentifier nodePath, TerminationPoint src) { - HwvtepPhysicalPortAugmentation augmentation = src.getAugmentation(HwvtepPhysicalPortAugmentation.class); + HwvtepPhysicalPortAugmentation augmentation = src.augmentation(HwvtepPhysicalPortAugmentation.class); if (augmentation == null) { return new TerminationPointBuilder(src).build(); } @@ -80,7 +80,7 @@ public class TerminationPointCmd extends MergeCommand up = updatedAugmentation != null ? updatedAugmentation.getVlanBindings() : null; List or = origAugmentation != null ? origAugmentation.getVlanBindings() : null; @@ -134,10 +134,10 @@ public class TerminationPointCmd extends MergeCommand generateId(InstanceIdentifier id, TunnelIps src) { - return id.augmentation(PhysicalSwitchAugmentation.class).child(TunnelIps.class, src.getKey()); + return id.augmentation(PhysicalSwitchAugmentation.class).child(TunnelIps.class, src.key()); } @Override @@ -47,7 +47,7 @@ public class TunnelIpCmd extends @Override public Identifier getKey(TunnelIps data) { - return data.getKey(); + return data.key(); } @Override diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java index b297c85a75..8fd9585c6a 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeConnectedHandler.java @@ -115,7 +115,7 @@ public class NodeConnectedHandler { return; } LOG.info("HA ps node not present cleanup child {}" , childNode); - HwvtepGlobalAugmentation augmentation = childNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = childNode.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null) { List switches = augmentation.getSwitches(); if (switches != null) { @@ -141,10 +141,10 @@ public class NodeConnectedHandler { ReadWriteTransaction tx) throws ReadFailedException { - if (childGlobalNode == null || childGlobalNode.getAugmentation(HwvtepGlobalAugmentation.class) == null) { + if (childGlobalNode == null || childGlobalNode.augmentation(HwvtepGlobalAugmentation.class) == null) { return; } - List switches = childGlobalNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches(); + List switches = childGlobalNode.augmentation(HwvtepGlobalAugmentation.class).getSwitches(); if (switches == null) { return; } @@ -171,7 +171,7 @@ public class NodeConnectedHandler { if (srcNode == null) { return; } - HwvtepGlobalAugmentation src = srcNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation src = srcNode.augmentation(HwvtepGlobalAugmentation.class); if (src == null) { return; } @@ -200,7 +200,7 @@ public class NodeConnectedHandler { if (childNode == null) { return; } - HwvtepGlobalAugmentation childData = childNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation childData = childNode.augmentation(HwvtepGlobalAugmentation.class); if (childData == null) { return; } @@ -253,7 +253,7 @@ public class NodeConnectedHandler { NodeBuilder childPsBuilder = HwvtepHAUtil.getNodeBuilderForPath(childPsPath); PhysicalSwitchAugmentationBuilder dstBuilder = new PhysicalSwitchAugmentationBuilder(); - PhysicalSwitchAugmentation src = haPsNode.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation src = haPsNode.augmentation(PhysicalSwitchAugmentation.class); psAugmentationMerger.mergeConfigData(dstBuilder, src, childPath); psNodeMerger.mergeConfigData(childPsBuilder, haPsNode, childPath); @@ -281,7 +281,7 @@ public class NodeConnectedHandler { NodeBuilder haPSNodeBuilder = HwvtepHAUtil.getNodeBuilderForPath(haPspath); PhysicalSwitchAugmentationBuilder dstBuilder = new PhysicalSwitchAugmentationBuilder(); - PhysicalSwitchAugmentation src = childPsNode.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation src = childPsNode.augmentation(PhysicalSwitchAugmentation.class); Node existingHAPSNode = HwvtepHAUtil.readNode(tx, OPERATIONAL, haPspath); PhysicalSwitchAugmentation existingHAPSAugumentation = diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java index f045129b07..629b67a081 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/handlers/NodeCopier.java @@ -92,7 +92,7 @@ public class NodeCopier implements INodeCopier { return; } HwvtepGlobalAugmentation srcGlobalAugmentation = - srcGlobalNodeOptional.get().getAugmentation(HwvtepGlobalAugmentation.class); + srcGlobalNodeOptional.get().augmentation(HwvtepGlobalAugmentation.class); if (srcGlobalAugmentation == null) { /** * If Source HA Global Node is not present @@ -122,7 +122,7 @@ public class NodeCopier implements INodeCopier { //Also update the manager section in config which helps in cluster reboot scenarios haBuilder.getManagers().forEach((manager) -> { InstanceIdentifier managerIid = dstPath.augmentation(HwvtepGlobalAugmentation.class) - .child(Managers.class, manager.getKey()); + .child(Managers.class, manager.key()); tx.put(CONFIGURATION, managerIid, manager, true); }); @@ -176,7 +176,7 @@ public class NodeCopier implements INodeCopier { PhysicalSwitchAugmentationBuilder dstPsAugmentationBuilder = new PhysicalSwitchAugmentationBuilder(); PhysicalSwitchAugmentation srcPsAugmenatation = - srcPsNodeOptional.get().getAugmentation(PhysicalSwitchAugmentation.class); + srcPsNodeOptional.get().augmentation(PhysicalSwitchAugmentation.class); Node existingDstPsNode = HwvtepHAUtil.readNode(tx, logicalDatastoreType, dstPsPath); PhysicalSwitchAugmentation existingDstPsAugmentation = diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java index 7e69b4ff7b..bdecafcd10 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HAOpNodeListener.java @@ -208,7 +208,7 @@ public class HAOpNodeListener extends HwvtepNodeBaseListener { private void readAndCopyChildPsOpToParent(Node childNode, ReadWriteTransaction tx) { String childGlobalNodeId = childNode.getNodeId().getValue(); List childPsIids = new ArrayList<>(); - HwvtepGlobalAugmentation hwvtepGlobalAugmentation = childNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation hwvtepGlobalAugmentation = childNode.augmentation(HwvtepGlobalAugmentation.class); if (hwvtepGlobalAugmentation == null || HwvtepHAUtil.isEmpty(hwvtepGlobalAugmentation.getSwitches())) { haOpClusteredListener.getConnectedNodes() .stream() diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java index 07c24b4ead..1251064d61 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/HwvtepNodeBaseListener.java @@ -68,11 +68,11 @@ public abstract class HwvtepNodeBaseListener implements DataTreeChangeListener>() .put(LogicalSwitches.class, data -> ((LogicalSwitches) data).getHwvtepNodeName().getValue()) .put(RemoteMcastMacs.class, data -> { - return logicalSwitchNameFromIid(((RemoteMcastMacs) data).getKey().getLogicalSwitchRef() + return logicalSwitchNameFromIid(((RemoteMcastMacs) data).key().getLogicalSwitchRef() .getValue()); }) .put(RemoteUcastMacs.class, data -> { - return logicalSwitchNameFromIid(((RemoteUcastMacs) data).getKey().getLogicalSwitchRef() + return logicalSwitchNameFromIid(((RemoteUcastMacs) data).key().getLogicalSwitchRef() .getValue()); }).build(); @@ -114,10 +114,10 @@ public abstract class HwvtepNodeBaseListener implements DataTreeChangeListener childPath, Node updatedChildNode, Node beforeChildNode) { - HwvtepGlobalAugmentation updatedAugmentaion = updatedChildNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation updatedAugmentaion = updatedChildNode.augmentation(HwvtepGlobalAugmentation.class); HwvtepGlobalAugmentation beforeAugmentaion = null; if (beforeChildNode != null) { - beforeAugmentaion = beforeChildNode.getAugmentation(HwvtepGlobalAugmentation.class); + beforeAugmentaion = beforeChildNode.augmentation(HwvtepGlobalAugmentation.class); } List up = null; List be = null; diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java index eb3d05e969..b8e9559ea4 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/ha/listeners/ManagerListener.java @@ -62,10 +62,10 @@ public final class ManagerListener extends AsyncClusteredDataTreeChangeListenerB @Override protected void add(InstanceIdentifier key, Managers managers) { InstanceIdentifier parent = key.firstIdentifierOf(Node.class); - if (managers.getKey().getTarget().getValue().contains(HwvtepHAUtil.MANAGER_KEY) + if (managers.key().getTarget().getValue().contains(HwvtepHAUtil.MANAGER_KEY) && managers.getManagerOtherConfigs() != null) { managers.getManagerOtherConfigs().stream() - .filter(otherConfig -> otherConfig.getKey().getOtherConfigKey().contains(HwvtepHAUtil.HA_CHILDREN)) + .filter(otherConfig -> otherConfig.key().getOtherConfigKey().contains(HwvtepHAUtil.HA_CHILDREN)) .flatMap(otherConfig -> Arrays.stream(otherConfig.getOtherConfigValue().split(","))) .map(HwvtepHAUtil::convertToInstanceIdentifier) .forEach(childIid -> hwvtepNodeHACache.addChild(parent, childIid)); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java index 829a8369e1..76be486ff5 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanGroupListener.java @@ -63,7 +63,7 @@ public class ElanGroupListener extends AsyncClusteredDataTreeChangeListenerBase< @Override protected void remove(InstanceIdentifier identifier, Group del) { - LOG.trace("received group removed {}", del.getKey().getGroupId()); + LOG.trace("received group removed {}", del.key().getGroupId()); } @@ -91,7 +91,7 @@ public class ElanGroupListener extends AsyncClusteredDataTreeChangeListenerBase< @Override protected void update(InstanceIdentifier identifier, Group original, Group update) { - LOG.trace("received group updated {}", update.getKey().getGroupId()); + LOG.trace("received group updated {}", update.key().getGroupId()); final BigInteger dpnId = getDpnId(identifier.firstKeyOf(Node.class).getId().getValue()); if (dpnId == null) { return; @@ -99,13 +99,13 @@ public class ElanGroupListener extends AsyncClusteredDataTreeChangeListenerBase< List allDevices = ElanL2GwCacheUtils.getAllElanDevicesFromCache(); if (allDevices == null || allDevices.isEmpty()) { - LOG.trace("no elan devices present in cache {}", update.getKey().getGroupId()); + LOG.trace("no elan devices present in cache {}", update.key().getGroupId()); return; } int expectedElanFootprint = 0; final ElanInstance elanInstance = getElanInstanceFromGroupId(update); if (elanInstance == null) { - LOG.trace("no elan instance is null {}", update.getKey().getGroupId()); + LOG.trace("no elan instance is null {}", update.key().getGroupId()); return; } @@ -113,7 +113,7 @@ public class ElanGroupListener extends AsyncClusteredDataTreeChangeListenerBase< ElanL2GwCacheUtils.getInvolvedL2GwDevices(elanInstance.getElanInstanceName()); if (devices == null || devices.isEmpty()) { LOG.trace("no elan devices in elan cache {} {}", elanInstance.getElanInstanceName(), - update.getKey().getGroupId()); + update.key().getGroupId()); return; } boolean updateGroup = false; @@ -129,7 +129,7 @@ public class ElanGroupListener extends AsyncClusteredDataTreeChangeListenerBase< updateGroup = true; } else { LOG.trace("no of buckets matched perfectly {} {}", elanInstance.getElanInstanceName(), - update.getKey().getGroupId()); + update.key().getGroupId()); } } if (updateGroup) { @@ -141,20 +141,20 @@ public class ElanGroupListener extends AsyncClusteredDataTreeChangeListenerBase< return; } LOG.trace("no of buckets mismatched {} {}", elanInstance.getElanInstanceName(), - update.getKey().getGroupId()); + update.key().getGroupId()); elanClusterUtils.runOnlyInOwnerNode(elanInstance.getElanInstanceName(), "updating broadcast group", () -> { elanL2GatewayMulticastUtils.setupElanBroadcastGroups(elanInstance, dpnId); return null; }); } else { LOG.trace("no buckets in the update {} {}", elanInstance.getElanInstanceName(), - update.getKey().getGroupId()); + update.key().getGroupId()); } } @Override protected void add(InstanceIdentifier identifier, Group added) { - LOG.trace("received group add {}", added.getKey().getGroupId()); + LOG.trace("received group add {}", added.key().getGroupId()); update(identifier, null/*original*/, added); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java index 5fd0d3ff91..048a2eec9f 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/ElanInstanceListener.java @@ -69,7 +69,7 @@ public class ElanInstanceListener extends AsyncClusteredDataTreeChangeListenerBa InstanceIdentifier iid = InstanceIdentifier.create(Neutron.class).child( L2gatewayConnections.class).child( - L2gatewayConnection.class, connection.getKey()); + L2gatewayConnection.class, connection.key()); tx.delete(LogicalDatastoreType.CONFIGURATION, iid); } }); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java index 07b154b0fb..0c0929b1e6 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/HwvtepTerminationPointListener.java @@ -80,7 +80,7 @@ public class HwvtepTerminationPointListener protected void removed(InstanceIdentifier identifier, TerminationPoint del) { LOG.trace("physical locator removed {}", identifier); final HwvtepPhysicalPortAugmentation portAugmentation = - del.getAugmentation(HwvtepPhysicalPortAugmentation.class); + del.augmentation(HwvtepPhysicalPortAugmentation.class); if (portAugmentation != null) { elanClusterUtils.runOnlyInOwnerNode(HwvtepSouthboundConstants.ELAN_ENTITY_NAME, "Handling Physical port delete", @@ -97,7 +97,7 @@ public class HwvtepTerminationPointListener @Override protected void added(InstanceIdentifier identifier, final TerminationPoint add) { final HwvtepPhysicalPortAugmentation portAugmentation = - add.getAugmentation(HwvtepPhysicalPortAugmentation.class); + add.augmentation(HwvtepPhysicalPortAugmentation.class); if (portAugmentation != null) { final NodeId nodeId = identifier.firstIdentifierOf(Node.class).firstKeyOf(Node.class).getNodeId(); elanClusterUtils.runOnlyInOwnerNode(HwvtepSouthboundConstants.ELAN_ENTITY_NAME, @@ -123,7 +123,7 @@ public class HwvtepTerminationPointListener private List> handlePortAdded(TerminationPoint portAdded, NodeId psNodeId) { Node psNode = HwvtepUtils.getHwVtepNode(broker, LogicalDatastoreType.OPERATIONAL, psNodeId); if (psNode != null) { - String psName = psNode.getAugmentation(PhysicalSwitchAugmentation.class).getHwvtepNodeName().getValue(); + String psName = psNode.augmentation(PhysicalSwitchAugmentation.class).getHwvtepNodeName().getValue(); L2GatewayDevice l2GwDevice = l2GatewayCache.get(psName); if (l2GwDevice != null) { if (isL2GatewayConfigured(l2GwDevice)) { diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java index a1d21b4d23..a4f528bcdf 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/L2GatewayConnectionListener.java @@ -72,10 +72,10 @@ public class L2GatewayConnectionListener extends AsyncClusteredDataTreeChangeLis HwvtepHAUtil.getPsName(psIid) != null; private static final Predicate IS_HA_PARENT_NODE = (node) -> { - HwvtepGlobalAugmentation augmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getManagers() != null) { return augmentation.getManagers().stream().anyMatch( - manager -> manager.getKey().getTarget().getValue().equals(HwvtepHAUtil.MANAGER_KEY)); + manager -> manager.key().getTarget().getValue().equals(HwvtepHAUtil.MANAGER_KEY)); } return false; }; @@ -218,8 +218,8 @@ public class L2GatewayConnectionListener extends AsyncClusteredDataTreeChangeLis l2GwDevice.setConnected(true); l2GwDevice.setHwvtepNodeId(globalNode.getNodeId().getValue()); - List tunnelIps = psNode.getAugmentation(PhysicalSwitchAugmentation.class) != null - ? psNode.getAugmentation(PhysicalSwitchAugmentation.class).getTunnelIps() : null; + List tunnelIps = psNode.augmentation(PhysicalSwitchAugmentation.class) != null + ? psNode.augmentation(PhysicalSwitchAugmentation.class).getTunnelIps() : null; if (tunnelIps != null) { for (TunnelIps tunnelIp : tunnelIps) { IpAddress tunnelIpAddr = tunnelIp.getTunnelIpsKey(); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java index 3b790e9593..67374d6f39 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/listeners/LocalUcastMacListener.java @@ -191,7 +191,7 @@ public class LocalUcastMacListener extends ChildListener iid = parentIid .augmentation(HwvtepGlobalAugmentation.class) - .child(LocalUcastMacs.class, mac.getKey()); + .child(LocalUcastMacs.class, mac.key()); result.put(iid, (DataObjectModification) childMod); }); } @@ -220,12 +220,12 @@ public class LocalUcastMacListener extends ChildListener getMacIid(InstanceIdentifier nodeIid, LocalUcastMacs mac) { return nodeIid.augmentation(HwvtepGlobalAugmentation.class) - .child(LocalUcastMacs.class, mac.getKey()); + .child(LocalUcastMacs.class, mac.key()); } private Set getMacs(@Nullable Node node) { if (node != null) { - HwvtepGlobalAugmentation augmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getLocalUcastMacs() != null) { return new HashSet<>(augmentation.getLocalUcastMacs()); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java index 62cc8e7b43..be13492035 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayMulticastUtils.java @@ -261,7 +261,7 @@ public class ElanL2GatewayMulticastUtils { } public void setupLeavesEtreeBroadcastGroups(ElanInstance elanInfo, DpnInterfaces dpnInterfaces, BigInteger dpnId) { - EtreeInstance etreeInstance = elanInfo.getAugmentation(EtreeInstance.class); + EtreeInstance etreeInstance = elanInfo.augmentation(EtreeInstance.class); if (etreeInstance != null) { long etreeLeafTag = etreeInstance.getEtreeLeafTagVal().getValue(); List listBucket = new ArrayList<>(); @@ -359,7 +359,7 @@ public class ElanL2GatewayMulticastUtils { try { operElanInstance = new SingleTransactionDataBroker(broker).syncReadOptional( LogicalDatastoreType.OPERATIONAL, - InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class, elanInfo.getKey()) + InstanceIdentifier.builder(ElanInstances.class).child(ElanInstance.class, elanInfo.key()) .build()).orNull(); } catch (ReadFailedException e) { LOG.error("Failed to read elan instance operational path {}", elanInfo, e); @@ -454,7 +454,7 @@ public class ElanL2GatewayMulticastUtils { InstanceIdentifier iid = HwvtepSouthboundUtils.createPhysicalLocatorInstanceIdentifier(nodeId, phyLocatorAug); TerminationPoint terminationPoint = new TerminationPointBuilder() - .setKey(HwvtepSouthboundUtils.getTerminationPointKey(phyLocatorAug)) + .withKey(HwvtepSouthboundUtils.getTerminationPointKey(phyLocatorAug)) .addAugmentation(HwvtepPhysicalLocatorAugmentation.class, phyLocatorAug).build(); ResourceBatchingManager.getInstance().put(ResourceBatchingManager.ShardResource.CONFIG_TOPOLOGY, iid, terminationPoint); @@ -502,7 +502,7 @@ public class ElanL2GatewayMulticastUtils { .setMacEntryKey(new MacAddress(ElanConstants.UNKNOWN_DMAC)).setLogicalSwitchRef(lsRef) .setLocatorSet(locators).build(); InstanceIdentifier iid = HwvtepSouthboundUtils.createRemoteMcastMacsInstanceIdentifier(nodeId, - remoteMcastMac.getKey()); + remoteMcastMac.key()); ResourceBatchingManager.getInstance().put(ResourceBatchingManager.ShardResource.CONFIG_TOPOLOGY, iid, remoteMcastMac); diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java index 617f12ab1b..9c44bab10e 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/ElanL2GatewayUtils.java @@ -533,7 +533,7 @@ public class ElanL2GatewayUtils { @Override public void onSuccess(Optional configNode) { if (configNode != null && configNode.isPresent()) { - HwvtepGlobalAugmentation augmentation = configNode.get().getAugmentation( + HwvtepGlobalAugmentation augmentation = configNode.get().augmentation( HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getLocalUcastMacs() != null) { macs.addAll(augmentation.getLocalUcastMacs().stream() @@ -619,7 +619,7 @@ public class ElanL2GatewayUtils { List lstMacs = Collections.emptyList(); Node hwvtepNode = HwvtepUtils.getHwVtepNode(broker, datastoreType, hwvtepNodeId); if (hwvtepNode != null) { - List remoteUcastMacs = hwvtepNode.getAugmentation(HwvtepGlobalAugmentation.class) + List remoteUcastMacs = hwvtepNode.augmentation(HwvtepGlobalAugmentation.class) .getRemoteUcastMacs(); if (remoteUcastMacs != null && !remoteUcastMacs.isEmpty()) { // Filtering remoteUcastMacs based on the logical switch and @@ -1152,7 +1152,7 @@ public class ElanL2GatewayUtils { Optional configNode = MDSALUtil.read(broker, LogicalDatastoreType.CONFIGURATION, HwvtepSouthboundUtils.createInstanceIdentifier(new NodeId(l2gwDevice.getHwvtepNodeId()))); if (configNode.isPresent()) { - HwvtepGlobalAugmentation augmentation = configNode.get().getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = configNode.get().augmentation(HwvtepGlobalAugmentation.class); if (augmentation != null && augmentation.getLocalUcastMacs() != null) { macs.addAll(augmentation.getLocalUcastMacs().stream() .filter(mac -> getLogicalSwitchName(mac).equals(elanName)) diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java index 248ec28067..15adbcff05 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/L2GatewayConnectionUtils.java @@ -186,7 +186,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable { public void addL2GatewayConnection(final L2gatewayConnection input, final String l2GwDeviceName , L2gateway l2Gateway) { - LOG.info("Adding L2gateway Connection with ID: {}", input.getKey().getUuid()); + LOG.info("Adding L2gateway Connection with ID: {}", input.key().getUuid()); Uuid networkUuid = input.getNetworkId(); @@ -215,7 +215,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable { } public void deleteL2GatewayConnection(L2gatewayConnection input) { - LOG.info("Deleting L2gateway Connection with ID: {}", input.getKey().getUuid()); + LOG.info("Deleting L2gateway Connection with ID: {}", input.key().getUuid()); Uuid networkUuid = input.getNetworkId(); String elanName = networkUuid.getValue(); @@ -227,8 +227,8 @@ public class L2GatewayConnectionUtils implements AutoCloseable { List l2Devices = ElanL2GwCacheUtils.getAllElanDevicesFromCache(); List l2gwDevicesToBeDeleted = new ArrayList<>(); for (L2GatewayDevice elanL2gwDevice : l2Devices) { - if (elanL2gwDevice.getL2GatewayIds().contains(input.getKey().getUuid())) { - l2gwDevicesToBeDeleted.addAll(elanL2gwDevice.getDevicesForL2gwConnectionId(input.getKey().getUuid())); + if (elanL2gwDevice.getL2GatewayIds().contains(input.key().getUuid())) { + l2gwDevicesToBeDeleted.addAll(elanL2gwDevice.getDevicesForL2gwConnectionId(input.key().getUuid())); } } if (l2gwDevicesToBeDeleted.isEmpty()) { @@ -254,7 +254,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable { ElanL2GwCacheUtils.removeL2GatewayDeviceFromCache(elanName, hwvtepNodeId); isLastL2GwConnDeleted = true; } else { - Uuid l2GwConnId = input.getKey().getUuid(); + Uuid l2GwConnId = input.key().getUuid(); LOG.debug("Elan L2Gw Conn cache with id {} is being referred by other L2Gw Conns; so only " + "L2 Gw Conn {} reference is removed", hwvtepNodeId, l2GwConnId); if (elanL2GwDevice != null) { @@ -277,7 +277,7 @@ public class L2GatewayConnectionUtils implements AutoCloseable { L2gateway l2Gateway, L2gatewayConnection input, String l2GwDeviceName) { String elanName = elanInstance.getElanInstanceName(); Integer defaultVlan = input.getSegmentId(); - Uuid l2GwConnId = input.getKey().getUuid(); + Uuid l2GwConnId = input.key().getUuid(); List l2Devices = l2Gateway.getDevices(); LOG.trace("Associating ELAN {} with L2Gw Conn Id {} having below L2Gw devices {}", elanName, l2GwConnId, @@ -378,9 +378,9 @@ public class L2GatewayConnectionUtils implements AutoCloseable { Optional nodeOptional = resultNode; if (nodeOptional.isPresent()) { Node node = nodeOptional.get(); - if (node.getAugmentation(HwvtepGlobalAugmentation.class) != null) { + if (node.augmentation(HwvtepGlobalAugmentation.class) != null) { List localUcastMacs = - node.getAugmentation(HwvtepGlobalAugmentation.class).getLocalUcastMacs(); + node.augmentation(HwvtepGlobalAugmentation.class).getLocalUcastMacs(); if (localUcastMacs == null) { return; } @@ -423,6 +423,6 @@ public class L2GatewayConnectionUtils implements AutoCloseable { } static InstanceIdentifier getMacIid(InstanceIdentifier nodeIid, LocalUcastMacs mac) { - return nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(LocalUcastMacs.class, mac.getKey()); + return nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(LocalUcastMacs.class, mac.key()); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java index 620b2ebebc..95f54369d1 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/l2gw/utils/StaleVlanBindingsCleaner.java @@ -62,8 +62,8 @@ public class StaleVlanBindingsCleaner { (validNetworks, logicalSwitch) -> !validNetworks.contains(logicalSwitch); private static Predicate CONTAINS_VLANBINDINGS = (port) -> - port.getAugmentation(HwvtepPhysicalPortAugmentation.class) != null - && port.getAugmentation(HwvtepPhysicalPortAugmentation.class).getVlanBindings() != null; + port.augmentation(HwvtepPhysicalPortAugmentation.class) != null + && port.augmentation(HwvtepPhysicalPortAugmentation.class).getVlanBindings() != null; private final DataBroker broker; @@ -157,7 +157,7 @@ public class StaleVlanBindingsCleaner { Map>> vlans = new HashMap<>(); ports.stream() .filter(CONTAINS_VLANBINDINGS) - .forEach((port) -> port.getAugmentation(HwvtepPhysicalPortAugmentation.class) + .forEach((port) -> port.augmentation(HwvtepPhysicalPortAugmentation.class) .getVlanBindings() .forEach((binding) -> putVlanBindingVsLogicalSwitch(configPsNode, vlans, port, binding))); return vlans; @@ -176,9 +176,9 @@ public class StaleVlanBindingsCleaner { final TerminationPoint tp, final VlanBindings vlanBinding) { return HwvtepSouthboundUtils.createInstanceIdentifier(nodeId) - .child(TerminationPoint.class, tp.getKey()) + .child(TerminationPoint.class, tp.key()) .augmentation(HwvtepPhysicalPortAugmentation.class) - .child(VlanBindings.class, vlanBinding.getKey()); + .child(VlanBindings.class, vlanBinding.key()); } private void cleanupStaleBindings(final String globalNodeId, @@ -198,7 +198,7 @@ public class StaleVlanBindingsCleaner { } private List getLogicalSwitchesOnDevice(final Node globalConfigNode) { - HwvtepGlobalAugmentation augmentation = globalConfigNode.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = globalConfigNode.augmentation(HwvtepGlobalAugmentation.class); if (augmentation == null || augmentation.getLogicalSwitches() == null) { return Collections.emptyList(); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java index d1953a9a35..3ee407e195 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanEtreeUtils.java @@ -31,7 +31,7 @@ public class ElanEtreeUtils { LogicalDatastoreType.OPERATIONAL, elanId); if (existingElanInfo.isPresent()) { ElanTagName elanTagName = existingElanInfo.get(); - return elanTagName.getAugmentation(EtreeLeafTagName.class); + return elanTagName.augmentation(EtreeLeafTagName.class); } return null; } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java index 2bdb2e7d72..26f7e71977 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanForwardingEntriesHandler.java @@ -72,7 +72,7 @@ public class ElanForwardingEntriesHandler { MacEntry macEntry = new MacEntryBuilder().setIsStaticAddress(true) .setMacAddress(staticMacEntries.getMacAddress()) .setIpPrefix(staticMacEntries.getIpPrefix()) - .setInterface(interfaceName).setKey(new MacEntryKey(staticMacEntries.getMacAddress())).build(); + .setInterface(interfaceName).withKey(new MacEntryKey(staticMacEntries.getMacAddress())).build(); createElanForwardingTablesList(elanInstanceName, macEntry, tx); createElanInterfaceForwardingTablesList(interfaceName, macEntry, tx); @@ -96,7 +96,7 @@ public class ElanForwardingEntriesHandler { if (existingInterfaceMacEntry == null) { MacEntry macEntry = new MacEntryBuilder().setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix()) .setInterface(interfaceName) - .setIsStaticAddress(true).setKey(new MacEntryKey(mac.getMacAddress())).build(); + .setIsStaticAddress(true).withKey(new MacEntryKey(mac.getMacAddress())).build(); tx.put(LogicalDatastoreType.OPERATIONAL, existingMacEntryId, macEntry, WriteTransaction.CREATE_MISSING_PARENTS); } @@ -110,7 +110,7 @@ public class ElanForwardingEntriesHandler { if (existingMacEntry != null && elanUtils.getElanMacTable(elanName) != null) { MacEntry newMacEntry = new MacEntryBuilder().setInterface(interfaceName).setIsStaticAddress(true) .setMacAddress(mac.getMacAddress()).setIpPrefix(mac.getIpPrefix()) - .setKey(new MacEntryKey(mac.getMacAddress())).build(); + .withKey(new MacEntryKey(mac.getMacAddress())).build(); tx.put(LogicalDatastoreType.OPERATIONAL, macEntryId, newMacEntry); } } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java index eb22c38c43..db9fd89eca 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanItmUtils.java @@ -247,7 +247,7 @@ public class ElanItmUtils { Interface tunnelInterface = ElanL2GatewayUtils.getInterfaceFromConfigDS(new InterfaceKey(tunnelInterfaceName), broker); if (tunnelInterface != null) { - dpnTepIp = tunnelInterface.getAugmentation(IfTunnel.class).getTunnelSource(); + dpnTepIp = tunnelInterface.augmentation(IfTunnel.class).getTunnelSource(); } else { LOG.warn("Tunnel interface not found for tunnelInterfaceName {}", tunnelInterfaceName); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java index 6076f036c6..7d1888b7f5 100755 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/ElanUtils.java @@ -674,7 +674,7 @@ public class ElanUtils { if (etreeInterface == null || etreeInterface.getEtreeInterfaceType() == EtreeInterfaceType.Root) { return elanInfo.getElanTag(); } else { // Leaf - EtreeInstance etreeInstance = elanInfo.getAugmentation(EtreeInstance.class); + EtreeInstance etreeInstance = elanInfo.augmentation(EtreeInstance.class); if (etreeInstance == null) { LOG.warn("EtreeInterface {} is connected to a non-Etree network: {}", interfaceInfo.getInterfaceName(), elanInfo.getElanInstanceName()); @@ -1141,19 +1141,19 @@ public class ElanUtils { elanTag = retrieveNewElanTag(idManager, elanInstanceName); } Elan elanInfo = new ElanBuilder().setName(elanInstanceName).setElanInterfaces(elanInterfaces) - .setKey(new ElanKey(elanInstanceName)).build(); + .withKey(new ElanKey(elanInstanceName)).build(); // Add the ElanState in the elan-state operational data-store tx.put(LogicalDatastoreType.OPERATIONAL, getElanInstanceOperationalDataPath(elanInstanceName), elanInfo, WriteTransaction.CREATE_MISSING_PARENTS); // Add the ElanMacTable in the elan-mac-table operational data-store - MacTable elanMacTable = new MacTableBuilder().setKey(new MacTableKey(elanInstanceName)).build(); + MacTable elanMacTable = new MacTableBuilder().withKey(new MacTableKey(elanInstanceName)).build(); tx.put(LogicalDatastoreType.OPERATIONAL, getElanMacTableOperationalDataPath(elanInstanceName), elanMacTable, WriteTransaction.CREATE_MISSING_PARENTS); ElanTagNameBuilder elanTagNameBuilder = new ElanTagNameBuilder().setElanTag(elanTag) - .setKey(new ElanTagNameKey(elanTag)).setName(elanInstanceName); + .withKey(new ElanTagNameKey(elanTag)).setName(elanInstanceName); long etreeLeafTag = -1; if (isEtreeInstance(elanInstanceAdded)) { etreeLeafTag = retrieveNewElanTag(idManager,elanInstanceName + ElanConstants @@ -1176,7 +1176,7 @@ public class ElanUtils { .setDescription(elanInstanceAdded.getDescription()) .setMacTimeout(elanInstanceAdded.getMacTimeout() == null ? Long.valueOf(ElanConstants.DEFAULT_MAC_TIME_OUT) : elanInstanceAdded.getMacTimeout()) - .setKey(elanInstanceAdded.getKey()).setElanTag(elanTag); + .withKey(elanInstanceAdded.key()).setElanTag(elanTag); if (isEtreeInstance(elanInstanceAdded)) { EtreeInstance etreeInstance = new EtreeInstanceBuilder().setEtreeLeafTagVal(new EtreeLeafTag(etreeLeafTag)) .build(); @@ -1190,13 +1190,13 @@ public class ElanUtils { private static void addTheLeafTagAsElanTag(String elanInstanceName, long etreeLeafTag, WriteTransaction tx) { ElanTagName etreeTagAsElanTag = new ElanTagNameBuilder().setElanTag(etreeLeafTag) - .setKey(new ElanTagNameKey(etreeLeafTag)).setName(elanInstanceName).build(); + .withKey(new ElanTagNameKey(etreeLeafTag)).setName(elanInstanceName).build(); tx.put(LogicalDatastoreType.OPERATIONAL, getElanInfoEntriesOperationalDataPath(etreeLeafTag), etreeTagAsElanTag); } private static boolean isEtreeInstance(ElanInstance elanInstanceAdded) { - return elanInstanceAdded.getAugmentation(EtreeInstance.class) != null; + return elanInstanceAdded.augmentation(EtreeInstance.class) != null; } public boolean isDpnPresent(BigInteger dpnId) { @@ -1221,7 +1221,7 @@ public class ElanUtils { BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority) .setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) + return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class) .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); } @@ -1625,9 +1625,9 @@ public class ElanUtils { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.interfaces.rev140508.interfaces.Interface configIface = interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName); - IfTunnel ifTunnel = configIface.getAugmentation(IfTunnel.class); + IfTunnel ifTunnel = configIface.augmentation(IfTunnel.class); if (ifTunnel != null && ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) { - ParentRefs refs = configIface.getAugmentation(ParentRefs.class); + ParentRefs refs = configIface.augmentation(ParentRefs.class); if (refs != null && !Strings.isNullOrEmpty(refs.getParentInterface())) { return true; //multiple VxLAN tunnels enabled, i.e. only logical tunnel should be treated } @@ -1640,10 +1640,10 @@ public class ElanUtils { org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId nodeId = new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId("openflow:" + dpnId); org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node nodeDpn = - new NodeBuilder().setId(nodeId).setKey(new NodeKey(nodeId)).build(); + new NodeBuilder().setId(nodeId).withKey(new NodeKey(nodeId)).build(); return InstanceIdentifier.builder(Nodes.class) .child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class, - nodeDpn.getKey()).augmentation(FlowCapableNode.class) + nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flowKey).build(); } diff --git a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java index 2266cba718..ad0435f409 100644 --- a/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java +++ b/elanmanager/impl/src/main/java/org/opendaylight/netvirt/elan/utils/TransportZoneNotificationUtil.java @@ -122,7 +122,7 @@ public class TransportZoneNotificationUtil { private TransportZone createZone(String subnetIp, String zoneName) { List subnets = new ArrayList<>(); subnets.add(buildSubnets(subnetIp)); - TransportZoneBuilder tzb = new TransportZoneBuilder().setKey(new TransportZoneKey(zoneName)) + TransportZoneBuilder tzb = new TransportZoneBuilder().withKey(new TransportZoneKey(zoneName)) .setTunnelType(TunnelTypeVxlan.class).setZoneName(zoneName).setSubnets(subnets); return tzb.build(); } @@ -427,7 +427,7 @@ public class TransportZoneNotificationUtil { private Subnets buildSubnets(String subnetIp) { SubnetsBuilder subnetsBuilder = new SubnetsBuilder().setDeviceVteps(new ArrayList<>()) .setGatewayIp(new IpAddress(ALL_SUBNETS_GW.toCharArray())) - .setKey(new SubnetsKey(new IpPrefix(subnetIp.toCharArray()))).setVlanId(0) + .withKey(new SubnetsKey(new IpPrefix(subnetIp.toCharArray()))).setVlanId(0) .setVteps(new ArrayList<>()); return subnetsBuilder.build(); } diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java index 3cf06b4eab..c9c518337e 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/LogicalSwitchesCmdTest.java @@ -178,7 +178,7 @@ public class LogicalSwitchesCmdTest extends AbstractConcurrentDataBrokerTest { LogicalSwitches buildData(String name, String tunnelKey) { LogicalSwitchesBuilder logicalSwitchesBuilder = new LogicalSwitchesBuilder(); - logicalSwitchesBuilder.setKey(new LogicalSwitchesKey(new HwvtepNodeName(name))); + logicalSwitchesBuilder.withKey(new LogicalSwitchesKey(new HwvtepNodeName(name))); logicalSwitchesBuilder.setTunnelKey(tunnelKey); logicalSwitchesBuilder.setHwvtepNodeName(new HwvtepNodeName(name)); return logicalSwitchesBuilder.build(); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java index c1e5b73f6d..d17088eef7 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/GlobalAugmentationHelper.java @@ -114,7 +114,7 @@ public final class GlobalAugmentationHelper { List switches = new ArrayList<>(); SwitchesBuilder switchesBuilder = new SwitchesBuilder(); - switchesBuilder.setKey(new SwitchesKey(new HwvtepPhysicalSwitchRef(psId))); + switchesBuilder.withKey(new SwitchesKey(new HwvtepPhysicalSwitchRef(psId))); switchesBuilder.setSwitchRef(new HwvtepPhysicalSwitchRef(psId)); switches.add(switchesBuilder.build()); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java index ef09c2acee..37ac6ee41e 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/NodeConnectedHandlerUtils.java @@ -78,7 +78,7 @@ public class NodeConnectedHandlerUtils { List tunnelIps = new ArrayList<>(); IpAddress ip = new IpAddress("192.168.122.30".toCharArray()); - tunnelIps.add(new TunnelIpsBuilder().setKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build()); + tunnelIps.add(new TunnelIpsBuilder().withKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build()); physicalSwitchAugmentationBuilder.setTunnelIps(tunnelIps); nodeBuilder.addAugmentation(PhysicalSwitchAugmentation.class, physicalSwitchAugmentationBuilder.build()); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java index 1e9f0f98a6..f840487dd3 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/PhysicalSwitchHelper.java @@ -79,7 +79,7 @@ public final class PhysicalSwitchHelper { Map vlanBindingData) { TerminationPointKey tpKey = new TerminationPointKey(new TpId(portName)); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); switchIid.firstKeyOf(Node.class); InstanceIdentifier tpPath = switchIid.child(TerminationPoint.class, @@ -125,7 +125,7 @@ public final class PhysicalSwitchHelper { public static VlanBindings createVlanBinding(Long key, String logicalSwitch) { VlanBindingsBuilder vbBuilder = new VlanBindingsBuilder(); VlanBindingsKey vbKey = new VlanBindingsKey(new VlanId(key.intValue())); - vbBuilder.setKey(vbKey); + vbBuilder.withKey(vbKey); vbBuilder.setVlanIdKey(vbKey.getVlanIdKey()); HwvtepLogicalSwitchRef hwvtepLogicalSwitchRef = new HwvtepLogicalSwitchRef(createInstanceIdentifier(logicalSwitch)); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java index 1c11ad6b0d..11b092e1a1 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestBuilders.java @@ -94,7 +94,7 @@ public final class TestBuilders { TerminationPointKey tpKey = new TerminationPointKey(new TpId("vxlan_over_ipv4:" + ip)); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); if (nodeIid != null && tpKey != null) { - tpBuilder.setKey(tpKey); + tpBuilder.withKey(tpKey); tpBuilder.setTpId(tpKey.getTpId()); InstanceIdentifier tpPath = buildTpId(nodeIid, ip); @@ -110,7 +110,7 @@ public final class TestBuilders { public static LogicalSwitches buildLogicalSwitch(String logicalSwitch, String tunnelKey) { 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 lgoicalSwitchUuid = getUUid(logicalSwitch); @@ -161,7 +161,7 @@ public final class TestBuilders { public static List buildManagers() { ManagersBuilder builder1 = new ManagersBuilder(); - builder1.setKey(new ManagersKey(new Uri("test"))); + builder1.withKey(new ManagersKey(new Uri("test"))); List otherConfigses = new ArrayList<>(); otherConfigses.add(buildOtherConfig("ha_enabled", "true")); @@ -174,7 +174,7 @@ public final class TestBuilders { public static List buildManagers1() { ManagersBuilder builder1 = new ManagersBuilder(); - builder1.setKey(new ManagersKey(new Uri("test"))); + builder1.withKey(new ManagersKey(new Uri("test"))); builder1.setManagerOtherConfigs(Collections.emptyList()); return ImmutableList.of(builder1.build()); } @@ -182,7 +182,7 @@ public final class TestBuilders { public static ManagerOtherConfigs buildOtherConfig(String key, String val) { ManagerOtherConfigsBuilder otherConfigsBuilder = new ManagerOtherConfigsBuilder(); ManagerOtherConfigsKey managerOtherConfigsKey = new ManagerOtherConfigsKey(key); - otherConfigsBuilder.setKey(managerOtherConfigsKey); + otherConfigsBuilder.withKey(managerOtherConfigsKey); otherConfigsBuilder.setOtherConfigKey(key); otherConfigsBuilder.setOtherConfigValue(val); return otherConfigsBuilder.build(); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java index ec0f0444a0..6fb9ddcd17 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestComparators.java @@ -51,7 +51,7 @@ public final class TestComparators { private TestComparators() { } public static void verifySwitches(Node globalOpNode, Node psOpNode) { - for (Switches switches : globalOpNode.getAugmentation(HwvtepGlobalAugmentation.class).getSwitches()) { + for (Switches switches : globalOpNode.augmentation(HwvtepGlobalAugmentation.class).getSwitches()) { String switchValue = switches.getSwitchRef().getValue().firstKeyOf(Node.class).getNodeId().getValue(); assertEquals("Switch Name should be equal", switchValue, psOpNode.getNodeId().getValue()); } @@ -59,8 +59,8 @@ public final class TestComparators { public static void compareLogicalSwitches(Node src, Node dst, InstanceIdentifier nodePath) { LogicalSwitchesCmd cmd = new LogicalSwitchesCmd(); - HwvtepGlobalAugmentation d1Aug = src.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = dst.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = src.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = dst.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getLogicalSwitches() != null ? d1Aug.getLogicalSwitches() : new ArrayList<>(); @@ -75,9 +75,9 @@ public final class TestComparators { public static void compareLogicalSwitches(Node d1, Node d2, Node ha, InstanceIdentifier nodePath) { LogicalSwitchesCmd cmd = new LogicalSwitchesCmd(); - HwvtepGlobalAugmentation d1Aug = d1.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation d2Aug = d2.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = ha.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = d1.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d2Aug = d2.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = ha.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getLogicalSwitches() != null ? d1Aug.getLogicalSwitches() : new ArrayList<>(); @@ -97,8 +97,8 @@ public final class TestComparators { public static void compareRemoteUcastMacs(Node src, Node dst, InstanceIdentifier nodePath) { RemoteUcastCmd cmd = new RemoteUcastCmd(); - HwvtepGlobalAugmentation d1Aug = src.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = dst.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = src.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = dst.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getRemoteUcastMacs() != null ? d1Aug.getRemoteUcastMacs() : new ArrayList<>(); List result1 = cmd.transform(nodePath, d1Values); @@ -115,9 +115,9 @@ public final class TestComparators { public static void compareRemoteUcastMacs(Node d1, Node d2, Node ha, InstanceIdentifier nodePath) { RemoteUcastCmd cmd = new RemoteUcastCmd(); - HwvtepGlobalAugmentation d1Aug = d1.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation d2Aug = d2.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = ha.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = d1.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d2Aug = d2.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = ha.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getRemoteUcastMacs() != null ? d1Aug.getRemoteUcastMacs() : new ArrayList<>(); @@ -139,8 +139,8 @@ public final class TestComparators { public static void compareRemoteMcastMacs(Node src, Node dst, InstanceIdentifier nodePath) { RemoteMcastCmd cmd = new RemoteMcastCmd(); - HwvtepGlobalAugmentation d1Aug = src.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = dst.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = src.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = dst.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getRemoteMcastMacs() != null ? d1Aug.getRemoteMcastMacs() : new ArrayList<>(); List result1 = cmd.transform(nodePath, d1Values); @@ -154,9 +154,9 @@ public final class TestComparators { public static void compareRemoteMcastMacs(Node d1, Node d2, Node ha, InstanceIdentifier nodePath) { RemoteMcastCmd cmd = new RemoteMcastCmd(); - HwvtepGlobalAugmentation d1Aug = d1.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation d2Aug = d2.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = ha.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = d1.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d2Aug = d2.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = ha.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getRemoteMcastMacs() != null ? d1Aug.getRemoteMcastMacs() : new ArrayList<>(); @@ -179,8 +179,8 @@ public final class TestComparators { public static void compareLocalUcastMacs(Node src, Node dst, InstanceIdentifier nodePath) { LocalUcastCmd cmd = new LocalUcastCmd(); - HwvtepGlobalAugmentation d1Aug = src.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = dst.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = src.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = dst.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getLocalUcastMacs() != null ? d1Aug.getLocalUcastMacs() : new ArrayList<>(); List result1 = cmd.transform(nodePath, d1Values); @@ -194,9 +194,9 @@ public final class TestComparators { public static void compareLocalUcastMacs(Node d1, Node d2, Node ha, InstanceIdentifier nodePath) { LocalUcastCmd cmd = new LocalUcastCmd(); - HwvtepGlobalAugmentation d1Aug = d1.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation d2Aug = d2.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = ha.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = d1.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d2Aug = d2.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = ha.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getLocalUcastMacs() != null ? d1Aug.getLocalUcastMacs() : new ArrayList<>(); @@ -218,8 +218,8 @@ public final class TestComparators { public static void compareLocalMcastMacs(Node src, Node dst, InstanceIdentifier nodePath) { LocalMcastCmd cmd = new LocalMcastCmd(); - HwvtepGlobalAugmentation d1Aug = src.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = dst.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = src.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = dst.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getLocalUcastMacs() != null ? d1Aug.getLocalMcastMacs() : new ArrayList<>(); List result1 = cmd.transform(nodePath, d1Values); @@ -233,9 +233,9 @@ public final class TestComparators { public static void compareLocalMcastMacs(Node d1, Node d2, Node ha, InstanceIdentifier nodePath) { LocalMcastCmd cmd = new LocalMcastCmd(); - HwvtepGlobalAugmentation d1Aug = d1.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation d2Aug = d2.getAugmentation(HwvtepGlobalAugmentation.class); - HwvtepGlobalAugmentation haAug = ha.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d1Aug = d1.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation d2Aug = d2.augmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation haAug = ha.augmentation(HwvtepGlobalAugmentation.class); List d1Values = d1Aug.getLocalUcastMacs() != null ? d1Aug.getLocalMcastMacs() : new ArrayList<>(); List result1 = cmd.transform(nodePath, d1Values); @@ -260,9 +260,9 @@ public final class TestComparators { InstanceIdentifier haPsnodePath, ReadWriteTransaction readWriteTransaction, String switchName, Node d1, Node d2, Node ha) throws ReadFailedException { - PhysicalSwitchAugmentation d1PsAug = d1ps.getAugmentation(PhysicalSwitchAugmentation.class); - PhysicalSwitchAugmentation d2PsAug = d2ps.getAugmentation(PhysicalSwitchAugmentation.class); - PhysicalSwitchAugmentation haPsAug = haps.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation d1PsAug = d1ps.augmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation d2PsAug = d2ps.augmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation haPsAug = haps.augmentation(PhysicalSwitchAugmentation.class); HwvtepGlobalRef managerd1Ps = d1PsAug.getManagedBy(); assertEquals("Hwvtep node name should be same", d1PsAug.getHwvtepNodeName().getValue(), @@ -300,8 +300,8 @@ public final class TestComparators { ReadWriteTransaction readWriteTransaction, String switchName, Node d1, Node ha) throws ReadFailedException { //Compare Physical Augmentation data - PhysicalSwitchAugmentation d1PsAug = d1ps.getAugmentation(PhysicalSwitchAugmentation.class); - PhysicalSwitchAugmentation haPsAug = haps.getAugmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation d1PsAug = d1ps.augmentation(PhysicalSwitchAugmentation.class); + PhysicalSwitchAugmentation haPsAug = haps.augmentation(PhysicalSwitchAugmentation.class); HwvtepGlobalRef managerd1Ps = d1PsAug.getManagedBy(); assertEquals("Hwvtep node name should be same", d1PsAug.getHwvtepNodeName().getValue(), @@ -332,14 +332,14 @@ public final class TestComparators { TerminationPoint tpNoded = readWriteTransaction.read(LogicalDatastoreType.OPERATIONAL, tpPathd) .checkedGet().get(); HwvtepPhysicalPortAugmentation hwvtepPhysicalPortAugmentationD = - tpNoded.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tpNoded.augmentation(HwvtepPhysicalPortAugmentation.class); InstanceIdentifier tpPathha = haPsa.child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); TerminationPoint tpNodeha = readWriteTransaction.read(LogicalDatastoreType.OPERATIONAL, tpPathha) .checkedGet().get(); HwvtepPhysicalPortAugmentation hwvtepPhysicalPortAugmentationHa = - tpNodeha.getAugmentation(HwvtepPhysicalPortAugmentation.class); + tpNodeha.augmentation(HwvtepPhysicalPortAugmentation.class); assertEquals("Termination point hwvtep-node-name should be same", hwvtepPhysicalPortAugmentationD.getHwvtepNodeName(), hwvtepPhysicalPortAugmentationHa.getHwvtepNodeName()); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java index 2bac67803d..4b5f20bfca 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elan/l2gw/nodehandlertest/TestUtil.java @@ -127,19 +127,19 @@ public final class TestUtil { Optional nodeOptional = TestUtil.readNodeOptional(LogicalDatastoreType.CONFIGURATION, nodeId, dataBroker); assertTrue(message, nodeOptional.isPresent()); if (nodeOptional.isPresent()) { - nodeOptional.get().getAugmentation(HwvtepGlobalAugmentation.class).getManagers(); + nodeOptional.get().augmentation(HwvtepGlobalAugmentation.class).getManagers(); } } public static void verifyHAconfigNode(Node haConfig, Node d1Node) throws Exception { - String haid = haConfig.getAugmentation(HwvtepGlobalAugmentation.class).getManagers() + String haid = haConfig.augmentation(HwvtepGlobalAugmentation.class).getManagers() .get(0).getManagerOtherConfigs().get(0).getOtherConfigValue(); String d1id = d1Node.getNodeId().getValue(); assertEquals("Other config should contain D1 as child manager", haid, d1id); } public static void verifyHAconfigNode(Node haConfig, Node d1Node, Node d2Node) throws Exception { - String haid = haConfig.getAugmentation(HwvtepGlobalAugmentation.class).getManagers() + String haid = haConfig.augmentation(HwvtepGlobalAugmentation.class).getManagers() .get(0).getManagerOtherConfigs().get(0).getOtherConfigValue(); String[] haids = haid.split(","); List haidSlist = Arrays.asList(haids); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/DpnNodeBuilders.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/DpnNodeBuilders.java index f353f69cd7..1b0818f932 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/DpnNodeBuilders.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/DpnNodeBuilders.java @@ -28,7 +28,7 @@ public final class DpnNodeBuilders { new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.NodeId("openflow:" + dpnId); org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node nodeDpn = new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder().setId(nodeId) - .setKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes + .withKey(new org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes .NodeKey(nodeId)).build(); return nodeDpn; } @@ -45,7 +45,7 @@ public final class DpnNodeBuilders { InstanceIdentifier groupInstanceId = InstanceIdentifier.builder(Nodes.class) .child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class, - nodeDpn.getKey()).augmentation(FlowCapableNode.class).child(Group.class, + nodeDpn.key()).augmentation(FlowCapableNode.class).child(Group.class, new GroupKey(new GroupId(Long.valueOf(groupId)))).build(); return groupInstanceId; } diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java index 89840ea598..84f1b4aaaf 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/ElanServiceTestBase.java @@ -383,10 +383,10 @@ public class ElanServiceTestBase { NodeId nodeId = new NodeId("openflow:" + dpnId); Node nodeDpn = - new NodeBuilder().setId(nodeId).setKey(new NodeKey(nodeId)).build(); + new NodeBuilder().setId(nodeId).withKey(new NodeKey(nodeId)).build(); return InstanceIdentifier.builder(Nodes.class) .child(Node.class, - nodeDpn.getKey()).augmentation(FlowCapableNode.class) + nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(tableId)).child(Flow.class, flowKey).build(); } @@ -405,7 +405,7 @@ public class ElanServiceTestBase { ElanInterfaceBuilder elanInterfaceBuilder = new ElanInterfaceBuilder() .setElanInstanceName(elanInstanceName) .setName(interfaceName) - .setKey(new ElanInterfaceKey(interfaceName)); + .withKey(new ElanInterfaceKey(interfaceName)); StaticMacEntriesBuilder staticMacEntriesBuilder = new StaticMacEntriesBuilder(); List staticMacEntries = new ArrayList<>(); diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/L2gwBuilders.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/L2gwBuilders.java index c743df28f6..9da17a36c1 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/L2gwBuilders.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/L2gwBuilders.java @@ -157,7 +157,7 @@ public class L2gwBuilders { physicalSwitchAugmentationBuilder.setHwvtepNodeDescription("torNode"); List tunnelIps = new ArrayList<>(); IpAddress ip = new IpAddress(tepIp.toCharArray()); - tunnelIps.add(new TunnelIpsBuilder().setKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build()); + tunnelIps.add(new TunnelIpsBuilder().withKey(new TunnelIpsKey(ip)).setTunnelIpsKey(ip).build()); physicalSwitchAugmentationBuilder.setTunnelIps(tunnelIps); nodeBuilder.addAugmentation(PhysicalSwitchAugmentation.class, physicalSwitchAugmentationBuilder.build()); singleTransactionDataBroker.syncWrite(LogicalDatastoreType.OPERATIONAL, psNodePath, nodeBuilder.build()); @@ -194,7 +194,7 @@ public class L2gwBuilders { } public InstanceIdentifier buildMacIid(InstanceIdentifier nodeIid, LocalUcastMacs mac) { - return nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(LocalUcastMacs.class, mac.getKey()); + return nodeIid.augmentation(HwvtepGlobalAugmentation.class).child(LocalUcastMacs.class, mac.key()); } public void deletel2GWConnection(String connectionName) throws TransactionCommitFailedException { diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/Verifications.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/Verifications.java index 9c364f0dbe..4394507e15 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/Verifications.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/Verifications.java @@ -117,7 +117,7 @@ public class Verifications { private boolean checkForRemoteMcastMac(InstanceIdentifier torNodeId, String tepIp, boolean checkForExists) { try { Node node = singleTxdataBroker.syncRead(LogicalDatastoreType.CONFIGURATION, torNodeId); - HwvtepGlobalAugmentation augmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (augmentation == null || augmentation.getRemoteMcastMacs() == null || augmentation.getRemoteMcastMacs().isEmpty()) { if (checkForExists) { @@ -161,7 +161,7 @@ public class Verifications { public boolean checkForRemoteUcastMac(InstanceIdentifier torNodeId, String dpnMac, boolean checkForExists) { try { Node node = singleTxdataBroker.syncRead(LogicalDatastoreType.CONFIGURATION, torNodeId); - HwvtepGlobalAugmentation augmentation = node.getAugmentation(HwvtepGlobalAugmentation.class); + HwvtepGlobalAugmentation augmentation = node.augmentation(HwvtepGlobalAugmentation.class); if (augmentation == null || augmentation.getRemoteUcastMacs() == null || augmentation.getRemoteUcastMacs().isEmpty()) { if (checkForExists) { @@ -273,7 +273,7 @@ public class Verifications { private Set modifyBucketId(List input) { return input.stream() .map(bucket -> new BucketBuilder(bucket).setBucketId(new BucketId(1L)) - .setKey(new BucketKey(new BucketId(1L))).build()) + .withKey(new BucketKey(new BucketId(1L))).build()) .collect(Collectors.toSet()); } @@ -408,10 +408,10 @@ public class Verifications { FlowKey flowKey = new FlowKey(new FlowId(flowid)); NodeId nodeId = GET_OPENFLOW_NODE_ID.apply(dpnId); org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node nodeDpn = - new NodeBuilder().setId(nodeId).setKey(new NodeKey(nodeId)).build(); + new NodeBuilder().setId(nodeId).withKey(new NodeKey(nodeId)).build(); return InstanceIdentifier.builder(Nodes.class) .child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class, - nodeDpn.getKey()).augmentation(FlowCapableNode.class) + nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(tableId)).child(Flow.class, flowKey).build(); } diff --git a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java index 0c1f2acb41..e5c401ddc0 100644 --- a/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java +++ b/elanmanager/impl/src/test/java/org/opendaylight/netvirt/elanmanager/tests/utils/EvpnTestHelper.java @@ -63,7 +63,8 @@ public class EvpnTestHelper { } public void updateRdtoNetworks(ElanInstance actualElanInstances) throws TransactionCommitFailedException { - EvpnRdToNetworkBuilder evpnRdToNetworkBuilder = new EvpnRdToNetworkBuilder().setKey(new EvpnRdToNetworkKey(RD)); + EvpnRdToNetworkBuilder evpnRdToNetworkBuilder = new EvpnRdToNetworkBuilder() + .withKey(new EvpnRdToNetworkKey(RD)); evpnRdToNetworkBuilder.setRd(RD); evpnRdToNetworkBuilder.setNetworkId(ELAN1); LOG.info("updating Evpn {} with elaninstance {} and rd {}", "evpn1", actualElanInstances, RD); diff --git a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java index 03cbe14e14..d48349cd3e 100644 --- a/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java +++ b/fibmanager/api/src/main/java/org/opendaylight/netvirt/fibmanager/api/FibHelper.java @@ -41,7 +41,7 @@ public final class FibHelper { public static RoutePaths buildRoutePath(String nextHop, Long label) { RoutePathsBuilder builder = new RoutePathsBuilder() - .setKey(new RoutePathsKey(nextHop)) + .withKey(new RoutePathsKey(nextHop)) .setNexthopAddress(nextHop); if (label != null) { builder.setLabel(label); @@ -50,13 +50,13 @@ public final class FibHelper { } public static VrfEntryBuilder getVrfEntryBuilder(String prefix, RouteOrigin origin, String parentVpnRd) { - return new VrfEntryBuilder().setKey(new VrfEntryKey(prefix)).setDestPrefix(prefix) + return new VrfEntryBuilder().withKey(new VrfEntryKey(prefix)).setDestPrefix(prefix) .setOrigin(origin.getValue()).setParentVpnRd(parentVpnRd); } public static VrfEntryBuilder getVrfEntryBuilder(String prefix, List routePaths, RouteOrigin origin, String parentVpnRd) { - return new VrfEntryBuilder().setKey(new VrfEntryKey(prefix)).setDestPrefix(prefix) + return new VrfEntryBuilder().withKey(new VrfEntryKey(prefix)).setDestPrefix(prefix) .setRoutePaths(routePaths).setOrigin(origin.getValue()).setParentVpnRd(parentVpnRd); } diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java index 55a321da5c..a0fabd57b9 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BaseVrfEntryHandler.java @@ -267,7 +267,7 @@ public class BaseVrfEntryHandler implements AutoCloseable { Node nodeDpn = FibUtil.buildDpnNode(dpId); InstanceIdentifier flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) + .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flowKey).build(); if (RouteOrigin.value(vrfEntry.getOrigin()) == RouteOrigin.BGP) { diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java index 02dfaff04a..556b7d9a5e 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/BgpRouteVrfEntryHandler.java @@ -379,7 +379,7 @@ public class BgpRouteVrfEntryHandler extends BaseVrfEntryHandler .findFirst() .ifPresent(routes -> { LOG.trace(" deleting remote FIB entry {}", vrfEntry); - deleteRemoteRoute(null, dpnId, vpnId, vrfTable.get().getKey(), vrfEntry, + deleteRemoteRoute(null, dpnId, vpnId, vrfTable.get().key(), vrfEntry, Optional.absent(), writeCfgTxn, subTxns); }); } diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java index b6e31d0880..bf51a8cdc7 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/EvpnVrfEntryHandler.java @@ -76,7 +76,7 @@ public class EvpnVrfEntryHandler extends BaseVrfEntryHandler implements IVrfEntr Preconditions.checkNotNull(vpnId, "Vpn Instance with rd " + vpnInstance.getVrfId() + " has null vpnId!"); if (RouteOrigin.value(vrfEntry.getOrigin()) == RouteOrigin.CONNECTED) { - SubnetRoute subnetRoute = vrfEntry.getAugmentation(SubnetRoute.class); + SubnetRoute subnetRoute = vrfEntry.augmentation(SubnetRoute.class); final List vpnToDpnList = vpnInstance.getVpnToDpnList(); final long elanTag = subnetRoute.getElantag(); LOG.trace("SubnetRoute augmented vrfentry found for rd {} prefix {} with elantag {}", diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java index 89f7a8414f..3d9f75ecf4 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/FibUtil.java @@ -489,7 +489,7 @@ public class FibUtil { InstanceIdentifier.InstanceIdentifierBuilder idBuilder = InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)); InstanceIdentifier vrfTableId = idBuilder.build(); - VrfTablesBuilder vrfTablesBuilder = new VrfTablesBuilder().setKey(new VrfTablesKey(rd)) + VrfTablesBuilder vrfTablesBuilder = new VrfTablesBuilder().withKey(new VrfTablesKey(rd)) .setRouteDistinguisher(rd).setVrfEntry(new ArrayList()); if (writeConfigTxn != null) { writeConfigTxn.merge(LogicalDatastoreType.CONFIGURATION, vrfTableId, vrfTablesBuilder.build()); @@ -696,7 +696,7 @@ public class FibUtil { if (targetDeviceIds.isEmpty()) { tx.delete(LogicalDatastoreType.OPERATIONAL, nextHopsId); } else { - Nexthops nextHopsToGroupId = new NexthopsBuilder().setKey(new NexthopsKey(nextHopKey)) + Nexthops nextHopsToGroupId = new NexthopsBuilder().withKey(new NexthopsKey(nextHopKey)) .setNexthopKey(nextHopKey) .setGroupId(groupId) .setTargetDeviceId(targetDeviceIds).build(); @@ -717,7 +717,7 @@ public class FibUtil { } private static Nexthops buildNextHops(BigInteger dpnId, String groupIdKey, String groupId) { - return new NexthopsBuilder().setKey(new NexthopsKey(groupIdKey)) + return new NexthopsBuilder().withKey(new NexthopsKey(groupIdKey)) .setNexthopKey(groupIdKey) .setGroupId(groupId) .setTargetDeviceId(Collections.singletonList(dpnId.toString())).build(); @@ -725,7 +725,7 @@ public class FibUtil { private static DpnLbNexthops buildDpnLbNextHops(BigInteger dpnId, String destinationIp, String groupIdKey) { - return new DpnLbNexthopsBuilder().setKey(new DpnLbNexthopsKey(destinationIp, dpnId)) + return new DpnLbNexthopsBuilder().withKey(new DpnLbNexthopsKey(destinationIp, dpnId)) .setDstDeviceId(destinationIp).setSrcDpId(dpnId) .setNexthopKey(Collections.singletonList(groupIdKey)).build(); } @@ -820,7 +820,7 @@ public class FibUtil { static Node buildDpnNode(BigInteger dpnId) { return new NodeBuilder().setId(new NodeId("openflow:" + dpnId)) - .setKey(new NodeKey(new NodeId("openflow:" + dpnId))).build(); + .withKey(new NodeKey(new NodeId("openflow:" + dpnId))).build(); } public static String getBroadcastAddressFromCidr(String cidr) { diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java index 13be7913ef..c273476e22 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/NexthopManager.java @@ -278,7 +278,7 @@ public class NexthopManager implements AutoCloseable { } List listActionInfo = new ArrayList<>(); for (Action action : actions) { - actionKey = action.getKey().getOrder() + actionKey; + actionKey = action.key().getOrder() + actionKey; org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action actionClass = action.getAction(); if (actionClass instanceof OutputActionCase) { @@ -432,7 +432,7 @@ public class NexthopManager implements AutoCloseable { LOG.trace("Prefix {} is already present in l3nextHop {} ", currDestIpPrefix, nexthop); } else { IpAdjacenciesBuilder ipPrefixesBuilder = - new IpAdjacenciesBuilder().setKey(new IpAdjacenciesKey(currDestIpPrefix)); + new IpAdjacenciesBuilder().withKey(new IpAdjacenciesKey(currDestIpPrefix)); LOG.trace("Updating prefix {} to vpnNextHop {} Operational DS", currDestIpPrefix, nexthop); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, getVpnNextHopIpPrefixIdentifier(vpnId, primaryIpAddress, currDestIpPrefix), @@ -482,7 +482,7 @@ public class NexthopManager implements AutoCloseable { ipPrefixesList.add(prefix); // Add nexthop to vpn node VpnNexthop nh = new VpnNexthopBuilder() - .setKey(new VpnNexthopKey(primaryIpAddr)) + .withKey(new VpnNexthopKey(primaryIpAddr)) .setDpnId(dpnId) .setIpAdjacencies(ipPrefixesList) .setEgressPointer(egressPointer).build(); diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java index a1eed62557..9da255909c 100644 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/RouterInterfaceVrfEntryHandler.java @@ -51,7 +51,7 @@ public class RouterInterfaceVrfEntryHandler extends BaseVrfEntryHandler implemen @Override public void createFlows(InstanceIdentifier identifier, VrfEntry vrfEntry, String rd) { - RouterInterface routerInt = vrfEntry.getAugmentation(RouterInterface.class); + RouterInterface routerInt = vrfEntry.augmentation(RouterInterface.class); installRouterFibEntries(vrfEntry, rd, NwConstants.ADD_FLOW, routerInt); } @@ -62,7 +62,7 @@ public class RouterInterfaceVrfEntryHandler extends BaseVrfEntryHandler implemen @Override public void removeFlows(InstanceIdentifier identifier, VrfEntry vrfEntry, String rd) { - RouterInterface routerInt = vrfEntry.getAugmentation(RouterInterface.class); + RouterInterface routerInt = vrfEntry.augmentation(RouterInterface.class); installRouterFibEntries(vrfEntry, rd, NwConstants.DEL_FLOW, routerInt); } diff --git a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java index 60c6f95b93..cc9d3b2ad9 100755 --- a/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java +++ b/fibmanager/impl/src/main/java/org/opendaylight/netvirt/fibmanager/VrfEntryListener.java @@ -211,7 +211,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) + .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flowKey).build(); if (addOrRemove == NwConstants.ADD_FLOW) { @@ -973,7 +973,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) + .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(terminatingServiceTableFlowEntity.getTableId())) .child(Flow.class, flowKey).build(); tx.put(LogicalDatastoreType.CONFIGURATION, flowInstanceId, flowbld.build(), @@ -994,7 +994,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) + .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flowEntity.getTableId())).child(Flow.class, flowKey).build(); tx.delete(LogicalDatastoreType.CONFIGURATION, flowInstanceId); @@ -1389,7 +1389,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase optionalLabel = FibUtil.getLabelFromRoutePaths(vrfEntry); List nextHopAddressList = FibHelper.getNextHopListFromRoutePaths(vrfEntry); String vpnName = fibUtil.getVpnNameFromId(vpnInstance.getVpnId()); @@ -1536,7 +1536,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) + .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())).child(Flow.class, flowKey).build(); if (addOrRemove == NwConstants.ADD_FLOW) { @@ -1570,7 +1570,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase { for (final VrfEntry vrfEntry : vrfTable.get().getVrfEntry()) { - SubnetRoute subnetRoute = vrfEntry.getAugmentation(SubnetRoute.class); + SubnetRoute subnetRoute = vrfEntry.augmentation(SubnetRoute.class); if (subnetRoute != null) { long elanTag = subnetRoute.getElantag(); installSubnetRouteInFib(dpnId, elanTag, rd, vpnId, vrfEntry, tx); @@ -1578,7 +1578,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase { for (final VrfEntry vrfEntry : vrfTable.get().getVrfEntry()) { /* Handle subnet routes here */ - SubnetRoute subnetRoute = vrfEntry.getAugmentation(SubnetRoute.class); + SubnetRoute subnetRoute = vrfEntry.augmentation(SubnetRoute.class); if (subnetRoute != null) { LOG.trace("SUBNETROUTE: cleanUpDpnForVpn: Cleaning subnetroute {} on dpn {}" + " for vpn {}", vrfEntry.getDestPrefix(), dpnId, rd); @@ -1745,7 +1745,7 @@ public class VrfEntryListener extends AsyncDataTreeChangeListenerBase { String flowRef = getInterVpnFibFlowRef(interVpnLinkName, vrfEntry.getDestPrefix(), nextHop); FlowKey flowKey = new FlowKey(new FlowId(flowRef)); - Flow flow = new FlowBuilder().setKey(flowKey).setId(new FlowId(flowRef)) + Flow flow = new FlowBuilder().withKey(flowKey).setId(new FlowId(flowRef)) .setTableId(NwConstants.L3_FIB_TABLE).setFlowName(flowRef).build(); LOG.trace("Removing flow in FIB table for interVpnLink {} key {}", interVpnLinkName, flowRef); diff --git a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java index fdcdf151eb..2775337806 100644 --- a/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java +++ b/ipv6service/impl/src/main/java/org/opendaylight/netvirt/ipv6service/utils/Ipv6ServiceUtils.java @@ -441,7 +441,7 @@ public class Ipv6ServiceUtils { BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie) .setFlowPriority(flowPriority).setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)) + return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)) .setServiceName(serviceName).setServicePriority(servicePriority) .setServiceType(ServiceTypeFlowBased.class) .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java index a91d60ca84..12d38d74f5 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/cli/DisplayNaptSwithcesCli.java @@ -82,11 +82,11 @@ public class DisplayNaptSwithcesCli extends OsgiCommandSupport { } private String getOpenvswitchOtherConfig(Node node, String key) { - OvsdbNodeAugmentation ovsdbNode = node.getAugmentation(OvsdbNodeAugmentation.class); + OvsdbNodeAugmentation ovsdbNode = node.augmentation(OvsdbNodeAugmentation.class); if (ovsdbNode == null) { Optional nodeFromReadOvsdbNode = readOvsdbNode(node); if (nodeFromReadOvsdbNode.isPresent()) { - ovsdbNode = nodeFromReadOvsdbNode.get().getAugmentation(OvsdbNodeAugmentation.class); + ovsdbNode = nodeFromReadOvsdbNode.get().augmentation(OvsdbNodeAugmentation.class); } } @@ -118,7 +118,7 @@ public class DisplayNaptSwithcesCli extends OsgiCommandSupport { if (node == null) { return null; } - return node.getAugmentation(OvsdbBridgeAugmentation.class); + return node.augmentation(OvsdbBridgeAugmentation.class); } } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java index e6c493f161..fdd8af8762 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/ha/SnatNodeEventListener.java @@ -47,7 +47,7 @@ public class SnatNodeEventListener extends AbstractClusteredAsyncDataTreeChange @Override public void remove(Node dataObjectModification) { - NodeKey nodeKey = dataObjectModification.getKey(); + NodeKey nodeKey = dataObjectModification.key(); BigInteger dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId()); LOG.info("Dpn removed {}", dpnId); centralizedSwitchScheduler.removeSwitch(dpnId); @@ -61,7 +61,7 @@ public class SnatNodeEventListener extends AbstractClusteredAsyncDataTreeChange @Override public void add(Node dataObjectModification) { - NodeKey nodeKey = dataObjectModification.getKey(); + NodeKey nodeKey = dataObjectModification.key(); BigInteger dpnId = MDSALUtil.getDpnIdFromNodeName(nodeKey.getId()); LOG.info("Dpn added {}", dpnId); centralizedSwitchScheduler.addSwitch(dpnId); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java index 453d43f307..92a1f72f31 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/EvpnDnatFlowProgrammer.java @@ -218,9 +218,9 @@ public class EvpnDnatFlowProgrammer { continue; } VpnInterfaceBuilder vpnIfBuilder = new VpnInterfaceBuilder(optionalVpnInterface.get()); - Adjacencies adjs = vpnIfBuilder.getAugmentation(Adjacencies.class); + Adjacencies adjs = vpnIfBuilder.augmentation(Adjacencies.class); VpnInterfaceOpDataEntryBuilder vpnIfOpDataEntryBuilder = new VpnInterfaceOpDataEntryBuilder(); - vpnIfOpDataEntryBuilder.setKey(new VpnInterfaceOpDataEntryKey(interfaceName, vpnName)); + vpnIfOpDataEntryBuilder.withKey(new VpnInterfaceOpDataEntryKey(interfaceName, vpnName)); List adjacencyList = adjs != null ? adjs.getAdjacency() : new ArrayList<>(); List adjacencyListToImport = new ArrayList<>(); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java index 0f04056a85..1e5e35bd7e 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalNetworksChangeListener.java @@ -121,7 +121,7 @@ public class ExternalNetworksChangeListener //Check for VPN disassociation Uuid originalVpn = original.getVpnid(); Uuid updatedVpn = update.getVpnid(); - coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + update.getKey(), + coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + update.key(), () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { if (originalVpn == null && updatedVpn != null) { //external network is dis-associated from L3VPN instance diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java index d07072baa1..bd83938d18 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalRoutersListener.java @@ -266,7 +266,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { LOG.info("add : Installing NAT default route on all dpns part of router {}", routerName); long bgpVpnId = NatConstants.INVALID_ID; @@ -498,7 +498,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase BGP VPN-NAME {}", bgpVpnId, bgpVpnName); - RouterIds rtrs = new RouterIdsBuilder().setKey(new RouterIdsKey(bgpVpnId)) + RouterIds rtrs = new RouterIdsBuilder().withKey(new RouterIdsKey(bgpVpnId)) .setRouterId(bgpVpnId).setRouterName(bgpVpnName).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, getRoutersIdentifier(bgpVpnId), rtrs); @@ -1037,10 +1037,10 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase { + coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + update.key(), () -> { List> futures = new ArrayList<>(); futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(writeFlowInvTx -> { futures.add(txRunner.callWithNewWriteOnlyTransactionAndSubmit(removeFlowInvTx -> { @@ -1623,7 +1623,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { LOG.info("remove : Removing default NAT route from FIB on all dpns part of router {} ", routerName); @@ -1846,7 +1846,7 @@ public class ExternalRoutersListener extends AsyncDataTreeChangeListenerBase BGP VPN-NAME {}", bgpVpnId, bgpVpnName); - RouterIds rtrs = new RouterIdsBuilder().setKey(new RouterIdsKey(bgpVpnId)) + RouterIds rtrs = new RouterIdsBuilder().withKey(new RouterIdsKey(bgpVpnId)) .setRouterId(bgpVpnId).setRouterName(bgpVpnName).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, getRoutersIdentifier(bgpVpnId), rtrs); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java index 1e3f3c5296..9091ea67b6 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/ExternalSubnetVpnInstanceListener.java @@ -73,7 +73,7 @@ public class ExternalSubnetVpnInstanceListener extends AsyncDataTreeChangeListen @Override protected void remove(InstanceIdentifier key, VpnInstance vpnInstance) { LOG.trace("remove : External Subnet VPN Instance remove mapping method - key:{}. value={}", - vpnInstance.getKey(), vpnInstance); + vpnInstance.key(), vpnInstance); String possibleExtSubnetUuid = vpnInstance.getVpnInstanceName(); Optional optionalSubnets = NatUtil.getOptionalExternalSubnets(dataBroker, new Uuid(possibleExtSubnetUuid)); @@ -87,13 +87,13 @@ public class ExternalSubnetVpnInstanceListener extends AsyncDataTreeChangeListen protected void update(InstanceIdentifier key, VpnInstance vpnInstanceOrig, VpnInstance vpnInstanceNew) { LOG.trace("update : External Subnet VPN Instance update mapping method - key:{} original:{} new:{}", - vpnInstanceNew.getKey(), vpnInstanceOrig, vpnInstanceNew); + vpnInstanceNew.key(), vpnInstanceOrig, vpnInstanceNew); } @Override protected void add(InstanceIdentifier key, VpnInstance vpnInstance) { LOG.trace("add : External Subnet VPN Instance OP Data Entry add mapping method - key:{}. value={}", - vpnInstance.getKey(), vpnInstance); + vpnInstance.key(), vpnInstance); String possibleExtSubnetUuid = vpnInstance.getVpnInstanceName(); Optional optionalSubnets = NatUtil.getOptionalExternalSubnets(dataBroker, new Uuid(possibleExtSubnetUuid)); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java index 4267deacda..e943de3a52 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/FloatingIPListener.java @@ -113,13 +113,13 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase identifier, final InternalToExternalPortMap mapping) { - LOG.trace("FloatingIPListener add ip mapping method - key: {} value: {}",mapping.getKey(), mapping); + LOG.trace("FloatingIPListener add ip mapping method - key: {} value: {}",mapping.key(), mapping); processFloatingIPAdd(identifier, mapping); } @Override protected void remove(InstanceIdentifier identifier, InternalToExternalPortMap mapping) { - LOG.trace("FloatingIPListener remove ip mapping method - kkey: {} value: {}",mapping.getKey(), mapping); + LOG.trace("FloatingIPListener remove ip mapping method - kkey: {} value: {}",mapping.key(), mapping); processFloatingIPDel(identifier, mapping); } @@ -127,7 +127,7 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase identifier, InternalToExternalPortMap original, InternalToExternalPortMap update) { LOG.trace("FloatingIPListener update ip mapping method - key: {}, original: {}, update: {}", - update.getKey(), original, update); + update.key(), original, update); } private FlowEntity buildPreDNATFlowEntity(BigInteger dpId, InternalToExternalPortMap mapping, long routerId, long @@ -378,14 +378,14 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase identifier, final InternalToExternalPortMap mapping) { - LOG.trace("processFloatingIPAdd key: {}, value: {}", mapping.getKey(), mapping); + LOG.trace("processFloatingIPAdd key: {}, value: {}", mapping.key(), mapping); final String routerId = identifier.firstKeyOf(RouterPorts.class).getRouterId(); final PortsKey pKey = identifier.firstKeyOf(Ports.class); String interfaceName = pKey.getPortName(); InstanceIdentifier portIid = identifier.firstIdentifierOf(RouterPorts.class); - coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + mapping.getKey(), () -> Collections.singletonList( + coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + mapping.key(), () -> Collections.singletonList( txRunner.callWithNewWriteOnlyTransactionAndSubmit( tx -> createNATFlowEntries(interfaceName, mapping, portIid, routerId, tx))), NatConstants.NAT_DJC_MAX_RETRIES); @@ -393,14 +393,14 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase identifier, final InternalToExternalPortMap mapping) { - LOG.trace("processFloatingIPDel : key: {}, value: {}", mapping.getKey(), mapping); + LOG.trace("processFloatingIPDel : key: {}, value: {}", mapping.key(), mapping); final String routerId = identifier.firstKeyOf(RouterPorts.class).getRouterId(); final PortsKey pKey = identifier.firstKeyOf(Ports.class); String interfaceName = pKey.getPortName(); InstanceIdentifier portIid = identifier.firstIdentifierOf(RouterPorts.class); - coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + mapping.getKey(), () -> Collections.singletonList( + coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + mapping.key(), () -> Collections.singletonList( txRunner.callWithNewWriteOnlyTransactionAndSubmit( tx -> removeNATFlowEntries(interfaceName, mapping, portIid, routerId, null, tx))), NatConstants.NAT_DJC_MAX_RETRIES); @@ -687,7 +687,7 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase optPorts = SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker, LogicalDatastoreType.OPERATIONAL, portsId); - InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().setKey(new + InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().withKey(new InternalToExternalPortMapKey(internalIp)).setInternalIp(internalIp).setExternalIp(externalIp) .setLabel(label).build(); if (optPorts.isPresent()) { @@ -700,7 +700,7 @@ public class FloatingIPListener extends AsyncDataTreeChangeListenerBase intExtPortMapList = new ArrayList<>(); intExtPortMapList.add(intExtPortMap); - Ports ports = new PortsBuilder().setKey(new PortsKey(interfaceName)).setPortName(interfaceName) + Ports ports = new PortsBuilder().withKey(new PortsKey(interfaceName)).setPortName(interfaceName) .setInternalToExternalPortMap(intExtPortMapList).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, portsId, ports); } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java index 20a5b491eb..fe6e388ccd 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptEventHandler.java @@ -349,7 +349,7 @@ public class NaptEventHandler { return; } List actionInfos = new ArrayList<>(); - IfL2vlan ifL2vlan = iface.getAugmentation(IfL2vlan.class); + IfL2vlan ifL2vlan = iface.augmentation(IfL2vlan.class); if (ifL2vlan != null && ifL2vlan.getVlanId() != null) { vlanId = ifL2vlan.getVlanId().getValue() == null ? 0 : ifL2vlan.getVlanId().getValue(); } @@ -466,7 +466,7 @@ public class NaptEventHandler { private static Node buildInventoryDpnNode(BigInteger dpnId) { NodeId nodeId = new NodeId("openflow:" + dpnId); - Node nodeDpn = new NodeBuilder().setId(nodeId).setKey(new NodeKey(nodeId)).build(); + Node nodeDpn = new NodeBuilder().setId(nodeId).withKey(new NodeKey(nodeId)).build(); return nodeDpn; } @@ -481,7 +481,7 @@ public class NaptEventHandler { Node nodeDpn = buildInventoryDpnNode(dpId); InstanceIdentifier flowInstanceId = InstanceIdentifier.builder(Nodes.class) - .child(Node.class, nodeDpn.getKey()).augmentation(FlowCapableNode.class) + .child(Node.class, nodeDpn.key()).augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())) .child(Flow.class, flowKey) .build(); diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java index 22d2e2c1b4..0eced3cc02 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptManager.java @@ -171,7 +171,7 @@ public class NaptManager { } updateCounter(segmentId, externalIp, true); //update the actual ip-map - IpMap ipm = new IpMapBuilder().setKey(new IpMapKey(internalIp)).setInternalIp(internalIp) + IpMap ipm = new IpMapBuilder().withKey(new IpMapKey(internalIp)).setInternalIp(internalIp) .setExternalIp(externalIp).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, getIpMapIdentifier(segmentId, internalIp), ipm); @@ -204,7 +204,7 @@ public class NaptManager { //update the new counter value for this externalIp ExternalIpCounter externalIpCounterData = new ExternalIpCounterBuilder() - .setKey(new ExternalIpCounterKey(externalIp)).setExternalIp(externalIp).setCounter(counter).build(); + .withKey(new ExternalIpCounterKey(externalIp)).setExternalIp(externalIp).setCounter(counter).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, getExternalIpsIdentifier(segmentId, externalIp), externalIpCounterData); } @@ -315,7 +315,7 @@ public class NaptManager { // Write to ip-port-map before returning IpPortExternalBuilder ipExt = new IpPortExternalBuilder(); IpPortExternal ipPortExt = ipExt.setIpAddress(extIp).setPortNum(extPort).build(); - IpPortMap ipm = new IpPortMapBuilder().setKey(new IpPortMapKey(internalIpPort)) + IpPortMap ipm = new IpPortMapBuilder().withKey(new IpPortMapKey(internalIpPort)) .setIpPortInternal(internalIpPort).setIpPortExternal(ipPortExt).build(); LOG.debug("getExternalAddressMapping : writing into ip-port-map with " + "externalIP {} and port {}", @@ -339,7 +339,7 @@ public class NaptManager { IntIpProtoTypeBuilder builder = new IntIpProtoTypeBuilder(); IntIpProtoType intIpProtocolType = - builder.setKey(new IntIpProtoTypeKey(protocolType)).setPorts(portList).build(); + builder.withKey(new IntIpProtoTypeKey(protocolType)).setPorts(portList).build(); try { MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, NatUtil.buildSnatIntIpPortIdentifier(segmentId, internalIpAddress, protocolType), @@ -596,7 +596,7 @@ public class NaptManager { IntIpProtoTypeBuilder builder = new IntIpProtoTypeBuilder(); IntIpProtoType intIpProtocolType = - builder.setKey(new IntIpProtoTypeKey(protocolType)).setPorts(portList).build(); + builder.withKey(new IntIpProtoTypeKey(protocolType)).setPorts(portList).build(); try { MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, NatUtil.buildSnatIntIpPortIdentifier(segmentId, address.getIpAddress(), protocolType), @@ -764,7 +764,7 @@ public class NaptManager { protected void initialiseNewExternalIpCounter(long routerId, String externalIp) { ExternalIpCounter externalIpCounterData = new ExternalIpCounterBuilder() - .setKey(new ExternalIpCounterKey(externalIp)).setExternalIp(externalIp).setCounter((short) 0).build(); + .withKey(new ExternalIpCounterKey(externalIp)).setExternalIp(externalIp).setCounter((short) 0).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, getExternalIpsIdentifier(routerId, externalIp), externalIpCounterData); } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java index a93f1f6aec..519e99c26a 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NaptSwitchHA.java @@ -800,7 +800,7 @@ public class NaptSwitchHA { // TODO Clean up the exception handling @SuppressWarnings("checkstyle:IllegalCatch") public boolean updateNaptSwitch(String routerName, BigInteger naptSwitchId) { - RouterToNaptSwitch naptSwitch = new RouterToNaptSwitchBuilder().setKey(new RouterToNaptSwitchKey(routerName)) + RouterToNaptSwitch naptSwitch = new RouterToNaptSwitchBuilder().withKey(new RouterToNaptSwitchKey(routerName)) .setPrimarySwitchId(naptSwitchId).build(); try { MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java index ce7ea592b5..a9211a0308 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatRouterInterfaceListener.java @@ -68,7 +68,7 @@ public class NatRouterInterfaceListener // TODO Clean up the exception handling @SuppressWarnings("checkstyle:IllegalCatch") protected void add(InstanceIdentifier identifier, Interfaces interfaceInfo) { - LOG.trace("add : Add event - key: {}, value: {}", interfaceInfo.getKey(), interfaceInfo); + LOG.trace("add : Add event - key: {}, value: {}", interfaceInfo.key(), interfaceInfo); final String routerId = identifier.firstKeyOf(RouterInterfaces.class).getRouterId().getValue(); final String interfaceName = interfaceInfo.getInterfaceId(); @@ -100,7 +100,7 @@ public class NatRouterInterfaceListener @Override protected void remove(InstanceIdentifier identifier, Interfaces interfaceInfo) { - LOG.trace("remove : Remove event - key: {}, value: {}", interfaceInfo.getKey(), interfaceInfo); + LOG.trace("remove : Remove event - key: {}, value: {}", interfaceInfo.key(), interfaceInfo); final String routerId = identifier.firstKeyOf(RouterInterfaces.class).getRouterId().getValue(); final String interfaceName = interfaceInfo.getInterfaceId(); @@ -120,11 +120,11 @@ public class NatRouterInterfaceListener @Override protected void update(InstanceIdentifier identifier, Interfaces original, Interfaces update) { - LOG.trace("update key: {}, original: {}, update: {}", update.getKey(), original, update); + LOG.trace("update key: {}, original: {}, update: {}", update.key(), original, update); } static RouterInterface getRouterInterface(String interfaceName, String routerName) { - return new RouterInterfaceBuilder().setKey(new RouterInterfaceKey(interfaceName)) + return new RouterInterfaceBuilder().withKey(new RouterInterfaceKey(interfaceName)) .setInterfaceName(interfaceName).setRouterName(routerName).build(); } } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java index ab77e9a556..d2874eb264 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatTunnelInterfaceStateListener.java @@ -1137,9 +1137,9 @@ public class NatTunnelInterfaceStateListener String ifaceName = stateTunnelList.getTunnelInterfaceName(); if (getTunnelType(stateTunnelList) == NatConstants.ITMTunnelLocType.Internal.getValue()) { Interface configIface = interfaceManager.getInterfaceInfoFromConfigDataStore(ifaceName); - IfTunnel ifTunnel = configIface != null ? configIface.getAugmentation(IfTunnel.class) : null; + IfTunnel ifTunnel = configIface != null ? configIface.augmentation(IfTunnel.class) : null; if (ifTunnel != null && ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) { - ParentRefs refs = configIface.getAugmentation(ParentRefs.class); + ParentRefs refs = configIface.augmentation(ParentRefs.class); if (refs != null && !Strings.isNullOrEmpty(refs.getParentInterface())) { return true; //multiple VxLAN tunnels enabled, i.e. only logical tunnel should be treated } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java index 3c4f16f181..33e4e9c0dc 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/NatUtil.java @@ -978,7 +978,7 @@ public final class NatUtil { LogicalDatastoreType.OPERATIONAL, dpnVpnInterfacesListIdentifier); org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.neutron.router.dpns .router.dpn.list.dpn.vpninterfaces.list.RouterInterfaces routerInterface = - new RouterInterfacesBuilder().setKey(new RouterInterfacesKey(interfaceName)) + new RouterInterfacesBuilder().withKey(new RouterInterfacesKey(interfaceName)) .setInterface(interfaceName).build(); if (optionalDpnVpninterfacesList.isPresent()) { LOG.debug("addToNeutronRouterDpnsMap : RouterDpnList already present for the Router {} and DPN {} for the " @@ -1021,7 +1021,7 @@ public final class NatUtil { LogicalDatastoreType.OPERATIONAL, dpnRoutersListIdentifier); if (optionalDpnRoutersList.isPresent()) { - RoutersList routersList = new RoutersListBuilder().setKey(new RoutersListKey(routerName)) + RoutersList routersList = new RoutersListBuilder().withKey(new RoutersListKey(routerName)) .setRouter(routerName).build(); List routersListFromDs = optionalDpnRoutersList.get().getRoutersList(); if (!routersListFromDs.contains(routersList)) { @@ -1066,7 +1066,7 @@ public final class NatUtil { optionalRouterDpnList.get().getRouterInterfaces(); org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.neutron.router .dpns.router.dpn.list.dpn.vpninterfaces.list.RouterInterfaces routerInterface = - new RouterInterfacesBuilder().setKey(new RouterInterfacesKey(interfaceName)) + new RouterInterfacesBuilder().withKey(new RouterInterfacesKey(interfaceName)) .setInterface(interfaceName).build(); if (routerInterfaces != null && routerInterfaces.remove(routerInterface)) { if (routerInterfaces.isEmpty()) { @@ -1121,7 +1121,7 @@ public final class NatUtil { optionalRouterDpnList.get().getRouterInterfaces(); org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.l3vpn.rev130911.neutron.router.dpns.router.dpn .list.dpn.vpninterfaces.list.RouterInterfaces routerInterface = - new RouterInterfacesBuilder().setKey(new RouterInterfacesKey(vpnInterfaceName)) + new RouterInterfacesBuilder().withKey(new RouterInterfacesKey(vpnInterfaceName)) .setInterface(vpnInterfaceName).build(); if (routerInterfaces != null && routerInterfaces.remove(routerInterface)) { @@ -1554,7 +1554,7 @@ public final class NatUtil { LOG.error("createRouterIdsConfigDS : invalid routerId for routerName {}", routerName); return; } - RouterIds rtrs = new RouterIdsBuilder().setKey(new RouterIdsKey(routerId)) + RouterIds rtrs = new RouterIdsBuilder().withKey(new RouterIdsKey(routerId)) .setRouterId(routerId).setRouterName(routerName).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, buildRouterIdentifier(routerId), rtrs); } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java index f600a89429..af397a4da9 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterDpnChangeListener.java @@ -112,7 +112,7 @@ public class RouterDpnChangeListener @Override protected void add(final InstanceIdentifier identifier, final DpnVpninterfacesList dpnInfo) { - LOG.trace("add : key: {}, value: {}", dpnInfo.getKey(), dpnInfo); + LOG.trace("add : key: {}, value: {}", dpnInfo.key(), dpnInfo); final String routerUuid = identifier.firstKeyOf(RouterDpnList.class).getRouterId(); BigInteger dpnId = dpnInfo.getDpnId(); //check router is associated to external network @@ -138,7 +138,7 @@ public class RouterDpnChangeListener natServiceManager.notify(router, naptSwitch, dpnId, SnatServiceManager.Action.SNAT_ROUTER_ENBL); } else { - coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + dpnInfo.getKey(), () -> { + coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + dpnInfo.key(), () -> { List> futures = new ArrayList<>(2); LOG.debug("add : Router {} is associated with ext nw {}", routerUuid, networkId); Uuid vpnName = NatUtil.getVpnForRouter(dataBroker, routerUuid); @@ -210,7 +210,7 @@ public class RouterDpnChangeListener @Override protected void remove(InstanceIdentifier identifier, DpnVpninterfacesList dpnInfo) { - LOG.trace("remove : key: {}, value: {}", dpnInfo.getKey(), dpnInfo); + LOG.trace("remove : key: {}, value: {}", dpnInfo.key(), dpnInfo); final String routerUuid = identifier.firstKeyOf(RouterDpnList.class).getRouterId(); Long routerId = NatUtil.getVpnId(dataBroker, routerUuid); if (routerId == NatConstants.INVALID_ID) { @@ -241,7 +241,7 @@ public class RouterDpnChangeListener natServiceManager.notify(router, naptSwitch, dpnId, SnatServiceManager.Action.SNAT_ROUTER_DISBL); } else { - coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + dpnInfo.getKey(), () -> { + coordinator.enqueueJob(NatConstants.NAT_DJC_PREFIX + dpnInfo.key(), () -> { LOG.debug("remove : Router {} is associated with ext nw {}", routerUuid, networkId); Uuid vpnName = NatUtil.getVpnForRouter(dataBroker, routerUuid); return Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { @@ -289,7 +289,7 @@ public class RouterDpnChangeListener @Override protected void update(InstanceIdentifier identifier, DpnVpninterfacesList original, DpnVpninterfacesList update) { - LOG.trace("Update key: {}, original: {}, update: {}", update.getKey(), original, update); + LOG.trace("Update key: {}, original: {}, update: {}", update.key(), original, update); } // TODO Clean up the exception handling diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java index 72508df8ff..c92ba06d62 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/RouterPortsListener.java @@ -60,7 +60,7 @@ public class RouterPortsListener @Override protected void add(final InstanceIdentifier identifier, final RouterPorts routerPorts) { - LOG.trace("add : key:{} value:{}",routerPorts.getKey(), routerPorts); + LOG.trace("add : key:{} value:{}",routerPorts.key(), routerPorts); Optional optRouterPorts = SingleTransactionDataBroker.syncReadOptionalAndTreatReadFailedExceptionAsAbsentOptional(dataBroker, LogicalDatastoreType.OPERATIONAL, identifier); @@ -68,12 +68,12 @@ public class RouterPortsListener RouterPorts ports = optRouterPorts.get(); String routerName = ports.getRouterId(); MDSALUtil.syncUpdate(dataBroker, LogicalDatastoreType.OPERATIONAL, identifier, - new RouterPortsBuilder().setKey(new RouterPortsKey(routerName)).setRouterId(routerName) + new RouterPortsBuilder().withKey(new RouterPortsKey(routerName)).setRouterId(routerName) .setExternalNetworkId(routerPorts.getExternalNetworkId()).build()); } else { String routerName = routerPorts.getRouterId(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, identifier, - new RouterPortsBuilder().setKey(new RouterPortsKey(routerName)).setRouterId(routerName) + new RouterPortsBuilder().withKey(new RouterPortsKey(routerName)).setRouterId(routerName) .setExternalNetworkId(routerPorts.getExternalNetworkId()).build()); } //Check if the router is associated with any BGP VPN and update the association @@ -87,7 +87,7 @@ public class RouterPortsListener if (!optRouterMapping.isPresent()) { Long vpnId = NatUtil.getVpnId(dataBroker, vpnName.getValue()); LOG.debug("add : Updating router {} to VPN {} association with Id {}", routerName, vpnName, vpnId); - Routermapping routerMapping = new RoutermappingBuilder().setKey(new RoutermappingKey(routerName)) + Routermapping routerMapping = new RoutermappingBuilder().withKey(new RoutermappingKey(routerName)) .setRouterName(routerName).setVpnName(vpnName.getValue()).setVpnId(vpnId).build(); MDSALUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, routerMappingId, routerMapping); } @@ -96,7 +96,7 @@ public class RouterPortsListener @Override protected void remove(InstanceIdentifier identifier, RouterPorts routerPorts) { - LOG.trace("remove : key:{} value:{}",routerPorts.getKey(), routerPorts); + LOG.trace("remove : key:{} value:{}",routerPorts.key(), routerPorts); //MDSALUtil.syncDelete(dataBroker, LogicalDatastoreType.OPERATIONAL, identifier); //Remove the router to vpn association mapping entry if at all present String routerName = routerPorts.getRouterId(); @@ -109,6 +109,6 @@ public class RouterPortsListener @Override protected void update(InstanceIdentifier identifier, RouterPorts original, RouterPorts update) { - LOG.trace("Update : key: {}, original:{}, update:{}",update.getKey(), original, update); + LOG.trace("Update : key: {}, original:{}, update:{}",update.key(), original, update); } } diff --git a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java index 5e167ed4ee..dde911a3a9 100644 --- a/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java +++ b/natservice/impl/src/main/java/org/opendaylight/netvirt/natservice/internal/SubnetmapListener.java @@ -47,7 +47,7 @@ public class SubnetmapListener extends AsyncDataTreeChangeListenerBase identifier, Subnetmap subnetmap) { - LOG.trace("remove key: {} value: {}", subnetmap.getKey(), subnetmap); + LOG.trace("remove key: {} value: {}", subnetmap.key(), subnetmap); NatServiceCounters.subnetmap_remove.inc(); externalNetworkGroupInstaller.removeExtNetGroupEntries(subnetmap); } @@ -55,14 +55,14 @@ public class SubnetmapListener extends AsyncDataTreeChangeListenerBase identifier, Subnetmap subnetmapBefore, Subnetmap subnetmapAfter) { - LOG.trace("update key: {}, original: {}, update: {}", subnetmapAfter.getKey(), subnetmapBefore, subnetmapAfter); + LOG.trace("update key: {}, original: {}, update: {}", subnetmapAfter.key(), subnetmapBefore, subnetmapAfter); NatServiceCounters.subnetmap_update.inc(); externalNetworkGroupInstaller.installExtNetGroupEntries(subnetmapAfter); } @Override protected void add(InstanceIdentifier identifier, Subnetmap subnetmap) { - LOG.trace("add key: {} value: {}", subnetmap.getKey(), subnetmap); + LOG.trace("add key: {} value: {}", subnetmap.key(), subnetmap); NatServiceCounters.subnetmap_add.inc(); externalNetworkGroupInstaller.installExtNetGroupEntries(subnetmap); } diff --git a/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java index 51e32fe1ec..4a7577bb0a 100644 --- a/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java +++ b/natservice/impl/src/test/java/org/opendaylight/netvirt/natservice/internal/test/NaptManagerTest.java @@ -74,7 +74,7 @@ public class NaptManagerTest { ipmapId = InstanceIdentifier.builder( IntextIpMap.class).child(IpMapping.class, new IpMappingKey(5L)) .child(IpMap.class, new IpMapKey("10.0.0.1")).build(); - ipmap = new IpMapBuilder().setKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1") + ipmap = new IpMapBuilder().withKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1") .setExternalIp("192.17.13.1").build(); try { PowerMockito.doNothing() @@ -98,7 +98,7 @@ public class NaptManagerTest { // TODO : This needs to be modified to make it work ipmapId = InstanceIdentifier.builder(IntextIpMap.class) .child(IpMapping.class, new IpMappingKey(5L)).child(IpMap.class, new IpMapKey("10.0.0.1")).build(); - ipmap = new IpMapBuilder().setKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1") + ipmap = new IpMapBuilder().withKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1") .setExternalIp("192.17.13.1/24").build(); try { PowerMockito.doNothing() @@ -121,7 +121,7 @@ public class NaptManagerTest { // TODO : This needs to be modified to make it work ipmapId = InstanceIdentifier.builder(IntextIpMap.class) .child(IpMapping.class, new IpMappingKey(6L)).child(IpMap.class, new IpMapKey("10.0.2.1/16")).build(); - ipmap = new IpMapBuilder().setKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1") + ipmap = new IpMapBuilder().withKey(new IpMapKey("10.0.0.1")).setInternalIp("10.0.0.1") .setExternalIp("192.19.15.3").build(); try { PowerMockito.doNothing() @@ -144,7 +144,7 @@ public class NaptManagerTest { // TODO : This needs to be modified to make it work ipmapId = InstanceIdentifier.builder(IntextIpMap.class) .child(IpMapping.class, new IpMappingKey(6L)).child(IpMap.class, new IpMapKey("10.2.0.2/24")).build(); - ipmap = new IpMapBuilder().setKey(new IpMapKey("10.2.0.2/24")).setInternalIp("10.2.0.2/24") + ipmap = new IpMapBuilder().withKey(new IpMapKey("10.2.0.2/24")).setInternalIp("10.2.0.2/24") .setExternalIp("192.21.16.1/16").build(); try { PowerMockito.doNothing() diff --git a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java index 882edfc124..4fcd56c802 100644 --- a/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java +++ b/neutronvpn/api/src/main/java/org/opendaylight/netvirt/neutronvpn/api/utils/NeutronUtils.java @@ -115,7 +115,7 @@ public final class NeutronUtils { } public static boolean isPortVnicTypeNormal(Port port) { - PortBindingExtension portBinding = port.getAugmentation(PortBindingExtension.class); + PortBindingExtension portBinding = port.augmentation(PortBindingExtension.class); if (portBinding == null || portBinding.getVnicType() == null) { // By default, VNIC_TYPE is NORMAL return true; @@ -127,7 +127,7 @@ public final class NeutronUtils { public static String getSegmentationIdFromNeutronNetwork(Network network, Class networkType) { String segmentationId = null; - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); if (providerExtension != null) { segmentationId = providerExtension.getSegmentationId(); if (segmentationId == null) { @@ -154,7 +154,7 @@ public final class NeutronUtils { public static boolean isNetworkSegmentType(Network network, Long index, Class expectedNetworkType) { Class segmentType = null; - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); if (providerExtension != null) { List providerSegments = providerExtension.getSegments(); if (providerSegments != null && providerSegments.size() > 0) { @@ -170,7 +170,7 @@ public final class NeutronUtils { } public static Long getNumberSegmentsFromNeutronNetwork(Network network) { - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); Integer numSegs = 0; if (providerExtension != null) { List providerSegments = providerExtension.getSegments(); @@ -183,7 +183,7 @@ public final class NeutronUtils { public static String getSegmentationIdFromNeutronNetworkSegment(Network network, Long index) { String segmentationId = null; - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); if (providerExtension != null) { List providerSegments = providerExtension.getSegments(); if (providerSegments != null && providerSegments.size() > 0) { diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java index 701628feb2..c1d6176fb1 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronFloatingToFixedIpMappingChangeListener.java @@ -142,7 +142,7 @@ public class NeutronFloatingToFixedIpMappingChangeListener extends AsyncDataTree LOG.debug("Creating new routerPorts node {} in floatingIpInfo DS for floating IP {} on fixed " + "neutron port {} : ", routerName, floatingIpAddress, fixedNeutronPortName); routerPortsBuilder = - new RouterPortsBuilder().setKey(new RouterPortsKey(routerName)).setRouterId(routerName); + new RouterPortsBuilder().withKey(new RouterPortsKey(routerName)).setRouterId(routerName); } if (extNetworkId != null) { routerPortsBuilder.setExternalNetworkId(extNetworkId); @@ -160,7 +160,7 @@ public class NeutronFloatingToFixedIpMappingChangeListener extends AsyncDataTree } } if (fixedNeutronPortBuilder == null) { - fixedNeutronPortBuilder = new PortsBuilder().setKey(new PortsKey(fixedNeutronPortName)) + fixedNeutronPortBuilder = new PortsBuilder().withKey(new PortsKey(fixedNeutronPortName)) .setPortName(fixedNeutronPortName); } if (fixedIpAddress != null) { @@ -169,7 +169,7 @@ public class NeutronFloatingToFixedIpMappingChangeListener extends AsyncDataTree if (intExtPortMapList == null) { intExtPortMapList = new ArrayList<>(); } - InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().setKey(new + InternalToExternalPortMap intExtPortMap = new InternalToExternalPortMapBuilder().withKey(new InternalToExternalPortMapKey(fixedIpAddress)).setInternalIp(fixedIpAddress) .setExternalIp(floatingIpAddress).setExternalId(floatingIpId).setLabel(null).build(); intExtPortMapList.add(intExtPortMap); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java index 46a8b6a9ae..12a62a4496 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronHostConfigChangeListener.java @@ -189,6 +189,6 @@ public class NeutronHostConfigChangeListener private InstanceIdentifier createInstanceIdentifier(Hostconfig hostconfig) { return InstanceIdentifier.create(Neutron.class) .child(Hostconfigs.class) - .child(Hostconfig.class, hostconfig.getKey()); + .child(Hostconfig.class, hostconfig.key()); } } diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java index ffeabfbe2c..b8262d74b9 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronNetworkChangeListener.java @@ -94,7 +94,7 @@ public class NeutronNetworkChangeListener LOG.error("Neutronvpn doesn't support the provider type for given network {}", networkId); return; } - Class networkType = input.getAugmentation(NetworkProviderExtension.class) + Class networkType = input.augmentation(NetworkProviderExtension.class) .getNetworkType(); if (NeutronvpnUtils.isVlanOrVxlanNetwork(networkType) && NeutronUtils.getSegmentationIdFromNeutronNetwork(input, networkType) == null) { @@ -190,7 +190,7 @@ public class NeutronNetworkChangeListener @Nonnull private List buildSegments(Network input) { - NetworkProviderExtension providerExtension = input.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = input.augmentation(NetworkProviderExtension.class); if (providerExtension == null || providerExtension.getSegments() == null) { return Collections.emptyList(); } @@ -266,7 +266,7 @@ public class NeutronNetworkChangeListener elanInstanceBuilder.setElanSegments(segments); elanInstanceBuilder.setExternal(isExternal); - elanInstanceBuilder.setKey(new ElanInstanceKey(elanInstanceName)); + elanInstanceBuilder.withKey(new ElanInstanceKey(elanInstanceName)); return elanInstanceBuilder; } diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java index 490de022c3..66c9f18b73 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronPortChangeListener.java @@ -466,7 +466,7 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase

id = InstanceIdentifier.builder(ElanInterfaces.class).child(ElanInterface .class, new ElanInterfaceKey(name)).build(); ElanInterface elanInterface = new ElanInterfaceBuilder().setElanInstanceName(elanInstanceName) - .setName(name).setStaticMacEntries(staticMacEntries).setKey(new ElanInterfaceKey(name)).build(); + .setName(name).setStaticMacEntries(staticMacEntries).withKey(new ElanInterfaceKey(name)).build(); wrtConfigTxn.put(LogicalDatastoreType.CONFIGURATION, id, elanInterface); LOG.debug("Creating new ELan Interface {}", elanInterface); } @@ -866,7 +866,7 @@ public class NeutronPortChangeListener extends AsyncDataTreeChangeListenerBase

subnetIdList = nwMapBuilder.getSubnetIdList(); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java index e439940a09..4fb2c375af 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnManager.java @@ -235,7 +235,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even InstanceIdentifier iid = InstanceIdentifier.builder( Neutron.class).child(Features.class).child( Feature.class, new FeatureKey(OperationalPortStatus.class)).build(); - Feature feature = new FeatureBuilder().setKey(new FeatureKey(OperationalPortStatus.class)).build(); + Feature feature = new FeatureBuilder().withKey(new FeatureKey(OperationalPortStatus.class)).build(); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, iid, feature); } catch (TransactionCommitFailedException e) { @@ -262,7 +262,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even subnetId.getValue()); return; } - SubnetmapBuilder subnetmapBuilder = new SubnetmapBuilder().setKey(new SubnetmapKey(subnetId)) + SubnetmapBuilder subnetmapBuilder = new SubnetmapBuilder().withKey(new SubnetmapKey(subnetId)) .setId(subnetId).setSubnetIp(subnetIp).setTenantId(tenantId).setNetworkId(networkId) .setNetworkType(networkType).setSegmentationId(segmentationId); LOG.debug("createSubnetmapNode: Adding a new subnet node in Subnetmaps DS for subnet {}", @@ -549,7 +549,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even builder = new VpnInstanceBuilder(optionalVpn.get()); LOG.debug("updating existing vpninstance node"); } else { - builder = new VpnInstanceBuilder().setKey(new VpnInstanceKey(vpnName)).setVpnInstanceName(vpnName) + builder = new VpnInstanceBuilder().withKey(new VpnInstanceKey(vpnName)).setVpnInstanceName(vpnName) .setType(type).setL3vni(l3vni); } if (irt != null && !irt.isEmpty()) { @@ -561,14 +561,14 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even irt.remove(common); ert.remove(common); VpnTarget vpnTarget = - new VpnTargetBuilder().setKey(new VpnTargetKey(common)).setVrfRTValue(common) + new VpnTargetBuilder().withKey(new VpnTargetKey(common)).setVrfRTValue(common) .setVrfRTType(VpnTarget.VrfRTType.Both).build(); vpnTargetList.add(vpnTarget); } } for (String importRT : irt) { VpnTarget vpnTarget = - new VpnTargetBuilder().setKey(new VpnTargetKey(importRT)).setVrfRTValue(importRT) + new VpnTargetBuilder().withKey(new VpnTargetKey(importRT)).setVrfRTValue(importRT) .setVrfRTType(VpnTarget.VrfRTType.ImportExtcommunity).build(); vpnTargetList.add(vpnTarget); } @@ -577,7 +577,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even if (ert != null && !ert.isEmpty()) { for (String exportRT : ert) { VpnTarget vpnTarget = - new VpnTargetBuilder().setKey(new VpnTargetKey(exportRT)).setVrfRTValue(exportRT) + new VpnTargetBuilder().withKey(new VpnTargetKey(exportRT)).setVrfRTValue(exportRT) .setVrfRTType(VpnTarget.VrfRTType.ExportExtcommunity).build(); vpnTargetList.add(vpnTarget); } @@ -647,7 +647,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even if (optionalVpnMap.isPresent()) { builder = new VpnMapBuilder(optionalVpnMap.get()); } else { - builder = new VpnMapBuilder().setKey(new VpnMapKey(vpnId)).setVpnId(vpnId); + builder = new VpnMapBuilder().withKey(new VpnMapKey(vpnId)).setVpnId(vpnId); } if (name != null) { @@ -770,7 +770,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even WriteTransaction wrtConfigTxn, Subnetmap sn, VpnInterface vpnIface) { List adjList = new ArrayList<>(); if (vpnIface != null) { - adjList = vpnIface.getAugmentation(Adjacencies.class).getAdjacency(); + adjList = vpnIface.augmentation(Adjacencies.class).getAdjacency(); } String infName = port.getUuid().getValue(); LOG.trace("neutronVpnManager: create config adjacencies for Port: {}", infName); @@ -786,7 +786,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even neutronvpnUtils.createVpnPortFixedIpToPort(vpnId.getValue(), ipValue, infName, port.getMacAddress().getValue(), isRouterInterface, wrtConfigTxn); //Create Neutron port adjacency if VPN presence is existing for subnet - Adjacency vmAdj = new AdjacencyBuilder().setKey(new AdjacencyKey(ipPrefix)).setIpAddress(ipPrefix) + Adjacency vmAdj = new AdjacencyBuilder().withKey(new AdjacencyKey(ipPrefix)).setIpAddress(ipPrefix) .setMacAddress(port.getMacAddress().getValue()).setAdjacencyType(AdjacencyType.PrimaryAdjacency) .setSubnetId(ip.getSubnetId()).build(); if (!adjList.contains(vmAdj)) { @@ -846,7 +846,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even } LOG.trace("withdraw adjacencies for Port: {} subnet {}", port.getUuid().getValue(), sn != null ? sn.getSubnetIp() : "null"); - List vpnAdjsList = optionalVpnInterface.get().getAugmentation(Adjacencies.class).getAdjacency(); + List vpnAdjsList = optionalVpnInterface.get().augmentation(Adjacencies.class).getAdjacency(); List updatedAdjsList = new ArrayList<>(); boolean isIpFromAnotherSubnet = false; for (Adjacency adj : vpnAdjsList) { @@ -973,7 +973,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even } VpnInterfaceBuilder vpnIfBuilder = new VpnInterfaceBuilder(optionalVpnInterface.get()) .setVpnInstanceNames(listVpn); - Adjacencies adjs = vpnIfBuilder.getAugmentation(Adjacencies.class); + Adjacencies adjs = vpnIfBuilder.augmentation(Adjacencies.class); LOG.debug("Updating vpn interface {}", infName); List adjacencyList = adjs != null ? adjs.getAdjacency() : new ArrayList<>(); Iterator adjacencyIter = adjacencyList.iterator(); @@ -1053,7 +1053,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even .setVpnInstanceNames(listVpn); LOG.debug("Updating vpn interface {}", infName); if (!isBeingAssociated) { - Adjacencies adjs = vpnIfBuilder.getAugmentation(Adjacencies.class); + Adjacencies adjs = vpnIfBuilder.augmentation(Adjacencies.class); List adjacencyList = adjs != null ? adjs.getAdjacency() : new ArrayList<>(); Iterator adjacencyIter = adjacencyList.iterator(); while (adjacencyIter.hasNext()) { @@ -1746,7 +1746,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even Optional optRouterInterfaces = SingleTransactionDataBroker.syncReadOptional(dataBroker, LogicalDatastoreType.CONFIGURATION, routerInterfacesId); - Interfaces routerInterface = new InterfacesBuilder().setKey(new InterfacesKey(interfaceName)) + Interfaces routerInterface = new InterfacesBuilder().withKey(new InterfacesKey(interfaceName)) .setInterfaceId(interfaceName).build(); if (optRouterInterfaces.isPresent()) { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, @@ -1775,7 +1775,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even Optional optRouterInterfaces = SingleTransactionDataBroker.syncReadOptional(dataBroker, LogicalDatastoreType.CONFIGURATION, routerInterfacesId); - Interfaces routerInterface = new InterfacesBuilder().setKey(new InterfacesKey(interfaceName)) + Interfaces routerInterface = new InterfacesBuilder().withKey(new InterfacesKey(interfaceName)) .setInterfaceId(interfaceName).build(); if (optRouterInterfaces.isPresent()) { RouterInterfaces routerInterfaces = optRouterInterfaces.get(); @@ -1912,7 +1912,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even final List ipList = entry.getValue(); Adjacency erAdj = new AdjacencyBuilder().setIpAddress(destination) .setAdjacencyType(AdjacencyType.ExtraRoute).setNextHopIpList(ipList) - .setKey(new AdjacencyKey(destination)).build(); + .withKey(new AdjacencyKey(destination)).build(); adjList.add(erAdj); } return adjList; @@ -1948,7 +1948,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even continue; } Adjacency erAdj = new AdjacencyBuilder().setIpAddress(destination) - .setNextHopIpList(Collections.singletonList(nextHop)).setKey(new AdjacencyKey(destination)) + .setNextHopIpList(Collections.singletonList(nextHop)).withKey(new AdjacencyKey(destination)) .setAdjacencyType(AdjacencyType.ExtraRoute).build(); isLockAcquired = interfaceLock.tryLock(infName, LOCK_WAIT_TIME, TimeUnit.SECONDS); SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, @@ -2123,11 +2123,11 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even VpnInterfaces.class).child(VpnInterface.class, new VpnInterfaceKey(infName)).build(); Adjacency newAdj = new AdjacencyBuilder(adjacency.get()).setIpAddress(destination) .setNextHopIpList(nextHopList) - .setKey(new AdjacencyKey(destination)) + .withKey(new AdjacencyKey(destination)) .build(); Adjacencies erAdjs = new AdjacenciesBuilder().setAdjacency(Collections.singletonList(newAdj)).build(); - VpnInterface vpnIf = new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(infName)) + VpnInterface vpnIf = new VpnInterfaceBuilder().withKey(new VpnInterfaceKey(infName)) .addAugmentation(Adjacencies.class, erAdjs).build(); SingleTransactionDataBroker.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, vpnIfIdentifier, vpnIf); @@ -2285,7 +2285,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even nw.getValue())); continue; } - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); if (providerExtension.getSegments() != null && providerExtension.getSegments().size() > 1) { LOG.error("associateNetworksToVpn: MultiSegmented network {} not supported in BGPVPN {}", nw.getValue(), vpnId.getValue()); @@ -2950,7 +2950,7 @@ public class NeutronvpnManager implements NeutronvpnService, AutoCloseable, Even } InstanceIdentifier vpnIfIdentifier = NeutronvpnUtils.buildVpnInterfaceIdentifier(infName); - VpnInterfaceBuilder vpnb = new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(infName)) + VpnInterfaceBuilder vpnb = new VpnInterfaceBuilder().withKey(new VpnInterfaceKey(infName)) .setName(infName) .setVpnInstanceNames(vpnIdListStruct) .setRouterInterface(isRouterInterface); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java index d581380272..1c63f954a2 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnNatManager.java @@ -243,7 +243,7 @@ public class NeutronvpnNatManager implements AutoCloseable { return; } NetworksBuilder builder = null; - builder = new NetworksBuilder().setKey(new NetworksKey(extNetId)).setId(extNetId); + builder = new NetworksBuilder().withKey(new NetworksKey(extNetId)).setId(extNetId); builder.setVpnid(neutronvpnUtils.getVpnForNetwork(extNetId)); builder.setRouterIds(new ArrayList<>()); builder.setProviderNetworkType(provType); @@ -451,7 +451,7 @@ public class NeutronvpnNatManager implements AutoCloseable { if (optionalRouters.isPresent()) { builder = new RoutersBuilder(optionalRouters.get()); } else { - builder = new RoutersBuilder().setKey(new RoutersKey(routerId.getValue())); + builder = new RoutersBuilder().withKey(new RoutersKey(routerId.getValue())); } builder.setRouterName(routerId.getValue()); builder.setNetworkId(extNetId); @@ -690,7 +690,7 @@ public class NeutronvpnNatManager implements AutoCloseable { private Subnets createSubnets(Uuid subnetId, Uuid networkId, List routerIds) { SubnetsBuilder subnetsBuilder = new SubnetsBuilder(); - subnetsBuilder.setKey(new SubnetsKey(subnetId)); + subnetsBuilder.withKey(new SubnetsKey(subnetId)); subnetsBuilder.setId(subnetId); subnetsBuilder.setVpnId(subnetId); subnetsBuilder.setExternalNetworkId(networkId); @@ -758,7 +758,7 @@ public class NeutronvpnNatManager implements AutoCloseable { Uuid subnetId = fixedIps.getSubnetId(); String ip = fixedIps.getIpAddress().getIpv4Address().getValue(); ExternalIpsBuilder externalIpsBuilder = new ExternalIpsBuilder(); - externalIpsBuilder.setKey(new ExternalIpsKey(ip, subnetId)); + externalIpsBuilder.withKey(new ExternalIpsKey(ip, subnetId)); externalIpsBuilder.setIpAddress(ip); externalIpsBuilder.setSubnetId(subnetId); externalIps.add(externalIpsBuilder.build()); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java index c250d2d45d..cbd31f01b9 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/NeutronvpnUtils.java @@ -419,7 +419,7 @@ public class NeutronvpnUtils { // router interface, dhcp port and floating ip. return false; } - PortSecurityExtension portSecurity = port.getAugmentation(PortSecurityExtension.class); + PortSecurityExtension portSecurity = port.augmentation(PortSecurityExtension.class); if (portSecurity != null) { return portSecurity.isPortSecurityEnabled(); } @@ -520,7 +520,7 @@ public class NeutronvpnUtils { .AllowedAddressPairs allowedAddressPair1 = iterator.next(); for (org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.ports.rev150712.port.attributes .AllowedAddressPairs allowedAddressPair2 : list2) { - if (allowedAddressPair1.getKey().equals(allowedAddressPair2.getKey())) { + if (allowedAddressPair1.key().equals(allowedAddressPair2.key())) { iterator.remove(); break; } @@ -708,7 +708,7 @@ public class NeutronvpnUtils { String portId = port.getUuid().getValue(); InstanceIdentifier portSubnetIdentifier = buildPortSubnetIdentifier(portId); - PortSubnetBuilder portSubnetBuilder = new PortSubnetBuilder().setKey(new PortSubnetKey(portId)) + PortSubnetBuilder portSubnetBuilder = new PortSubnetBuilder().withKey(new PortSubnetKey(portId)) .setPortId(portId).setSubnetInfo(portSubnetInfo); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, @@ -735,7 +735,7 @@ public class NeutronvpnUtils { NeutronSecurityRuleConstants.IP_VERSION_MAP.get(subnet.getIpVersion()); Class raMode = subnet.getIpv6RaMode() == null ? null : NeutronSecurityRuleConstants.RA_MODE_MAP.get(subnet.getIpv6RaMode()); - SubnetInfo subnetInfo = new SubnetInfoBuilder().setKey(new SubnetInfoKey(subnetId)) + SubnetInfo subnetInfo = new SubnetInfoBuilder().withKey(new SubnetInfoKey(subnetId)) .setIpVersion(ipVersion).setIpPrefix(new IpPrefixOrAddress(subnet.getCidr())) .setIpv6RaMode(raMode).setGatewayIp(subnet.getGatewayIp()).build(); subnetInfoList.add(subnetInfo); @@ -810,7 +810,7 @@ public class NeutronvpnUtils { boolean isSubnetIp, WriteTransaction writeConfigTxn) { InstanceIdentifier id = NeutronvpnUtils.buildVpnPortipToPortIdentifier(vpnName, fixedIp); VpnPortipToPortBuilder builder = new VpnPortipToPortBuilder() - .setKey(new VpnPortipToPortKey(fixedIp, vpnName)) + .withKey(new VpnPortipToPortKey(fixedIp, vpnName)) .setVpnName(vpnName).setPortFixedip(fixedIp) .setPortName(portName).setMacAddress(macAddress).setSubnetIp(isSubnetIp); try { @@ -910,7 +910,7 @@ public class NeutronvpnUtils { public static String getSegmentationIdFromNeutronNetwork(Network network) { String segmentationId = null; - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); if (providerExtension != null) { Class networkType = providerExtension.getNetworkType(); segmentationId = NeutronUtils.getSegmentationIdFromNeutronNetwork(network, networkType); @@ -920,12 +920,12 @@ public class NeutronvpnUtils { } public static Class getSegmentTypeFromNeutronNetwork(Network network) { - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); return providerExtension != null ? NETWORK_MAP.get(providerExtension.getNetworkType()) : null; } public static String getPhysicalNetworkName(Network network) { - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); return providerExtension != null ? providerExtension.getPhysicalNetwork() : null; } @@ -948,8 +948,8 @@ public class NeutronvpnUtils { } static Boolean getIsExternal(Network network) { - return network.getAugmentation(NetworkL3Extension.class) != null - && network.getAugmentation(NetworkL3Extension.class).isExternal(); + return network.augmentation(NetworkL3Extension.class) != null + && network.augmentation(NetworkL3Extension.class).isExternal(); } public void addToQosPolicyCache(QosPolicy qosPolicy) { @@ -1051,7 +1051,7 @@ public class NeutronvpnUtils { } public static Class getNetworkType(Network network) { - NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); return providerExtension != null ? providerExtension.getNetworkType() : null; } @@ -1060,7 +1060,7 @@ public class NeutronvpnUtils { LOG.error("Error in getting provider network type since network is null"); return null; } - NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension npe = network.augmentation(NetworkProviderExtension.class); if (npe != null) { Class networkTypeBase = npe.getNetworkType(); if (networkTypeBase != null) { @@ -1081,12 +1081,12 @@ public class NeutronvpnUtils { } static boolean isNetworkTypeSupported(Network network) { - NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension npe = network.augmentation(NetworkProviderExtension.class); return npe != null && npe.getNetworkType() != null && SUPPORTED_NETWORK_TYPES.contains(npe.getNetworkType()); } static boolean isNetworkOfType(Network network, Class type) { - NetworkProviderExtension npe = network.getAugmentation(NetworkProviderExtension.class); + NetworkProviderExtension npe = network.augmentation(NetworkProviderExtension.class); if (npe != null && npe.getNetworkType() != null) { return type.isAssignableFrom(npe.getNetworkType()); } diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java index d4a06370a4..ed3e1fc930 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/evpn/utils/NeutronEvpnUtils.java @@ -90,9 +90,9 @@ public class NeutronEvpnUtils { EvpnAugmentationBuilder evpnAugmentationBuilder = new EvpnAugmentationBuilder(); ElanInstanceBuilder elanInstanceBuilder = new ElanInstanceBuilder(elanInstanceOptional.get()); - if (elanInstanceBuilder.getAugmentation(EvpnAugmentation.class) != null) { + if (elanInstanceBuilder.augmentation(EvpnAugmentation.class) != null) { evpnAugmentationBuilder = - new EvpnAugmentationBuilder(elanInstanceBuilder.getAugmentation(EvpnAugmentation.class)); + new EvpnAugmentationBuilder(elanInstanceBuilder.augmentation(EvpnAugmentation.class)); } if (operation == Operation.ADD) { evpnAugmentationBuilder.setEvpnName(vpnName); @@ -119,7 +119,7 @@ public class NeutronEvpnUtils { LOG.debug("Deleting Evpn-Network with key {}", rd); tx.delete(LogicalDatastoreType.CONFIGURATION, rdToNetworkIdentifier); } else { - EvpnRdToNetworkBuilder evpnRdToNetworkBuilder = new EvpnRdToNetworkBuilder().setKey( + EvpnRdToNetworkBuilder evpnRdToNetworkBuilder = new EvpnRdToNetworkBuilder().withKey( new EvpnRdToNetworkKey(rd)); evpnRdToNetworkBuilder.setRd(rd); evpnRdToNetworkBuilder.setNetworkId(elanInstanceName); diff --git a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java index b6e517a18d..a1cf06092c 100644 --- a/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java +++ b/neutronvpn/impl/src/main/java/org/opendaylight/netvirt/neutronvpn/l2gw/L2GatewayListener.java @@ -104,7 +104,7 @@ public class L2GatewayListener extends AsyncClusteredDataTreeChangeListenerBase< Futures.addCallback(txRunner.callWithNewReadWriteTransactionAndSubmit(tx -> { for (L2gatewayConnection connection : connections) { InstanceIdentifier iid = InstanceIdentifier.create(Neutron.class) - .child(L2gatewayConnections.class).child(L2gatewayConnection.class, connection.getKey()); + .child(L2gatewayConnections.class).child(L2gatewayConnection.class, connection.key()); tx.delete(LogicalDatastoreType.CONFIGURATION, iid); } }), new FutureCallback() { diff --git a/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java index 11f3c5427e..25449f51cb 100644 --- a/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java +++ b/neutronvpn/shell/src/main/java/org/opendaylight/netvirt/neutronvpn/shell/ShowSubnet.java @@ -88,7 +88,7 @@ public class ShowSubnet extends OsgiCommandSupport { SubnetOpDataEntry data = optionalSubs.get(); System.out.println("Fetching subnetmap for given subnetId\n"); System.out.println("------------------------------------------------------------------------------"); - System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: " + System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: " + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n" + "RouteAdvState: " + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " + data.getVpnName() + "\n"); @@ -105,7 +105,7 @@ public class ShowSubnet extends OsgiCommandSupport { System.out.println("Fetching subnetmapdataentry for given subnetId\n"); System.out.println("------------------------" + "------------------------------------------------------"); - System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n" + System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: " + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n" + "RouteAdvState: " + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " @@ -124,7 +124,7 @@ public class ShowSubnet extends OsgiCommandSupport { System.out.println("------------------------------------------------------------------------------"); String getRouterInterfacePortId = (data.getRouterInterfacePortId() != null ? data.getRouterInterfacePortId().getValue() : "null"); - System.out.println("Key: " + data.getKey() + "\n" + "VpnId: " + data.getVpnId() + "\n" + System.out.println("Key: " + data.key() + "\n" + "VpnId: " + data.getVpnId() + "\n" + "InternetVpnId: " + data.getInternetVpnId() + "\n" + "DirectPortList: " + data.getDirectPortList() + "\n" + "NetworkId: " + data.getNetworkId() + "\n" + "Network-type: " + data.getNetworkType() + "\n" + "Network-segmentation-Id: " @@ -143,7 +143,7 @@ public class ShowSubnet extends OsgiCommandSupport { System.out.println("------------------------------------------------------------------------------"); String getRouterInterfacePortId = (data.getRouterInterfacePortId() != null ? data.getRouterInterfacePortId().getValue() : "null"); - System.out.println("Key: " + data.getKey() + "\n" + "VpnId: " + data.getVpnId() + "\n" + System.out.println("Key: " + data.key() + "\n" + "VpnId: " + data.getVpnId() + "\n" + "InternetVpnId: " + data.getInternetVpnId() + "\n" + "DirectPortList: " + data.getDirectPortList() + "\n" + "NetworkId: " + data.getNetworkId() + "\n" + "Network-type: " + data.getNetworkType() + "\n" + "Network-segmentation-Id: " @@ -160,7 +160,7 @@ public class ShowSubnet extends OsgiCommandSupport { SubnetOpDataEntry data = optionalSubs.get(); System.out.println("Fetching subnetmap for given subnetId\n"); System.out.println("------------------------------------------------------------------------------"); - System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: " + System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: " + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n" + "RouteAdvState: " + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " + data.getVpnName() + "\n"); @@ -191,7 +191,7 @@ public class ShowSubnet extends OsgiCommandSupport { System.out.println("Fetching subnetmap for given subnetId\n"); System.out.println("------------------------" + "------------------------------------------------------"); - System.out.println("Key: " + data.getKey() + "\n" + "VrfId: " + data.getVrfId() + "\n" + System.out.println("Key: " + data.key() + "\n" + "VrfId: " + data.getVrfId() + "\n" + "ElanTag: " + "" + data.getElanTag() + "\n" + "NhDpnId: " + data.getNhDpnId() + "\n" + "RouteAdvState: " + data.getRouteAdvState() + "\n" + "SubnetCidr: " + data.getSubnetCidr() + "\n" + "SubnetToDpnList: " + data.getSubnetToDpn() + "\n" + "VpnName: " diff --git a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java index 2bb8fc7b48..1eeec5fae1 100644 --- a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java +++ b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/PolicyAceFlowProgrammer.java @@ -151,7 +151,7 @@ public class PolicyAceFlowProgrammer { } private Optional getPolicyAceFlowWrapper(Matches matches) { - IngressInterface ingressInterface = matches.getAugmentation(IngressInterface.class); + IngressInterface ingressInterface = matches.augmentation(IngressInterface.class); if (ingressInterface != null) { Optional interfaceFlowOpt = getIngressInterfaceFlow(ingressInterface); if (interfaceFlowOpt.isPresent()) { @@ -159,7 +159,7 @@ public class PolicyAceFlowProgrammer { } } - Service service = matches.getAugmentation(Service.class); + Service service = matches.augmentation(Service.class); if (service != null) { Optional serviceFlowOpt = getPolicyServiceFlow(service); if (serviceFlowOpt.isPresent()) { diff --git a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java index 7d4e433025..eb85fe3dcc 100644 --- a/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java +++ b/policyservice/impl/src/main/java/org/opendaylight/netvirt/policyservice/util/PolicyServiceUtil.java @@ -103,7 +103,7 @@ public class PolicyServiceUtil { public Optional getAcePolicyClassifier(Ace ace) { Actions actions = ace.getActions(); - SetPolicyClassifier setPolicyClassifier = actions.getAugmentation(SetPolicyClassifier.class); + SetPolicyClassifier setPolicyClassifier = actions.augmentation(SetPolicyClassifier.class); if (setPolicyClassifier == null) { LOG.warn("No valid policy action found for ACE rule {}", ace.getRuleName()); return Optional.absent(); @@ -501,7 +501,7 @@ public class PolicyServiceUtil { } private boolean isVlanMemberInterface(Interface iface, VlanId vlanId) { - IfL2vlan l2vlan = iface.getAugmentation(IfL2vlan.class); + IfL2vlan l2vlan = iface.augmentation(IfL2vlan.class); if (l2vlan == null || !L2vlanMode.TrunkMember.equals(l2vlan.getL2vlanMode())) { LOG.warn("Interface {} is not VLAN member", iface.getName()); return false; diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java index 169bdf442a..99167461b1 100644 --- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java +++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosInterfaceStateChangeListener.java @@ -90,15 +90,15 @@ public class QosInterfaceStateChangeListener extends AsyncClusteredDataTreeChang getNeutronPort(interfaceName).ifPresent(port -> { Network network = qosNeutronUtils.getNeutronNetwork(port.getNetworkId()); LOG.trace("Qos Service : Received interface {} PORT UP event ", interfaceName); - if (port.getAugmentation(QosPortExtension.class) != null) { - Uuid portQosUuid = port.getAugmentation(QosPortExtension.class).getQosPolicyId(); + if (port.augmentation(QosPortExtension.class) != null) { + Uuid portQosUuid = port.augmentation(QosPortExtension.class).getQosPolicyId(); if (portQosUuid != null) { qosNeutronUtils.addToQosPortsCache(portQosUuid, port); qosNeutronUtils.handleQosInterfaceAdd(port, portQosUuid); } } else { - if (network.getAugmentation(QosNetworkExtension.class) != null) { - Uuid networkQosUuid = network.getAugmentation(QosNetworkExtension.class).getQosPolicyId(); + if (network.augmentation(QosNetworkExtension.class) != null) { + Uuid networkQosUuid = network.augmentation(QosNetworkExtension.class).getQosPolicyId(); if (networkQosUuid != null) { qosNeutronUtils.handleQosInterfaceAdd(port, networkQosUuid); } @@ -143,14 +143,14 @@ public class QosInterfaceStateChangeListener extends AsyncClusteredDataTreeChang String lowerLayerIf = intrf.getLowerLayerIf().get(0); LOG.trace("lowerLayerIf {}", lowerLayerIf); qosAlertManager.removeLowerLayerIfFromQosAlertCache(lowerLayerIf); - QosPortExtension removeQos = port.getAugmentation(QosPortExtension.class); + QosPortExtension removeQos = port.augmentation(QosPortExtension.class); if (removeQos != null) { qosNeutronUtils.handleNeutronPortRemove(port, removeQos.getQosPolicyId(), intrf); qosNeutronUtils.removeFromQosPortsCache(removeQos.getQosPolicyId(), port); } else { Network network = qosNeutronUtils.getNeutronNetwork(port.getNetworkId()); - if (network != null && network.getAugmentation(QosNetworkExtension.class) != null) { - Uuid networkQosUuid = network.getAugmentation(QosNetworkExtension.class).getQosPolicyId(); + if (network != null && network.augmentation(QosNetworkExtension.class) != null) { + Uuid networkQosUuid = network.augmentation(QosNetworkExtension.class).getQosPolicyId(); if (networkQosUuid != null) { qosNeutronUtils.handleNeutronPortRemove(port, networkQosUuid, intrf); } diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java index 50c6f76366..097364eb0c 100644 --- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java +++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronNetworkChangeListener.java @@ -74,8 +74,8 @@ public class QosNeutronNetworkChangeListener extends AsyncClusteredDataTreeChang protected void update(InstanceIdentifier instanceIdentifier, Network original, Network update) { qosNeutronUtils.addToNetworkCache(update); - QosNetworkExtension updateQos = update.getAugmentation(QosNetworkExtension.class); - QosNetworkExtension originalQos = original.getAugmentation(QosNetworkExtension.class); + QosNetworkExtension updateQos = update.augmentation(QosNetworkExtension.class); + QosNetworkExtension originalQos = original.augmentation(QosNetworkExtension.class); if (originalQos == null && updateQos != null) { // qosservice policy add qosNeutronUtils.addToQosNetworksCache(updateQos.getQosPolicyId(), update); @@ -97,7 +97,7 @@ public class QosNeutronNetworkChangeListener extends AsyncClusteredDataTreeChang protected void add(InstanceIdentifier instanceIdentifier, Network network) { qosNeutronUtils.addToNetworkCache(network); - QosNetworkExtension networkQos = network.getAugmentation(QosNetworkExtension.class); + QosNetworkExtension networkQos = network.augmentation(QosNetworkExtension.class); if (networkQos != null) { qosNeutronUtils.addToQosNetworksCache(networkQos.getQosPolicyId(), network); qosNeutronUtils.handleNeutronNetworkQosUpdate(network, networkQos.getQosPolicyId()); diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java index 61029f17d9..98eadb2cb9 100644 --- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java +++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronPortChangeListener.java @@ -78,8 +78,8 @@ public class QosNeutronPortChangeListener extends AsyncClusteredDataTreeChangeLi protected void update(InstanceIdentifier instanceIdentifier, Port original, Port update) { qosNeutronUtils.addToPortCache(update); // check for QoS updates - QosPortExtension updateQos = update.getAugmentation(QosPortExtension.class); - QosPortExtension originalQos = original.getAugmentation(QosPortExtension.class); + QosPortExtension updateQos = update.augmentation(QosPortExtension.class); + QosPortExtension originalQos = original.augmentation(QosPortExtension.class); if (originalQos == null && updateQos != null) { // qosservice policy add diff --git a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java index 91ed174ee0..401a1e9800 100644 --- a/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java +++ b/qosservice/impl/src/main/java/org/opendaylight/netvirt/qosservice/QosNeutronUtils.java @@ -270,8 +270,8 @@ public class QosNeutronUtils { // check for network qosservice to apply Network network = neutronVpnManager.getNeutronNetwork(port.getNetworkId()); - if (network != null && network.getAugmentation(QosNetworkExtension.class) != null) { - Uuid networkQosUuid = network.getAugmentation(QosNetworkExtension.class).getQosPolicyId(); + if (network != null && network.augmentation(QosNetworkExtension.class) != null) { + Uuid networkQosUuid = network.augmentation(QosNetworkExtension.class).getQosPolicyId(); if (networkQosUuid != null) { handleNeutronPortQosUpdate(port, networkQosUuid, qosUuid); } @@ -339,8 +339,8 @@ public class QosNeutronUtils { List portIds = getPortIdsFromSubnetId(subnetId); for (Uuid portId : portIds) { Port port = getNeutronPort(portId); - if (port != null && (port.getAugmentation(QosPortExtension.class) == null - || port.getAugmentation(QosPortExtension.class).getQosPolicyId() == null)) { + if (port != null && (port.augmentation(QosPortExtension.class) == null + || port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) { jobCoordinator.enqueueJob("QosPort-" + portId.getValue(), () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { if (qosPolicy.getBandwidthLimitRules() != null @@ -366,8 +366,8 @@ public class QosNeutronUtils { List portIds = getPortIdsFromSubnetId(subnetId); for (Uuid portId : portIds) { Port port = getNeutronPort(portId); - if (port != null && (port.getAugmentation(QosPortExtension.class) == null - || port.getAugmentation(QosPortExtension.class).getQosPolicyId() == null)) { + if (port != null && (port.augmentation(QosPortExtension.class) == null + || port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) { jobCoordinator.enqueueJob("QosPort-" + portId.getValue(), () -> Collections.singletonList(txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { if (qosPolicy != null && qosPolicy.getBandwidthLimitRules() != null @@ -396,8 +396,8 @@ public class QosNeutronUtils { List portIds = getPortIdsFromSubnetId(subnetId); for (Uuid portId : portIds) { Port port = getNeutronPort(portId); - if (port != null && (port.getAugmentation(QosPortExtension.class) == null - || port.getAugmentation(QosPortExtension.class).getQosPolicyId() == null)) { + if (port != null && (port.augmentation(QosPortExtension.class) == null + || port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) { jobCoordinator.enqueueJob("QosPort-" + portId.getValue(), () -> Collections.singletonList( txRunner.callWithNewWriteOnlyTransactionAndSubmit( tx -> setPortBandwidthLimits(port, zeroBwLimitRule, tx)))); @@ -415,8 +415,8 @@ public class QosNeutronUtils { List portIds = getPortIdsFromSubnetId(subnetId); for (Uuid portId : portIds) { Port port = getNeutronPort(portId); - if (port != null && (port.getAugmentation(QosPortExtension.class) == null - || port.getAugmentation(QosPortExtension.class).getQosPolicyId() == null)) { + if (port != null && (port.augmentation(QosPortExtension.class) == null + || port.augmentation(QosPortExtension.class).getQosPolicyId() == null)) { jobCoordinator.enqueueJob("QosPort-" + portId.getValue(), () -> { unsetPortDscpMark(port); return Collections.emptyList(); @@ -448,7 +448,7 @@ public class QosNeutronUtils { TerminationPoint tp = SouthboundUtils.getTerminationPointByExternalId(bridgeNode.get(), port.getUuid().getValue()); - OvsdbTerminationPointAugmentation ovsdbTp = tp.getAugmentation(OvsdbTerminationPointAugmentation.class); + OvsdbTerminationPointAugmentation ovsdbTp = tp.augmentation(OvsdbTerminationPointAugmentation.class); OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); tpAugmentationBuilder.setName(ovsdbTp.getName()); @@ -456,21 +456,21 @@ public class QosNeutronUtils { tpAugmentationBuilder.setIngressPolicingBurst(bwLimit.getMaxBurstKbps().longValue()); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); - tpBuilder.setKey(tp.getKey()); + tpBuilder.withKey(tp.key()); tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); try { if (writeConfigTxn != null) { writeConfigTxn.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(SouthboundUtils.OVSDB_TOPOLOGY_ID)) - .child(Node.class, bridgeNode.get().getKey()) - .child(TerminationPoint.class, new TerminationPointKey(tp.getKey())), tpBuilder.build(), true); + .child(Node.class, bridgeNode.get().key()) + .child(TerminationPoint.class, new TerminationPointKey(tp.key())), tpBuilder.build(), true); } else { MDSALUtil.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, new TopologyKey(SouthboundUtils.OVSDB_TOPOLOGY_ID)) - .child(Node.class, bridgeNode.get().getKey()) - .child(TerminationPoint.class, new TerminationPointKey(tp.getKey())), tpBuilder.build()); + .child(Node.class, bridgeNode.get().key()) + .child(TerminationPoint.class, new TerminationPointKey(tp.key())), tpBuilder.build()); } } catch (Exception e) { LOG.error("Failure while setting BwLimitRule {} to port {}", bwLimit, port, e); @@ -714,7 +714,7 @@ public class QosNeutronUtils { BigInteger cookieQosTable, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookieQosTable) .setFlowPriority(priority).setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(qosServiceIndex)).setServiceName(serviceName) + return new BoundServicesBuilder().withKey(new BoundServicesKey(qosServiceIndex)).setServiceName(serviceName) .setServicePriority(qosServiceIndex).setServiceType(ServiceTypeFlowBased.class) .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); } @@ -727,8 +727,8 @@ public class QosNeutronUtils { public boolean portHasQosPolicy(Port port) { LOG.trace("checking qos policy for port: {}", port.getUuid()); - boolean isQosPolicy = port.getAugmentation(QosPortExtension.class) != null - && port.getAugmentation(QosPortExtension.class).getQosPolicyId() != null; + boolean isQosPolicy = port.augmentation(QosPortExtension.class) != null + && port.augmentation(QosPortExtension.class).getQosPolicyId() != null; LOG.trace("portHasQosPolicy for port: {} return value {}", port.getUuid(), isQosPolicy); return isQosPolicy; @@ -739,13 +739,13 @@ public class QosNeutronUtils { Uuid qosUuid = null; QosPolicy qosPolicy = null; - if (port.getAugmentation(QosPortExtension.class) != null) { - qosUuid = port.getAugmentation(QosPortExtension.class).getQosPolicyId(); + if (port.augmentation(QosPortExtension.class) != null) { + qosUuid = port.augmentation(QosPortExtension.class).getQosPolicyId(); } else { Network network = neutronVpnManager.getNeutronNetwork(port.getNetworkId()); - if (network.getAugmentation(QosNetworkExtension.class) != null) { - qosUuid = network.getAugmentation(QosNetworkExtension.class).getQosPolicyId(); + if (network.augmentation(QosNetworkExtension.class) != null) { + qosUuid = network.augmentation(QosNetworkExtension.class).getQosPolicyId(); } } diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java index 9b1411cda2..1645f4a219 100644 --- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java +++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/GeniusProvider.java @@ -275,7 +275,7 @@ public class GeniusProvider { List tpOptions = tp.getOptions(); for (Options tpOption : tpOptions) { // From the VXLAN Tunnels, we want the one with the GPE option set - if (tpOption.getKey().getOption().equals(OPTION_KEY_EXTS)) { + if (tpOption.key().getOption().equals(OPTION_KEY_EXTS)) { if (tpOption.getValue().equals(OPTION_VALUE_EXTS_GPE)) { return Optional.ofNullable(tp.getOfport()); } @@ -362,7 +362,7 @@ public class GeniusProvider { public Optional getRemoteIpAddress(String interfaceName) { return Optional.ofNullable(interfaceMgr.getInterfaceInfoFromConfigDataStore(interfaceName)) - .map(anInterface -> anInterface.getAugmentation(IfTunnel.class)) + .map(anInterface -> anInterface.augmentation(IfTunnel.class)) .map(IfTunnel::getTunnelDestination) .map(IpAddress::getIpv4Address) .map(Ipv4Address::getValue); diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java index bee241632b..234676b0af 100644 --- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java +++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13Provider.java @@ -96,7 +96,7 @@ public class OpenFlow13Provider { .child(Node.class, nodeKey) .augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())) - .child(Flow.class, flow.getKey()) + .child(Flow.class, flow.key()) .build(); tx.put(LogicalDatastoreType.CONFIGURATION, iidFlow, flow, WriteTransaction.CREATE_MISSING_PARENTS); @@ -108,7 +108,7 @@ public class OpenFlow13Provider { .child(Node.class, nodeKey) .augmentation(FlowCapableNode.class) .child(Table.class, new TableKey(flow.getTableId())) - .child(Flow.class, flow.getKey()) + .child(Flow.class, flow.key()) .build(); tx.delete(LogicalDatastoreType.CONFIGURATION, iidFlow); diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java index 464d80117c..68a461d6ab 100644 --- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java +++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/service/domain/impl/ConfigurationClassifierImpl.java @@ -95,7 +95,7 @@ public class ConfigurationClassifierImpl implements ClassifierState { LOG.trace("Ace details: {}", ace); Optional sfcActions = Optional.ofNullable(ace.getActions()) - .map(actions -> actions.getAugmentation(RedirectToSfc.class)); + .map(actions -> actions.augmentation(RedirectToSfc.class)); String rspName = sfcActions.map(NetvirtsfcAclActions::getRspName).map(Strings::emptyToNull).orElse(null); String sfpName = sfcActions.map(NetvirtsfcAclActions::getSfpName).map(Strings::emptyToNull).orElse(null); @@ -114,17 +114,17 @@ public class ConfigurationClassifierImpl implements ClassifierState { return Collections.emptySet(); } - NeutronNetwork network = matches.getAugmentation(NeutronNetwork.class); + NeutronNetwork network = matches.augmentation(NeutronNetwork.class); if (sfpName != null && network != null) { LOG.warn("Ace {} ignored: SFP redirect action with neutron network match not supported", ruleName); return Collections.emptySet(); } - String sourcePort = Optional.ofNullable(matches.getAugmentation(NeutronPorts.class)) + String sourcePort = Optional.ofNullable(matches.augmentation(NeutronPorts.class)) .map(NeutronPorts::getSourcePortUuid) .map(Strings::emptyToNull) .orElse(null); - String destinationPort = Optional.ofNullable(matches.getAugmentation(NeutronPorts.class)) + String destinationPort = Optional.ofNullable(matches.augmentation(NeutronPorts.class)) .map(NeutronPorts::getDestinationPortUuid) .map(Strings::emptyToNull) .orElse(null); diff --git a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java index bf9a8873ca..b65f16418b 100644 --- a/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java +++ b/sfc/classifier/impl/src/main/java/org/opendaylight/netvirt/sfc/classifier/utils/OpenFlow13Utils.java @@ -157,7 +157,7 @@ public final class OpenFlow13Utils { private static void addExtension(MatchBuilder match, Class extensionKey, NxAugMatchNodesNodeTableFlow am) { GeneralAugMatchNodesNodeTableFlow existingAugmentations = match - .getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + .augmentation(GeneralAugMatchNodesNodeTableFlow.class); List extensions = null; if (existingAugmentations != null) { extensions = existingAugmentations.getExtensionList(); @@ -343,7 +343,7 @@ public final class OpenFlow13Utils { public static ActionBuilder createActionBuilder(int order) { ActionBuilder ab = new ActionBuilder(); ab.setOrder(order); - ab.setKey(new ActionKey(order)); + ab.withKey(new ActionKey(order)); return ab; } @@ -357,7 +357,7 @@ public final class OpenFlow13Utils { InstructionBuilder ib = new InstructionBuilder(); ib.setInstruction(new ApplyActionsCaseBuilder().setApplyActions(aab.build()).build()); ib.setOrder(0); - ib.setKey(new InstructionKey(0)); + ib.withKey(new InstructionKey(0)); // Put our Instruction in a list of Instructions List instructions = new ArrayList<>(); @@ -370,7 +370,7 @@ public final class OpenFlow13Utils { InstructionsBuilder isb) { FlowBuilder flow = new FlowBuilder(); flow.setId(new FlowId(flowIdStr)); - flow.setKey(new FlowKey(new FlowId(flowIdStr))); + flow.withKey(new FlowKey(new FlowId(flowIdStr))); flow.setTableId(table); flow.setFlowName(flowName); flow.setCookie(new FlowCookie(cookieValue)); @@ -401,7 +401,7 @@ public final class OpenFlow13Utils { public static Instruction createGotoTableInstruction(short nextTableId, int order) { GoToTableBuilder gotoIngress = createActionGotoTable(nextTableId); - return new InstructionBuilder().setKey(new InstructionKey(order)).setOrder(order) + return new InstructionBuilder().withKey(new InstructionKey(order)).setOrder(order) .setInstruction(new GoToTableCaseBuilder().setGoToTable(gotoIngress.build()).build()).build(); } @@ -428,7 +428,7 @@ public final class OpenFlow13Utils { org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.action.Action action, int order) { return new ActionBuilder() .setOrder(order) - .setKey(new ActionKey(order)) + .withKey(new ActionKey(order)) .setAction(action) .build(); } diff --git a/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java index 07c8e5876e..68cb553ffe 100644 --- a/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java +++ b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/OpenFlow13ProviderTest.java @@ -357,19 +357,19 @@ public class OpenFlow13ProviderTest { assertNull(match.getIpMatch()); assertNull(match.getLayer3Match()); assertNull(match.getLayer4Match()); - assertNull(match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class)); + assertNull(match.augmentation(GeneralAugMatchNodesNodeTableFlow.class)); } private void checkMatchVxgpeNsh(Match match) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxTunGpeNp() != null) { assertEquals(nxAugMatch.getNxmNxTunGpeNp().getValue().shortValue(), OpenFlow13Utils.TUN_GPE_NP_NSH); @@ -379,14 +379,14 @@ public class OpenFlow13ProviderTest { private void checkMatchTunId(Match match, long value) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxTunId() != null) { assertEquals(nxAugMatch.getNxmNxTunId().getValue().longValue(), value); @@ -396,14 +396,14 @@ public class OpenFlow13ProviderTest { private void checkMatchTunDstIp(Match match, Ipv4Address value) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxTunIpv4Dst() != null) { assertEquals(nxAugMatch.getNxmNxTunIpv4Dst().getIpv4Address(), value); @@ -413,14 +413,14 @@ public class OpenFlow13ProviderTest { private void checkMatchEthNsh(Match match) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxEncapEthType() != null) { assertEquals(nxAugMatch.getNxmNxEncapEthType().getValue().intValue(), OpenFlow13Utils.ETHERTYPE_NSH); @@ -430,14 +430,14 @@ public class OpenFlow13ProviderTest { private void checkMatchNshMdType1(Match match) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxNshMdtype() != null) { assertEquals(nxAugMatch.getNxmNxNshMdtype().getValue().shortValue(), @@ -452,14 +452,14 @@ public class OpenFlow13ProviderTest { private void checkMatchC1(Match match, long c1) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxNshc1() != null) { assertEquals(nxAugMatch.getNxmNxNshc1().getValue().longValue(), c1); @@ -469,14 +469,14 @@ public class OpenFlow13ProviderTest { private void checkMatchC2(Match match, long c2) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxNshc2() != null) { assertEquals(nxAugMatch.getNxmNxNshc2().getValue().longValue(), c2); @@ -486,14 +486,14 @@ public class OpenFlow13ProviderTest { private void checkMatchNsp(Match match, long nsp) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxNsp() != null) { assertEquals(nxAugMatch.getNxmNxNsp().getValue().longValue(), nsp); @@ -503,14 +503,14 @@ public class OpenFlow13ProviderTest { private void checkMatchNsi(Match match, short nsi) { GeneralAugMatchNodesNodeTableFlow genAug = - match.getAugmentation(GeneralAugMatchNodesNodeTableFlow.class); + match.augmentation(GeneralAugMatchNodesNodeTableFlow.class); assertNotNull(genAug); List extensions = genAug.getExtensionList(); for (ExtensionList extensionList : extensions) { Extension extension = extensionList.getExtension(); - NxAugMatchNodesNodeTableFlow nxAugMatch = extension.getAugmentation(NxAugMatchNodesNodeTableFlow.class); + NxAugMatchNodesNodeTableFlow nxAugMatch = extension.augmentation(NxAugMatchNodesNodeTableFlow.class); if (nxAugMatch.getNxmNxNsi() != null) { assertEquals(nxAugMatch.getNxmNxNsi().getNsi().shortValue(), nsi); diff --git a/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java index 4a24058474..120136e5a2 100644 --- a/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java +++ b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/SfcProviderTest.java @@ -193,7 +193,7 @@ public class SfcProviderTest extends ConstantSchemaAbstractDataBrokerTest { if (createSffDpl) { List sffDpls = new ArrayList<>(); - sffDplBuilder.setKey(new SffDataPlaneLocatorKey(new SffDataPlaneLocatorName(SFF_DPL_NAME))); + sffDplBuilder.withKey(new SffDataPlaneLocatorKey(new SffDataPlaneLocatorName(SFF_DPL_NAME))); sffDplBuilder.setName(new SffDataPlaneLocatorName(SFF_DPL_NAME)); sffDpls.add(sffDplBuilder.build()); sffBuilder.setSffDataPlaneLocator(sffDpls); diff --git a/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java index 90cfa29111..9ce509f4b4 100644 --- a/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java +++ b/sfc/classifier/impl/src/test/java/org/opendaylight/netvirt/sfc/classifier/providers/TestInterfaceManager.java @@ -54,7 +54,7 @@ public abstract class TestInterfaceManager implements IInterfaceManager { List opsList = new ArrayList<>(); if (dpnId != GeniusProviderTestParams.DPN_ID_NO_OPTIONS) { OptionsBuilder opsBuilder = new OptionsBuilder(); - opsBuilder.setKey(new OptionsKey(GeniusProvider.OPTION_KEY_EXTS)); + opsBuilder.withKey(new OptionsKey(GeniusProvider.OPTION_KEY_EXTS)); opsBuilder.setValue(GeniusProvider.OPTION_VALUE_EXTS_GPE); opsList.add(opsBuilder.build()); } diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java index 57dce94fba..d83690187a 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/SfcMdsalHelper.java @@ -55,7 +55,7 @@ public class SfcMdsalHelper { //ACL Flow Classifier data store utility methods public void addAclFlowClassifier(Acl aclFlowClassifier) { - InstanceIdentifier aclIid = getAclPath(aclFlowClassifier.getKey()); + InstanceIdentifier aclIid = getAclPath(aclFlowClassifier.key()); LOG.info("Write ACL FlowClassifier {} to config data store at {}",aclFlowClassifier, aclIid); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, aclIid, @@ -66,7 +66,7 @@ public class SfcMdsalHelper { } public void updateAclFlowClassifier(Acl aclFlowClassifier) { - InstanceIdentifier aclIid = getAclPath(aclFlowClassifier.getKey()); + InstanceIdentifier aclIid = getAclPath(aclFlowClassifier.key()); LOG.info("Update ACL FlowClassifier {} in config data store at {}",aclFlowClassifier, aclIid); try { SingleTransactionDataBroker.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, aclIid, @@ -77,7 +77,7 @@ public class SfcMdsalHelper { } public void removeAclFlowClassifier(Acl aclFlowClassifier) { - InstanceIdentifier aclIid = getAclPath(aclFlowClassifier.getKey()); + InstanceIdentifier aclIid = getAclPath(aclFlowClassifier.key()); LOG.info("Remove ACL FlowClassifier {} from config data store at {}",aclFlowClassifier, aclIid); try { SingleTransactionDataBroker.syncDelete(dataBroker, LogicalDatastoreType.CONFIGURATION, aclIid); @@ -95,7 +95,7 @@ public class SfcMdsalHelper { } public void addServiceFunction(ServiceFunction sf) { - InstanceIdentifier sfIid = getSFPath(sf.getKey()); + InstanceIdentifier sfIid = getSFPath(sf.key()); LOG.info("Write Service Function {} to config data store at {}",sf, sfIid); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, sfIid, sf); @@ -105,7 +105,7 @@ public class SfcMdsalHelper { } public void updateServiceFunction(ServiceFunction sf) { - InstanceIdentifier sfIid = getSFPath(sf.getKey()); + InstanceIdentifier sfIid = getSFPath(sf.key()); LOG.info("Update Service Function {} in config data store at {}",sf, sfIid); try { SingleTransactionDataBroker.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, sfIid, sf); @@ -133,7 +133,7 @@ public class SfcMdsalHelper { } public void addServiceFunctionForwarder(ServiceFunctionForwarder sff) { - InstanceIdentifier sffIid = getSFFPath(sff.getKey()); + InstanceIdentifier sffIid = getSFFPath(sff.key()); LOG.info("Write Service Function Forwarder {} to config data store at {}",sff, sffIid); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, sffIid, sff); @@ -143,7 +143,7 @@ public class SfcMdsalHelper { } public void updateServiceFunctionForwarder(ServiceFunctionForwarder sff) { - InstanceIdentifier sffIid = getSFFPath(sff.getKey()); + InstanceIdentifier sffIid = getSFFPath(sff.key()); LOG.info("Update Service Function Forwarder {} to config data store at {}",sff, sffIid); try { SingleTransactionDataBroker.syncUpdate(dataBroker, LogicalDatastoreType.CONFIGURATION, sffIid, sff); @@ -163,7 +163,7 @@ public class SfcMdsalHelper { } public void addServiceFunctionChain(ServiceFunctionChain sfc) { - InstanceIdentifier sfcIid = getSFCPath(sfc.getKey()); + InstanceIdentifier sfcIid = getSFCPath(sfc.key()); LOG.info("Write Service Function Chain {} to config data store at {}",sfc, sfcIid); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, sfcIid, sfc); @@ -183,7 +183,7 @@ public class SfcMdsalHelper { } public void addServiceFunctionPath(ServiceFunctionPath sfp) { - InstanceIdentifier sfpIid = getSFPPath(sfp.getKey()); + InstanceIdentifier sfpIid = getSFPPath(sfp.key()); LOG.info("Write Service Function Path {} to config data store at {}",sfp, sfpIid); try { SingleTransactionDataBroker.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, sfpIid, sfp); diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java index a3203170fc..700dc12dae 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/flowclassifier/FlowClassifierTranslator.java @@ -161,7 +161,7 @@ public final class FlowClassifierTranslator { //with the actions. aceBuilder.setRuleName(aclBuilder.getAclName() + RULE); - aceBuilder.setKey(new AceKey(aceBuilder.getRuleName())); + aceBuilder.withKey(new AceKey(aceBuilder.getRuleName())); ArrayList aceList = new ArrayList<>(); aceList.add(aceBuilder.build()); @@ -169,7 +169,7 @@ public final class FlowClassifierTranslator { accessListEntriesBuilder.setAce(aceList); aclBuilder.setAccessListEntries(accessListEntriesBuilder.build()); - aclBuilder.setKey(new AclKey(aclBuilder.getAclName(),aclBuilder.getAclType())); + aclBuilder.withKey(new AclKey(aclBuilder.getAclName(),aclBuilder.getAclType())); LOG.info("Translated ACL Flow classfier : {}", aclBuilder.toString()); diff --git a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java index fcc30cee80..2f9702cfd6 100644 --- a/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java +++ b/sfc/translator/src/main/java/org/opendaylight/netvirt/sfc/translator/portchain/PortChainTranslator.java @@ -44,7 +44,7 @@ public final class PortChainTranslator { PortChain portChain, List sfList) { ServiceFunctionChainBuilder sfcBuilder = new ServiceFunctionChainBuilder(); sfcBuilder.setName(new SfcName(portChain.getName())); - sfcBuilder.setKey(new ServiceFunctionChainKey(sfcBuilder.getName())); + sfcBuilder.withKey(new ServiceFunctionChainKey(sfcBuilder.getName())); //By default set it to false. If user specify it in chain parameters, it //will be overridden. @@ -56,7 +56,7 @@ public final class PortChainTranslator { SfcServiceFunctionBuilder sfcSfBuilder = new SfcServiceFunctionBuilder(); sfcSfBuilder.setName(sf.getName().getValue()); sfcSfBuilder.setType(sf.getType()); - sfcSfBuilder.setKey(new SfcServiceFunctionKey(sfcSfBuilder.getName())); + sfcSfBuilder.withKey(new SfcServiceFunctionKey(sfcSfBuilder.getName())); //NOTE: no explicit order is set. sfcSfList.add(sfcSfBuilder.build()); diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java index 49734ebae6..23f6e8bf0b 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/CountersServiceUtils.java @@ -92,7 +92,7 @@ public final class CountersServiceUtils { BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority) .setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) + return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)).setServiceName(serviceName) .setServicePriority(servicePriority).setServiceType(ServiceTypeFlowBased.class) .addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); } diff --git a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java index 07a1860279..2ee88b2b68 100644 --- a/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java +++ b/statistics/impl/src/main/java/org/opendaylight/netvirt/statistics/StatisticsImpl.java @@ -543,13 +543,13 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan tx.delete(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier .builder(IngressElementCountersRequestConfig.class) .child(CounterRequests.class, - new CounterRequestsKey(counterRequest.getKey().getRequestId())) + new CounterRequestsKey(counterRequest.key().getRequestId())) .build()); } else if (ElementCountersDirection.EGRESS.equals(direction)) { tx.delete(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier .builder(EgressElementCountersRequestConfig.class) .child(CounterRequests.class, - new CounterRequestsKey(counterRequest.getKey().getRequestId())) + new CounterRequestsKey(counterRequest.key().getRequestId())) .build()); } }), LOG, "Error deleting counter"); @@ -597,7 +597,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan List counterRequests) { transaction.delete(LogicalDatastoreType.CONFIGURATION, path); CounterRequests counterRequest = requestData.get(); - if (shouldUnbindCountersService(counterRequest.getPortId(), counterRequest.getKey().getRequestId(), + if (shouldUnbindCountersService(counterRequest.getPortId(), counterRequest.key().getRequestId(), counterRequests)) { unbindCountersServiceIfBound(counterRequest.getPortId(), ElementCountersDirection.valueOf(counterRequest.getTrafficDirection())); @@ -826,7 +826,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan private boolean shouldUnbindCountersService(String portId, String requesId, List counterRequests) { for (CounterRequests counterRequest : counterRequests) { - if (portId.equals(counterRequest.getPortId()) && !requesId.equals(counterRequest.getKey().getRequestId())) { + if (portId.equals(counterRequest.getPortId()) && !requesId.equals(counterRequest.key().getRequestId())) { return false; } } @@ -865,7 +865,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan IngressElementCountersRequestConfig requestConfig = iecrcOpt.get(); CounterRequestsBuilder crb = new CounterRequestsBuilder(); crb.setRequestId(requestKey); - crb.setKey(new CounterRequestsKey(requestKey)); + crb.withKey(new CounterRequestsKey(requestKey)); crb.setFilters(input.getOutgoingTraffic().getFilters()); crb.setPortId(input.getPortId()); crb.setLportTag(getLportTag(input.getPortId())); @@ -889,7 +889,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan EgressElementCountersRequestConfig requestConfig = eecrcOpt.get(); CounterRequestsBuilder crb = new CounterRequestsBuilder(); crb.setRequestId(requestKey); - crb.setKey(new CounterRequestsKey(requestKey)); + crb.withKey(new CounterRequestsKey(requestKey)); crb.setFilters(input.getIncomingTraffic().getFilters()); crb.setPortId(input.getPortId()); crb.setLportTag(getLportTag(input.getPortId())); @@ -1024,7 +1024,7 @@ public class StatisticsImpl implements StatisticsService, ICountersInterfaceChan for (CounterRequests counterRequest : counterRequests) { if (portId.equals(counterRequest.getPortId()) && dirction.equals(counterRequest.getTrafficDirection()) - && !counterRequest.getKey().getRequestId().equals(requesId)) { + && !counterRequest.key().getRequestId().equals(requesId)) { if (areFiltersEqual(filters, counterRequest.getFilters())) { return true; } diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java index 9a553caf4f..fc9e3519d1 100644 --- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java +++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/InterfaceUtils.java @@ -99,7 +99,7 @@ public final class InterfaceUtils { BigInteger cookie, List instructions) { StypeOpenflowBuilder augBuilder = new StypeOpenflowBuilder().setFlowCookie(cookie).setFlowPriority(flowPriority).setInstruction(instructions); - return new BoundServicesBuilder().setKey(new BoundServicesKey(servicePriority)) + return new BoundServicesBuilder().withKey(new BoundServicesKey(servicePriority)) .setServiceName(serviceName).setServicePriority(servicePriority) .setServiceType(ServiceTypeFlowBased.class).addAugmentation(StypeOpenflow.class, augBuilder.build()).build(); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/LearntVpnVipToPortEventProcessor.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/LearntVpnVipToPortEventProcessor.java index 24a2354fdf..7a0ea4f925 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/LearntVpnVipToPortEventProcessor.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/LearntVpnVipToPortEventProcessor.java @@ -204,7 +204,7 @@ public class LearntVpnVipToPortEventProcessor } ip = VpnUtil.getIpPrefix(ip); AdjacencyBuilder newAdjBuilder = new AdjacencyBuilder().setIpAddress(ip) - .setKey(new AdjacencyKey(ip)).setAdjacencyType(AdjacencyType.PrimaryAdjacency) + .withKey(new AdjacencyKey(ip)).setAdjacencyType(AdjacencyType.PrimaryAdjacency) .setMacAddress(mipMacAddress).setSubnetId(new Uuid(subnetId)).setPhysNetworkFunc(true); List adjacencyList = adjacencies.isPresent() @@ -254,7 +254,7 @@ public class LearntVpnVipToPortEventProcessor } String nextHopIp = nextHopIpAddr.split("/")[0]; AdjacencyBuilder newAdjBuilder = - new AdjacencyBuilder().setIpAddress(ip).setKey(new AdjacencyKey(ip)).setNextHopIpList( + new AdjacencyBuilder().setIpAddress(ip).withKey(new AdjacencyKey(ip)).setNextHopIpList( Collections.singletonList(nextHopIp)).setAdjacencyType(AdjacencyType.LearntIp); if (mipMacAddress != null && !mipMacAddress.equalsIgnoreCase(nextHopMacAddress)) { newAdjBuilder.setMacAddress(mipMacAddress); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java index 5c968a97ba..34536c14b4 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetOpDpnManager.java @@ -60,7 +60,7 @@ public class SubnetOpDpnManager { + " already seen in datastore", subnetId.getValue(), dpnId); return null; } - SubnetToDpnBuilder subDpnBuilder = new SubnetToDpnBuilder().setKey(new SubnetToDpnKey(dpnId)); + SubnetToDpnBuilder subDpnBuilder = new SubnetToDpnBuilder().withKey(new SubnetToDpnKey(dpnId)); List vpnIntfList = new ArrayList<>(); subDpnBuilder.setVpnInterfaces(vpnIntfList); SubnetToDpn subDpn = subDpnBuilder.build(); @@ -117,7 +117,7 @@ public class SubnetOpDpnManager { SubnetToDpnBuilder subDpnBuilder = new SubnetToDpnBuilder(subDpn); List vpnIntfList = subDpnBuilder.getVpnInterfaces(); VpnInterfaces vpnIntfs = - new VpnInterfacesBuilder().setKey(new VpnInterfacesKey(intfName)).setInterfaceName(intfName).build(); + new VpnInterfacesBuilder().withKey(new VpnInterfacesKey(intfName)).setInterfaceName(intfName).build(); vpnIntfList.add(vpnIntfs); subDpnBuilder.setVpnInterfaces(vpnIntfList); subDpn = subDpnBuilder.build(); @@ -147,7 +147,7 @@ public class SubnetOpDpnManager { if (!optionalPortOp.isPresent()) { // Create PortOpDataEntry only if not present portOpBuilder = - new PortOpDataEntryBuilder().setKey(new PortOpDataEntryKey(intfName)).setPortId(intfName); + new PortOpDataEntryBuilder().withKey(new PortOpDataEntryKey(intfName)).setPortId(intfName); List listSubnet = new ArrayList<>(); listSubnet.add(subnetId); portOpBuilder.setSubnetIds(listSubnet); @@ -194,7 +194,7 @@ public class SubnetOpDpnManager { SubnetToDpnBuilder subDpnBuilder = new SubnetToDpnBuilder(optionalSubDpn.get()); List vpnIntfList = subDpnBuilder.getVpnInterfaces(); VpnInterfaces vpnIntfs = - new VpnInterfacesBuilder().setKey(new VpnInterfacesKey(intfName)).setInterfaceName(intfName).build(); + new VpnInterfacesBuilder().withKey(new VpnInterfacesKey(intfName)).setInterfaceName(intfName).build(); vpnIntfList.remove(vpnIntfs); if (vpnIntfList.isEmpty()) { // Remove the DPN as well diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java index fb733562f9..e81e8db2b3 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/SubnetRoutePacketInHandler.java @@ -374,7 +374,7 @@ public class SubnetRoutePacketInHandler implements PacketProcessingListener { org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang .ietf.interfaces.rev140508.interfaces.Interface configIface = interfaceManager.getInterfaceInfoFromConfigDataStore(interfaceName); - IfTunnel ifTunnel = configIface.getAugmentation(IfTunnel.class); + IfTunnel ifTunnel = configIface.augmentation(IfTunnel.class); if (ifTunnel != null) { return true; } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java index 7bedb847ef..a3946919d1 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/TunnelInterfaceStateListener.java @@ -464,7 +464,7 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas intfName, vpnName); if (opVpnInterface.isPresent()) { VpnInterfaceOpDataEntry vpnInterface = opVpnInterface.get(); - AdjacenciesOp adjacencies = vpnInterface.getAugmentation(AdjacenciesOp.class); + AdjacenciesOp adjacencies = vpnInterface.augmentation(AdjacenciesOp.class); List adjList = adjacencies != null ? adjacencies.getAdjacency() : Collections.emptyList(); String prefix = null; @@ -573,9 +573,9 @@ public class TunnelInterfaceStateListener extends AsyncDataTreeChangeListenerBas String ifaceName = stateTunnelList.getTunnelInterfaceName(); if (getTunnelType(stateTunnelList) == VpnConstants.ITMTunnelLocType.Internal.getValue()) { Interface configIface = InterfaceUtils.getInterface(dataBroker, stateTunnelList.getTunnelInterfaceName()); - IfTunnel ifTunnel = configIface != null ? configIface.getAugmentation(IfTunnel.class) : null; + IfTunnel ifTunnel = configIface != null ? configIface.augmentation(IfTunnel.class) : null; if (ifTunnel != null && ifTunnel.getTunnelInterfaceType().isAssignableFrom(TunnelTypeVxlan.class)) { - ParentRefs refs = configIface.getAugmentation(ParentRefs.class); + ParentRefs refs = configIface.augmentation(ParentRefs.class); if (refs != null && !Strings.isNullOrEmpty(refs.getParentInterface())) { return true; //multiple VxLAN tunnels enabled, i.e. only logical tunnel should be treated } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java index 0575d20ab6..ebacb9b3f9 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnElanInterfaceChangeListener.java @@ -116,7 +116,7 @@ public class VpnElanInterfaceChangeListener .getVpnInterfaceVpnInstanceNames(vpnId.getValue(), AssociatedSubnetType.V4AndV6Subnets); List listVpn = new ArrayList<>(); listVpn.add(vpnInstance); - VpnInterface vpnInterface = new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(interfaceName)) + VpnInterface vpnInterface = new VpnInterfaceBuilder().withKey(new VpnInterfaceKey(interfaceName)) .setVpnInstanceNames(listVpn) .setScheduledForRemove(Boolean.FALSE) .build(); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java index 453a4b83b7..c6e0d8f7fb 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnFootprintService.java @@ -197,7 +197,7 @@ public class VpnFootprintService implements IVpnFootprintService { Optional dpnInVpn = VpnUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, id); IpAddressesBuilder ipAddressesBldr = new IpAddressesBuilder() .setIpAddressSource(ipAddressSourceValuePair.getKey()); - ipAddressesBldr.setKey(new IpAddressesKey(ipAddressSourceValuePair.getValue())); + ipAddressesBldr.withKey(new IpAddressesKey(ipAddressSourceValuePair.getValue())); ipAddressesBldr.setIpAddress(ipAddressSourceValuePair.getValue()); ListenableFuture future = txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> { @@ -329,7 +329,7 @@ public class VpnFootprintService implements IVpnFootprintService { } IpAddresses currIpAddress = new IpAddressesBuilder() - .setKey(new IpAddressesKey(ipAddressSourceValuePair.getValue())) + .withKey(new IpAddressesKey(ipAddressSourceValuePair.getValue())) .setIpAddressSource(ipAddressSourceValuePair.getKey()).build(); if (ipAddresses.remove(currIpAddress)) { try { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java index 900e3bdd7f..969dc2e171 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInstanceListener.java @@ -271,7 +271,7 @@ public class VpnInstanceListener extends AsyncDataTreeChangeListenerBase adjList = adjacencies != null ? adjacencies.getAdjacency() : new ArrayList<>(); if (adjList.isEmpty()) { LOG.trace("updateVpnInterfaceOnTepAdd: Adjacencies are empty for vpnInterface {} on dpn {}", @@ -966,7 +966,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase interfaceId = VpnUtil.getVpnInterfaceOpDataEntryIdentifier(vpnInterface.getName(), vpnName); @@ -984,7 +984,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase adjList = adjacencies != null ? adjacencies.getAdjacency() : new ArrayList<>(); String prefix = null; long label = 0; @@ -1071,7 +1071,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase interfaceId = VpnUtil.getVpnInterfaceOpDataEntryIdentifier(vpnInterface.getName(), vpnName); @@ -1150,7 +1150,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase oldAdjs = origAdjs != null && origAdjs.getAdjacency() != null ? origAdjs.getAdjacency() : new ArrayList<>(); - final Adjacencies updateAdjs = update.getAugmentation(Adjacencies.class); + final Adjacencies updateAdjs = update.augmentation(Adjacencies.class); final List newAdjs = updateAdjs != null && updateAdjs.getAdjacency() != null ? updateAdjs.getAdjacency() : new ArrayList<>(); @@ -1589,10 +1589,10 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase oldAdjs = (origAdjs != null && origAdjs.getAdjacency() != null) ? origAdjs.getAdjacency() : new ArrayList<>(); - final Adjacencies updateAdjs = update.getAugmentation(Adjacencies.class); + final Adjacencies updateAdjs = update.augmentation(Adjacencies.class); final List newAdjs = (updateAdjs != null && updateAdjs.getAdjacency() != null) ? updateAdjs.getAdjacency() : new ArrayList<>(); @@ -1859,7 +1859,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase optionalRouterDpnList = VpnUtil.read(dataBroker, LogicalDatastoreType .OPERATIONAL, routerDpnListIdentifier); RouterInterfaces routerInterface = - new RouterInterfacesBuilder().setKey(new RouterInterfacesKey(vpnInterfaceName)).setInterface( + new RouterInterfacesBuilder().withKey(new RouterInterfacesKey(vpnInterfaceName)).setInterface( vpnInterfaceName).build(); if (optionalRouterDpnList.isPresent()) { writeOperTxn.merge(LogicalDatastoreType.OPERATIONAL, routerDpnListIdentifier.child( @@ -1890,7 +1890,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase routerInterfaces = optionalRouterDpnList.get().getRouterInterfaces(); RouterInterfaces routerInterface = - new RouterInterfacesBuilder().setKey(new RouterInterfacesKey(vpnInterfaceName)).setInterface( + new RouterInterfacesBuilder().withKey(new RouterInterfacesKey(vpnInterfaceName)).setInterface( vpnInterfaceName).build(); if (routerInterfaces != null && routerInterfaces.remove(routerInterface)) { @@ -1930,7 +1930,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase routerInterfaces = optionalRouterDpnList.get().getRouterInterfaces(); RouterInterfaces routerInterface = - new RouterInterfacesBuilder().setKey(new RouterInterfacesKey(vpnInterfaceName)).setInterface( + new RouterInterfacesBuilder().withKey(new RouterInterfacesKey(vpnInterfaceName)).setInterface( vpnInterfaceName).build(); if (routerInterfaces != null && routerInterfaces.remove(routerInterface)) { if (routerInterfaces.isEmpty()) { @@ -1981,7 +1981,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase adjsList = adjs.getAdjacency(); @@ -2162,7 +2162,7 @@ public class VpnInterfaceManager extends AsyncDataTreeChangeListenerBase operationVpnAdjacencies = vpnInterfaceOptional.get() - .getAugmentation(AdjacenciesOp.class).getAdjacency(); + .augmentation(AdjacenciesOp.class).getAdjacency(); // Due to insufficient rds, some of the extra route wont get processed when it is added. // The unprocessed adjacencies will be present in config vpn interface DS but will be missing // in operational DS. These unprocessed adjacencies will be handled below. diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java index b85871cf04..db1803f503 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnInterfaceOpListener.java @@ -120,7 +120,7 @@ public class VpnInterfaceOpListener extends AsyncDataTreeChangeListenerBase adjList = adjs != null ? adjs.getAdjacency() : null; if (vpnInstOp != null && adjList != null && adjList.size() > 0) { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java index 072bd16263..dea5831bbb 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnOperDsUtils.java @@ -50,13 +50,13 @@ public final class VpnOperDsUtils { } public static VpnInstance makeVpnInstance(String vpnName, String vpnRd, Long vpnTag) { - return new VpnInstanceBuilder().setKey(new VpnInstanceKey(vpnName)).setVpnInstanceName(vpnName) + return new VpnInstanceBuilder().withKey(new VpnInstanceKey(vpnName)).setVpnInstanceName(vpnName) .setVrfId(vpnRd).setVpnId(vpnTag).build(); } static List makeVpnTargets(List rtList, VpnTarget.VrfRTType type) { return rtList.stream() - .map(rt -> new VpnTargetBuilder().setKey(new VpnTargetKey(rt)) + .map(rt -> new VpnTargetBuilder().withKey(new VpnTargetKey(rt)) .setVrfRTValue(rt).setVrfRTType(type).build()) .collect(Collectors.toList()); } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java index 1c23ec15b9..e874a274ff 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnSubnetRouteHandler.java @@ -163,7 +163,7 @@ public class VpnSubnetRouteHandler { } LOG.debug("{} onSubnetAddedToVpn: Creating new SubnetOpDataEntry node for subnet {} subnetIp {} " + "vpn {}", LOGGING_PREFIX, subnetId.getValue(), subnetIp, vpnName); - subOpBuilder = new SubnetOpDataEntryBuilder().setKey(new SubnetOpDataEntryKey(subnetId)); + subOpBuilder = new SubnetOpDataEntryBuilder().withKey(new SubnetOpDataEntryKey(subnetId)); subOpBuilder.setSubnetId(subnetId); subOpBuilder.setSubnetCidr(subnetIp); String primaryRd = VpnUtil.getPrimaryRd(dataBroker, vpnName); @@ -203,7 +203,7 @@ public class VpnSubnetRouteHandler { optionalSubs = VpnUtil.read(dataBroker, LogicalDatastoreType.OPERATIONAL, subOpIdentifier); subOpBuilder = - new SubnetOpDataEntryBuilder(optionalSubs.get()).setKey(new SubnetOpDataEntryKey(subnetId)); + new SubnetOpDataEntryBuilder(optionalSubs.get()).withKey(new SubnetOpDataEntryKey(subnetId)); List portList = subMap.getPortList(); if (portList != null) { for (Uuid port : portList) { diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java index 51b4352572..bbc9e89b79 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/VpnUtil.java @@ -288,7 +288,7 @@ public final class VpnUtil { static VpnInterfaceOpDataEntry getVpnInterfaceOpDataEntry(String intfName, String vpnName, AdjacenciesOp aug, BigInteger dpnId, Boolean isSheduledForRemove, long lportTag, String gwMac) { - return new VpnInterfaceOpDataEntryBuilder().setKey(new VpnInterfaceOpDataEntryKey(intfName, vpnName)) + return new VpnInterfaceOpDataEntryBuilder().withKey(new VpnInterfaceOpDataEntryKey(intfName, vpnName)) .setDpnId(dpnId).setScheduledForRemove(isSheduledForRemove).addAugmentation(AdjacenciesOp.class, aug) .setLportTag(lportTag).setGatewayMacAddress(gwMac).build(); } @@ -318,7 +318,7 @@ public final class VpnUtil { } static VpnIds getPrefixToInterface(long vpnId) { - return new VpnIdsBuilder().setKey(new VpnIdsKey(vpnId)).setVpnId(vpnId).build(); + return new VpnIdsBuilder().withKey(new VpnIdsKey(vpnId)).setVpnId(vpnId).build(); } static Prefixes getPrefixToInterface(BigInteger dpId, String vpnInterfaceName, String ipPrefix, Uuid subnetId, @@ -473,7 +473,7 @@ public final class VpnUtil { } static AllocatedRdsBuilder getRdsBuilder(String nexthop, String rd) { - return new AllocatedRdsBuilder().setKey(new AllocatedRdsKey(nexthop)).setNexthop(nexthop).setRd(rd); + return new AllocatedRdsBuilder().withKey(new AllocatedRdsKey(nexthop)).setNexthop(nexthop).setRd(rd); } static Adjacencies getVpnInterfaceAugmentation(List nextHopList) { @@ -638,7 +638,7 @@ public final class VpnUtil { for (VrfEntry vrfEntry : vrfTables.getVrfEntry()) { if (origin == RouteOrigin.value(vrfEntry.getOrigin())) { tx.delete(LogicalDatastoreType.CONFIGURATION, - vpnVrfTableIid.child(VrfEntry.class, vrfEntry.getKey())); + vpnVrfTableIid.child(VrfEntry.class, vrfEntry.key())); } } }), LOG, "Error removing VRF entries by origin"); @@ -670,7 +670,7 @@ public final class VpnUtil { new ManagedNewTransactionRunnerImpl(broker).callWithNewWriteOnlyTransactionAndSubmit(tx -> { for (VrfEntry vrfEntry : vrfEntries) { tx.delete(LogicalDatastoreType.CONFIGURATION, - vpnVrfTableIid.child(VrfEntry.class, vrfEntry.getKey())); + vpnVrfTableIid.child(VrfEntry.class, vrfEntry.key())); } }), LOG, "Error removing VRF entries"); } @@ -757,7 +757,7 @@ public final class VpnUtil { } static RouterInterface getRouterInterface(String interfaceName, String routerName) { - return new RouterInterfaceBuilder().setKey(new RouterInterfaceKey(interfaceName)) + return new RouterInterfaceBuilder().withKey(new RouterInterfaceKey(interfaceName)) .setInterfaceName(interfaceName).setRouterName(routerName).build(); } @@ -980,7 +980,7 @@ public final class VpnUtil { InstanceIdentifier interfaceId = VpnUtil.getVpnInterfaceOpDataEntryIdentifier(interfaceName, vpnInstanceName); VpnInterfaceOpDataEntry interfaceToUpdate = - new VpnInterfaceOpDataEntryBuilder().setKey(new VpnInterfaceOpDataEntryKey(interfaceName, + new VpnInterfaceOpDataEntryBuilder().withKey(new VpnInterfaceOpDataEntryKey(interfaceName, vpnInstanceName)).setName(interfaceName).setDpnId(dpnId).setVpnInstanceName(vpnInstanceName) .setScheduledForRemove(isScheduledToRemove).build(); if (writeOperTxn != null) { @@ -995,7 +995,7 @@ public final class VpnUtil { synchronized ((vpnName + fixedIp).intern()) { InstanceIdentifier id = buildLearntVpnVipToPortIdentifier(vpnName, fixedIp); LearntVpnVipToPortBuilder builder = - new LearntVpnVipToPortBuilder().setKey(new LearntVpnVipToPortKey(fixedIp, vpnName)).setVpnName( + new LearntVpnVipToPortBuilder().withKey(new LearntVpnVipToPortKey(fixedIp, vpnName)).setVpnName( vpnName).setPortFixedip(fixedIp).setPortName(portName) .setMacAddress(macAddress.toLowerCase(Locale.getDefault())) .setCreationTime(new SimpleDateFormat("MM/dd/yyyy h:mm:ss a").format(new Date())); @@ -1036,7 +1036,7 @@ public final class VpnUtil { String eventId = MicroTimestamp.INSTANCE.get(); InstanceIdentifier id = buildLearntVpnVipToPortEventIdentifier(eventId); - LearntVpnVipToPortEventBuilder builder = new LearntVpnVipToPortEventBuilder().setKey( + LearntVpnVipToPortEventBuilder builder = new LearntVpnVipToPortEventBuilder().withKey( new LearntVpnVipToPortEventKey(eventId)).setVpnName(vpnName).setSrcFixedip(srcIp) .setDestFixedip(destIP).setPortName(portName) .setMacAddress(macAddress.toLowerCase(Locale.getDefault())).setEventAction(action); @@ -1657,8 +1657,8 @@ public final class VpnUtil { } static Boolean getIsExternal(Network network) { - return network.getAugmentation(NetworkL3Extension.class) != null - && network.getAugmentation(NetworkL3Extension.class).isExternal(); + return network.augmentation(NetworkL3Extension.class) != null + && network.augmentation(NetworkL3Extension.class).isExternal(); } @SuppressWarnings("checkstyle:linelength") @@ -1912,7 +1912,7 @@ public final class VpnUtil { public static ListenableFuture unsetScheduledToRemoveForVpnInterface(ManagedNewTransactionRunner txRunner, String interfaceName) { - VpnInterfaceBuilder builder = new VpnInterfaceBuilder().setKey(new VpnInterfaceKey(interfaceName)) + VpnInterfaceBuilder builder = new VpnInterfaceBuilder().withKey(new VpnInterfaceKey(interfaceName)) .setScheduledForRemove(false); return txRunner.callWithNewWriteOnlyTransactionAndSubmit(tx -> tx.merge(LogicalDatastoreType.OPERATIONAL, VpnUtil.getVpnInterfaceIdentifier(interfaceName), builder.build(), @@ -2025,7 +2025,7 @@ public final class VpnUtil { if (!elanInterfaceList.contains(routerInterfacePortId)) { elanInterfaceList.add(routerInterfacePortId); dpnInterface = new DpnInterfacesBuilder().setDpId(dpnId).setInterfaces(elanInterfaceList) - .setKey(new DpnInterfacesKey(dpnId)).build(); + .withKey(new DpnInterfacesKey(dpnId)).build(); VpnUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId, dpnInterface); } @@ -2053,7 +2053,7 @@ public final class VpnUtil { } elanInterfaceList.remove(routerInterfacePortId); dpnInterface = new DpnInterfacesBuilder().setDpId(dpnId).setInterfaces(elanInterfaceList) - .setKey(new DpnInterfacesKey(dpnId)).build(); + .withKey(new DpnInterfacesKey(dpnId)).build(); VpnUtil.syncWrite(dataBroker, LogicalDatastoreType.OPERATIONAL, elanDpnInterfaceId, dpnInterface); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java index 8256b715f0..fea4029cc0 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/IVpnLinkServiceImpl.java @@ -167,7 +167,7 @@ public class IVpnLinkServiceImpl implements IVpnLinkService, AutoCloseable { String leakedOrigin = forcedOrigin != null ? forcedOrigin.getValue() : RouteOrigin.INTERVPN.getValue(); FibHelper.buildRoutePath(endpointIp, label); VrfEntry newVrfEntry = - new VrfEntryBuilder().setKey(new VrfEntryKey(prefix)).setDestPrefix(prefix) + new VrfEntryBuilder().withKey(new VrfEntryKey(prefix)).setDestPrefix(prefix) .setRoutePaths(Collections.singletonList(FibHelper.buildRoutePath(endpointIp, label))) .setOrigin(leakedOrigin).build(); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java index 0034b61564..5ce47217c5 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkListener.java @@ -152,7 +152,7 @@ public class InterVpnLinkListener extends AsyncDataTreeChangeListenerBase firstDpnList, List secondDpnList) { - String ivpnLinkName = interVpnLinkState.getKey().getInterVpnLinkName(); + String ivpnLinkName = interVpnLinkState.key().getInterVpnLinkName(); Optional optVpnLink = interVpnLinkCache.getInterVpnLinkByName(ivpnLinkName); if (!optVpnLink.isPresent()) { LOG.warn("installLPortDispatcherTable: Could not find interVpnLink {}", ivpnLinkName); diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java index 0c9635da7a..80464cf074 100755 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/InterVpnLinkUtil.java @@ -219,7 +219,7 @@ public final class InterVpnLinkUtil { interVpnLinkCache.addInterVpnLinkStateToCaches(newVpnLinkState); } else { InterVpnLinkState newIVpnLinkState = - new InterVpnLinkStateBuilder().setKey(new InterVpnLinkStateKey(vpnLinkName)) + new InterVpnLinkStateBuilder().withKey(new InterVpnLinkStateKey(vpnLinkName)) .setInterVpnLinkName(vpnLinkName) .setFirstEndpointState(newFirstEndpointState) .setSecondEndpointState(newSecondEndpointState) diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java index 6324cb0527..6d6a9d8900 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverMplsGrePopulator.java @@ -129,7 +129,7 @@ public class L3vpnOverMplsGrePopulator extends L3vpnPopulator { : nextHopIp == null ? Collections.emptyList() : Collections.singletonList(nextHopIp); return new AdjacencyBuilder(nextHop).setLabel(label).setNextHopIpList(nextHopList) - .setIpAddress(prefix).setVrfId(rd).setKey(new AdjacencyKey(prefix)) + .setIpAddress(prefix).setVrfId(rd).withKey(new AdjacencyKey(prefix)) .setAdjacencyType(nextHop.getAdjacencyType()) .setSubnetGatewayMacAddress(nextHop.getSubnetGatewayMacAddress()).build(); } diff --git a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java index ea627fcb68..f6af25d745 100644 --- a/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java +++ b/vpnmanager/impl/src/main/java/org/opendaylight/netvirt/vpnmanager/populator/impl/L3vpnOverVxlanPopulator.java @@ -82,7 +82,7 @@ public class L3vpnOverVxlanPopulator extends L3vpnPopulator { : nextHopIp == null ? Collections.emptyList() : Collections.singletonList(nextHopIp); return new AdjacencyBuilder(nextHop).setNextHopIpList(nextHopList).setIpAddress(prefix).setVrfId(rd) - .setKey(new AdjacencyKey(prefix)).setAdjacencyType(nextHop.getAdjacencyType()) + .withKey(new AdjacencyKey(prefix)).setAdjacencyType(nextHop.getAdjacencyType()) .setSubnetGatewayMacAddress(nextHop.getSubnetGatewayMacAddress()).build(); } } diff --git a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java index e13ce2e847..2c047e672e 100644 --- a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java +++ b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/intervpnlink/L3VpnTestCatalog.java @@ -58,7 +58,7 @@ public final class L3VpnTestCatalog { static List makeVpnTargetsByType(List rtList, VpnTarget.VrfRTType type) { return rtList.stream() - .map(rt -> new VpnTargetBuilder().setKey(new VpnTargetKey(rt)) + .map(rt -> new VpnTargetBuilder().withKey(new VpnTargetKey(rt)) .setVrfRTValue(rt).setVrfRTType(type).build()) .collect(Collectors.toList()); } diff --git a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java index d27037f1bb..241fd9ae67 100644 --- a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java +++ b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/SubnetOpDpnManagerTest.java @@ -92,9 +92,9 @@ public class SubnetOpDpnManagerTest { List vpnInterfaces = new ArrayList<>(); List subnetIdList = new ArrayList<>(); subnetIdList.add(subnetId); - subnetToDpn = new SubnetToDpnBuilder().setDpnId(dpId).setKey(new SubnetToDpnKey(dpId)).setVpnInterfaces( + subnetToDpn = new SubnetToDpnBuilder().setDpnId(dpId).withKey(new SubnetToDpnKey(dpId)).setVpnInterfaces( vpnInterfaces).build(); - portOp = new PortOpDataEntryBuilder().setDpnId(dpId).setKey(new PortOpDataEntryKey(infName)).setSubnetIds( + portOp = new PortOpDataEntryBuilder().setDpnId(dpId).withKey(new PortOpDataEntryKey(infName)).setSubnetIds( subnetIdList).setPortId(portId).build(); doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction(); doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction(); diff --git a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java index 76adec26a5..7b271926d7 100644 --- a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java +++ b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnServiceTest.java @@ -49,9 +49,9 @@ public class VpnServiceTest { List vpnTargetList = new ArrayList<>(); - VpnTarget vpneRTarget = new VpnTargetBuilder().setKey(new VpnTargetKey("100:1")).setVrfRTValue("100:1") + VpnTarget vpneRTarget = new VpnTargetBuilder().withKey(new VpnTargetKey("100:1")).setVrfRTValue("100:1") .setVrfRTType(VpnTarget.VrfRTType.ExportExtcommunity).build(); - VpnTarget vpniRTarget = new VpnTargetBuilder().setKey(new VpnTargetKey("100:2")).setVrfRTValue("100:2") + VpnTarget vpniRTarget = new VpnTargetBuilder().withKey(new VpnTargetKey("100:2")).setVrfRTValue("100:2") .setVrfRTType(VpnTarget.VrfRTType.ImportExtcommunity).build(); vpnTargetList.add(vpneRTarget); @@ -64,7 +64,7 @@ public class VpnServiceTest { new PerRouteBuilder().setApplyLabelPerRoute(true).build()).build()).build(); VpnInstanceBuilder builder = - new VpnInstanceBuilder().setKey(new VpnInstanceKey("Vpn1")).setIpv4Family(ipv4Family); + new VpnInstanceBuilder().withKey(new VpnInstanceKey("Vpn1")).setIpv4Family(ipv4Family); VpnInstance instance = builder.build(); //TODO: Need to enhance the test case to handle ds read/write ops //vpnManager.onDataChanged(event); diff --git a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java index 23bd70ba15..c436e8d8ca 100644 --- a/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java +++ b/vpnmanager/impl/src/test/java/org/opendaylight/netvirt/vpnmanager/test/VpnSubnetRouteHandlerTest.java @@ -254,7 +254,7 @@ public class VpnSubnetRouteHandlerTest { longId = Long.valueOf("100"); nodeConnectorId = buildNodeConnectorId(dpId, 2L); ipAddress = IpAddressBuilder.getDefaultInstance(nexthopIp); - vpnIntfaces = new VpnInterfacesBuilder().setInterfaceName(interfaceName).setKey( + vpnIntfaces = new VpnInterfacesBuilder().setInterfaceName(interfaceName).withKey( new VpnInterfacesKey(interfaceName)).build(); List vpnInterfaces = new ArrayList<>(); final List subToDpn = new ArrayList<>(); @@ -265,9 +265,9 @@ public class VpnSubnetRouteHandlerTest { subnetIdList.add(subnetId); vpnInterfaces.add(vpnIntfaces); lowerLayerIfList.add(nodeConnectorId.getValue()); - portOp = new PortOpDataEntryBuilder().setDpnId(dpId).setKey(new PortOpDataEntryKey(tenantId.getValue())) + portOp = new PortOpDataEntryBuilder().setDpnId(dpId).withKey(new PortOpDataEntryKey(tenantId.getValue())) .setSubnetIds(subnetIdList).setPortId(tenantId.getValue()).build(); - subnetToDpn = new SubnetToDpnBuilder().setDpnId(dpId).setKey(new SubnetToDpnKey(dpId)).setVpnInterfaces( + subnetToDpn = new SubnetToDpnBuilder().setDpnId(dpId).withKey(new SubnetToDpnKey(dpId)).setVpnInterfaces( vpnInterfaces).build(); allocateIdOutput = new AllocateIdOutputBuilder().setIdValue(longId).build(); allocateIdInput = new AllocateIdInputBuilder().setPoolName(poolName).setIdKey(idKey).build(); @@ -280,30 +280,30 @@ public class VpnSubnetRouteHandlerTest { ifaceBuilder.setLowerLayerIf(lowerLayerIfList).setType(L2vlan.class) .setAdminStatus(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.interfaces.rev140508 .interfaces.state.Interface.AdminStatus.Up).setOperStatus(Interface.OperStatus.Up) - .setIfIndex(100).setKey(new InterfaceKey(interfaceName)).setName(interfaceName) + .setIfIndex(100).withKey(new InterfaceKey(interfaceName)).setName(interfaceName) .setPhysAddress(org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715 .PhysAddress.getDefaultInstance("AA:AA:AA:AA:AA:AA")); stateInterface = ifaceBuilder.build(); subnetOp = new SubnetOpDataEntryBuilder().setElanTag(elanTag).setNhDpnId(dpId).setSubnetCidr(subnetIp) - .setSubnetId(subnetId).setKey(new SubnetOpDataEntryKey(subnetId)).setVpnName(interfaceName) + .setSubnetId(subnetId).withKey(new SubnetOpDataEntryKey(subnetId)).setVpnName(interfaceName) .setVrfId(primaryRd).setSubnetToDpn(subToDpn).setRouteAdvState(TaskState.Advertised).build(); vpnInstance = new VpnInstanceBuilder().setVpnId(elanTag).setVpnInstanceName(interfaceName) - .setVrfId(interfaceName).setKey(new VpnInstanceKey(interfaceName)).build(); - subnetmap = new SubnetmapBuilder().setSubnetIp(subnetIp).setId(subnetId).setNetworkId(portId).setKey(new + .setVrfId(interfaceName).withKey(new VpnInstanceKey(interfaceName)).build(); + subnetmap = new SubnetmapBuilder().setSubnetIp(subnetIp).setId(subnetId).setNetworkId(portId).withKey(new SubnetmapKey(subnetId)).setRouterId(portId).setVpnId(subnetId) .setTenantId(tenantId).setPortList(portList).build(); portOpData = new PortOpDataBuilder().setPortOpDataEntry(listPortOpDataEntry).build(); - dpntePsInfo = new DPNTEPsInfoBuilder().setDPNID(dpId).setUp(true).setKey(new DPNTEPsInfoKey(dpId)) + dpntePsInfo = new DPNTEPsInfoBuilder().setDPNID(dpId).setUp(true).withKey(new DPNTEPsInfoKey(dpId)) .setTunnelEndPoints(tunnelEndPoints).build(); tunlEndPts = new TunnelEndPointsBuilder().setInterfaceName(interfaceName).setVLANID(10).setIpAddress(ipAddress).build(); tunnelEndPoints.add(tunlEndPts); ipv4Family = new Ipv4FamilyBuilder().setRouteDistinguisher(routeDistinguishers).build(); vpnInstnce = new org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances - .VpnInstanceBuilder().setKey(new org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn + .VpnInstanceBuilder().withKey(new org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn .rev140815.vpn.instances.VpnInstanceKey(interfaceName)).setVpnInstanceName(interfaceName) .setIpv4Family(ipv4Family).build(); - networks = new NetworksBuilder().setId(portId).setKey(new NetworksKey(portId)).build(); + networks = new NetworksBuilder().setId(portId).withKey(new NetworksKey(portId)).build(); doReturn(mockReadTx).when(dataBroker).newReadOnlyTransaction(); doReturn(mockWriteTx).when(dataBroker).newWriteOnlyTransaction(); doReturn(Futures.immediateCheckedFuture(null)).when(mockWriteTx).submit(); diff --git a/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java index 7105d7cbbc..de7f96a4d4 100644 --- a/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java +++ b/vpnmanager/shell/src/main/java/org/opendaylight/netvirt/vpnmanager/shell/ShowVpnInstanceOpData.java @@ -81,7 +81,7 @@ public class ShowVpnInstanceOpData extends OsgiCommandSupport { } session.getConsole().println( "VpnInstanceName: " + check.getVpnInstanceName() + "\nVpnId: " + check.getVpnId() + "\nVrfId: " - + check.getVrfId() + "\nKey: " + check.getKey() + "\nVpnInterfaceCount: " + + check.getVrfId() + "\nKey: " + check.key() + "\nVpnInterfaceCount: " + intfCount + "\nVpnToDpnList: " + check.getVpnToDpnList() + "\n"); session.getConsole().println( "------------------------------------------------------------------------------");