From: Michael Vorburger <vorburger@redhat.com>
Date: Mon, 4 Jun 2018 15:26:46 +0000 (+0000)
Subject: Merge "Fixup Augmentable and Identifiable methods changing"
X-Git-Tag: release/fluorine~26
X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=4549f7fe749544738e9d6ba9aee1736765bc8dcc;p=neutron.git

Merge "Fixup Augmentable and Identifiable methods changing"
---

4549f7fe749544738e9d6ba9aee1736765bc8dcc
diff --cc transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
index 8e9894e0c,6a36f5351..d1d36a964
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
@@@ -63,12 -63,11 +63,12 @@@ public final class NeutronNetworkInterf
          result.initDefaults();
          fromMdAdminAttributes(network, result);
          result.setShared(network.isShared());
 +        result.setVlanTransparent(network.isVlanTransparent());
  
-         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()));