Bump MRI upstreams

Adopt:
- odlparent-9.0.2
- infrautils-2.0.2
- mdsal-8.0.0
- controller-4.0.0
- aaa-0.14.0
- netconf-2.0.0

Change-Id: I2d273ff67ee4b9557580ad57b6c9377dd8e75ef2
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>

diff --git a/artifacts/pom.xml b/artifacts/pom.xml
index 4c25f571c8f5f9818bf8a449fcec741ccb697a3a..096b3f4f60d5a317f7a314afccc16a12e2a6d675 100644 (file)
--- a/artifacts/pom.xml
+++ b/artifacts/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>odlparent-lite</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/parent/pom.xml b/features/parent/pom.xml
index 97f006722b0eeb725fcc4bad3f9a0c3556aa3645..e89bc28e1116cc590c9c6fba23d4a450d2848ba4 100644 (file)
--- a/features/parent/pom.xml
+++ b/features/parent/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>single-feature-parent</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/production/odl-neutron-hostconfig-ovs/pom.xml b/features/production/odl-neutron-hostconfig-ovs/pom.xml
index 8758c38246ff33c3622dd89c82b2818076d244f5..3615044014f97559ed15f694ecc950e1522650ea 100644 (file)
--- a/features/production/odl-neutron-hostconfig-ovs/pom.xml
+++ b/features/production/odl-neutron-hostconfig-ovs/pom.xml
@@ -51,7 +51,7 @@
             <artifactId>odl-aaa-cert</artifactId>
             <type>xml</type>
             <classifier>features</classifier>
-            <version>0.13.2</version>
+            <version>0.14.0</version>
         </dependency>
         <dependency>
             <groupId>${project.groupId}</groupId>

diff --git a/features/production/odl-neutron-hostconfig-ovs/src/main/feature/feature.xml b/features/production/odl-neutron-hostconfig-ovs/src/main/feature/feature.xml
index 2964b8368bb3c753a7165cd624e025c799443590..d03fea3292628c87b9022de9dbbd13dc29ed9183 100644 (file)
--- a/features/production/odl-neutron-hostconfig-ovs/src/main/feature/feature.xml
+++ b/features/production/odl-neutron-hostconfig-ovs/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="odl-neutron-hostconfig-ovs-${project.version}">
     <feature name="odl-neutron-hostconfig-ovs">
-        <feature version="[0.13,1)">odl-aaa-cert</feature>
+        <feature version="[0.14,1)">odl-aaa-cert</feature>
     </feature>
 </features>

diff --git a/features/production/odl-neutron-model/src/main/feature/feature.xml b/features/production/odl-neutron-model/src/main/feature/feature.xml
index 9e404ba6620d04c1afabefdcd1fc868e8ada8ced..7a555b8fdd48917173554b3ff858ecc86641d065 100644 (file)
--- a/features/production/odl-neutron-model/src/main/feature/feature.xml
+++ b/features/production/odl-neutron-model/src/main/feature/feature.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="odl-neutron-model-${project.version}">
    <feature name="odl-neutron-model" version="${project.version}">
-     <feature version="[7,8)">odl-mdsal-model-rfc6991</feature>
+     <feature version="[8,9)">odl-mdsal-model-rfc6991</feature>
    </feature>
 </features>

diff --git a/features/production/odl-neutron-northbound-api/src/main/feature/feature.xml b/features/production/odl-neutron-northbound-api/src/main/feature/feature.xml
index 4743c12037720066b8ba3c4183e19d97598cc732..ec767b1903c32508e160716fce360a7e0678ccc9 100644 (file)
--- a/features/production/odl-neutron-northbound-api/src/main/feature/feature.xml
+++ b/features/production/odl-neutron-northbound-api/src/main/feature/feature.xml
@@ -2,8 +2,8 @@
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="odl-neutron-northbound-api-${project.version}">
     <feature name="odl-neutron-northbound-api" version="${project.version}">
         <configfile finalname="${config.configfile.directory}/${config.configfile.file}">mvn:org.opendaylight.neutron/northbound-api/${project.version}/xml/config</configfile>
-        <feature version="[0.13,1)">odl-aaa-shiro</feature>
-        <feature version="[1.9,2)">odl-infrautils-utils</feature>
-        <feature version="[1.13,2)">odl-restconf</feature>
+        <feature version="[0.14,1)">odl-aaa-shiro</feature>
+        <feature version="[2,3)">odl-infrautils-utils</feature>
+        <feature version="[2,3)">odl-restconf</feature>
     </feature>
 </features>

diff --git a/features/production/odl-neutron-spi/src/main/feature/feature.xml b/features/production/odl-neutron-spi/src/main/feature/feature.xml
index 880ed1b22014b801e2df13d929fdb8b4db0e4486..284b4e6c8da1033fdefa14db6f6ebd20cc9e64bc 100644 (file)
--- a/features/production/odl-neutron-spi/src/main/feature/feature.xml
+++ b/features/production/odl-neutron-spi/src/main/feature/feature.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <features xmlns="http://karaf.apache.org/xmlns/features/v1.2.1" name="odl-neutron-spi-${project.version}">
    <feature name="odl-neutron-spi" version="${project.version}">
-     <feature version="[8.1,9)">odl-apache-commons-net</feature>
-     <feature version="[3,4)">odl-mdsal-broker</feature>
+     <feature version="[9,10)">odl-apache-commons-net</feature>
+     <feature version="[4,5)">odl-mdsal-broker</feature>
    </feature>
 </features>

diff --git a/features/production/pom.xml b/features/production/pom.xml
index 575b84f67c15e082d4ecaee947a38c0b19ac0b6c..68994f947e7f995690596a035c26a58f76442a14 100644 (file)
--- a/features/production/pom.xml
+++ b/features/production/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/features/test/features-neutron-test/pom.xml b/features/test/features-neutron-test/pom.xml
index 5d434bcdca7cc8bad61b99870413bc04e0a17c30..a6f4644c9c3ef39c1a090d7e9de19ed0d62e2ee4 100644 (file)
--- a/features/test/features-neutron-test/pom.xml
+++ b/features/test/features-neutron-test/pom.xml
@@ -12,7 +12,7 @@
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>feature-repo-parent</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
 

diff --git a/features/test/pom.xml b/features/test/pom.xml
index 7711ae2c41036f0294c32ec4e75c7c2aaca67f16..e1604db9b01253dd330ea9cf6f24f4f7aca23b41 100644 (file)
--- a/features/test/pom.xml
+++ b/features/test/pom.xml
@@ -11,7 +11,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent-lite</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 

diff --git a/integration/test-standalone/pom.xml b/integration/test-standalone/pom.xml
index d7df7092220c48ddd088033bad24b67383ef2485..34d88ac586016da634aaebb8a7e00698da93054f 100644 (file)
--- a/integration/test-standalone/pom.xml
+++ b/integration/test-standalone/pom.xml
@@ -5,7 +5,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>bundle-parent</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 
@@ -27,21 +27,21 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>7.0.6</version>
+        <version>8.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.13.2</version>
+        <version>0.14.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.9.6</version>
+        <version>2.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/integration/test/pom.xml b/integration/test/pom.xml
index a19bb7dd971eba82a4c7b31d750382d715566daf..f96f1ba22d4f09aa226a19f060e53d8cbfc6bf52 100644 (file)
--- a/integration/test/pom.xml
+++ b/integration/test/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.controller</groupId>
     <artifactId>mdsal-it-parent</artifactId>
-    <version>3.0.7</version>
+    <version>4.0.0</version>
     <relativePath/>
   </parent>
 

diff --git a/karaf/pom.xml b/karaf/pom.xml
index a8b12339a1f62176439fd147d241d5b93f381ff0..dd69a39a9b307569760727f7cff4829c04298f72 100644 (file)
--- a/karaf/pom.xml
+++ b/karaf/pom.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL
     <parent>
         <groupId>org.opendaylight.odlparent</groupId>
         <artifactId>karaf4-parent</artifactId>
-        <version>8.1.1</version>
+        <version>9.0.2</version>
         <relativePath/>
     </parent>
     <modelVersion>4.0.0</modelVersion>

diff --git a/neutron-hostconfig/ovs/pom.xml b/neutron-hostconfig/ovs/pom.xml
index 25772ff5a39de2ddf6e2781b615096f4f923c757..2ef0fc57ea75152db74d9d145b59af70d328b69d 100644 (file)
--- a/neutron-hostconfig/ovs/pom.xml
+++ b/neutron-hostconfig/ovs/pom.xml
@@ -55,9 +55,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/neutron-hostconfig/pom.xml b/neutron-hostconfig/pom.xml
index 3618166bf48d8d1b5b793b12b6dd5697992d87b8..c975db80e74daa8cf15a42db552c7479918c567f 100644 (file)
--- a/neutron-hostconfig/pom.xml
+++ b/neutron-hostconfig/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.odlparent</groupId>
     <artifactId>odlparent</artifactId>
-    <version>8.1.1</version>
+    <version>9.0.2</version>
     <relativePath/>
   </parent>
 

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 a838865ed3d7d5ea0c2b253cf6d2eac1b96268ea..6265c059c17a8f04ec1e264ff148ae50a972d0d6 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
@@ -10,7 +10,6 @@ package org.opendaylight.neutron.hostconfig.vpp;
 import static java.util.Objects.requireNonNull;
 
 import com.google.common.base.Preconditions;
-import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
@@ -40,7 +39,6 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.
 import org.opendaylight.yangtools.concepts.ListenerRegistration;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.QName;
-import org.opendaylight.yangtools.yang.common.Revision;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,15 +51,12 @@ public class NeutronHostconfigVppListener implements ClusteredDataTreeChangeList
     private final ExecutorService executorService = Executors.newFixedThreadPool(1);
 
     private static final TopologyId TOPOLOGY_NETCONF = new TopologyId("topology-netconf");
-    private static final QName V3PO_1704_CAPABILITY = QName.create(
-            URI.create("urn:opendaylight:params:xml:ns:yang:v3po"),
-            Revision.of("2017-03-15"), "v3po");
-    private static final QName V3PO_1701_CAPABILITY = QName.create(
-            URI.create("urn:opendaylight:params:xml:ns:yang:v3po"),
-            Revision.of("2016-12-14"), "v3po");
-    private static final QName INTERFACES_CAPABILITY =
-            QName.create(URI.create("urn:ietf:params:xml:ns:yang:ietf-interfaces"),
-                    Revision.of("2014-05-08"), "ietf-interfaces");
+    private static final QName V3PO_1704_CAPABILITY = QName.create("urn:opendaylight:params:xml:ns:yang:v3po",
+            "2017-03-15", "v3po");
+    private static final QName V3PO_1701_CAPABILITY = QName.create("urn:opendaylight:params:xml:ns:yang:v3po",
+            "2016-12-14", "v3po");
+    private static final QName INTERFACES_CAPABILITY = QName.create("urn:ietf:params:xml:ns:yang:ietf-interfaces",
+            "2014-05-08", "ietf-interfaces");
     private static final List<QName> REQUIRED_CAPABILITIES = new ArrayList<>();
     private final SocketInfo socketInfo;
 

diff --git a/neutron-logger/pom.xml b/neutron-logger/pom.xml
index 0aec31291147b5e42cadfb664bc3c7d4a096ee1a..0ede6820986180be685b4594b4e4c509f15b36e0 100644 (file)
--- a/neutron-logger/pom.xml
+++ b/neutron-logger/pom.xml
@@ -38,9 +38,8 @@
       <artifactId>slf4j-api</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/northbound-api/pom.xml b/northbound-api/pom.xml
index b7ddd7d78f9dbae0b08c053ab08ed5211c910cd4..a85a930af4f6d65ff369b46e160f2bb0890d953f 100644 (file)
--- a/northbound-api/pom.xml
+++ b/northbound-api/pom.xml
@@ -43,9 +43,8 @@
       <version>${project.version}</version>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/parent/pom.xml b/parent/pom.xml
index d9f68954e2ec3cecb6eeabc322b66c6cba1c8869..0dfb7b4d1af6b50ef829b242c2c955938905a95e 100644 (file)
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -12,7 +12,7 @@
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>7.0.6</version>
+    <version>8.0.0</version>
     <relativePath/>
   </parent>
 
@@ -39,28 +39,28 @@
       <dependency>
         <groupId>org.opendaylight.infrautils</groupId>
         <artifactId>infrautils-artifacts</artifactId>
-        <version>1.9.6</version>
+        <version>2.0.2</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.controller</groupId>
         <artifactId>controller-artifacts</artifactId>
-        <version>3.0.7</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.aaa</groupId>
         <artifactId>aaa-artifacts</artifactId>
-        <version>0.13.2</version>
+        <version>0.14.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>
       <dependency>
         <groupId>org.opendaylight.netconf</groupId>
         <artifactId>netconf-artifacts</artifactId>
-        <version>1.13.1</version>
+        <version>2.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/transcriber/pom.xml b/transcriber/pom.xml
index a24a128d97fd597b34feec2b8ec19572568236b2..9c6883f90b9548bc97d0fc89e1db2a42585d3429 100644 (file)
--- a/transcriber/pom.xml
+++ b/transcriber/pom.xml
@@ -76,9 +76,8 @@
       <artifactId>infrautils-util</artifactId>
     </dependency>
     <dependency>
-      <groupId>javax.inject</groupId>
+      <groupId>com.guicedee.services</groupId>
       <artifactId>javax.inject</artifactId>
-      <scope>provided</scope>
       <optional>true</optional>
     </dependency>
     <dependency>

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
index 1df10064622a77dc0d1d1acbe11d8ac66cb5c86d..1e6be1d94f1c0796656672f88670f1453adaec16 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronBgpvpnInterface.java
@@ -25,6 +25,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.b
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.bgpvpns.Bgpvpn;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.bgpvpns.BgpvpnBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.bgpvpns.rev150903.bgpvpns.attributes.bgpvpns.BgpvpnKey;
+import org.opendaylight.yangtools.yang.common.Uint32;
 
 @Singleton
 @Service(classes = INeutronBgpvpnCRUD.class)
@@ -115,7 +116,7 @@ public final class NeutronBgpvpnInterface extends AbstractNeutronInterface<Bgpvp
             bgpvpnBuilder.setAutoAggregate(bgpvpn.getAutoAggregate());
         }
         if (bgpvpn.getVni() != null) {
-            bgpvpnBuilder.setVni(bgpvpn.getVni());
+            bgpvpnBuilder.setVni(Uint32.valueOf(bgpvpn.getVni()));
         }
         if (bgpvpn.getType() != null) {
             final ImmutableBiMap<String, Class<? extends BgpvpnTypeBase>> mapper = BGPVPN_TYPE_MAP.inverse();

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
index 91ad68274e45ab89375865383cfac2a7ed514aa8..4ce73780bd8d91dfd6e43fbb935566326359ec1f 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronFirewallRuleInterface.java
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.rul
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.fwaas.rev150712.rules.attributes.firewall.rules.FirewallRuleKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.types.rev160517.IpPrefixOrAddress;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.types.rev160517.IpPrefixOrAddressBuilder;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 @Singleton
 @Service(classes = INeutronFirewallRuleCRUD.class)
@@ -147,16 +148,16 @@ public final class NeutronFirewallRuleInterface
             ruleBuilder.setDestinationIpAddr(ipAddress);
         }
         if (rule.getFirewallRuleSrcPortRangeMin() != null) {
-            ruleBuilder.setSourcePortRangeMin(rule.getFirewallRuleSrcPortRangeMin());
+            ruleBuilder.setSourcePortRangeMin(Uint16.valueOf(rule.getFirewallRuleSrcPortRangeMin()));
         }
         if (rule.getFirewallRuleSrcPortRangeMax() != null) {
-            ruleBuilder.setSourcePortRangeMax(rule.getFirewallRuleSrcPortRangeMax());
+            ruleBuilder.setSourcePortRangeMax(Uint16.valueOf(rule.getFirewallRuleSrcPortRangeMax()));
         }
         if (rule.getFirewallRuleDstPortRangeMin() != null) {
-            ruleBuilder.setDestinationPortRangeMin(rule.getFirewallRuleDstPortRangeMin());
+            ruleBuilder.setDestinationPortRangeMin(Uint16.valueOf(rule.getFirewallRuleDstPortRangeMin()));
         }
         if (rule.getFirewallRuleDstPortRangeMax() != null) {
-            ruleBuilder.setDestinationPortRangeMax(rule.getFirewallRuleDstPortRangeMax());
+            ruleBuilder.setDestinationPortRangeMax(Uint16.valueOf(rule.getFirewallRuleDstPortRangeMax()));
         }
         if (rule.getFirewallRulePosition() != null) {
             ruleBuilder.setPosition(rule.getFirewallRulePosition().shortValue());

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java
index 3c9c416893e84aeff5c12fb396baa6ec5e366822..7f711d7e77a171186c23f3c7dbf3cd2331865a1b 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronL2gatewayInterface.java
@@ -26,6 +26,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev15071
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateways.attributes.l2gateways.L2gateway;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateways.attributes.l2gateways.L2gatewayBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l2gateways.rev150712.l2gateways.attributes.l2gateways.L2gatewayKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 @Singleton
 @Service(classes = INeutronL2gatewayCRUD.class)
@@ -88,29 +89,27 @@ public final class NeutronL2gatewayInterface
         toMdBaseAttributes(neutronObject, l2gatewayBuilder);
 
         if (neutronObject.getNeutronL2gatewayDevices() != null) {
-            final List<Devices> devices = new ArrayList<>();
-            for (final NeutronL2gatewayDevice neutronL2gatewayDevice : neutronObject.getNeutronL2gatewayDevices()) {
-                final DevicesBuilder deviceBuilder = new DevicesBuilder();
-                final List<Interfaces> interfaces = new ArrayList<>();
-                for (final NeutronL2gatewayDeviceInterface neutronL2gatewayDeviceInterface : neutronL2gatewayDevice
-                        .getNeutronL2gatewayDeviceInterfaces()) {
-                    final InterfacesBuilder interfacesBuilder = new InterfacesBuilder();
-                    final List<Integer> segmentIds = new ArrayList<>();
-                    interfacesBuilder.setInterfaceName(neutronL2gatewayDeviceInterface.getInterfaceName());
-                    if (neutronL2gatewayDeviceInterface.getSegmentationId() != null) {
-                        for (final Integer segmentationId : neutronL2gatewayDeviceInterface.getSegmentationId()) {
-                            segmentIds.add(segmentationId);
-                        }
-                        interfacesBuilder.setSegmentationIds(segmentIds);
-                    }
-                    interfaces.add(interfacesBuilder.build());
-                }
-                deviceBuilder.setDeviceName(neutronL2gatewayDevice.getDeviceName());
-                deviceBuilder.setUuid(toUuid(neutronL2gatewayDevice.getID()));
-                deviceBuilder.setInterfaces(interfaces);
-                devices.add(deviceBuilder.build());
-            }
-            l2gatewayBuilder.setDevices(devices);
+            l2gatewayBuilder.setDevices(neutronObject.getNeutronL2gatewayDevices().stream()
+                .map(neutronL2gatewayDevice -> new DevicesBuilder()
+                    .setDeviceName(neutronL2gatewayDevice.getDeviceName())
+                    .setUuid(toUuid(neutronL2gatewayDevice.getID()))
+                    .setInterfaces(neutronL2gatewayDevice.getNeutronL2gatewayDeviceInterfaces().stream()
+                        .map(neutronL2gatewayDeviceInterface -> {
+                            final InterfacesBuilder interfacesBuilder = new InterfacesBuilder();
+                            final List<Integer> segmentIds = new ArrayList<>();
+                            interfacesBuilder.setInterfaceName(neutronL2gatewayDeviceInterface.getInterfaceName());
+                            if (neutronL2gatewayDeviceInterface.getSegmentationId() != null) {
+                                for (Integer segmentationId : neutronL2gatewayDeviceInterface.getSegmentationId()) {
+                                    segmentIds.add(segmentationId);
+                                }
+                                interfacesBuilder.setSegmentationIds(segmentIds);
+                            }
+
+                            return interfacesBuilder.build();
+                        })
+                        .collect(BindingMap.toOrderedMap()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         return l2gatewayBuilder.build();
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
index 89f6c3e3df70c1e771997634d23f7a580d0f9edc..4f6120722df68a680355cbd91c4fe21389cf5f63 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerHealthMonitorInterface.java
@@ -28,6 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.l
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.lbaas.attributes.healthmonitors.Healthmonitor;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.lbaas.attributes.healthmonitors.HealthmonitorBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.lbaas.attributes.healthmonitors.HealthmonitorKey;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 @Singleton
@@ -67,7 +68,7 @@ public final class NeutronLoadBalancerHealthMonitorInterface
             healthmonitorBuilder.setHttpMethod(healthMonitor.getLoadBalancerHealthMonitorHttpMethod());
         }
         if (healthMonitor.getLoadBalancerHealthMonitorMaxRetries() != null) {
-            healthmonitorBuilder.setMaxRetries(healthMonitor.getLoadBalancerHealthMonitorMaxRetries());
+            healthmonitorBuilder.setMaxRetries(Uint16.valueOf(healthMonitor.getLoadBalancerHealthMonitorMaxRetries()));
         }
         if (healthMonitor.getLoadBalancerHealthMonitorPools() != null) {
             final List<Uuid> listUuid = new ArrayList<>();

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 c77026c728305ef5f42e82becb007a7ed5888fe9..419b6dc59e23e128ed31f36f4a0c9bbea3c127bc 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronLoadBalancerPoolInterface.java
@@ -45,6 +45,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.lbaasv2.rev150712.p
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.OperationFailedException;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -256,13 +257,13 @@ public final class NeutronLoadBalancerPoolInterface
             memberBuilder.setAddress(ipAddress);
         }
         if (member.getPoolMemberProtoPort() != null) {
-            memberBuilder.setProtocolPort(member.getPoolMemberProtoPort());
+            memberBuilder.setProtocolPort(Uint16.valueOf(member.getPoolMemberProtoPort()));
         }
         if (member.getPoolMemberSubnetID() != null) {
             memberBuilder.setSubnetId(toUuid(member.getPoolMemberSubnetID()));
         }
         if (member.getPoolMemberWeight() != null) {
-            memberBuilder.setWeight(member.getPoolMemberWeight());
+            memberBuilder.setWeight(Uint16.valueOf(member.getPoolMemberWeight()));
         }
         return memberBuilder.build();
     }

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 38164e1f4c6b02c593b5ccc9900c933185526ed2..be0f617231bf7d64ea7194b6f896043e5beb9dc7 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronNetworkInterface.java
@@ -35,10 +35,13 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.NetworkKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.NetworkProviderExtensionBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.neutron.networks.network.Segments;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.neutron.networks.network.SegmentsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.network.provider.extension.Segments;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.network.provider.extension.SegmentsBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.provider.ext.rev150712.network.provider.extension.SegmentsKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.ext.rev160613.QosNetworkExtension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.ext.rev160613.QosNetworkExtensionBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 @Singleton
@@ -121,11 +124,12 @@ public final class NeutronNetworkInterface
                     .setNetworkType(mapper.get(network.getProviderNetworkType()));
         }
         if (network.getSegments() != null) {
-            final List<Segments> segments = new ArrayList<>();
+            final BindingMap.Builder<SegmentsKey, Segments> segments = BindingMap.orderedBuilder();
             long count = 0;
             for (final NeutronNetworkSegment segment : network.getSegments()) {
                 count++;
-                final SegmentsBuilder segmentsBuilder = new SegmentsBuilder();
+                final SegmentsBuilder segmentsBuilder = new SegmentsBuilder()
+                    .setSegmentationIndex(Uint32.valueOf(count));
                 if (segment.getProviderPhysicalNetwork() != null) {
                     segmentsBuilder.setPhysicalNetwork(segment.getProviderPhysicalNetwork());
                 }
@@ -137,10 +141,9 @@ public final class NeutronNetworkInterface
                     segmentsBuilder.setNetworkType(
                             mapper.get(segment.getProviderNetworkType()));
                 }
-                segmentsBuilder.setSegmentationIndex(Uint32.valueOf(count));
                 segments.add(segmentsBuilder.build());
             }
-            providerExtensionBuilder.setSegments(segments);
+            providerExtensionBuilder.setSegments(segments.build());
         }
         if (network.getProviderSegmentationID() != null) {
             providerExtensionBuilder.setSegmentationId(network.getProviderSegmentationID());
@@ -153,7 +156,9 @@ public final class NeutronNetworkInterface
         networkBuilder.addAugmentation(l3ExtensionBuilder.build());
         networkBuilder.addAugmentation(providerExtensionBuilder.build());
         if (network.getMtu() != null) {
-            networkBuilder.addAugmentation(new NetworkMtuExtensionBuilder().setMtu(network.getMtu()).build());
+            networkBuilder.addAugmentation(new NetworkMtuExtensionBuilder()
+                .setMtu(Uint16.valueOf(network.getMtu()))
+                .build());
         }
     }
 

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 a63eac5ae2a8db3866e5a93e7c21c1650546c45f..708cc75195104081ab4084443447e7274b6e5cf0 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronPortInterface.java
@@ -51,6 +51,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.portsecurity.rev150
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.ext.rev160613.QosPortExtension;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.ext.rev160613.QosPortExtensionBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.types.rev160517.IpPrefixOrAddressBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 @Singleton
 @Service(classes = INeutronPortCRUD.class)
@@ -168,19 +169,18 @@ public final class NeutronPortInterface extends AbstractNeutronInterface<Port, P
             bindingBuilder.setHostId(neutronPort.getBindinghostID());
         }
         if (neutronPort.getVIFDetails() != null) {
-            final Map<String, String> vifDetails = neutronPort.getVIFDetails();
-            final List<VifDetails> listVifDetail = new ArrayList<>(vifDetails.size());
-            for (final Map.Entry<String, String> vifDetail : vifDetails.entrySet()) {
-                final VifDetailsBuilder vifDetailsBuilder = new VifDetailsBuilder();
-                if (vifDetail.getKey() != null) {
-                    vifDetailsBuilder.setDetailsKey(vifDetail.getKey());
-                }
-                if (vifDetail.getValue() != null) {
-                    vifDetailsBuilder.setValue(vifDetail.getValue());
-                }
-                listVifDetail.add(vifDetailsBuilder.build());
-            }
-            bindingBuilder.setVifDetails(listVifDetail);
+            bindingBuilder.setVifDetails(neutronPort.getVIFDetails().entrySet().stream()
+                .map(vifDetail -> {
+                    final VifDetailsBuilder vifDetailsBuilder = new VifDetailsBuilder();
+                    if (vifDetail.getKey() != null) {
+                        vifDetailsBuilder.setDetailsKey(vifDetail.getKey());
+                    }
+                    if (vifDetail.getValue() != null) {
+                        vifDetailsBuilder.setValue(vifDetail.getValue());
+                    }
+                    return vifDetailsBuilder.build();
+                })
+                .collect(BindingMap.toOrderedMap()));
         }
         if (neutronPort.getBindingvifType() != null) {
             bindingBuilder.setVifType(neutronPort.getBindingvifType());
@@ -203,15 +203,12 @@ public final class NeutronPortInterface extends AbstractNeutronInterface<Port, P
         portBuilder.addAugmentation(bindingBuilder.build());
         portBuilder.addAugmentation(portSecurityBuilder.build());
         if (neutronPort.getAllowedAddressPairs() != null) {
-            final List<AllowedAddressPairs> listAllowedAddressPairs = new ArrayList<>();
-            for (final NeutronPortAllowedAddressPairs allowedAddressPairs : neutronPort.getAllowedAddressPairs()) {
-                final AllowedAddressPairsBuilder allowedAddressPairsBuilder = new AllowedAddressPairsBuilder();
-                allowedAddressPairsBuilder
-                        .setIpAddress(IpPrefixOrAddressBuilder.getDefaultInstance(allowedAddressPairs.getIpAddress()));
-                allowedAddressPairsBuilder.setMacAddress(new MacAddress(allowedAddressPairs.getMacAddress()));
-                listAllowedAddressPairs.add(allowedAddressPairsBuilder.build());
-            }
-            portBuilder.setAllowedAddressPairs(listAllowedAddressPairs);
+            portBuilder.setAllowedAddressPairs(neutronPort.getAllowedAddressPairs().stream()
+                .map(allowedAddressPairs -> new AllowedAddressPairsBuilder()
+                    .setIpAddress(IpPrefixOrAddressBuilder.getDefaultInstance(allowedAddressPairs.getIpAddress()))
+                    .setMacAddress(new MacAddress(allowedAddressPairs.getMacAddress()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         if (neutronPort.getDeviceID() != null) {
             portBuilder.setDeviceId(neutronPort.getDeviceID());
@@ -220,31 +217,29 @@ public final class NeutronPortInterface extends AbstractNeutronInterface<Port, P
             portBuilder.setDeviceOwner(neutronPort.getDeviceOwner());
         }
         if (neutronPort.getExtraDHCPOptions() != null) {
-            final List<ExtraDhcpOpts> listExtraDHCPOptions = new ArrayList<>();
             final ImmutableBiMap<Integer, Class<? extends IpVersionBase>> mapper = IPV_MAP.inverse();
-            for (final NeutronPortExtraDHCPOption extraDHCPOption : neutronPort.getExtraDHCPOptions()) {
-                final ExtraDhcpOptsBuilder extraDHCPOptsBuilder = new ExtraDhcpOptsBuilder();
-                extraDHCPOptsBuilder.setOptName(extraDHCPOption.getName());
-                extraDHCPOptsBuilder.setOptValue(extraDHCPOption.getValue());
-                Integer ipVersion = extraDHCPOption.getIpVersion();
-                if (ipVersion == null) {
-                    // default as v4 for neutron api evolves
-                    ipVersion = 4;
-                }
-                extraDHCPOptsBuilder.setIpVersion(mapper.get(ipVersion));
-                listExtraDHCPOptions.add(extraDHCPOptsBuilder.build());
-            }
-            portBuilder.setExtraDhcpOpts(listExtraDHCPOptions);
+            portBuilder.setExtraDhcpOpts(neutronPort.getExtraDHCPOptions().stream()
+                .map(extraDHCPOption -> {
+                    Integer ipVersion = extraDHCPOption.getIpVersion();
+                    if (ipVersion == null) {
+                        // default as v4 for neutron api evolves
+                        ipVersion = 4;
+                    }
+                    return new ExtraDhcpOptsBuilder()
+                        .setOptName(extraDHCPOption.getName())
+                        .setOptValue(extraDHCPOption.getValue())
+                        .setIpVersion(mapper.get(ipVersion))
+                        .build();
+                })
+                .collect(BindingMap.toOrderedMap()));
         }
         if (neutronPort.getFixedIps() != null) {
-            final List<FixedIps> listNeutronIps = new ArrayList<>();
-            for (final NeutronIps neutronIPs : neutronPort.getFixedIps()) {
-                final FixedIpsBuilder fixedIpsBuilder = new FixedIpsBuilder();
-                fixedIpsBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(neutronIPs.getIpAddress()));
-                fixedIpsBuilder.setSubnetId(toUuid(neutronIPs.getSubnetUUID()));
-                listNeutronIps.add(fixedIpsBuilder.build());
-            }
-            portBuilder.setFixedIps(listNeutronIps);
+            portBuilder.setFixedIps(neutronPort.getFixedIps().stream()
+                .map(neutronIPs -> new FixedIpsBuilder()
+                    .setIpAddress(IpAddressBuilder.getDefaultInstance(neutronIPs.getIpAddress()))
+                    .setSubnetId(toUuid(neutronIPs.getSubnetUUID()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         if (neutronPort.getMacAddress() != null) {
             portBuilder.setMacAddress(new MacAddress(neutronPort.getMacAddress()));

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
index af5d3580ccb5a0c8b0c1a0f47e7fe18065eeef28..e845019d293b979869531d46f31764530bf45cfc 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronQosPolicyInterface.java
@@ -30,6 +30,9 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.rev160613.qos.a
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.rev160613.qos.attributes.qos.policies.qos.policy.DscpmarkingRulesBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.rev160613.qos.attributes.qos.policies.qos.policy.MinimumbandwidthRules;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.qos.rev160613.qos.attributes.qos.policies.qos.policy.MinimumbandwidthRulesBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.Uint64;
+import org.opendaylight.yangtools.yang.common.Uint8;
 
 @Singleton
 @Service(classes = INeutronQosPolicyCRUD.class)
@@ -55,40 +58,31 @@ public final class NeutronQosPolicyInterface
             qosPolicyBuilder.setShared(qosPolicy.getPolicyIsShared());
         }
         if (qosPolicy.getBandwidthLimitRules() != null) {
-            final List<BandwidthLimitRules> listBandwith = new ArrayList<>();
-            for (final NeutronQosBandwidthLimitRule bandwidthLimitRule : qosPolicy.getBandwidthLimitRules()) {
-                final BandwidthLimitRulesBuilder bandwidthLimitRulesBuilder =
-                        toMdIds(bandwidthLimitRule, BandwidthLimitRulesBuilder.class);
-                bandwidthLimitRulesBuilder.setMaxKbps(bandwidthLimitRule.getMaxKbps());
-                bandwidthLimitRulesBuilder.setMaxBurstKbps(bandwidthLimitRule.getMaxBurstKbps());
-                bandwidthLimitRulesBuilder.setDirection(DirectionMapper.get(bandwidthLimitRule.getDirection()));
-                listBandwith.add(bandwidthLimitRulesBuilder.build());
-            }
-            qosPolicyBuilder.setBandwidthLimitRules(listBandwith);
+            qosPolicyBuilder.setBandwidthLimitRules(qosPolicy.getBandwidthLimitRules().stream()
+                .map(bandwidthLimitRule -> toMdIds(bandwidthLimitRule, BandwidthLimitRulesBuilder.class)
+                    .setMaxKbps(Uint64.valueOf(bandwidthLimitRule.getMaxKbps()))
+                    .setMaxBurstKbps(Uint64.valueOf(bandwidthLimitRule.getMaxBurstKbps()))
+                    .setDirection(DirectionMapper.get(bandwidthLimitRule.getDirection()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
 
         if (qosPolicy.getDscpMarkingRules() != null) {
-            final List<DscpmarkingRules> listDscpMarking = new ArrayList<>();
-            for (final NeutronQosDscpMarkingRule dscpMarkingRule : qosPolicy.getDscpMarkingRules()) {
-                final DscpmarkingRulesBuilder dscpmarkingRulesBuilder =
-                        toMdIds(dscpMarkingRule, DscpmarkingRulesBuilder.class);
-                dscpmarkingRulesBuilder.setDscpMark(dscpMarkingRule.getDscpMark());
-                listDscpMarking.add(dscpmarkingRulesBuilder.build());
-            }
-            qosPolicyBuilder.setDscpmarkingRules(listDscpMarking);
+            qosPolicyBuilder.setDscpmarkingRules(qosPolicy.getDscpMarkingRules().stream()
+                .map(dscpMarkingRule -> toMdIds(dscpMarkingRule, DscpmarkingRulesBuilder.class)
+                    .setDscpMark(Uint8.valueOf(dscpMarkingRule.getDscpMark()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         if (qosPolicy.getMinimumBandwidthRules() != null) {
-            final List<MinimumbandwidthRules> listMinimumBandwidth = new ArrayList<>();
-            for (final NeutronQosMinimumBandwidthRule minimumBandwidthRule : qosPolicy.getMinimumBandwidthRules()) {
-                final MinimumbandwidthRulesBuilder minimumBandwidthRulesBuilder =
-                        new MinimumbandwidthRulesBuilder();
-                minimumBandwidthRulesBuilder.setUuid(toUuid(minimumBandwidthRule.getID()));
-                minimumBandwidthRulesBuilder.setTenantId(toUuid(minimumBandwidthRule.getTenantID()));
-                minimumBandwidthRulesBuilder.setMinKbps(minimumBandwidthRule.getMinKbps());
-                minimumBandwidthRulesBuilder.setDirection(DirectionMapper.get(minimumBandwidthRule.getDirection()));
-                listMinimumBandwidth.add(minimumBandwidthRulesBuilder.build());
-            }
-            qosPolicyBuilder.setMinimumbandwidthRules(listMinimumBandwidth);
+            qosPolicyBuilder.setMinimumbandwidthRules(qosPolicy.getMinimumBandwidthRules().stream()
+                .map(minimumBandwidthRule -> new MinimumbandwidthRulesBuilder()
+                    .setUuid(toUuid(minimumBandwidthRule.getID()))
+                    .setTenantId(toUuid(minimumBandwidthRule.getTenantID()))
+                    .setMinKbps(Uint64.valueOf(minimumBandwidthRule.getMinKbps()))
+                    .setDirection(DirectionMapper.get(minimumBandwidthRule.getDirection()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         return qosPolicyBuilder.build();
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
index 69fb53c6946754f9989f2a3248d10d811115b0e0..3a8b5054f15e2c9327477ae8fb6cbe7458c9c12a 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronRouterInterface.java
@@ -31,6 +31,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.router
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.router.ExternalGatewayInfoBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.router.external_gateway_info.ExternalFixedIps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev150712.routers.attributes.routers.router.external_gateway_info.ExternalFixedIpsBuilder;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 @Singleton
 @Service(classes = INeutronRouterCRUD.class)
@@ -60,14 +61,12 @@ public final class NeutronRouterInterface extends AbstractNeutronInterface<Route
         }
         routerBuilder.setDistributed(router.getDistributed());
         if (router.getRoutes() != null) {
-            final List<Routes> routes = new ArrayList<>();
-            for (final NeutronRoute route : router.getRoutes()) {
-                final RoutesBuilder routeBuilder = new RoutesBuilder();
-                routeBuilder.setDestination(IpPrefixBuilder.getDefaultInstance(route.getDestination()));
-                routeBuilder.setNexthop(IpAddressBuilder.getDefaultInstance(route.getNextHop()));
-                routes.add(routeBuilder.build());
-            }
-            routerBuilder.setRoutes(routes);
+            routerBuilder.setRoutes(router.getRoutes().stream()
+                .map(route -> new RoutesBuilder()
+                    .setDestination(IpPrefixBuilder.getDefaultInstance(route.getDestination()))
+                    .setNexthop(IpAddressBuilder.getDefaultInstance(route.getNextHop()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         if (router.getExternalGatewayInfo() != null) {
             ExternalGatewayInfo externalGatewayInfo = null;
@@ -78,14 +77,12 @@ public final class NeutronRouterInterface extends AbstractNeutronInterface<Route
                 builder.setEnableSnat(externalGatewayInfos.getEnableSNAT());
                 builder.setExternalNetworkId(toUuid(externalGatewayInfos.getNetworkID()));
                 if (externalGatewayInfos.getExternalFixedIps() != null) {
-                    final List<ExternalFixedIps> externalFixedIps = new ArrayList<>();
-                    for (final NeutronIps externalIp : externalGatewayInfos.getExternalFixedIps()) {
-                        final ExternalFixedIpsBuilder eFixedIpBuilder = new ExternalFixedIpsBuilder();
-                        eFixedIpBuilder.setIpAddress(IpAddressBuilder.getDefaultInstance(externalIp.getIpAddress()));
-                        eFixedIpBuilder.setSubnetId(toUuid(externalIp.getSubnetUUID()));
-                        externalFixedIps.add(eFixedIpBuilder.build());
-                    }
-                    builder.setExternalFixedIps(externalFixedIps);
+                    builder.setExternalFixedIps(externalGatewayInfos.getExternalFixedIps().stream()
+                        .map(externalIp -> new ExternalFixedIpsBuilder()
+                            .setIpAddress(IpAddressBuilder.getDefaultInstance(externalIp.getIpAddress()))
+                            .setSubnetId(toUuid(externalIp.getSubnetUUID()))
+                            .build())
+                        .collect(BindingMap.toOrderedMap()));
                 }
                 externalGatewayInfo = builder.build();
             }

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 594ae93aaea40a8fb509cfb4c6cbd5c66a94340a..ea61c602786a4651d9280f1879cd705c146f22c2 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCFlowClassifierInterface.java
@@ -8,10 +8,8 @@
 package org.opendaylight.neutron.transcriber;
 
 import com.google.common.collect.ImmutableBiMap;
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Service;
@@ -30,11 +28,12 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.ProtocolUdp;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.flow.classifier.match.attributes.L7Parameter;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.flow.classifier.match.attributes.L7ParameterBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.flow.classifier.match.attributes.L7ParameterKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.sfc.flow.classifiers.attributes.SfcFlowClassifiers;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.sfc.flow.classifiers.attributes.sfc.flow.classifiers.SfcFlowClassifier;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.sfc.flow.classifiers.attributes.sfc.flow.classifiers.SfcFlowClassifierBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.flow.classifier.rev160511.sfc.flow.classifiers.attributes.sfc.flow.classifiers.SfcFlowClassifierKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
+import org.opendaylight.yangtools.yang.common.Uint16;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -90,16 +89,16 @@ public final class NeutronSFCFlowClassifierInterface
             }
         }
         if (neutronClassifier.getSourcePortRangeMin() != null) {
-            result.setSourcePortRangeMin(neutronClassifier.getSourcePortRangeMin());
+            result.setSourcePortRangeMin(Uint16.valueOf(neutronClassifier.getSourcePortRangeMin()));
         }
         if (neutronClassifier.getSourcePortRangeMax() != null) {
-            result.setSourcePortRangeMax(neutronClassifier.getSourcePortRangeMax());
+            result.setSourcePortRangeMax(Uint16.valueOf(neutronClassifier.getSourcePortRangeMax()));
         }
         if (neutronClassifier.getDestinationPortRangeMin() != null) {
-            result.setDestinationPortRangeMin(neutronClassifier.getDestinationPortRangeMin());
+            result.setDestinationPortRangeMin(Uint16.valueOf(neutronClassifier.getDestinationPortRangeMin()));
         }
         if (neutronClassifier.getDestinationPortRangeMax() != null) {
-            result.setDestinationPortRangeMax(neutronClassifier.getDestinationPortRangeMax());
+            result.setDestinationPortRangeMax(Uint16.valueOf(neutronClassifier.getDestinationPortRangeMax()));
         }
         if (neutronClassifier.getSourceIpPrefix() != null) {
             result.setSourceIpPrefix(IpPrefixBuilder.getDefaultInstance(neutronClassifier.getSourceIpPrefix()));
@@ -115,15 +114,12 @@ public final class NeutronSFCFlowClassifierInterface
             result.setLogicalDestinationPort(new Uuid(neutronClassifier.getLogicalDestinationPortUUID()));
         }
         if (neutronClassifier.getL7Parameters() != null) {
-            List<L7Parameter> l7Params = new ArrayList<>();
-            for (String paramKey : neutronClassifier.getL7Parameters().keySet()) {
-                L7ParameterBuilder param = new L7ParameterBuilder();
-                param.withKey(new L7ParameterKey(paramKey));
-                param.setMatchParameter(paramKey);
-                param.setMatchParameterValue(neutronClassifier.getL7Parameters().get(paramKey));
-                l7Params.add(param.build());
-            }
-            result.setL7Parameter(l7Params);
+            result.setL7Parameter(neutronClassifier.getL7Parameters().entrySet().stream()
+                .map(entry -> new L7ParameterBuilder()
+                    .setMatchParameter(entry.getKey())
+                    .setMatchParameterValue(entry.getValue())
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         LOG.trace("toMd: Yang SFC Flow Classifier data : {}", result);
         return result.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 7e04712596f384a35767f0b4091a19e9b4d1d1af..5e83a7c58ca90b6f2e9c61841b3d77db40515074 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortChainInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortChainInterface.java
@@ -20,11 +20,11 @@ import org.opendaylight.neutron.spi.NeutronSFCPortChain;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.port.chain.attributes.ChainParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.port.chain.attributes.ChainParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.port.chain.attributes.ChainParametersKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.PortChains;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.port.chains.PortChain;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.port.chains.PortChainBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.port.chains.PortChainKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -71,15 +71,12 @@ public final class NeutronSFCPortChainInterface
             result.setFlowClassifiers(flowClassifiers);
         }
         if (neutronPortChain.getChainParameters() != null) {
-            List<ChainParameters> chainParams = new ArrayList<>();
-            for (String paramKey : neutronPortChain.getChainParameters().keySet()) {
-                ChainParametersBuilder param = new ChainParametersBuilder();
-                param.withKey(new ChainParametersKey(paramKey));
-                param.setChainParameter(paramKey);
-                param.setChainParameterValue(neutronPortChain.getChainParameters().get(paramKey));
-                chainParams.add(param.build());
-            }
-            result.setChainParameters(chainParams);
+            result.setChainParameters(neutronPortChain.getChainParameters().entrySet().stream()
+                .map(entry -> new ChainParametersBuilder()
+                    .setChainParameter(entry.getKey())
+                    .setChainParameterValue(entry.getValue())
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         LOG.trace("toMd: Yang SFC Port Chain data : {}", result);
         return result.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 b8f9ce3ed9fa62207d87cac086853b3efc8dcb2b..ce1af3e3cde9ba0634e22b06b8a93767f70f8b6a 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortPairInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSFCPortPairInterface.java
@@ -7,10 +7,8 @@
  */
 package org.opendaylight.neutron.transcriber;
 
-import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
-import java.util.List;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Service;
@@ -20,11 +18,11 @@ import org.opendaylight.neutron.spi.NeutronSFCPortPair;
 import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.port.pair.attributes.ServiceFunctionParameters;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.port.pair.attributes.ServiceFunctionParametersBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.port.pair.attributes.ServiceFunctionParametersKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.PortPairs;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.port.pairs.PortPair;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.port.pairs.PortPairBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.sfc.rev160511.sfc.attributes.port.pairs.PortPairKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -58,15 +56,12 @@ public final class NeutronSFCPortPairInterface
             result.setEgress(new Uuid(neutronPortPair.getEgressPortUUID()));
         }
         if (neutronPortPair.getServiceFunctionParameters() != null) {
-            List<ServiceFunctionParameters> serviceFunctionParams = new ArrayList<>();
-            for (String paramKey : neutronPortPair.getServiceFunctionParameters().keySet()) {
-                ServiceFunctionParametersBuilder param = new ServiceFunctionParametersBuilder();
-                param.withKey(new ServiceFunctionParametersKey(paramKey));
-                param.setServiceFunctionParameter(paramKey);
-                param.setServiceFunctionParameterValue(neutronPortPair.getServiceFunctionParameters().get(paramKey));
-                serviceFunctionParams.add(param.build());
-            }
-            result.setServiceFunctionParameters(serviceFunctionParams);
+            result.setServiceFunctionParameters(neutronPortPair.getServiceFunctionParameters().entrySet().stream()
+                .map(entry -> new ServiceFunctionParametersBuilder()
+                    .setServiceFunctionParameter(entry.getKey())
+                    .setServiceFunctionParameterValue(entry.getValue())
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         LOG.trace("toMd: Yang SFC Port Pair data : {}", result);
         return result.build();

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
index 2fad9611317e6e631a0e729db3b9956aebde9351..ebf246ffa90c10a1af64ee91366039861c62e6cf 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSecurityRuleInterface.java
@@ -32,6 +32,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRule;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRuleBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.secgroups.rev150712.security.rules.attributes.security.rules.SecurityRuleKey;
+import org.opendaylight.yangtools.yang.common.Uint16;
 
 @Singleton
 @Service(classes = INeutronSecurityRuleCRUD.class)
@@ -129,10 +130,10 @@ public final class NeutronSecurityRuleInterface extends
                     .setEthertype(mapper.get(securityRule.getSecurityRuleEthertype()));
         }
         if (securityRule.getSecurityRulePortMin() != null) {
-            securityRuleBuilder.setPortRangeMin(securityRule.getSecurityRulePortMin());
+            securityRuleBuilder.setPortRangeMin(Uint16.valueOf(securityRule.getSecurityRulePortMin()));
         }
         if (securityRule.getSecurityRulePortMax() != null) {
-            securityRuleBuilder.setPortRangeMax(securityRule.getSecurityRulePortMax());
+            securityRuleBuilder.setPortRangeMax(Uint16.valueOf(securityRule.getSecurityRulePortMax()));
         }
         return securityRuleBuilder.build();
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
index f751197a759c720ec700ecd2073e19153463d0c1..b2b12595f230a814fa19fa8663475bfefa2e20e9 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronSubnetInterface.java
@@ -39,6 +39,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.s
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.SubnetBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.SubnetKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 
 @Singleton
 @Service(classes = INeutronSubnetCRUD.class)
@@ -146,15 +147,12 @@ public final class NeutronSubnetInterface extends AbstractNeutronInterface<Subne
         }
         subnetBuilder.setEnableDhcp(subnet.getEnableDHCP());
         if (subnet.getAllocationPools() != null) {
-            final List<AllocationPools> allocationPools = new ArrayList<>();
-            for (final NeutronSubnetIpAllocationPool allocationPool : subnet.getAllocationPools()) {
-                final AllocationPoolsBuilder builder = new AllocationPoolsBuilder();
-                builder.setStart(IpAddressBuilder.getDefaultInstance(allocationPool.getPoolStart()));
-                builder.setEnd(IpAddressBuilder.getDefaultInstance(allocationPool.getPoolEnd()));
-                final AllocationPools temp = builder.build();
-                allocationPools.add(temp);
-            }
-            subnetBuilder.setAllocationPools(allocationPools);
+            subnetBuilder.setAllocationPools(subnet.getAllocationPools().stream()
+                .map(allocationPool -> new AllocationPoolsBuilder()
+                    .setStart(IpAddressBuilder.getDefaultInstance(allocationPool.getPoolStart()))
+                    .setEnd(IpAddressBuilder.getDefaultInstance(allocationPool.getPoolEnd()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         if (subnet.getDnsNameservers() != null) {
             final List<IpAddress> dnsNameServers = new ArrayList<>();
@@ -165,14 +163,12 @@ public final class NeutronSubnetInterface extends AbstractNeutronInterface<Subne
             subnetBuilder.setDnsNameservers(dnsNameServers);
         }
         if (subnet.getHostRoutes() != null) {
-            final List<HostRoutes> hostRoutes = new ArrayList<>();
-            for (final NeutronRoute hostRoute : subnet.getHostRoutes()) {
-                final HostRoutesBuilder hrBuilder = new HostRoutesBuilder();
-                hrBuilder.setDestination(IpPrefixBuilder.getDefaultInstance(hostRoute.getDestination()));
-                hrBuilder.setNexthop(IpAddressBuilder.getDefaultInstance(hostRoute.getNextHop()));
-                hostRoutes.add(hrBuilder.build());
-            }
-            subnetBuilder.setHostRoutes(hostRoutes);
+            subnetBuilder.setHostRoutes(subnet.getHostRoutes().stream()
+                .map(hostRoute -> new HostRoutesBuilder()
+                    .setDestination(IpPrefixBuilder.getDefaultInstance(hostRoute.getDestination()))
+                    .setNexthop(IpAddressBuilder.getDefaultInstance(hostRoute.getNextHop()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         return subnetBuilder.build();
     }

diff --git a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTrunkInterface.java b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTrunkInterface.java
index 2b17f1a64cb356c975da462fb2894de6b2899223..62dad1f7c739d5c48ac372c3174882f0c34f5fba 100644 (file)
--- a/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTrunkInterface.java
+++ b/transcriber/src/main/java/org/opendaylight/neutron/transcriber/NeutronTrunkInterface.java
@@ -29,6 +29,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.trunks.rev170118.tr
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.trunks.rev170118.trunks.attributes.trunks.Trunk;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.trunks.rev170118.trunks.attributes.trunks.TrunkBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.trunks.rev170118.trunks.attributes.trunks.TrunkKey;
+import org.opendaylight.yangtools.yang.binding.util.BindingMap;
 import org.opendaylight.yangtools.yang.common.Uint32;
 
 @Singleton
@@ -82,16 +83,14 @@ public final class NeutronTrunkInterface extends AbstractNeutronInterface<Trunk,
             trunkBuilder.setPortId(toUuid(trunk.getPortId()));
         }
         if (trunk.getSubPorts() != null) {
-            final List<SubPorts> subPortsList = new ArrayList<>();
-            final SubPortsBuilder subPortsBuilder = new SubPortsBuilder();
             final ImmutableBiMap<String, Class<? extends NetworkTypeBase>> mapper = NETWORK_TYPE_MAP.inverse();
-            for (NeutronTrunkSubPort subPort: trunk.getSubPorts()) {
-                subPortsBuilder.setPortId(toUuid(subPort.getPortId()));
-                subPortsBuilder.setSegmentationType(mapper.get(subPort.getSegmentationType()));
-                subPortsBuilder.setSegmentationId(Uint32.valueOf(subPort.getSegmentationId()));
-                subPortsList.add(subPortsBuilder.build());
-            }
-            trunkBuilder.setSubPorts(subPortsList);
+            trunkBuilder.setSubPorts(trunk.getSubPorts().stream()
+                .map(subPort -> new SubPortsBuilder()
+                    .setPortId(toUuid(subPort.getPortId()))
+                    .setSegmentationType(mapper.get(subPort.getSegmentationType()))
+                    .setSegmentationId(Uint32.valueOf(subPort.getSegmentationId()))
+                    .build())
+                .collect(BindingMap.toOrderedMap()));
         }
         return trunkBuilder.build();
     }