fix compilation issue 57/51957/2
authorDavid Goldberg <gdavid@hpe.com>
Thu, 16 Feb 2017 12:58:55 +0000 (14:58 +0200)
committerDavid Goldberg <gdavid@hpe.com>
Thu, 16 Feb 2017 13:04:38 +0000 (15:04 +0200)
Change-Id: I06c8d4a3e6ee42ebf0a1285d30c0d972f9e2a29b
Signed-off-by: David Goldberg <gdavid@hpe.com>
netvirt/src/main/java/org/opendaylight/unimgr/mef/netvirt/NetvirtVpnUtils.java

index 27477a08aa483504e9e85d4782cdfb8894e19ff1..7337df2ff96872e55b5c943b1994c5588689c3d3 100644 (file)
@@ -105,7 +105,7 @@ public class NetvirtVpnUtils {
         // WA till netvirt will allow creation of VPN without RD
         UUID vpnId = UUID.fromString(instanceName);
         String rd = String.valueOf(Math.abs(vpnId.getLeastSignificantBits()));
-        ipv4FamilyBuilder.setRouteDistinguisher(rd);
+        ipv4FamilyBuilder.setRouteDistinguisher(Arrays.asList(rd));
         builder.setIpv4Family(ipv4FamilyBuilder.build());
 
         tx.put(LogicalDatastoreType.CONFIGURATION, getVpnInstanceInstanceIdentifier(instanceName), builder.build());
@@ -219,7 +219,7 @@ public class NetvirtVpnUtils {
             InstanceIdentifier<LearntVpnVipToPort> id = getLearntVpnVipToPortIdentifier(vpnName, ipStr);
             MdsalUtils.syncDelete(dataBroker, LogicalDatastoreType.OPERATIONAL, id);
         });
-        int waitCount = (adjacenciesList.isEmpty()) ? 2 : 2 * adjacenciesList.size();
+        int waitCount = adjacenciesList.isEmpty() ? 2 : 2 * adjacenciesList.size();
 
         AdjacenciesBuilder builder = new AdjacenciesBuilder();
         List<Adjacency> list = new ArrayList<>();
@@ -228,8 +228,9 @@ public class NetvirtVpnUtils {
         MdsalUtils.syncWrite(dataBroker, LogicalDatastoreType.CONFIGURATION, identifier, einterfaceBuilder.build());
 
         final DataWaitGetter<Adjacencies> getData = vpnint -> {
-            if (vpnint.getAdjacency() == null)
+            if (vpnint.getAdjacency() == null) {
                 return null;
+            }
             return vpnint.getAdjacency().stream().filter(a -> !a.isPrimaryAdjacency());
         };