MDSAL-API Migration

[genius.git] / networkutils / networkutils / src / main / java / org / opendaylight / genius / networkutils / impl / VniUtilsImpl.java

diff --git a/networkutils/networkutils/src/main/java/org/opendaylight/genius/networkutils/impl/VniUtilsImpl.java b/networkutils/networkutils/src/main/java/org/opendaylight/genius/networkutils/impl/VniUtilsImpl.java
index e460d85a84e11e3a344980f7910091dd26df6098..eaa03681e8d4b7268399a7769b1a882976138a19 100644 (file)
--- a/networkutils/networkutils/src/main/java/org/opendaylight/genius/networkutils/impl/VniUtilsImpl.java
+++ b/networkutils/networkutils/src/main/java/org/opendaylight/genius/networkutils/impl/VniUtilsImpl.java
@@ -8,19 +8,18 @@
 package org.opendaylight.genius.networkutils.impl;
 
 import com.google.common.annotations.VisibleForTesting;
-import com.google.common.base.Optional;
+import java.util.Optional;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.Future;
 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.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
-import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
 import org.opendaylight.genius.datastoreutils.SingleTransactionDataBroker;
 import org.opendaylight.genius.mdsalutil.NwConstants;
 import org.opendaylight.genius.networkutils.VniUtils;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.genius.idmanager.rev160406.AllocateIdOutput;
@@ -56,7 +55,7 @@ public class VniUtilsImpl implements VniUtils {
 
     @Inject
     public VniUtilsImpl(NetworkConfig networkConfig, IdManagerService idManagerService,
-                    @Reference DataBroker dataBroker) throws ReadFailedException {
+                    @Reference DataBroker dataBroker) throws InterruptedException, ExecutionException {
         this.idManagerService = idManagerService;
         this.dataBroker = dataBroker;
         this.networkConfig = networkConfig;
@@ -85,12 +84,12 @@ public class VniUtilsImpl implements VniUtils {
     }
 
     @Override
-    public Optional<IdPool> getVxlanVniPool() throws ReadFailedException {
+    public Optional<IdPool> getVxlanVniPool() throws ExecutionException, InterruptedException {
         return SingleTransactionDataBroker.syncReadOptional(dataBroker,
                 LogicalDatastoreType.CONFIGURATION, buildIdPoolInstanceIdentifier(NwConstants.ODL_VNI_POOL_NAME));
     }
 
-    private void validateAndCreateVxlanVniPool() throws ReadFailedException {
+    private void validateAndCreateVxlanVniPool() throws InterruptedException, ExecutionException {
         /*
          * 1. If VNI Pool doesn't exist create it.
          * 2. If VNI Pool exists, but the range value is changed incorrectly