<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>mappingservice.api</artifactId>
</dependency>
- <dependency>
+<!-- <dependency>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>mappingservice.clusterdao</artifactId>
- </dependency>
+ </dependency> -->
<dependency>
<groupId>org.opendaylight.lispflowmapping</groupId>
<artifactId>mappingservice.config</artifactId>
<feature version="${mdsal.version}">odl-mdsal-broker</feature>
<feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
<feature version="${sal.version}">odl-adsal-core</feature>
- <feature version="${clustering.services.version}">odl-adsal-clustering</feature>
+ <!-- <feature version="${clustering.services.version}">odl-adsal-clustering</feature> -->
<feature version='${yangtools.version}'>odl-yangtools-binding</feature>
<feature version='${yangtools.version}'>odl-yangtools-models</feature>
<bundle>mvn:com.google.guava/guava/${guava.version}</bundle>
<bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.api/${lispflowmapping.version}</bundle>
<bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${lispflowmapping.version}</bundle>
<bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.shell/${lispflowmapping.version}</bundle>
- <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.clusterdao/${lispflowmapping.version}</bundle>
+ <!-- <bundle>mvn:org.opendaylight.lispflowmapping/mappingservice.clusterdao/${lispflowmapping.version}</bundle> -->
<configfile finalname="${configfile.directory}/lfm-mappingservice.xml">
mvn:org.opendaylight.lispflowmapping/mappingservice.implementation/${lispflowmapping.version}/xml/config
</configfile>
Dictionary<String, String> props = new Hashtable<String, String>();
props.put("name", "mappingservice");
c.setInterface(new String[] { IFlowMapping.class.getName(), IFlowMappingShell.class.getName() }, props);
- c.add(createContainerServiceDependency(containerName).setService(ILispDAO.class).setCallbacks("setLispDao", "unsetLispDao")
- .setRequired(true));
c.add(createServiceDependency().setService(BindingAwareBroker.class).setRequired(true)
.setCallbacks("setBindingAwareBroker", "unsetBindingAwareBroker"));
}
import org.opendaylight.controller.sal.binding.api.NotificationListener;
import org.opendaylight.controller.sal.binding.api.NotificationService;
import org.opendaylight.lispflowmapping.implementation.config.ConfigIni;
+import org.opendaylight.lispflowmapping.implementation.dao.HashMapDb;
import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKey;
import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceKeyUtil;
import org.opendaylight.lispflowmapping.implementation.dao.MappingServiceNoMaskKey;
LOG.debug("BindingAwareBroker set!");
BundleContext bundleContext = FrameworkUtil.getBundle(this.getClass()).getBundleContext();
bindingAwareBroker.registerProvider(this, bundleContext);
+
+ // For the time being we initialize variables here. But once we remove the activator, these should
+ // be moved to the constructor.
lfmService = this;
+ setLispDao(new HashMapDb());
}
void unsetBindingAwareBroker(BindingAwareBroker bindingAwareBroker) {
import java.nio.charset.Charset;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.concurrent.TimeUnit;
import javax.inject.Inject;
}
private void causeEntryToBeCleaned() {
- clusterService.setTimeUnit(TimeUnit.NANOSECONDS);
- clusterService.cleanOld();
+ // TODO for the time being, to keep master and stable/lithium in sync, we need to remove the forceful
+ // expiration of DAO entries. Once we're past this, we'll have to expose methods to setTimeUnit(TimeUnit)
+ // and cleanOld() (expired) entries in IFlowMapping (and perhaps ILispDAO) and use them here.
+ this.lms.clean();
}
private void testTTLAfterRegister(MapRequest mapRequest) throws SocketTimeoutException {
org.opendaylight.lispflowmapping.type,
org.opendaylight.lispflowmapping.type.lisp,
org.opendaylight.lispflowmapping.type.sbplugin,
- org.opendaylight.controller.clustering.services,
org.opendaylight.lispflowmapping.implementation.serializer,
org.opendaylight.lispflowmapping.implementation.util,
org.opendaylight.controller.sal.binding.api,