Registration of entity type "elan" missed out. This is used by L2Gw in
order to identify the owner for type "elan".
Change-Id: I583ec617529a82ee8a0db1dbd34421c29ac9f571
Signed-off-by: Kency Kurian <kency.kurian@ericsson.com>
package org.opendaylight.netvirt.elan.internal;
package org.opendaylight.netvirt.elan.internal;
-import com.google.common.base.Optional;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
import java.math.BigInteger;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Set;
import java.util.concurrent.Future;
import java.util.function.BiFunction;
import java.util.Set;
import java.util.concurrent.Future;
import java.util.function.BiFunction;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.common.api.clustering.CandidateAlreadyRegisteredException;
+import org.opendaylight.controller.md.sal.common.api.clustering.EntityOwnershipService;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.genius.interfacemanager.exceptions.InterfaceAlreadyExistsException;
import org.opendaylight.genius.interfacemanager.globals.IfmConstants;
import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.genius.interfacemanager.exceptions.InterfaceAlreadyExistsException;
import org.opendaylight.genius.interfacemanager.globals.IfmConstants;
import org.opendaylight.genius.interfacemanager.interfaces.IInterfaceManager;
import org.opendaylight.genius.mdsalutil.MDSALUtil;
+import org.opendaylight.genius.utils.clustering.EntityOwnerUtils;
+import org.opendaylight.genius.utils.hwvtep.HwvtepSouthboundConstants;
import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
import org.opendaylight.netvirt.elan.utils.ElanConstants;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.opendaylight.netvirt.elan.statusanddiag.ElanStatusMonitor;
import org.opendaylight.netvirt.elan.utils.ElanConstants;
import org.opendaylight.netvirt.elan.utils.ElanUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.google.common.base.Optional;
+
public class ElanServiceProvider implements IElanService {
private static final Logger LOG = LoggerFactory.getLogger(ElanServiceProvider.class);
public class ElanServiceProvider implements IElanService {
private static final Logger LOG = LoggerFactory.getLogger(ElanServiceProvider.class);
ElanInstanceManager elanInstanceManager, ElanBridgeManager bridgeMgr,
DataBroker dataBroker,
ElanInterfaceManager elanInterfaceManager,
ElanInstanceManager elanInstanceManager, ElanBridgeManager bridgeMgr,
DataBroker dataBroker,
ElanInterfaceManager elanInterfaceManager,
- ElanStatusMonitor elanStatusMonitor, ElanUtils elanUtils) {
+ ElanStatusMonitor elanStatusMonitor, ElanUtils elanUtils, EntityOwnershipService entityOwnershipService) {
this.idManager = idManager;
this.interfaceManager = interfaceManager;
this.elanInstanceManager = elanInstanceManager;
this.idManager = idManager;
this.interfaceManager = interfaceManager;
this.elanInstanceManager = elanInstanceManager;
this.elanStatusMonitor = elanStatusMonitor;
this.elanUtils = elanUtils;
elanInterfaceManager.setElanUtils(elanUtils);
this.elanStatusMonitor = elanStatusMonitor;
this.elanUtils = elanUtils;
elanInterfaceManager.setElanUtils(elanUtils);
+ try {
+ EntityOwnerUtils.registerEntityCandidateForOwnerShip(entityOwnershipService,
+ HwvtepSouthboundConstants.ELAN_ENTITY_TYPE, HwvtepSouthboundConstants.ELAN_ENTITY_TYPE,
+ null/*listener*/);
+ } catch (CandidateAlreadyRegisteredException e) {
+ LOG.error("failed to register the entity");
+ }
<argument ref="elanInterfaceManager" />
<argument ref="elanStatusMonitor" />
<argument ref="elanUtils" />
<argument ref="elanInterfaceManager" />
<argument ref="elanStatusMonitor" />
<argument ref="elanUtils" />
+ <argument ref="entityOwnershipService" />
</bean>
<service ref="elanService" odl:type="default" interface="org.opendaylight.netvirt.elanmanager.api.IElanService" />
</bean>
<service ref="elanService" odl:type="default" interface="org.opendaylight.netvirt.elanmanager.api.IElanService" />