X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=nexthopmgr%2Fnexthopmgr-impl%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fvpnservice%2Fnexthopmgr%2FNexthopManager.java;h=cb1447fb6d7cb12bffc2dc727094c13cb52456e8;hb=3510292a1184e25751f8690ea49a8c2312bba4b3;hp=4f384474a782e8f0e72d870a9b2385ce100e24d0;hpb=00b0d63ef8325f3b9b32b4dbee0c11a51eed1440;p=vpnservice.git

diff --git a/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java b/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
old mode 100644
new mode 100755
index 4f384474..cb1447fb
--- a/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
+++ b/nexthopmgr/nexthopmgr-impl/src/main/java/org/opendaylight/vpnservice/nexthopmgr/NexthopManager.java
@@ -34,7 +34,7 @@ import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev14081
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances.VpnInstance;
 import org.opendaylight.yang.gen.v1.urn.huawei.params.xml.ns.yang.l3vpn.rev140815.vpn.instances.VpnInstanceKey;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.group.types.rev131018.GroupTypes;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.l3vpn.rev130911.VpnInstance1;
+//import org.opendaylight.yang.gen.v1.urn.opendaylight.l3vpn.rev130911.VpnInstance1;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.AllocateIdInput;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.AllocateIdInputBuilder;
 import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.AllocateIdOutput;
@@ -124,15 +124,18 @@ public class NexthopManager implements L3nexthopService, AutoCloseable {
                 .child(VpnInstance.class, new VpnInstanceKey(vpnName));
 
         InstanceIdentifier<VpnInstance> id = idBuilder.build();
-        InstanceIdentifier<VpnInstance1> idx = id.augmentation(VpnInstance1.class);
-        Optional<VpnInstance1> vpn = read(LogicalDatastoreType.OPERATIONAL, idx);
-
-        if (vpn.isPresent()) {
-            LOG.debug("VPN id returned: {}", vpn.get().getVpnId());
-            return vpn.get().getVpnId();
-        } else {
-            return -1;
-        }
+        //FIXME [ELAnBE] Commenting out below 2 lines
+        //InstanceIdentifier<VpnInstance1> idx = id.augmentation(VpnInstance1.class);
+        //Optional<VpnInstance1> vpn = read(LogicalDatastoreType.OPERATIONAL, idx);
+
+
+//        if (vpn.isPresent()) {
+//            LOG.debug("VPN id returned: {}", vpn.get().getVpnId());
+//            return vpn.get().getVpnId();
+//        } else {
+//            return -1;
+//        }
+        return -1;
     }
 
     private BigInteger getDpnId(String ofPortId) {