Updated BgpManager for Be

[vpnservice.git] / bgpmanager / bgpmanager-impl / src / main / java / org / opendaylight / bgpmanager / FibDSWriter.java

diff --git a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java
index 053e88e1ec9610e6bf5ec1aa339aee1d204e9674..b916e3dd5a1528e61076e2a29cf3a1b21360c8b1 100644 (file)
--- a/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java
+++ b/bgpmanager/bgpmanager-impl/src/main/java/org/opendaylight/bgpmanager/FibDSWriter.java
@@ -8,16 +8,11 @@
 
 package org.opendaylight.bgpmanager;
 
-import com.google.common.util.concurrent.Futures;
 import org.opendaylight.controller.md.sal.binding.api.DataBroker;
 import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
 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.controller.md.sal.binding.api.ReadOnlyTransaction;
-import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.VrfEntries;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.vrfentries.VrfEntry;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.vrfentries.VrfEntryBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev150330.fibentries.VrfTables;
@@ -29,12 +24,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.fibmanager.rev15
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Iterator;
+import java.util.*;
 
-import com.google.common.util.concurrent.FutureCallback;
-import com.google.common.base.Optional;
 
 /**
  * Created by emhamla on 4/14/2015.
@@ -49,33 +40,38 @@ public class FibDSWriter {
 
     public synchronized void addFibEntryToDS(String rd, String prefix,
                                        String nexthop, int label) {
+        if (rd == null || rd.isEmpty()) {
+            logger.error("Prefix {} not associated with vpn", prefix);
+            return;
+        }
 
         VrfEntry vrfEntry = new VrfEntryBuilder().setDestPrefix(prefix).
             setNextHopAddress(nexthop).setLabel((long)label).build();
-        logger.debug("Created vrfEntry for {} nexthop {} label {}", prefix, nexthop, label);
-
-        List<VrfEntry> vrfEntryList = new ArrayList<VrfEntry>();
-        vrfEntryList.add(vrfEntry);
-
-        InstanceIdentifierBuilder<VrfTables> idBuilder =
-            InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd));
-        InstanceIdentifier<VrfTables> vrfTableId = idBuilder.build();
 
-        VrfTables vrfTableNew = new VrfTablesBuilder().setRouteDistinguisher(rd).
-            setVrfEntry(vrfEntryList).build();
+        logger.debug("Created vrfEntry for {} nexthop {} label {}", prefix, nexthop, label);
 
-        write(LogicalDatastoreType.OPERATIONAL, vrfTableId, vrfTableNew);
+        InstanceIdentifier.InstanceIdentifierBuilder<VrfEntry> idBuilder =
+            InstanceIdentifier.builder(FibEntries.class)
+                    .child(VrfTables.class, new VrfTablesKey(rd))
+                    .child(VrfEntry.class, new VrfEntryKey(vrfEntry.getDestPrefix()));
+        InstanceIdentifier<VrfEntry> vrfEntryId= idBuilder.build();
 
+        BgpUtil.write(broker, LogicalDatastoreType.CONFIGURATION,
+                vrfEntryId, vrfEntry);
     }
 
     public synchronized void removeFibEntryFromDS(String rd, String prefix) {
 
+        if (rd == null || rd.isEmpty()) {
+            logger.error("Prefix {} not associated with vpn", prefix);
+            return;
+        }
         logger.debug("Removing fib entry with destination prefix {} from vrf table for rd {}", prefix, rd);
 
         InstanceIdentifierBuilder<VrfEntry> idBuilder =
             InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd)).child(VrfEntry.class, new VrfEntryKey(prefix));
         InstanceIdentifier<VrfEntry> vrfEntryId = idBuilder.build();
-        delete(LogicalDatastoreType.OPERATIONAL, vrfEntryId);
+        BgpUtil.delete(broker, LogicalDatastoreType.CONFIGURATION, vrfEntryId);
 
     }
 
@@ -86,36 +82,10 @@ public class FibDSWriter {
                 InstanceIdentifier.builder(FibEntries.class).child(VrfTables.class, new VrfTablesKey(rd));
         InstanceIdentifier<VrfTables> vrfTableId = idBuilder.build();
 
-        delete(LogicalDatastoreType.OPERATIONAL, vrfTableId);
+        BgpUtil.delete(broker, LogicalDatastoreType.CONFIGURATION, vrfTableId);
 
     }
 
 
-    private <T extends DataObject> Optional<T> read(LogicalDatastoreType datastoreType,
-                                                    InstanceIdentifier<T> path) {
 
-        ReadOnlyTransaction tx = broker.newReadOnlyTransaction();
-
-        Optional<T> result = Optional.absent();
-        try {
-            result = tx.read(datastoreType, path).get();
-        } catch (Exception e) {
-            throw new RuntimeException(e);
-        }
-
-        return result;
-    }
-
-    private <T extends DataObject> void write(LogicalDatastoreType datastoreType,
-                                                   InstanceIdentifier<T> path, T data) {
-        WriteTransaction tx = broker.newWriteOnlyTransaction();
-        tx.merge(datastoreType, path, data, true);
-        tx.submit();
-    }
-
-    private <T extends DataObject> void delete(LogicalDatastoreType datastoreType, InstanceIdentifier<T> path) {
-        WriteTransaction tx = broker.newWriteOnlyTransaction();
-        tx.delete(datastoreType, path);
-        tx.submit();
-    }
 }