From 15855deac51c12fca196951ee06e5bba425b51a3 Mon Sep 17 00:00:00 2001 From: Stephen Kitt Date: Thu, 31 May 2018 16:20:03 +0200 Subject: [PATCH] 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: I449489503c6c9811b7b1fe97eabbe37b46ab7473 JIRA: TSC-101 Signed-off-by: Stephen Kitt --- .../neutron/hostconfig/utils/NeutronHostconfigUtils.java | 2 +- .../hostconfig/vpp/NeutronHostconfigVppListener.java | 4 ++-- .../neutron/transcriber/AbstractTranscriberInterface.java | 2 +- .../transcriber/NeutronLoadBalancerPoolInterface.java | 6 +++--- .../neutron/transcriber/NeutronNetworkInterface.java | 6 +++--- .../neutron/transcriber/NeutronPortInterface.java | 6 +++--- .../transcriber/NeutronSFCFlowClassifierInterface.java | 2 +- .../neutron/transcriber/NeutronSFCPortChainInterface.java | 2 +- .../neutron/transcriber/NeutronSFCPortPairInterface.java | 2 +- .../neutron/transcriber/NeutronTapFlowInterface.java | 2 +- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/neutron-hostconfig/utils/src/main/java/org/opendaylight/neutron/hostconfig/utils/NeutronHostconfigUtils.java b/neutron-hostconfig/utils/src/main/java/org/opendaylight/neutron/hostconfig/utils/NeutronHostconfigUtils.java index c42aa0d40..b8090a263 100644 --- a/neutron-hostconfig/utils/src/main/java/org/opendaylight/neutron/hostconfig/utils/NeutronHostconfigUtils.java +++ b/neutron-hostconfig/utils/src/main/java/org/opendaylight/neutron/hostconfig/utils/NeutronHostconfigUtils.java @@ -75,6 +75,6 @@ public class NeutronHostconfigUtils { 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/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java index 205ac3542..c9aca8ea5 100644 --- a/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java +++ b/neutron-hostconfig/vpp/src/main/java/org/opendaylight/neutron/hostconfig/vpp/NeutronHostconfigVppListener.java @@ -127,7 +127,7 @@ public class NeutronHostconfigVppListener implements ClusteredDataTreeChangeList private void updateHostConfig(Node node, NeutronHostconfigUtils.Action action) { for (Map.Entry entry : HostconfigUtil.createHostconfigsDataFor(node.getNodeId(), socketInfo) .entrySet()) { - LOG.info("Updating hostconfig for node {}. Action: {}.", node.getKey(), action); + LOG.info("Updating hostconfig for node {}. Action: {}.", node.key(), action); neutronHostconfig.updateMdsal(neutronHostconfig.buildHostConfigInfo(node.getNodeId().getValue(), entry.getKey(), entry.getValue()), action); } @@ -135,7 +135,7 @@ public class NeutronHostconfigVppListener implements ClusteredDataTreeChangeList private boolean validateVppNode(Node node) { LOG.info("Registering new node {}", node.getNodeId().getValue()); - NetconfNode netconfNode = node.getAugmentation(NetconfNode.class); + NetconfNode netconfNode = node.augmentation(NetconfNode.class); if (netconfNode == null) { LOG.warn("Node {} is not a netconf device", node.getNodeId().getValue()); return false; diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java index 47083adbc..9caa30df7 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/AbstractTranscriberInterface.java @@ -173,7 +173,7 @@ public abstract class AbstractTranscriberInterface< } private InstanceIdentifier createInstanceIdentifier(T item) { - return InstanceIdentifier.create(mdParentClass).child(mdContainerClass).child(mdListClass, item.getKey()); + return InstanceIdentifier.create(mdParentClass).child(mdContainerClass).child(mdListClass, item.key()); } private InstanceIdentifier createInstanceIdentifier() { diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java index f608e850f..2f2090e38 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java @@ -215,12 +215,12 @@ public final class NeutronLoadBalancerPoolInterface } protected InstanceIdentifier createMemberInstanceIdentifier(Pool pool, Member item) { - return InstanceIdentifier.create(Neutron.class).child(Pools.class).child(Pool.class, pool.getKey()) - .child(Members.class).child(Member.class, item.getKey()); + return InstanceIdentifier.create(Neutron.class).child(Pools.class).child(Pool.class, pool.key()) + .child(Members.class).child(Member.class, item.key()); } protected InstanceIdentifier createMembersInstanceIdentifier(Pool pool) { - return InstanceIdentifier.create(Neutron.class).child(Pools.class).child(Pool.class, pool.getKey()) + return InstanceIdentifier.create(Neutron.class).child(Pools.class).child(Pool.class, pool.key()) .child(Members.class); } diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java index 7075e7221..6a36f5351 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java @@ -64,10 +64,10 @@ public final class NeutronNetworkInterface fromMdAdminAttributes(network, result); result.setShared(network.isShared()); - final NetworkL3Extension l3Extension = network.getAugmentation(NetworkL3Extension.class); + final NetworkL3Extension l3Extension = network.augmentation(NetworkL3Extension.class); result.setRouterExternal(l3Extension.isExternal()); - final NetworkProviderExtension providerExtension = network.getAugmentation(NetworkProviderExtension.class); + final NetworkProviderExtension providerExtension = network.augmentation(NetworkProviderExtension.class); result.setProviderPhysicalNetwork(providerExtension.getPhysicalNetwork()); result.setProviderSegmentationID(providerExtension.getSegmentationId()); result.setProviderNetworkType(NETWORK_MAP.get(providerExtension.getNetworkType())); @@ -81,7 +81,7 @@ public final class NeutronNetworkInterface segments.add(neutronSegment); } } - final QosNetworkExtension qos = network.getAugmentation(QosNetworkExtension.class); + final QosNetworkExtension qos = network.augmentation(QosNetworkExtension.class); if (qos != null && qos.getQosPolicyId() != null) { result.setQosPolicyId(qos.getQosPolicyId().getValue()); } diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java index c7b6ab9ee..2dfbcb617 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java @@ -72,7 +72,7 @@ public final class NeutronPortInterface extends AbstractNeutronInterface details = new HashMap<>(binding.getVifDetails().size()); @@ -87,14 +87,14 @@ public final class NeutronPortInterface extends AbstractNeutronInterface l7Params = new ArrayList<>(); for (String paramKey : neutronClassifier.getL7Parameters().keySet()) { L7ParameterBuilder param = new L7ParameterBuilder(); - param.setKey(new L7ParameterKey(paramKey)); + param.withKey(new L7ParameterKey(paramKey)); param.setMatchParameter(paramKey); param.setMatchParameterValue(neutronClassifier.getL7Parameters().get(paramKey)); l7Params.add(param.build()); diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortChainInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortChainInterface.java index 2fa86e713..78a11adf3 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortChainInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortChainInterface.java @@ -73,7 +73,7 @@ public final class NeutronSFCPortChainInterface List chainParams = new ArrayList<>(); for (String paramKey : neutronPortChain.getChainParameters().keySet()) { ChainParametersBuilder param = new ChainParametersBuilder(); - param.setKey(new ChainParametersKey(paramKey)); + param.withKey(new ChainParametersKey(paramKey)); param.setChainParameter(paramKey); param.setChainParameterValue(neutronPortChain.getChainParameters().get(paramKey)); chainParams.add(param.build()); diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortPairInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortPairInterface.java index 72ffc97a7..fd09327a2 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortPairInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortPairInterface.java @@ -60,7 +60,7 @@ public final class NeutronSFCPortPairInterface List serviceFunctionParams = new ArrayList<>(); for (String paramKey : neutronPortPair.getServiceFunctionParameters().keySet()) { ServiceFunctionParametersBuilder param = new ServiceFunctionParametersBuilder(); - param.setKey(new ServiceFunctionParametersKey(paramKey)); + param.withKey(new ServiceFunctionParametersKey(paramKey)); param.setServiceFunctionParameter(paramKey); param.setServiceFunctionParameterValue(neutronPortPair.getServiceFunctionParameters().get(paramKey)); serviceFunctionParams.add(param.build()); diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTapFlowInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTapFlowInterface.java index 39ff112a4..39b0a88f5 100644 --- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTapFlowInterface.java +++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTapFlowInterface.java @@ -60,7 +60,7 @@ public final class NeutronTapFlowInterface return InstanceIdentifier.create(Neutron.class) .child(TapServices.class) .child(TapService.class, new TapServiceKey(toUuid(tapServiceUUID))) - .child(TapFlows.class).child(TapFlow.class, item.getKey()); + .child(TapFlows.class).child(TapFlow.class, item.key()); } @Override -- 2.36.6