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;
import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.CreateIdPoolInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.CreateIdPoolInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.GetUniqueIdOutput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.GetUniqueIdInputBuilder;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.GetUniqueIdInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.IdManagerService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.ReleaseIdInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.idmanager.rev150403.ReleaseIdInputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.*;
import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.l3nexthop.*;
import org.opendaylight.yang.gen.v1.urn.opendaylight.vpnservice.l3nexthop.rev150409.l3nexthop.tunnelnexthops.*;
private final DataBroker broker;
private IMdsalApiManager mdsalManager;
private IInterfaceManager interfaceManager;
- private IdManager idManager;
+ private IdManagerService idManager;
private static final short LPORT_INGRESS_TABLE = 0;
private static final short LFIB_TABLE = 20;
private static final short FIB_TABLE = 21;
this.mdsalManager = mdsalManager;
}
- public void setIdManager(IdManager idManager) {
+ public void setIdManager(IdManagerService idManager) {
this.idManager = idManager;
}
protected void createNexthopPointerPool() {
CreateIdPoolInput createPool = new CreateIdPoolInputBuilder()
- .setPoolName("nextHopPointerPool")
- .setIdStart(1L)
- .setPoolSize(new BigInteger("65535"))
- .build();
+ .setPoolName("nextHopPointerPool")
+ .setLow(150000L)
+ .setHigh(175000L)
+ .build();
//TODO: Error handling
Future<RpcResult<Void>> result = idManager.createIdPool(createPool);
LOG.trace("NextHopPointerPool result : {}", result);
-// try {
-// LOG.info("Result2: {}",result.get());
-// } catch (InterruptedException | ExecutionException e) {
-// // TODO Auto-generated catch block
-// LOG.error("Error in result.get");
-// }
-
}
.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) {
return dpn;
}
- protected int createNextHopPointer(String nexthopKey) {
- GetUniqueIdInput getIdInput = new GetUniqueIdInputBuilder()
- .setPoolName("nextHopPointerPool").setIdKey(nexthopKey)
- .build();
+ protected long createNextHopPointer(String nexthopKey) {
+ AllocateIdInput getIdInput = new AllocateIdInputBuilder()
+ .setPoolName("nextHopPointerPool").setIdKey(nexthopKey)
+ .build();
//TODO: Proper error handling once IdManager code is complete
try {
- Future<RpcResult<GetUniqueIdOutput>> result = idManager.getUniqueId(getIdInput);
- RpcResult<GetUniqueIdOutput> rpcResult = result.get();
- return rpcResult.getResult().getIdValue().intValue();
+ Future<RpcResult<AllocateIdOutput>> result = idManager.allocateId(getIdInput);
+ RpcResult<AllocateIdOutput> rpcResult = result.get();
+ return rpcResult.getResult().getIdValue();
} catch (NullPointerException | InterruptedException | ExecutionException e) {
LOG.trace("",e);
}
public void createLocalNextHop(String ifName, String vpnName, String ipAddress, String macAddress) {
String nhKey = new String("nexthop." + vpnName + ipAddress);
- int groupId = createNextHopPointer(nhKey);
+ long groupId = createNextHopPointer(nhKey);
long vpnId = getVpnId(vpnName);
BigInteger dpnId = interfaceManager.getDpnForInterface(ifName);
}
}
- public void createRemoteNextHop(String ifName, String ofPortId, String ipAddress) {
+ public void createRemoteNextHop(String ifName, String ipAddress) {
String nhKey = new String("nexthop." + ifName + ipAddress);
- int groupId = createNextHopPointer(nhKey);
+ long groupId = createNextHopPointer(nhKey);
- BigInteger dpnId = getDpnId(ofPortId);
+ BigInteger dpnId = interfaceManager.getDpnForInterface(ifName);
TunnelNexthop nexthop = getTunnelNexthop(dpnId, ipAddress);
if (nexthop == null) {
List<BucketInfo> listBucketInfo = new ArrayList<BucketInfo>();
GroupEntity groupEntity = MDSALUtil.buildGroupEntity(
dpnId, groupId, ipAddress, GroupTypes.GroupIndirect, listBucketInfo);
mdsalManager.installGroup(groupEntity);
- makeRemoteFlow(dpnId, ifName, NwConstants.ADD_FLOW);
+ //makeRemoteFlow(dpnId, ifName, NwConstants.ADD_FLOW);
//update MD-SAL DS
addTunnelNexthopToDS(dpnId, ipAddress, groupId);
dpnId, nh.getEgressPointer(), ipAddress, GroupTypes.GroupIndirect, null);
// remove Group ...
mdsalManager.removeGroup(groupEntity);
- makeRemoteFlow(dpnId, ifName, NwConstants.DEL_FLOW);
+ //makeRemoteFlow(dpnId, ifName, NwConstants.DEL_FLOW);
//update MD-SAL DS
removeTunnelNexthopFromDS(dpnId, ipAddress);
} else {
String endpointIp = interfaceManager.getEndpointIpForDpn(input.getDpnId());
LOG.trace("getEgressPointer: input {}, endpointIp {}", input, endpointIp);
- if (input.getNexthopIp().equals(endpointIp)) {
+ if (input.getNexthopIp() == null || input.getNexthopIp().equals(endpointIp)) {
VpnNexthop vpnNextHop = getVpnNexthop(input.getVpnId(), input.getIpPrefix(), 5);
output.setEgressPointer(vpnNextHop.getEgressPointer());
output.setLocalDestination(true);
}
- private <T extends DataObject> Optional<T> read(LogicalDatastoreType datastoreType,
+ <T extends DataObject> Optional<T> read(LogicalDatastoreType datastoreType,
InstanceIdentifier<T> path) {
ReadOnlyTransaction tx = broker.newReadOnlyTransaction();