Bump mdsal to 4.0.0

Bump mdsal version to 4.0.0 and codegen changes

Change-Id: Idcfb62212acb989848fa1d77e822183165dd7826
Signed-off-by: R P Karthika <r.p.karthika@ericsson.com>

diff --git a/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java b/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
index 3e0d751fc17ccc0e269061d1037e7281b3878977..e34ddc3584d7e2d249dc34a0a0f684653e58a544 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
+++ b/alivenessmonitor/alivenessmonitor-impl-protocols/src/test/java/org/opendaylight/genius/alivenessmonitor/protocols/test/AlivenessMonitorTest.java
@@ -194,8 +194,8 @@ public class AlivenessMonitorTest {
         doReturn(readWriteTx).when(dataBroker).newReadWriteTransaction();
         doNothing().when(writeTx).put(eq(LogicalDatastoreType.OPERATIONAL),
                 any(InstanceIdentifier.class), any(DataObject.class));
-        doReturn(Futures.immediateCheckedFuture(null)).when(writeTx).commit();
-        doReturn(Futures.immediateCheckedFuture(null)).when(readWriteTx).commit();
+        doReturn(FluentFutures.immediateNullFluentFuture()).when(writeTx).commit();
+        doReturn(FluentFutures.immediateNullFluentFuture()).when(readWriteTx).commit();
     }
 
     @After
@@ -211,10 +211,10 @@ public class AlivenessMonitorTest {
                         .setMonitorInterval(10000L).setMonitorWindow(10L)
                         .setProtocolType(MonitorProtocolType.Arp).build())
                 .build();
-        doReturn(Futures.immediateCheckedFuture(Optional.empty()))
+        doReturn(FluentFutures.immediateFluentFuture(Optional.empty()))
                 .when(readWriteTx).read(eq(LogicalDatastoreType.OPERATIONAL),
                         argThat(isType(MonitorProfile.class)));
-        doReturn(Futures.immediateCheckedFuture(null)).when(readWriteTx).commit();
+        doReturn(FluentFutures.immediateNullFluentFuture()).when(readWriteTx).commit();
         RpcResult<MonitorProfileCreateOutput> output = alivenessMonitor
                 .monitorProfileCreate(input).get();
         assertTrue("Monitor Profile Create result", output.isSuccessful());

diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/AlivenessProtocolHandlerRegistry.java b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/AlivenessProtocolHandlerRegistry.java
index 7f78fb8995f3f7f7342b6a548071af1f9b66fdfb..d0e5cf09b39a11cc5499d81f0431d3ad6956e75a 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/AlivenessProtocolHandlerRegistry.java
+++ b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/AlivenessProtocolHandlerRegistry.java
@@ -7,7 +7,6 @@
  */
 package org.opendaylight.genius.alivenessmonitor.protocols;
 
-import javax.annotation.concurrent.ThreadSafe;
 import org.eclipse.jdt.annotation.NonNull;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.openflowplugin.libraries.liblldp.Packet;
@@ -15,10 +14,11 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.alivenessmonitor.rev
 
 /**
  * Registry of {@link AlivenessProtocolHandler}s.
+ *Implementations of this interface are expected to be thread-safe.
  *
  * @author Michael Vorburger.ch
  */
-@ThreadSafe
+
 public interface AlivenessProtocolHandlerRegistry {
 
     void register(MonitorProtocolType protocolType, AlivenessProtocolHandler<?> protocolHandler);

diff --git a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java
index dc35748c40222b5b93589f81e1c0371cce311b1a..e659f2192a87307e70658e88781ed532c8955460 100644 (file)
--- a/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java
+++ b/alivenessmonitor/alivenessmonitor-impl/src/main/java/org/opendaylight/genius/alivenessmonitor/protocols/impl/AlivenessProtocolHandlerRegistryImpl.java
@@ -10,7 +10,6 @@ package org.opendaylight.genius.alivenessmonitor.protocols.impl;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.Map;
-import javax.annotation.concurrent.ThreadSafe;
 import javax.inject.Singleton;
 
 import org.apache.aries.blueprint.annotation.service.Service;
@@ -23,11 +22,12 @@ import org.slf4j.LoggerFactory;
 
 /**
  * Implementation of AlivenessProtocolHandlerRegistry.
+ * Implementations of this interface are expected to be thread-safe.
  *
  * @author Michael Vorburger.ch
  */
+
 @Singleton
-@ThreadSafe
 @Service(classes = AlivenessProtocolHandlerRegistry.class)
 public class AlivenessProtocolHandlerRegistryImpl implements AlivenessProtocolHandlerRegistry {
 

diff --git a/commons/binding-parent/pom.xml b/commons/binding-parent/pom.xml
index c509f57d623c5af19ad206986c7fe108afdf5b7f..28a03f777d047988ffabf8dc7cde729b41f8b3ab 100644 (file)
--- a/commons/binding-parent/pom.xml
+++ b/commons/binding-parent/pom.xml
@@ -10,7 +10,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
   <parent>
     <groupId>org.opendaylight.mdsal</groupId>
     <artifactId>binding-parent</artifactId>
-    <version>3.0.6</version>
+    <version>4.0.0</version>
     <relativePath/>
   </parent>
 
@@ -55,6 +55,20 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     </dependency>
 
     <!-- Testing Dependencies -->
+
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest</artifactId>
+      <!-- Hamcrest is internally used by Awaitility, so must be compile instead of test scope for build to work -->
+      <scope>compile</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hamcrest</groupId>
+      <artifactId>hamcrest-library</artifactId>
+      <!-- Hamcrest is internally used by Awaitility, so must be compile instead of test scope for build to work -->
+      <scope>compile</scope>
+    </dependency>
+
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/commons/quality-parent/pom.xml b/commons/quality-parent/pom.xml
index 74defe78bb88f1accf626de808385ed4a0f5556f..008b1b1faaec93d9bdd0fb1a877d3af0647a867c 100644 (file)
--- a/commons/quality-parent/pom.xml
+++ b/commons/quality-parent/pom.xml
@@ -43,7 +43,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <type>pom</type>
         <scope>import</scope>
       </dependency>

diff --git a/features/odl-genius-api/pom.xml b/features/odl-genius-api/pom.xml
index c39810131bb995611d7f9dc03225db8151b6c007..374b67ef2a1e3cb141d667e455e0d89f17bf0cb1 100644 (file)
--- a/features/odl-genius-api/pom.xml
+++ b/features/odl-genius-api/pom.xml
@@ -27,7 +27,7 @@
       <dependency>
         <groupId>org.opendaylight.mdsal</groupId>
         <artifactId>mdsal-artifacts</artifactId>
-        <version>3.0.6</version>
+        <version>4.0.0</version>
         <scope>import</scope>
         <type>pom</type>
       </dependency>

diff --git a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/ActionConverterUtil.java b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/ActionConverterUtil.java
index d2405c2fcf54d54d73b7920ffecede1921a53890..e422938ba86bfd5186b49ccc0b0d3d3be506cddc 100644 (file)
--- a/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/ActionConverterUtil.java
+++ b/interfacemanager/interfacemanager-impl/src/main/java/org/opendaylight/genius/interfacemanager/servicebindings/flowbased/utilities/ActionConverterUtil.java
@@ -161,7 +161,7 @@ public final class ActionConverterUtil {
     }
 
     public static Action convertServiceActionToFlowAction(Action inAction) {
-        final Function<Action, Action> func = SERVICE_TO_OF.get(inAction.getImplementedInterface());
+        final Function<Action, Action> func = SERVICE_TO_OF.get(inAction.implementedInterface());
         return func == null ? inAction : func.apply(inAction);
     }
 }

diff --git a/itm/itm-impl/pom.xml b/itm/itm-impl/pom.xml
index 4752a5970c16899607da90e67728a3d1ded4e6ed..fc3ce4d30149396660826d6efd971702133a4b34 100644 (file)
--- a/itm/itm-impl/pom.xml
+++ b/itm/itm-impl/pom.xml
@@ -183,6 +183,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <groupId>com.google.truth</groupId>
       <artifactId>truth</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito2</artifactId>

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepCommandHelper.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepCommandHelper.java
index 49f9fd92c174da4cdf038d076497c40d052bc168..c8e6108a16f346c830c151041d9f40541b9a857c 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepCommandHelper.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepCommandHelper.java
@@ -12,6 +12,7 @@ import static org.opendaylight.genius.infra.Datastore.CONFIGURATION;
 import com.google.common.base.Optional;
 import com.google.common.base.Preconditions;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import java.math.BigInteger;
 import java.util.ArrayList;
 import java.util.Collection;
@@ -418,7 +419,8 @@ public class TepCommandHelper {
                 InstanceIdentifier<TransportZones> path = InstanceIdentifier.builder(TransportZones.class).build();
                 LOG.debug("InstanceIdentifier {}", path);
                 Futures.addCallback(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
-                    tx -> tx.merge(path, transportZones, true)), ItmUtils.DEFAULT_WRITE_CALLBACK);
+                    tx -> tx.merge(path, transportZones, true)), ItmUtils.DEFAULT_WRITE_CALLBACK,
+                        MoreExecutors.directExecutor());
                 LOG.debug("wrote to Config DS {}", transportZones);
                 transportZonesHashMap.clear();
                 transportZoneArrayList.clear();
@@ -669,7 +671,8 @@ public class TepCommandHelper {
                     allPaths.addAll(vtepPaths);
                     allPaths.addAll(subnetPaths);
                     Futures.addCallback(txRunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.CONFIGURATION,
-                        tx -> allPaths.forEach(tx::delete)), ItmUtils.DEFAULT_WRITE_CALLBACK);
+                        tx -> allPaths.forEach(tx::delete)), ItmUtils.DEFAULT_WRITE_CALLBACK,
+                            MoreExecutors.directExecutor());
                 }
                 vtepPaths.clear();
                 subnetPaths.clear();
@@ -881,7 +884,8 @@ public class TepCommandHelper {
             TunnelMonitorParams tunnelMonitor = new TunnelMonitorParamsBuilder().setEnabled(monitorEnabled)
                     .setMonitorProtocol(monitorType).build();
             Futures.addCallback(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
-                tx -> tx.merge(path, tunnelMonitor, true)), ItmUtils.DEFAULT_WRITE_CALLBACK);
+                tx -> tx.merge(path, tunnelMonitor, true)), ItmUtils.DEFAULT_WRITE_CALLBACK,
+                    MoreExecutors.directExecutor());
         }
     }
 
@@ -893,7 +897,8 @@ public class TepCommandHelper {
         if (!storedTunnelMonitor.isPresent() || storedTunnelMonitor.get().getInterval() != interval) {
             TunnelMonitorInterval tunnelMonitor = new TunnelMonitorIntervalBuilder().setInterval(interval).build();
             Futures.addCallback(txRunner.callWithNewWriteOnlyTransactionAndSubmit(CONFIGURATION,
-                tx -> tx.merge(path, tunnelMonitor, true)), ItmUtils.DEFAULT_WRITE_CALLBACK);
+                tx -> tx.merge(path, tunnelMonitor, true)), ItmUtils.DEFAULT_WRITE_CALLBACK,
+                    MoreExecutors.directExecutor());
         }
     }
 

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepDeleteDatastore.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepDeleteDatastore.java
index 33eb956e566f06560a44ca243bbfa3c3b82f19a0..e6baccaf2c4d5e7feca425ad0f5ae4bac0342c10 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepDeleteDatastore.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/cli/TepDeleteDatastore.java
@@ -8,6 +8,7 @@
 package org.opendaylight.genius.itm.cli;
 
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.util.ArrayList;
 import java.util.List;
@@ -51,12 +52,13 @@ public class TepDeleteDatastore<T extends DataObject>  extends OsgiCommandSuppor
         //allConfigPaths.add((InstanceIdentifier<T>) tunnelsConfigPath);
         final ManagedNewTransactionRunner txrunner = new ManagedNewTransactionRunnerImpl(itmProvider.getDataBroker());
         Futures.addCallback(txrunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.CONFIGURATION,
-            tx -> allConfigPaths.forEach(tx::delete)), ItmUtils.DEFAULT_WRITE_CALLBACK);
+            tx -> allConfigPaths.forEach(tx::delete)), ItmUtils.DEFAULT_WRITE_CALLBACK, MoreExecutors.directExecutor());
         List<InstanceIdentifier<T>> allOperationalPaths = new ArrayList<>();
         // allOperationalPaths.add((InstanceIdentifier<T>) tnStateOpPath);
         allOperationalPaths.add((InstanceIdentifier<T>) ifStateOpPath);
         Futures.addCallback(txrunner.callWithNewWriteOnlyTransactionAndSubmit(Datastore.OPERATIONAL,
-            tx -> allOperationalPaths.forEach(tx::delete)), ItmUtils.DEFAULT_WRITE_CALLBACK);
+            tx -> allOperationalPaths.forEach(tx::delete)), ItmUtils.DEFAULT_WRITE_CALLBACK,
+                MoreExecutors.directExecutor());
         return null;
     }
 }

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
index b5637ed75f069af88d2c0cd5f506dc37f5ee6c33..f4ad6dd4a22f67b1286fe9a8cc391d1f9c91ba86 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/impl/ItmUtils.java
@@ -17,6 +17,7 @@ import com.google.common.collect.ImmutableMap;
 import com.google.common.net.InetAddresses;
 import com.google.common.util.concurrent.FutureCallback;
 import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.MoreExecutors;
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import java.math.BigInteger;
 import java.net.InetAddress;
@@ -214,7 +215,7 @@ public final class ItmUtils {
                                                          FutureCallback<Void> callback) {
         WriteTransaction tx = broker.newWriteOnlyTransaction();
         tx.put(datastoreType, path, data, true);
-        Futures.addCallback(tx.submit(), callback);
+        Futures.addCallback(tx.submit(), callback, MoreExecutors.directExecutor());
     }
 
     /**
@@ -228,7 +229,7 @@ public final class ItmUtils {
                                                           FutureCallback<Void> callback) {
         WriteTransaction tx = broker.newWriteOnlyTransaction();
         tx.merge(datastoreType, path, data, true);
-        Futures.addCallback(tx.submit(), callback);
+        Futures.addCallback(tx.submit(), callback, MoreExecutors.directExecutor());
     }
 
     /**
@@ -242,7 +243,7 @@ public final class ItmUtils {
                                                           FutureCallback<Void> callback) {
         WriteTransaction tx = broker.newWriteOnlyTransaction();
         tx.delete(datastoreType, path);
-        Futures.addCallback(tx.submit(), callback);
+        Futures.addCallback(tx.submit(), callback, MoreExecutors.directExecutor());
     }
 
     /**
@@ -260,7 +261,7 @@ public final class ItmUtils {
             for (InstanceIdentifier<T> path : pathList) {
                 tx.delete(datastoreType, path);
             }
-            Futures.addCallback(tx.submit(), callback);
+            Futures.addCallback(tx.submit(), callback ,MoreExecutors.directExecutor());
         }
     }
 

diff --git a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
index 7011ce841a3fb748d0699c395f030d49749b0736..70723682c7a2b5ecfd78b693f32a0504f861249f 100644 (file)
--- a/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
+++ b/itm/itm-impl/src/main/java/org/opendaylight/genius/itm/rpc/ItmManagerRpcService.java
@@ -302,7 +302,7 @@ public class ItmManagerRpcService implements ItmRpcService {
                             settableFuture.set(RpcResultBuilder.<GetEgressActionsForTunnelOutput>failed()
                                     .withError(RpcError.ErrorType.APPLICATION, errMsg, throwable).build());
                         }
-                });
+                } ,MoreExecutors.directExecutor());
             return  settableFuture;
         } else {
             return fromListenableFuture(LOG, input, () -> getEgressActionsForInterface(input.getIntfName(),
@@ -342,8 +342,9 @@ public class ItmManagerRpcService implements ItmRpcService {
                                     tunnelName);
                             settableFuture.set(RpcResultBuilder.<GetTunnelTypeOutput>failed()
                                     .withError(RpcError.ErrorType.APPLICATION, errMsg, throwable).build());
+
                         }
-                });
+                },MoreExecutors.directExecutor());
             return settableFuture;
         } else {
             LOG.debug("get tunnel type from ITM for interface name {}", input.getIntfName());

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelAddTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelAddTest.java
index cb90ce995794e3a97393e1a1f0520d7bccd8c786..045861f70b15639f71dbfdcd7c430c743c44dc74 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelAddTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelAddTest.java
@@ -85,6 +85,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transp
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.Vteps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.VtepsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.VtepsKey;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -394,7 +395,7 @@ public class ItmExternalTunnelAddTest {
                         new ExternalTunnelKey(getExternalTunnelKey(source),
                                 getExternalTunnelKey(destination), tunnelType1));
 
-        doReturn(Futures.immediateCheckedFuture(Optional.of(transportZone))).when(typedReadWriteTransaction)
+        doReturn(FluentFutures.immediateFluentFuture(Optional.of(transportZone))).when(typedReadWriteTransaction)
             .read(transportZoneIdentifier);
 
         externalTunnelAddWorker.buildHwVtepsTunnels(cfgdDpnListVxlan, null, typedReadWriteTransaction);

diff --git a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelDeleteTest.java b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelDeleteTest.java
index ac3e3787b566d6c8e1aec9aa83b0ad6479ee3ebe..b050a2798aec2f2f1e92c21606ff07f100dad76b 100644 (file)
--- a/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelDeleteTest.java
+++ b/itm/itm-impl/src/test/java/org/opendaylight/genius/itm/impl/ItmExternalTunnelDeleteTest.java
@@ -73,6 +73,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transp
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.Vteps;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.VtepsBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.itm.rev160406.transport.zones.transport.zone.subnets.VtepsKey;
+import org.opendaylight.yangtools.util.concurrent.FluentFutures;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.common.RpcResult;
 import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
@@ -297,19 +298,19 @@ public class ItmExternalTunnelDeleteTest {
         Optional<TransportZone> optionalTransportZone = Optional.of(transportZone);
         Optional<ExternalTunnel> exTunnels = Optional.of(externalTunnel);
 
-        doReturn(Futures.immediateCheckedFuture(optionalTransportZone))
+        doReturn(FluentFutures.immediateFluentFuture(optionalTransportZone))
                 .when(typedReadWriteTransaction).read(transportZoneIdentifier);
-        doReturn(Futures.immediateCheckedFuture(exTunnels))
+        doReturn(FluentFutures.immediateFluentFuture(exTunnels))
                 .when(typedReadWriteTransaction).read(externalTunnelIdentifier1);
-        doReturn(Futures.immediateCheckedFuture(exTunnels))
+        doReturn(FluentFutures.immediateFluentFuture(exTunnels))
                 .when(typedReadWriteTransaction).read(externalTunnelIdentifier2);
-        doReturn(Futures.immediateCheckedFuture(exTunnels)).when(typedReadWriteTransaction)
+        doReturn(FluentFutures.immediateFluentFuture(exTunnels)).when(typedReadWriteTransaction)
                 .read(externalTunnelIdentifier3);
-        doReturn(Futures.immediateCheckedFuture(exTunnels)).when(typedReadWriteTransaction)
+        doReturn(FluentFutures.immediateFluentFuture(exTunnels)).when(typedReadWriteTransaction)
                 .read(externalTunnelIdentifier4);
-        doReturn(Futures.immediateCheckedFuture(exTunnels)).when(typedReadWriteTransaction)
+        doReturn(FluentFutures.immediateFluentFuture(exTunnels)).when(typedReadWriteTransaction)
                 .read(externalTunnelIdentifier5);
-        doReturn(Futures.immediateCheckedFuture(exTunnels)).when(typedReadWriteTransaction)
+        doReturn(FluentFutures.immediateFluentFuture(exTunnels)).when(typedReadWriteTransaction)
                 .read(externalTunnelIdentifier6);
         try {
             ItmExternalTunnelDeleteWorker

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MDSALUtil.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MDSALUtil.java
index ad47e95e1fdd1ea22d56b53fd13c83622d6f3976..412f41efbdc7a374f93e6476b97ef6b7adaf3e1f 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MDSALUtil.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/MDSALUtil.java
@@ -89,6 +89,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.packet.service.rev130709.Tr
 import org.opendaylight.yangtools.yang.binding.DataObject;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
 import org.opendaylight.yangtools.yang.binding.InstanceIdentifier.InstanceIdentifierBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -644,7 +645,8 @@ public class MDSALUtil {
 
     public static Action createNxOfInPortAction(final int actionKey, final int inPortVal) {
         NxRegLoad regLoad = new NxRegLoadBuilder()
-                .setDst(new DstBuilder().setDstChoice(new DstNxOfInPortCaseBuilder().setOfInPort(Boolean.TRUE).build())
+                .setDst(new DstBuilder().setDstChoice(new DstNxOfInPortCaseBuilder()
+                        .setOfInPort(Empty.getInstance()).build())
                         .setStart(0).setEnd(15).build())
                 .setValue(BigInteger.valueOf(inPortVal)).build();
         ActionBuilder abExt = new ActionBuilder();

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpa.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpa.java
index 5128a6c080c3f084796ec848fcddacf093fe49da..47353e25918c54645f03d144d3f236870abd0f1b 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpa.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpa.java
@@ -17,7 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
-
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Load IP Address to SPA (Sender Protocol Address).
@@ -51,7 +51,7 @@ public class ActionLoadIpToSpa extends ActionInfo {
             .setAction(new NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegLoad(new NxRegLoadBuilder()
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstOfArpSpaCaseBuilder().setOfArpSpa(true).build())
+                        .setDstChoice(new DstOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(31)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToSha.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToSha.java
index 29858bae138d49cb68e2c185d8cf2922f0c4c10a..ae0ee9b92e42905ac6a07f42135ca3b52b85bf19 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToSha.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToSha.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Load MAC address to SHA (Sender Hardware Address).
@@ -51,7 +52,7 @@ public class ActionLoadMacToSha extends ActionInfo {
             .setAction(new NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegLoad(new NxRegLoadBuilder()
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstNxArpShaCaseBuilder().setNxArpSha(true).build())
+                        .setDstChoice(new DstNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(47)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveShaToTha.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveShaToTha.java
index 3087200e2a81a39d89909a0a2da2ef5a7d288a68..b764f5b9e4cf5a1320a7456a51d2be76be6674de 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveShaToTha.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveShaToTha.java
@@ -17,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxArpShaCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Move Source Hardware address to Destination address, to where the ARP
@@ -44,12 +45,12 @@ public class ActionMoveShaToTha extends ActionInfo {
             .setAction(new NxActionRegMoveNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegMove(new NxRegMoveBuilder()
                     .setSrc(new SrcBuilder()
-                        .setSrcChoice(new SrcNxArpShaCaseBuilder().setNxArpSha(true).build())
+                        .setSrcChoice(new SrcNxArpShaCaseBuilder().setNxArpSha(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(47)
                         .build())
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstNxArpThaCaseBuilder().setNxArpTha(true).build())
+                        .setDstChoice(new DstNxArpThaCaseBuilder().setNxArpTha(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(47)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEth.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEth.java
index 790f3d85020296d7a6459577f6b44b0d8c77af95..3400dbf2ff1b138f9bd11ad1370532cd62687653 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEth.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEth.java
@@ -18,7 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthSrcCaseBuilder;
-
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Move source/destination Ethernet action.
@@ -43,11 +43,11 @@ public class ActionMoveSourceDestinationEth extends ActionInfo {
         ActionBuilder ab = new ActionBuilder();
         NxRegMove regMove = new NxRegMoveBuilder()
             .setSrc(new SrcBuilder()
-                .setSrcChoice(new SrcOfEthSrcCaseBuilder().setOfEthSrc(Boolean.TRUE).build())
+                .setSrcChoice(new SrcOfEthSrcCaseBuilder().setOfEthSrc(Empty.getInstance()).build())
                 .setStart(0)
                 .build())
             .setDst(new DstBuilder()
-                .setDstChoice(new DstOfEthDstCaseBuilder().setOfEthDst(Boolean.TRUE).build())
+                .setDstChoice(new DstOfEthDstCaseBuilder().setOfEthDst(Empty.getInstance()).build())
                 .setStart(0)
                 .setEnd(47)
                 .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIp.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIp.java
index bd88d9774e39d0fcfb4026414aa51d6a2bee73fb..4fa102462e7fac2bc8dd82ff70b120148595a44b 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIp.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIp.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpSrcCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Move source/destination IP action.
@@ -42,11 +43,11 @@ public class ActionMoveSourceDestinationIp extends ActionInfo {
         ActionBuilder ab = new ActionBuilder();
         NxRegMove regMove = new NxRegMoveBuilder()
             .setSrc(new SrcBuilder()
-                .setSrcChoice(new SrcOfIpSrcCaseBuilder().setOfIpSrc(Boolean.TRUE).build())
+                .setSrcChoice(new SrcOfIpSrcCaseBuilder().setOfIpSrc(Empty.getInstance()).build())
                 .setStart(0)
                 .build())
             .setDst(new DstBuilder()
-                .setDstChoice(new DstOfIpDstCaseBuilder().setOfIpDst(Boolean.TRUE).build())
+                .setDstChoice(new DstOfIpDstCaseBuilder().setOfIpDst(Empty.getInstance()).build())
                 .setStart(0)
                 .setEnd(31)
                 .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6.java
index 7ab4246d522fad41469e74b166a9756a2da92dfd..4e52f3ffdd30d1829c0a5ffe1db0da00dc2f4222 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxIpv6SrcCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Move source/destination IPv6 action.
@@ -42,11 +43,11 @@ public class ActionMoveSourceDestinationIpv6 extends ActionInfo {
         ActionBuilder ab = new ActionBuilder();
         NxRegMove regMove = new NxRegMoveBuilder()
             .setSrc(new SrcBuilder()
-                .setSrcChoice(new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Boolean.TRUE).build())
+                .setSrcChoice(new SrcNxIpv6SrcCaseBuilder().setNxIpv6Src(Empty.getInstance()).build())
                 .setStart(0)
                 .build())
             .setDst(new DstBuilder()
-                .setDstChoice(new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Boolean.TRUE).build())
+                .setDstChoice(new DstNxIpv6DstCaseBuilder().setNxIpv6Dst(Empty.getInstance()).build())
                 .setStart(0)
                 .setEnd(127)
                 .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSpaToTpa.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSpaToTpa.java
index 792e7bb34484aff3d16c3eaf83a365e3d67ec131..36191fe03847d6fc84da233de63413eb700ea0ba 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSpaToTpa.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSpaToTpa.java
@@ -17,6 +17,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.DstBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfArpSpaCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Move Source IP address to Destination IP address, to where the ARP
@@ -44,12 +45,12 @@ public class ActionMoveSpaToTpa extends ActionInfo {
             .setAction(new NxActionRegMoveNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegMove(new NxRegMoveBuilder()
                     .setSrc(new SrcBuilder()
-                        .setSrcChoice(new SrcOfArpSpaCaseBuilder().setOfArpSpa(true).build())
+                        .setSrcChoice(new SrcOfArpSpaCaseBuilder().setOfArpSpa(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(31)
                         .build())
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstOfArpTpaCaseBuilder().setOfArpTpa(true).build())
+                        .setDstChoice(new DstOfArpTpaCaseBuilder().setOfArpTpa(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(31)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPort.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPort.java
index b0998e5a129650bf8337e3cb0bfb90111249d9d0..a6672c4b71fd280418965bbd6dc6f4d109e0c366 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPort.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPort.java
@@ -16,6 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * NX load in port action.
@@ -44,7 +45,7 @@ public class ActionNxLoadInPort extends ActionInfo {
             .setAction(new NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegLoad(new NxRegLoadBuilder()
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstNxOfInPortCaseBuilder().setOfInPort(true).build())
+                        .setDstChoice(new DstNxOfInPortCaseBuilder().setOfInPort(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(15)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadata.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadata.java
index 83ebea864119cf2ddee82d59db3bf472b64fa195..d99b6a71b0819a46587410b5ea52d3aa077ab363 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadata.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadata.java
@@ -16,6 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * NX load metadata action.
@@ -48,7 +49,7 @@ public class ActionNxLoadMetadata extends ActionInfo {
             .setAction(new NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegLoad(new NxRegLoadBuilder()
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstOfMetadataCaseBuilder().setOfMetadata(true).build())
+                        .setDstChoice(new DstOfMetadataCaseBuilder().setOfMetadata(Empty.getInstance()).build())
                         .setStart(startBit)
                         .setEnd(endBit)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionRegMove.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionRegMove.java
index 6be9945141e6ddbbf1506bc86db028f6888bf756..8195ae53a66babf5835ea749df82b24f6bde0455 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionRegMove.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionRegMove.java
@@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.Src;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.nx.reg.move.SrcBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxRegCaseBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Action to move an NXM register.
@@ -55,7 +56,7 @@ public class ActionRegMove extends ActionInfo {
                 .build();
 
         Dst dst = new DstBuilder()
-                .setDstChoice(new DstOfMplsLabelCaseBuilder().setOfMplsLabel(true).build())
+                .setDstChoice(new DstOfMplsLabelCaseBuilder().setOfMplsLabel(Empty.getInstance()).build())
                 .setStart(start)
                 .setEnd(end)
                 .build();

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetArpOp.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetArpOp.java
index 6ed904b61ae2e154e90bb0da3bf7157b2b5f84ed..8f76387eebc94ecd43fc23907522ed623bcb396a 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetArpOp.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetArpOp.java
@@ -16,6 +16,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Set ARP Operation Type that is Request or Replay.
@@ -49,7 +50,7 @@ public class ActionSetArpOp extends ActionInfo {
             .setAction(new NxActionRegLoadNodesNodeTableFlowApplyActionsCaseBuilder()
                 .setNxRegLoad(new NxRegLoadBuilder()
                     .setDst(new DstBuilder()
-                        .setDstChoice(new DstOfArpOpCaseBuilder().setOfArpOp(true).build())
+                        .setDstChoice(new DstOfArpOpCaseBuilder().setOfArpOp(Empty.getInstance()).build())
                         .setStart(0)
                         .setEnd(15)
                         .build())

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelDestinationIp.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelDestinationIp.java
index fffe52f254b95000538655f41dd91d1d8a659c83..9c320264484c925c5b4e2b74b29d72a5a20fc4b4 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelDestinationIp.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelDestinationIp.java
@@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.Dst;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Set tunnel destination IP action.
@@ -64,7 +65,7 @@ public class ActionSetTunnelDestinationIp extends ActionInfo {
     public Action buildAction(int newActionKey) {
         NxRegLoadBuilder nxRegLoadBuilder = new NxRegLoadBuilder();
         Dst dst = new DstBuilder()
-            .setDstChoice(new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Boolean.TRUE).build())
+            .setDstChoice(new DstNxTunIpv4DstCaseBuilder().setNxTunIpv4Dst(Empty.getInstance()).build())
             .setStart(0)
             .setEnd(31)
             .build();

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelSourceIp.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelSourceIp.java
index d2811357a22f4881e74590b19c0a80e4a1cc596e..fbe6706f95a23fe81b9acb9ad7fb7ab5eeacf5d3 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelSourceIp.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/actions/ActionSetTunnelSourceIp.java
@@ -20,6 +20,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoadBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.Dst;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.nx.reg.load.DstBuilder;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Set tunnel source IP action.
@@ -64,7 +65,7 @@ public class ActionSetTunnelSourceIp extends ActionInfo {
     public Action buildAction(int newActionKey) {
         NxRegLoadBuilder nxRegLoadBuilder = new NxRegLoadBuilder();
         Dst dst = new DstBuilder()
-            .setDstChoice(new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Boolean.TRUE).build())
+            .setDstChoice(new DstNxTunIpv4SrcCaseBuilder().setNxTunIpv4Src(Empty.getInstance()).build())
             .setStart(0)
             .setEnd(31)
             .build();

diff --git a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java
index ae7f0af46ee8d70eb996a26a71863d2aeebd5e0d..6f58959929cdd23fab8b0b8f3012ff9cf35e98b8 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java
+++ b/mdsalutil/mdsalutil-api/src/main/java/org/opendaylight/genius/mdsalutil/packet/IPv4.java
@@ -568,7 +568,7 @@ public class IPv4 extends Packet {
             try {
                 payloadLength = payload.serialize().length;
             } catch (PacketException e) {
-                LOG.error("", e);
+                LOG.error("Exception in setpayload", e);
             }
         }
 

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java
index f3c679344f0ead18d292c2af92638570cfa700db..a2db6928c4bf0e3bf04a07a46968a3cc36089aa5 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadIpToSpaTest.java
@@ -20,6 +20,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfArpSpaCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoad;
+import org.opendaylight.yangtools.yang.common.Empty;
+
 
 /**
  * Test for {@link ActionLoadIpToSpa}.
@@ -42,7 +44,7 @@ public class ActionLoadIpToSpaTest {
         NxRegLoad nxRegLoad = actionCase.getNxRegLoad();
         assertTrue(nxRegLoad.getDst().getDstChoice() instanceof DstOfArpSpaCase);
         DstOfArpSpaCase dstOfArpSpaCase = (DstOfArpSpaCase) nxRegLoad.getDst().getDstChoice();
-        assertTrue(dstOfArpSpaCase.isOfArpSpa());
+        assertEquals(Empty.getInstance(),dstOfArpSpaCase.getOfArpSpa());
         assertEquals(0, nxRegLoad.getDst().getStart().intValue());
         assertEquals(31, nxRegLoad.getDst().getEnd().intValue());
         assertEquals(

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java
index f50d5634ff97c340ebb33f5c5e49f1b1f5fe96e1..17f6935f21ccc0c35b658287a511f0ae79e7a025 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionLoadMacToShaTest.java
@@ -21,6 +21,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxArpShaCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoad;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test for {@link ActionLoadMacToSha}.
@@ -43,7 +44,7 @@ public class ActionLoadMacToShaTest {
         NxRegLoad nxRegLoad = actionCase.getNxRegLoad();
         assertTrue(nxRegLoad.getDst().getDstChoice() instanceof DstNxArpShaCase);
         DstNxArpShaCase dstNxArpShaCase = (DstNxArpShaCase) nxRegLoad.getDst().getDstChoice();
-        assertTrue(dstNxArpShaCase.isNxArpSha());
+        assertEquals(Empty.getInstance(),dstNxArpShaCase.getNxArpSha());
         assertEquals(0, nxRegLoad.getDst().getStart().intValue());
         assertEquals(47, nxRegLoad.getDst().getEnd().intValue());
         assertEquals(BigInteger.valueOf(NWUtil.macToLong(new MacAddress(MAC_ADDRESS))), nxRegLoad.getValue());

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java
index b37355397246b491c79b6747e679d053ce0f89db..f8fced838339b4a916a94b09ddbb127ad834c1b7 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationEthTest.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.NxRegMove;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfEthSrcCase;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test class for {@link ActionMoveSourceDestinationEth}.
@@ -37,11 +38,11 @@ public class ActionMoveSourceDestinationEthTest {
         NxRegMove nxRegMove = actionCase.getNxRegMove();
         assertTrue(nxRegMove.getSrc().getSrcChoice() instanceof SrcOfEthSrcCase);
         SrcOfEthSrcCase srcChoice = (SrcOfEthSrcCase) nxRegMove.getSrc().getSrcChoice();
-        assertTrue(srcChoice.isOfEthSrc());
+        assertEquals(Empty.getInstance(),srcChoice.getOfEthSrc());
         assertEquals(0, nxRegMove.getSrc().getStart().intValue());
         assertTrue(nxRegMove.getDst().getDstChoice() instanceof DstOfEthDstCase);
         DstOfEthDstCase dstChoice = (DstOfEthDstCase) nxRegMove.getDst().getDstChoice();
-        assertTrue(dstChoice.isOfEthDst());
+        assertEquals(Empty.getInstance(),dstChoice.getOfEthDst());
         assertEquals(0, nxRegMove.getDst().getStart().intValue());
         assertEquals(47, nxRegMove.getDst().getEnd().intValue());
     }

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java
index 04aca477f168369f60609168b7471e20b2c2039a..f74404b124e86ec411f110d5e0d2004cdc8477e4 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpTest.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.NxRegMove;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcOfIpSrcCase;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test class for {@link ActionMoveSourceDestinationIp}.
@@ -37,11 +38,11 @@ public class ActionMoveSourceDestinationIpTest {
         NxRegMove nxRegMove = actionCase.getNxRegMove();
         assertTrue(nxRegMove.getSrc().getSrcChoice() instanceof SrcOfIpSrcCase);
         SrcOfIpSrcCase srcChoice = (SrcOfIpSrcCase) nxRegMove.getSrc().getSrcChoice();
-        assertTrue(srcChoice.isOfIpSrc());
+        assertEquals(Empty.getInstance(),srcChoice.getOfIpSrc());
         assertEquals(0, nxRegMove.getSrc().getStart().intValue());
         assertTrue(nxRegMove.getDst().getDstChoice() instanceof DstOfIpDstCase);
         DstOfIpDstCase dstChoice = (DstOfIpDstCase) nxRegMove.getDst().getDstChoice();
-        assertTrue(dstChoice.isOfIpDst());
+        assertEquals(Empty.getInstance(),dstChoice.getOfIpDst());
         assertEquals(0, nxRegMove.getDst().getStart().intValue());
         assertEquals(31, nxRegMove.getDst().getEnd().intValue());
     }

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java
index 07e06f6b786288c0ecd6dd7bd4218e83089f8e90..cd7b31dc7783046c79601b1b35dafeed51fbb657 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionMoveSourceDestinationIpv6Test.java
@@ -18,6 +18,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.ni
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegMoveNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.move.grouping.NxRegMove;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.src.choice.grouping.src.choice.SrcNxIpv6SrcCase;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test class for {@link ActionMoveSourceDestinationIpv6}.
@@ -37,11 +38,11 @@ public class ActionMoveSourceDestinationIpv6Test {
         NxRegMove nxRegMove = actionCase.getNxRegMove();
         assertTrue(nxRegMove.getSrc().getSrcChoice() instanceof SrcNxIpv6SrcCase);
         SrcNxIpv6SrcCase srcChoice = (SrcNxIpv6SrcCase) nxRegMove.getSrc().getSrcChoice();
-        assertTrue(srcChoice.isNxIpv6Src());
+        assertEquals(Empty.getInstance(),srcChoice.getNxIpv6Src());
         assertEquals(0, nxRegMove.getSrc().getStart().intValue());
         assertTrue(nxRegMove.getDst().getDstChoice() instanceof DstNxIpv6DstCase);
         DstNxIpv6DstCase dstChoice = (DstNxIpv6DstCase) nxRegMove.getDst().getDstChoice();
-        assertTrue(dstChoice.isNxIpv6Dst());
+        assertEquals(Empty.getInstance(), dstChoice.getNxIpv6Dst());
         assertEquals(0, nxRegMove.getDst().getStart().intValue());
         assertEquals(127, nxRegMove.getDst().getEnd().intValue());
     }

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java
index 1d354a958d407786571622f7c180241adce682f1..1959db19cd76cca7e1f171ee43d45209a24c64eb 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadInPortTest.java
@@ -19,6 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstNxOfInPortCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoad;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test for {@link ActionNxLoadInPort}.
@@ -41,7 +42,7 @@ public class ActionNxLoadInPortTest {
         NxRegLoad nxRegLoad = actionCase.getNxRegLoad();
         assertTrue(nxRegLoad.getDst().getDstChoice() instanceof DstNxOfInPortCase);
         DstNxOfInPortCase dstNxOfInPortCase = (DstNxOfInPortCase) nxRegLoad.getDst().getDstChoice();
-        assertTrue(dstNxOfInPortCase.isOfInPort());
+        assertEquals(Empty.getInstance(),dstNxOfInPortCase.getOfInPort());
         assertEquals(0, nxRegLoad.getDst().getStart().intValue());
         assertEquals(15, nxRegLoad.getDst().getEnd().intValue());
         assertEquals(VALUE, nxRegLoad.getValue());

diff --git a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java
index bc5d45d4cac7e1bc51441f6dbf805f2be0c78755..a835f69112e968ec1bcdf25d34177668f3421ec9 100644 (file)
--- a/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java
+++ b/mdsalutil/mdsalutil-api/src/test/java/org/opendaylight/genius/mdsalutil/actions/ActionNxLoadMetadataTest.java
@@ -19,6 +19,7 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.action.types.rev131112.Acti
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.dst.choice.grouping.dst.choice.DstOfMetadataCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nodes.node.table.flow.instructions.instruction.instruction.apply.actions._case.apply.actions.action.action.NxActionRegLoadNodesNodeTableFlowApplyActionsCase;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.openflowplugin.extension.nicira.action.rev140714.nx.action.reg.load.grouping.NxRegLoad;
+import org.opendaylight.yangtools.yang.common.Empty;
 
 /**
  * Test for {@link ActionNxLoadMetadata}.
@@ -43,7 +44,7 @@ public class ActionNxLoadMetadataTest {
         NxRegLoad nxRegLoad = actionCase.getNxRegLoad();
         assertTrue(nxRegLoad.getDst().getDstChoice() instanceof DstOfMetadataCase);
         DstOfMetadataCase dstOfMetadataCase = (DstOfMetadataCase) nxRegLoad.getDst().getDstChoice();
-        assertTrue(dstOfMetadataCase.isOfMetadata());
+        assertEquals(Empty.getInstance(),dstOfMetadataCase.getOfMetadata());
         assertEquals(START, nxRegLoad.getDst().getStart());
         assertEquals(END, nxRegLoad.getDst().getEnd());
         assertEquals(VALUE, nxRegLoad.getValue());

diff --git a/mdsalutil/mdsalutil-impl/pom.xml b/mdsalutil/mdsalutil-impl/pom.xml
index 5b02b0a4af25d1960f1fca45f56298451e6107e8..242fb9a57b7447f09c800354edd6d87ced3e8020 100644 (file)
--- a/mdsalutil/mdsalutil-impl/pom.xml
+++ b/mdsalutil/mdsalutil-impl/pom.xml
@@ -98,6 +98,11 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <version>1.6.4</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.powermock</groupId>
       <artifactId>powermock-api-mockito</artifactId>

diff --git a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java
index 9871b7233bce80a5f64dd8a8496a4eb756b09be3..35f0990dc6bb2949f588b947e3c002808bbdb247 100644 (file)
--- a/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java
+++ b/mdsalutil/mdsalutil-impl/src/main/java/org/opendaylight/genius/datastoreutils/listeners/internal/DataTreeEventCallbackRegistrarImpl.java
@@ -20,11 +20,11 @@ import java.util.concurrent.TimeUnit;
 import java.util.function.BiFunction;
 import java.util.function.Consumer;
 import java.util.function.Function;
-import javax.annotation.concurrent.GuardedBy;
 import javax.inject.Inject;
 import javax.inject.Singleton;
 import org.apache.aries.blueprint.annotation.service.Reference;
 import org.apache.aries.blueprint.annotation.service.Service;
+import org.checkerframework.checker.lock.qual.GuardedBy;
 import org.eclipse.jdt.annotation.Nullable;
 import org.opendaylight.controller.md.sal.binding.api.ClusteredDataTreeChangeListener;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;

diff --git a/mdsalutil/mdsalutil-testutils/pom.xml b/mdsalutil/mdsalutil-testutils/pom.xml
index 207d4c087eb321963c61e3c9fa4e2a4a5bdfd2cc..8edfddc7137b27cbf4df8afbba905a565314953a 100644 (file)
--- a/mdsalutil/mdsalutil-testutils/pom.xml
+++ b/mdsalutil/mdsalutil-testutils/pom.xml
@@ -51,18 +51,6 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>awaitility</artifactId>
       <scope>compile</scope> <!-- Do *NOT* use <scope>test</scope> here, because this is a testutils -->
     </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-core</artifactId>
-      <!-- Hamcrest is internally used by Awaitility, so must be compile instead of test scope for build to work -->
-      <scope>compile</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.hamcrest</groupId>
-      <artifactId>hamcrest-library</artifactId>
-      <!-- Hamcrest is internally used by Awaitility, so must be compile instead of test scope for build to work -->
-      <scope>compile</scope>
-    </dependency>
     <dependency>
       <groupId>com.google.inject</groupId>
       <artifactId>guice</artifactId>