Handle nullable lists in vpnmanager

[netvirt.git] / vpnmanager / api / src / main / java / org / opendaylight / netvirt / vpnmanager / api / IVpnManager.java

diff --git a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java
index 83413493c66342a72153e60f25374d434539a30b..c9c57209e079fb6e33d52da49db1f4e6a7987bb5 100644 (file)
--- a/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java
+++ b/vpnmanager/api/src/main/java/org/opendaylight/netvirt/vpnmanager/api/IVpnManager.java
@@ -13,8 +13,10 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Set;
 
+import java.util.concurrent.ExecutionException;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
 import org.opendaylight.genius.infra.Datastore.Configuration;
 import org.opendaylight.genius.infra.Datastore.Operational;
 import org.opendaylight.genius.infra.TypedReadTransaction;
@@ -31,66 +33,37 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.netvirt.neutronvpn.rev15060
 
 
 public interface IVpnManager {
-    @Deprecated
-    void addExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID,
-            Long l3vni, RouteOrigin origin, String intfName, Adjacency operationalAdj,
-            VrfEntry.EncapType encapType, WriteTransaction writeConfigTxn);
-
-    void addExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID,
-        Long l3vni, RouteOrigin origin, String intfName, Adjacency operationalAdj,
-        VrfEntry.EncapType encapType, TypedWriteTransaction<Configuration> confTx);
-
-    @Deprecated
-    void delExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID,
-            String intfName, WriteTransaction writeConfigTxn, WriteTransaction writeOperTx);
+    void addExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
+        Long l3vni, RouteOrigin origin, @Nullable String intfName, @Nullable Adjacency operationalAdj,
+        VrfEntry.EncapType encapType, @Nonnull TypedWriteTransaction<Configuration> confTx);
 
-    void delExtraRoute(String vpnName, String destination, String nextHop, String rd, String routerID,
-        String intfName, TypedWriteTransaction<Configuration> confTx, TypedWriteTransaction<Operational> operTx);
+    void delExtraRoute(String vpnName, String destination, String nextHop, String rd, @Nullable String routerID,
+        @Nullable String intfName, @Nonnull TypedWriteTransaction<Configuration> confTx,
+        @Nonnull TypedWriteTransaction<Operational> operTx);
 
-    @Deprecated
     void removePrefixFromBGP(String vpnName, String primaryRd, String extraRouteRd, String vpnInterfaceName,
-        String prefix, String nextHop, String nextHopTunnelIp, BigInteger dpnId, WriteTransaction writeConfigTxn,
-        WriteTransaction writeOperTx);
-
-    void removePrefixFromBGP(String vpnName, String primaryRd, String extraRouteRd, String vpnInterfaceName,
-        String prefix, String nextHop, String nextHopTunnelIp, BigInteger dpnId,
-        TypedWriteTransaction<Configuration> confTx, TypedWriteTransaction<Operational> operTx);
+                                    String prefix, String nextHop, String nextHopTunnelIp, BigInteger dpnId,
+                                    TypedWriteTransaction<Configuration> confTx,
+                                    TypedWriteTransaction<Operational> operTx);
 
     boolean isVPNConfigured();
 
     String getPrimaryRdFromVpnInstance(VpnInstance vpnInstance);
 
-    @Deprecated
     void addSubnetMacIntoVpnInstance(String vpnName, String subnetVpnName, String srcMacAddress,
-            BigInteger dpnId, WriteTransaction tx);
-
-    void addSubnetMacIntoVpnInstance(String vpnName, String subnetVpnName, String srcMacAddress,
-        BigInteger dpnId, TypedWriteTransaction<Configuration> confTx);
-
-    @Deprecated
-    void removeSubnetMacFromVpnInstance(String vpnName, String subnetVpnName, String srcMacAddress,
-            BigInteger dpnId, WriteTransaction tx);
+        BigInteger dpnId, TypedWriteTransaction<Configuration> confTx) throws ExecutionException, InterruptedException;
 
     void removeSubnetMacFromVpnInstance(String vpnName, String subnetVpnName, String srcMacAddress,
-        BigInteger dpnId, TypedReadWriteTransaction<Configuration> confTx);
-
-    @Deprecated
-    void addRouterGwMacFlow(String routerName, String routerGwMac, BigInteger dpnId, Uuid extNetworkId,
-            String subnetVpnName, WriteTransaction writeTx);
+        BigInteger dpnId, TypedReadWriteTransaction<Configuration> confTx)
+        throws ExecutionException, InterruptedException;
 
     void addRouterGwMacFlow(String routerName, String routerGwMac, BigInteger dpnId, Uuid extNetworkId,
-        String subnetVpnName, TypedWriteTransaction<Configuration> confTx);
+        String subnetVpnName, TypedWriteTransaction<Configuration> confTx)
+        throws ExecutionException, InterruptedException;
 
-    @Deprecated
     void removeRouterGwMacFlow(String routerName, String routerGwMac, BigInteger dpnId, Uuid extNetworkId,
-            String subnetVpnName, WriteTransaction writeTx);
-
-    void removeRouterGwMacFlow(String routerName, String routerGwMac, BigInteger dpnId, Uuid extNetworkId,
-        String subnetVpnName, TypedReadWriteTransaction<Configuration> confTx);
-
-    @Deprecated
-    void addArpResponderFlowsToExternalNetworkIps(String id, Collection<String> fixedIps, String macAddress,
-            BigInteger dpnId, Uuid extNetworkId, WriteTransaction writeTx);
+        String subnetVpnName, TypedReadWriteTransaction<Configuration> confTx)
+        throws ExecutionException, InterruptedException;
 
     void addArpResponderFlowsToExternalNetworkIps(String id, Collection<String> fixedIps, String macAddress,
         BigInteger dpnId, Uuid extNetworkId);