/*
- * Copyright (c) 2015 Cisco Systems, Inc. All rights reserved.
+ * Copyright (c) 2015, 2017 Cisco Systems, Inc. All rights reserved.
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Public License v1.0 which accompanies this distribution,
*/
package org.opendaylight.lispflowmapping.implementation;
-import java.util.concurrent.Future;
+import static java.util.Objects.requireNonNull;
-import org.opendaylight.controller.md.sal.binding.api.DataBroker;
-import org.opendaylight.controller.md.sal.binding.api.NotificationPublishService;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext;
-import org.opendaylight.controller.sal.binding.api.BindingAwareProvider;
-import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
-import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.RpcRegistration;
-import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.ListenableFuture;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+import org.opendaylight.lispflowmapping.config.ConfigIni;
+import org.opendaylight.lispflowmapping.dsbackend.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.mdsal.AuthenticationKeyDataListener;
-import org.opendaylight.lispflowmapping.implementation.mdsal.DataStoreBackEnd;
import org.opendaylight.lispflowmapping.implementation.mdsal.MappingDataListener;
import org.opendaylight.lispflowmapping.implementation.util.DSBEInputUtil;
import org.opendaylight.lispflowmapping.implementation.util.RPCInputConvertorUtil;
import org.opendaylight.lispflowmapping.interfaces.dao.ILispDAO;
+import org.opendaylight.lispflowmapping.interfaces.dao.Subscriber;
import org.opendaylight.lispflowmapping.interfaces.mappingservice.IMappingService;
+import org.opendaylight.lispflowmapping.lisp.type.MappingData;
+import org.opendaylight.lispflowmapping.lisp.util.LispAddressUtil;
+import org.opendaylight.mdsal.binding.api.DataBroker;
+import org.opendaylight.mdsal.binding.api.NotificationPublishService;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.SiteId;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.XtrId;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.eid.container.Eid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.record.container.MappingRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.locatorrecords.LocatorRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecord;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping._record.container.MappingRecordBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.lisp.proto.rev151105.mapping.authkey.container.MappingAuthkey;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeyOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeyOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeysInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddKeysOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddMappingOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddMappingOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddMappingsInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.AddMappingsOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetAllKeysInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetAllKeysOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetAllMappingsInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetAllMappingsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetKeyInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetKeyOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingOutputBuilder;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingWithXtrIdInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingWithXtrIdOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingWithXtrIdOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingsInput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.GetMappingsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.MappingOrigin;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.OdlMappingserviceService;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllKeysInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllKeysOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllMappingsInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllMappingsOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllOperationalContentInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllOperationalContentOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveAllOperationalContentOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveKeyOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveKeyOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveKeysInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveKeysOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveMappingOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveMappingOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveMappingsInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.RemoveMappingsOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateKeyInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateKeyOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateKeyOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateKeysInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateKeysOutput;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingInput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingOutput;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingOutputBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingsInput;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.mapping.authkey.container.MappingAuthkey;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.lfm.mappingservice.rev150906.UpdateMappingsOutput;
import org.opendaylight.yangtools.yang.common.RpcError;
import org.opendaylight.yangtools.yang.common.RpcResult;
import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Preconditions;
-import com.google.common.util.concurrent.Futures;
-
/**
* Dispatcher of API calls that implements the RPC and Java APIs in mappingservice.yang and IMappingService
* respectively. It also coordinates and acts as container for all objects in charge of
* @author Florin Coras
*
*/
-public class MappingService implements OdlMappingserviceService, IMappingService, BindingAwareProvider, AutoCloseable {
- protected static final Logger LOG = LoggerFactory.getLogger(MappingService.class);
+public class MappingService implements OdlMappingserviceService, IMappingService, AutoCloseable {
+ private static final Logger LOG = LoggerFactory.getLogger(MappingService.class);
private static final String NOT_FOUND_TAG = "data-missing";
private static final String DATA_EXISTS_TAG = "data-exists";
private MappingSystem mappingSystem;
private DataStoreBackEnd dsbe;
- private RpcRegistration<OdlMappingserviceService> mappingServiceRpc;
private AuthenticationKeyDataListener keyListener;
private MappingDataListener mappingListener;
- private ILispDAO dao;
-
- private DataBroker dataBroker;
- private RpcProviderRegistry rpcRegistry;
- private BindingAwareBroker bindingAwareBroker;
- private NotificationPublishService notificationPublishService;
+ private final ILispDAO dao;
- private boolean overwritePolicy = ConfigIni.getInstance().mappingOverwriteIsSet();
- private boolean notificationPolicy = ConfigIni.getInstance().smrIsSet();
- private boolean iterateMask = true;
+ private final DataBroker dataBroker;
+ private final NotificationPublishService notificationPublishService;
- public MappingService() {
- LOG.debug("MappingService created!");
- }
+ private boolean mappingMergePolicy = ConfigIni.getInstance().mappingMergeIsSet();
+ private final boolean notificationPolicy = ConfigIni.getInstance().smrIsSet();
+ private final boolean iterateMask = true;
+ private boolean isMaster = false;
- public void setDataBroker(DataBroker dataBroker) {
- this.dataBroker = dataBroker;
- }
+ public MappingService(final DataBroker broker,
+ final NotificationPublishService notificationPublishService,
+ final ILispDAO lispDAO) {
+ this.dataBroker = broker;
+ this.notificationPublishService = notificationPublishService;
+ this.dao = lispDAO;
- public void setRpcProviderRegistry(RpcProviderRegistry rpc) {
- this.rpcRegistry = rpc;
- }
-
- public void setBindingAwareBroker(BindingAwareBroker broker) {
- this.bindingAwareBroker = broker;
+ LOG.debug("MappingService created!");
}
- public void setNotificationPublishService(NotificationPublishService nps) {
- this.notificationPublishService = nps;
- }
-
- public void setDaoService(ILispDAO dao) {
- this.dao = dao;
- }
@Override
- public void setMappingOverwrite(boolean overwrite) {
- this.overwritePolicy = overwrite;
+ public void setMappingMerge(boolean mergeMapping) {
+ this.mappingMergePolicy = mergeMapping;
if (mappingSystem != null) {
- mappingSystem.setOverwritePolicy(overwrite);
- ConfigIni.getInstance().setMappingOverwrite(overwrite);
+ mappingSystem.setMappingMerge(mergeMapping);
+ ConfigIni.getInstance().setMappingMerge(mappingMergePolicy);
}
}
}
public void initialize() {
- bindingAwareBroker.registerProvider(this);
-
- mappingServiceRpc = rpcRegistry.addRpcImplementation(OdlMappingserviceService.class, this);
+ LOG.info("Mapping Service initializing...");
dsbe = new DataStoreBackEnd(dataBroker);
- mappingSystem = new MappingSystem(dao, iterateMask, notificationPolicy, overwritePolicy);
+ mappingSystem = new MappingSystem(dao, iterateMask, notificationPublishService, mappingMergePolicy);
mappingSystem.setDataStoreBackEnd(dsbe);
mappingSystem.initialize();
keyListener = new AuthenticationKeyDataListener(dataBroker, mappingSystem);
mappingListener = new MappingDataListener(dataBroker, mappingSystem, notificationPublishService);
+ LOG.info("Mapping Service loaded.");
}
@Override
- public Future<RpcResult<Void>> addKey(AddKeyInput input) {
- Preconditions.checkNotNull(input, "add-key RPC input must be not null!");
+ public ListenableFuture<RpcResult<AddKeyOutput>> addKey(AddKeyInput input) {
+ requireNonNull(input, "add-key RPC input must be not null!");
LOG.trace("RPC received to add the following key: " + input.toString());
- RpcResultBuilder<Void> rpcResultBuilder;
+ RpcResultBuilder<AddKeyOutput> rpcResultBuilder;
- MappingAuthkey key = mappingSystem.getAuthenticationKey(input.getEid());
+ MappingAuthkey key = mappingSystem.getAuthenticationKey(convertToBinaryIfNecessary(input.getEid()));
if (key != null) {
String message = "Key already exists! Please use update-key if you want to change it.";
- rpcResultBuilder = RpcResultBuilder.<Void>failed()
+ rpcResultBuilder = RpcResultBuilder.<AddKeyOutput>failed()
.withError(RpcError.ErrorType.PROTOCOL, DATA_EXISTS_TAG, message);
return Futures.immediateFuture(rpcResultBuilder.build());
}
dsbe.addAuthenticationKey(RPCInputConvertorUtil.toAuthenticationKey(input));
- rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder = RpcResultBuilder.success(new AddKeyOutputBuilder().build());
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<Void>> addMapping(AddMappingInput input) {
- Preconditions.checkNotNull(input, "add-mapping RPC input must be not null!");
+ public ListenableFuture<RpcResult<AddMappingOutput>> addMapping(AddMappingInput input) {
+ requireNonNull(input, "add-mapping RPC input must be not null!");
LOG.trace("RPC received to add the following mapping: " + input.toString());
dsbe.addMapping(RPCInputConvertorUtil.toMapping(input));
- RpcResultBuilder<Void> rpcResultBuilder;
+ RpcResultBuilder<AddMappingOutput> rpcResultBuilder;
- rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder = RpcResultBuilder.success(new AddMappingOutputBuilder().build());
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<GetKeyOutput>> getKey(GetKeyInput input) {
- Preconditions.checkNotNull(input, "get-key RPC input must be not null!");
+ public void addMapping(MappingOrigin origin, Eid key, SiteId siteId, MappingData mappingData) {
+ // SB registrations are first written to the MappingSystem and only afterwards are persisted to the datastore
+ if (origin.equals(MappingOrigin.Southbound)) {
+ // Store data first in MapCache and only afterwards persist to datastore. This should be used only for SB
+ // registrations
+ mappingSystem.addMapping(origin, key, mappingData);
+ dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, mappingData));
+ if (mappingData.getXtrId() != null) {
+ dsbe.addXtrIdMapping(DSBEInputUtil.toXtrIdMapping(mappingData));
+ }
+ } else {
+ dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, mappingData));
+ }
+ }
+
+ @Override
+ public MappingData addNegativeMapping(Eid key) {
+ return mappingSystem.addNegativeMapping(key);
+ }
+
+ @Override
+ public void refreshMappingRegistration(Eid key, XtrId xtrId, Long timestamp) {
+ mappingSystem.refreshMappingRegistration(key, xtrId, timestamp);
+ }
+
+ @Override
+ public ListenableFuture<RpcResult<GetKeyOutput>> getKey(GetKeyInput input) {
+ requireNonNull(input, "get-key RPC input must be not null!");
LOG.trace("RPC received to get the following key: " + input.toString());
RpcResultBuilder<GetKeyOutput> rpcResultBuilder;
- MappingAuthkey key = mappingSystem.getAuthenticationKey(input.getEid());
+ MappingAuthkey key = mappingSystem.getAuthenticationKey(convertToBinaryIfNecessary(input.getEid()));
if (key == null) {
String message = "Key was not found in the mapping database";
}
@Override
- public Future<RpcResult<GetMappingOutput>> getMapping(GetMappingInput input) {
- Preconditions.checkNotNull(input, "get-mapping RPC input must be not null!");
+ public ListenableFuture<RpcResult<GetMappingOutput>> getMapping(GetMappingInput input) {
+ requireNonNull(input, "get-mapping RPC input must be not null!");
LOG.trace("RPC received to get the following mapping: " + input.toString());
RpcResultBuilder<GetMappingOutput> rpcResultBuilder;
- MappingRecord reply = (MappingRecord) mappingSystem.getMapping(input.getEid());
+ MappingData reply = mappingSystem.getMapping(convertToBinaryIfNecessary(input.getEid()));
if (reply == null) {
String message = "No mapping was found in the mapping database";
rpcResultBuilder = RpcResultBuilder.<GetMappingOutput>failed()
.withError(RpcError.ErrorType.APPLICATION, NOT_FOUND_TAG, message);
} else {
- rpcResultBuilder = RpcResultBuilder.success(new GetMappingOutputBuilder().setMappingRecord(reply));
+ final MappingRecord convertedReply = convertFromBinaryIfNecessary(reply.getRecord());
+ rpcResultBuilder = RpcResultBuilder.success(new GetMappingOutputBuilder().setMappingRecord(convertedReply));
+ }
+
+ return Futures.immediateFuture(rpcResultBuilder.build());
+ }
+
+ @Override
+ public MappingData getMapping(MappingOrigin origin, Eid key) {
+ return mappingSystem.getMapping(origin, key);
+ }
+
+ @Override
+ public MappingData getMapping(Eid key) {
+ return mappingSystem.getMapping(key);
+ }
+
+ @Override
+ public MappingData getMapping(Eid srcKey, Eid dstKey) {
+ return mappingSystem.getMapping(srcKey, dstKey);
+ }
+
+ @Override
+ public void subscribe(Subscriber subscriber, Eid subscribedEid) {
+ mappingSystem.subscribe(subscriber, subscribedEid);
+ }
+
+ @Override
+ public Set<Subscriber> getSubscribers(Eid eid) {
+ return mappingSystem.getSubscribers(eid);
+ }
+
+ @Override
+ public ListenableFuture<RpcResult<GetMappingWithXtrIdOutput>> getMappingWithXtrId(GetMappingWithXtrIdInput input) {
+ requireNonNull(input, "get-mapping RPC input must be not null!");
+ LOG.trace("RPC received to get the following mapping: " + input.toString());
+
+ RpcResultBuilder<GetMappingWithXtrIdOutput> rpcResultBuilder;
+
+ MappingData reply = mappingSystem.getMapping(null, convertToBinaryIfNecessary(input.getEid()),
+ input.getXtrId());
+
+ if (reply == null) {
+ String message = "No mapping was found in the mapping database";
+ rpcResultBuilder = RpcResultBuilder.<GetMappingWithXtrIdOutput>failed()
+ .withError(RpcError.ErrorType.APPLICATION, NOT_FOUND_TAG, message);
+ } else {
+ final MappingRecord convertedReply = convertFromBinaryIfNecessary(reply.getRecord());
+ rpcResultBuilder = RpcResultBuilder.success(new GetMappingWithXtrIdOutputBuilder()
+ .setMappingRecord(convertedReply));
}
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<Void>> removeKey(RemoveKeyInput input) {
- Preconditions.checkNotNull(input, "remove-key RPC input must be not null!");
+ public ListenableFuture<RpcResult<RemoveKeyOutput>> removeKey(RemoveKeyInput input) {
+ requireNonNull(input, "remove-key RPC input must be not null!");
LOG.trace("RPC received to remove the following key: " + input.toString());
- RpcResultBuilder<Void> rpcResultBuilder;
+ RpcResultBuilder<RemoveKeyOutput> rpcResultBuilder;
dsbe.removeAuthenticationKey(RPCInputConvertorUtil.toAuthenticationKey(input));
- rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder = RpcResultBuilder.success(new RemoveKeyOutputBuilder().build());
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<Void>> removeMapping(RemoveMappingInput input) {
- Preconditions.checkNotNull(input, "remove-mapping RPC input must be not null!");
+ public ListenableFuture<RpcResult<RemoveMappingOutput>> removeMapping(RemoveMappingInput input) {
+ requireNonNull(input, "remove-mapping RPC input must be not null!");
LOG.trace("RPC received to remove the following mapping: " + input.toString());
- RpcResultBuilder<Void> rpcResultBuilder;
+ RpcResultBuilder<RemoveMappingOutput> rpcResultBuilder;
dsbe.removeMapping(RPCInputConvertorUtil.toMapping(input));
- rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder = RpcResultBuilder.success(new RemoveMappingOutputBuilder().build());
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<Void>> updateKey(UpdateKeyInput input) {
- Preconditions.checkNotNull(input, "update-key RPC input must be not null!");
+ public void removeMapping(MappingOrigin origin, Eid key) {
+ if (origin.equals(MappingOrigin.Southbound)) {
+ mappingSystem.removeMapping(origin, key);
+ }
+ dsbe.removeMapping(DSBEInputUtil.toMapping(origin, key));
+ }
+
+ @Override
+ public ListenableFuture<RpcResult<UpdateKeyOutput>> updateKey(UpdateKeyInput input) {
+ requireNonNull(input, "update-key RPC input must be not null!");
LOG.trace("RPC received to update the following key: " + input.toString());
- RpcResultBuilder<Void> rpcResultBuilder;
+ RpcResultBuilder<UpdateKeyOutput> rpcResultBuilder;
- MappingAuthkey key = mappingSystem.getAuthenticationKey(input.getEid());
+ MappingAuthkey key = mappingSystem.getAuthenticationKey(convertToBinaryIfNecessary(input.getEid()));
if (key == null) {
String message = "Key doesn't exist! Please use add-key if you want to create a new authentication key.";
- rpcResultBuilder = RpcResultBuilder.<Void>failed()
+ rpcResultBuilder = RpcResultBuilder.<UpdateKeyOutput>failed()
.withError(RpcError.ErrorType.PROTOCOL, NOT_FOUND_TAG, message);
return Futures.immediateFuture(rpcResultBuilder.build());
}
dsbe.updateAuthenticationKey(RPCInputConvertorUtil.toAuthenticationKey(input));
- rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder = RpcResultBuilder.success(new UpdateKeyOutputBuilder().build());
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<Void>> updateMapping(UpdateMappingInput input) {
+ public ListenableFuture<RpcResult<UpdateMappingOutput>> updateMapping(UpdateMappingInput input) {
LOG.trace("RPC received to update the following mapping: " + input.toString());
- Preconditions.checkNotNull(input, "update-mapping RPC input must be not null!");
+ requireNonNull(input, "update-mapping RPC input must be not null!");
- RpcResultBuilder<Void> rpcResultBuilder;
+ RpcResultBuilder<UpdateMappingOutput> rpcResultBuilder;
dsbe.updateMapping(RPCInputConvertorUtil.toMapping(input));
- rpcResultBuilder = RpcResultBuilder.success();
+ rpcResultBuilder = RpcResultBuilder.success(new UpdateMappingOutputBuilder().build());
return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Future<RpcResult<Void>> removeKeys(RemoveKeysInput input) {
+ public ListenableFuture<RpcResult<RemoveKeysOutput>> removeKeys(RemoveKeysInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> removeMappings(RemoveMappingsInput input) {
+ public ListenableFuture<RpcResult<RemoveMappingsOutput>> removeMappings(RemoveMappingsInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<GetKeysOutput>> getKeys(GetKeysInput input) {
+ public ListenableFuture<RpcResult<GetKeysOutput>> getKeys(GetKeysInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> addMappings(AddMappingsInput input) {
+ public ListenableFuture<RpcResult<AddMappingsOutput>> addMappings(AddMappingsInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> updateKeys(UpdateKeysInput input) {
+ public ListenableFuture<RpcResult<UpdateKeysOutput>> updateKeys(UpdateKeysInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> removeAllMappings() {
+ public ListenableFuture<RpcResult<RemoveAllMappingsOutput>> removeAllMappings(RemoveAllMappingsInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> removeAllKeys() {
+ public ListenableFuture<RpcResult<RemoveAllKeysOutput>> removeAllKeys(RemoveAllKeysInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<GetAllKeysOutput>> getAllKeys() {
+ public ListenableFuture<RpcResult<GetAllKeysOutput>> getAllKeys(GetAllKeysInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> updateMappings(UpdateMappingsInput input) {
+ public ListenableFuture<RpcResult<UpdateMappingsOutput>> updateMappings(UpdateMappingsInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<Void>> addKeys(AddKeysInput input) {
+ public ListenableFuture<RpcResult<AddKeysOutput>> addKeys(AddKeysInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<GetAllMappingsOutput>> getAllMappings() {
+ public ListenableFuture<RpcResult<GetAllMappingsOutput>> getAllMappings(GetAllMappingsInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public Future<RpcResult<GetMappingsOutput>> getMappings(
+ public ListenableFuture<RpcResult<GetMappingsOutput>> getMappings(
GetMappingsInput input) {
// TODO Auto-generated method stub
return null;
}
@Override
- public void addMapping(MappingOrigin origin, Eid key, SiteId siteId, Object data, boolean merge) {
- // SB registrations are first written to the MappingSystem and only afterwards are persisted to the datastore
- if (origin.equals(MappingOrigin.Southbound)) {
- // Store data first in MapCache and only afterwards persist to datastore. This should be used only for SB
- // registrations
- mappingSystem.addMapping(origin, key, data, merge);
- dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
- if (((MappingRecord) data).getXtrId() != null) {
- dsbe.addXtrIdMapping(DSBEInputUtil.toXtrIdMapping((MappingRecord) data));
- }
- } else {
- dsbe.addMapping(DSBEInputUtil.toMapping(origin, key, siteId, (MappingRecord) data));
+ public ListenableFuture<RpcResult<RemoveAllOperationalContentOutput>> removeAllOperationalContent(
+ RemoveAllOperationalContentInput input) {
+ RpcResultBuilder<RemoveAllOperationalContentOutput> rpcResultBuilder;
+
+ /*
+ * Since master nodes ignore datastore changes for southbound originated mappings, they need to be removed
+ * explicitly.
+ */
+ if (isMaster) {
+ mappingSystem.cleanSBMappings();
}
- }
+ dsbe.removeAllOperationalDatastoreContent();
- @Override
- public Object getMapping(MappingOrigin origin, Eid key) {
- return mappingSystem.getMapping(origin, key);
- }
+ rpcResultBuilder = RpcResultBuilder.success(new RemoveAllOperationalContentOutputBuilder().build());
- @Override
- public Object getMapping(Eid key) {
- return mappingSystem.getMapping(key);
+ return Futures.immediateFuture(rpcResultBuilder.build());
}
@Override
- public Object getMapping(Eid srcKey, Eid dstKey) {
- return mappingSystem.getMapping(srcKey, dstKey);
+ public Eid getWidestNegativePrefix(Eid key) {
+ return mappingSystem.getWidestNegativePrefix(key);
}
@Override
- public void removeMapping(MappingOrigin origin, Eid key) {
- dsbe.removeMapping(DSBEInputUtil.toMapping(origin, key));
+ public Set<Eid> getSubtree(MappingOrigin origin, Eid key) {
+ return mappingSystem.getSubtree(origin, key);
}
@Override
mappingSystem.removeData(origin, key, subKey);
}
+ @Override
+ public Eid getParentPrefix(Eid key) {
+ return mappingSystem.getParentPrefix(key);
+ }
+
@Override
public String printMappings() {
return mappingSystem.printMappings();
}
@Override
- public void onSessionInitiated(ProviderContext session) {
- LOG.info("Mapping Service provider session initializing!");
+ public String prettyPrintMappings() {
+ return mappingSystem.prettyPrintMappings();
+ }
+
+ @Override
+ public String printKeys() {
+ return mappingSystem.printKeys();
+ }
+
+ @Override
+ public String prettyPrintKeys() {
+ return mappingSystem.prettyPrintKeys();
}
@Override
public void close() throws Exception {
LOG.info("Mapping Service is being destroyed!");
- mappingServiceRpc.close();
keyListener.closeDataChangeListener();
mappingListener.closeDataChangeListener();
+ mappingSystem.destroy();
}
@Override
mappingSystem.cleanCaches();
dsbe.removeAllDatastoreContent();
}
+
+ private static Eid convertToBinaryIfNecessary(Eid eid) {
+ if (LispAddressUtil.addressNeedsConversionToBinary(eid.getAddress())) {
+ return LispAddressUtil.convertToBinary(eid);
+ }
+ return eid;
+ }
+
+ private static MappingRecord convertFromBinaryIfNecessary(MappingRecord originalRecord) {
+ List<LocatorRecord> originalLocators = originalRecord.getLocatorRecord();
+
+ List<LocatorRecord> convertedLocators = null;
+ if (originalLocators != null) {
+ // If convertedLocators is non-null, while originalLocators is also non-null, conversion has been made
+ convertedLocators = convertFromBinaryIfNecessary(originalLocators);
+ }
+
+ if (LispAddressUtil.addressNeedsConversionFromBinary(originalRecord.getEid().getAddress())
+ || originalLocators != null && convertedLocators != null) {
+ MappingRecordBuilder mrb = new MappingRecordBuilder(originalRecord);
+ mrb.setEid(LispAddressUtil.convertFromBinary(originalRecord.getEid()));
+ if (convertedLocators != null) {
+ mrb.setLocatorRecord(convertedLocators);
+ }
+ return mrb.build();
+ }
+ return originalRecord;
+ }
+
+ private static List<LocatorRecord> convertFromBinaryIfNecessary(List<LocatorRecord> originalLocators) {
+ List<LocatorRecord> convertedLocators = null;
+ for (LocatorRecord record : originalLocators) {
+ if (LispAddressUtil.addressNeedsConversionFromBinary(record.getRloc().getAddress())) {
+ LocatorRecordBuilder lrb = new LocatorRecordBuilder(record);
+ lrb.setRloc(LispAddressUtil.convertFromBinary(record.getRloc()));
+ if (convertedLocators == null) {
+ convertedLocators = new ArrayList<>();
+ }
+ convertedLocators.add(lrb.build());
+ }
+ }
+ if (convertedLocators != null) {
+ return convertedLocators;
+ }
+ return originalLocators;
+ }
+
+ @Override
+ public void setIsMaster(boolean isMaster) {
+ this.isMaster = isMaster;
+ mappingSystem.setIsMaster(isMaster);
+ }
+
+ @Override
+ public boolean isMaster() {
+ return isMaster;
+ }
}
Code Review / lispflowmapping.git / blobdiff