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 <skitt@redhat.com>

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 c42aa0d4020488fd221f873181b8361366937782..b8090a263e239095dc954ff349f25bf1c36f1bfb 100644 (file)
--- 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<Hostconfig> 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 205ac3542a28b076c4b58616a3b546b184acef54..c9aca8ea51c67a2e5e77dcb3a3e993a5820955dd 100644 (file)
--- 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<String, String> 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 47083adbc91f2c12a934e005212c21b15587d2fa..9caa30df7bfa252eac1c5fe3d651159d18524635 100644 (file)
--- 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<T> 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<U> 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 f608e850f2954132967683b8c1f0e1ba9341775b..2f2090e388beb9b259fdf33433a5c8b52b4df798 100644 (file)
--- 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<Member> 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<Members> 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 7075e7221bf08a4cd5ac38031036a12953cb9c37..6a36f5351fabdfa71a852f5e6f85f17c1114eb1a 100644 (file)
--- 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 c7b6ab9ee3507df981df979577e15c0de29ec0bf..2dfbcb6172a087f5d9a2b4e0f4d87965277d8d54 100644 (file)
--- 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<Port, P
     }
 
     protected void addExtensions(Port port, NeutronPort result) {
-        final PortBindingExtension binding = port.getAugmentation(PortBindingExtension.class);
+        final PortBindingExtension binding = port.augmentation(PortBindingExtension.class);
         result.setBindinghostID(binding.getHostId());
         if (binding.getVifDetails() != null) {
             final Map<String, String> details = new HashMap<>(binding.getVifDetails().size());
@@ -87,14 +87,14 @@ public final class NeutronPortInterface extends AbstractNeutronInterface<Port, P
     }
 
     private void portSecurityExtension(Port port, NeutronPort result) {
-        final PortSecurityExtension portSecurity = port.getAugmentation(PortSecurityExtension.class);
+        final PortSecurityExtension portSecurity = port.augmentation(PortSecurityExtension.class);
         if (portSecurity != null && portSecurity.isPortSecurityEnabled() != null) {
             result.setPortSecurityEnabled(portSecurity.isPortSecurityEnabled());
         }
     }
 
     private void qosExtension(Port port, NeutronPort result) {
-        final QosPortExtension qos = port.getAugmentation(QosPortExtension.class);
+        final QosPortExtension qos = port.augmentation(QosPortExtension.class);
         if (qos != null && qos.getQosPolicyId() != null) {
             result.setQosPolicyId(qos.getQosPolicyId().getValue());
         }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
index c6d6356e653d032a5325de5dfdfade45d497fdbe..fa1d03d3ed13d2015786ecabec77dc665a673ece 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
@@ -116,7 +116,7 @@ public final class NeutronSFCFlowClassifierInterface
             List<L7Parameter> 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 2fa86e7133f901376df7322bb021a77ca73ec985..78a11adf3087356b9636e453cafad78a7145d74d 100644 (file)
--- 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<ChainParameters> 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 72ffc97a743fd748d8d68ba383921e0abac39012..fd09327a24630922b032e4d996362ee7fa2f7d1b 100644 (file)
--- 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<ServiceFunctionParameters> 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 39ff112a46d7b808fbccf443e4b92426c9a9a21d..39b0a88f56f2ee8d08ccf5ee6fc538f0929f2588 100644 (file)
--- 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