/*
- * Copyright (c) 2015, 2016 Ericsson India Global Services Pvt Ltd. and others. All rights reserved.
+ * Copyright (c) 2015, 2017 Ericsson India Global Services Pvt Ltd. and others. 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.ovsdb.hwvtepsouthbound.transactions.md;
-import com.google.common.base.Optional;
-
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.mdsal.binding.api.ReadWriteTransaction;
+import org.opendaylight.mdsal.common.api.LogicalDatastoreType;
import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepConnectionInstance;
import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundConstants;
import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundMapper;
-import org.opendaylight.ovsdb.hwvtepsouthbound.HwvtepSouthboundUtil;
+import org.opendaylight.ovsdb.hwvtepsouthbound.transact.TransactUtils;
import org.opendaylight.ovsdb.lib.message.TableUpdates;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsLocal;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocator;
import org.opendaylight.ovsdb.schema.hardwarevtep.PhysicalLocatorSet;
-import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentation;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepGlobalAugmentationBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepLogicalSwitchRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.HwvtepPhysicalLocatorRef;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.hwvtep.rev150901.hwvtep.global.attributes.LocalMcastMacs;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.node.TerminationPoint;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
-public class HwvtepMcastMacsLocalUpdateCommand extends AbstractTransactionCommand {
+public final class HwvtepMcastMacsLocalUpdateCommand extends AbstractTransactionCommand {
- private Map<UUID, McastMacsLocal> updatedMMacsLocalRows;
- private Map<UUID, PhysicalLocatorSet> updatedPLocSetRows;
- private Map<UUID, PhysicalLocator> updatedPLocRows;
+ private final Map<UUID, McastMacsLocal> updatedMMacsLocalRows;
+ private final Map<UUID, PhysicalLocatorSet> updatedPLocSetRows;
+ private final Map<UUID, PhysicalLocator> updatedPLocRows;
- public HwvtepMcastMacsLocalUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates, DatabaseSchema dbSchema) {
+ public HwvtepMcastMacsLocalUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates,
+ DatabaseSchema dbSchema) {
super(key, updates, dbSchema);
updatedMMacsLocalRows = TyperUtils.extractRowsUpdated(McastMacsLocal.class, getUpdates(), getDbSchema());
updatedPLocSetRows = TyperUtils.extractRowsUpdated(PhysicalLocatorSet.class, getUpdates(), getDbSchema());
}
}
- private void updateData(ReadWriteTransaction transaction, McastMacsLocal mMacLocal) {
+ private void updateData(ReadWriteTransaction transaction, McastMacsLocal macLocal) {
final InstanceIdentifier<Node> connectionIId = getOvsdbConnectionInstance().getInstanceIdentifier();
- Optional<Node> connection = HwvtepSouthboundUtil.readNode(transaction, connectionIId);
- if (connection.isPresent()) {
- // Update the connection node to let it know it manages this MCastMacsLocal
- Node connectionNode = buildConnectionNode(mMacLocal);
- transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode);
- // TODO: Delete entries that are no longer needed
+
+ // Ensure the node exists
+ transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId,
+ new NodeBuilder().setNodeId(getOvsdbConnectionInstance().getNodeId()).build());
+
+ final LocalMcastMacs mac = buildLocalMcastMacs(macLocal);
+ final InstanceIdentifier<LocalMcastMacs> macIid = connectionIId.augmentation(HwvtepGlobalAugmentation.class)
+ .child(LocalMcastMacs.class, mac.key());
+
+ // Merge update, relying on automatic lifecycle...
+ transaction.merge(LogicalDatastoreType.OPERATIONAL, macIid, mac);
+ if (mac.getLocatorSet() == null) {
+ // ... but delete locator set if it is empty
+ // FIXME: can we use .put() of instead of merge/delete?
+ transaction.delete(LogicalDatastoreType.OPERATIONAL, macIid.child(LocatorSet.class));
}
}
- private Node buildConnectionNode(McastMacsLocal mMacLocal) {
- NodeBuilder connectionNode = new NodeBuilder();
- connectionNode.setNodeId(getOvsdbConnectionInstance().getNodeId());
- HwvtepGlobalAugmentationBuilder hgAugmentationBuilder = new HwvtepGlobalAugmentationBuilder();
- LocalMcastMacsBuilder mMacLocalBuilder = new LocalMcastMacsBuilder();
- if (mMacLocal.getMac().equals(HwvtepSouthboundConstants.UNKNOWN_DST_STRING)) {
- mMacLocalBuilder.setMacEntryKey(HwvtepSouthboundConstants.UNKNOWN_DST_MAC);
+ private LocalMcastMacs buildLocalMcastMacs(McastMacsLocal macLocal) {
+ LocalMcastMacsBuilder macLocalBuilder = new LocalMcastMacsBuilder();
+ if (macLocal.getMac().equals(HwvtepSouthboundConstants.UNKNOWN_DST_STRING)) {
+ macLocalBuilder.setMacEntryKey(HwvtepSouthboundConstants.UNKNOWN_DST_MAC);
} else {
- mMacLocalBuilder.setMacEntryKey(new MacAddress(mMacLocal.getMac()));
+ macLocalBuilder.setMacEntryKey(new MacAddress(macLocal.getMac()));
}
- mMacLocalBuilder.setMacEntryUuid(new Uuid(mMacLocal.getUuid().toString()));
- setIpAddress(mMacLocalBuilder, mMacLocal);
- setLocatorSet(mMacLocalBuilder, mMacLocal);
- setLogicalSwitch(mMacLocalBuilder, mMacLocal);
+ macLocalBuilder.setMacEntryUuid(new Uuid(macLocal.getUuid().toString()));
+ setIpAddress(macLocalBuilder, macLocal);
+ setLocatorSet(macLocalBuilder, macLocal);
+ setLogicalSwitch(macLocalBuilder, macLocal);
- List<LocalMcastMacs> mMacLocalList = new ArrayList<>();
- mMacLocalList.add(mMacLocalBuilder.build());
- hgAugmentationBuilder.setLocalMcastMacs(mMacLocalList);
- connectionNode.addAugmentation(HwvtepGlobalAugmentation.class, hgAugmentationBuilder.build());
- return connectionNode.build();
+ return macLocalBuilder.build();
}
- private void setLogicalSwitch(LocalMcastMacsBuilder mMacLocalBuilder, McastMacsLocal mMacLocal) {
- if (mMacLocal.getLogicalSwitchColumn() != null && mMacLocal.getLogicalSwitchColumn().getData() != null) {
- UUID lsUUID = mMacLocal.getLogicalSwitchColumn().getData();
- LogicalSwitch lSwitch = getOvsdbConnectionInstance().getDeviceInfo().getLogicalSwitch(lsUUID);
- if (lSwitch != null) {
- InstanceIdentifier<LogicalSwitches> lSwitchIid =
- HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), lSwitch);
- mMacLocalBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitchIid));
+ private void setLogicalSwitch(LocalMcastMacsBuilder macLocalBuilder, McastMacsLocal macLocal) {
+ if (macLocal.getLogicalSwitchColumn() != null && macLocal.getLogicalSwitchColumn().getData() != null) {
+ UUID lsUUID = macLocal.getLogicalSwitchColumn().getData();
+ LogicalSwitch logicalSwitch = getOvsdbConnectionInstance().getDeviceInfo().getLogicalSwitch(lsUUID);
+ if (logicalSwitch != null) {
+ InstanceIdentifier<LogicalSwitches> switchIid =
+ HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), logicalSwitch);
+ macLocalBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(switchIid));
}
}
}
- private void setIpAddress(LocalMcastMacsBuilder mMacLocalBuilder, McastMacsLocal mMacLocal) {
- if (mMacLocal.getIpAddr() != null && !mMacLocal.getIpAddr().isEmpty()) {
- mMacLocalBuilder.setIpaddr(new IpAddress(mMacLocal.getIpAddr().toCharArray()));
+ private static void setIpAddress(LocalMcastMacsBuilder macLocalBuilder, McastMacsLocal macLocal) {
+ if (macLocal.getIpAddr() != null && !macLocal.getIpAddr().isEmpty()) {
+ macLocalBuilder.setIpaddr(TransactUtils.parseIpAddress(macLocal.getIpAddr()));
}
}
- private void setLocatorSet(LocalMcastMacsBuilder mMacLocalBuilder, McastMacsLocal mMacLocal) {
- if (mMacLocal.getLocatorSetColumn() != null && mMacLocal.getLocatorSetColumn().getData() != null) {
- UUID pLocSetUUID = mMacLocal.getLocatorSetColumn().getData();
- PhysicalLocatorSet plSet = updatedPLocSetRows.get(pLocSetUUID);
+ private void setLocatorSet(LocalMcastMacsBuilder macLocalBuilder, McastMacsLocal macLocal) {
+ if (macLocal.getLocatorSetColumn() != null && macLocal.getLocatorSetColumn().getData() != null) {
+ UUID locSetUUID = macLocal.getLocatorSetColumn().getData();
+ PhysicalLocatorSet plSet = updatedPLocSetRows.get(locSetUUID);
if (plSet != null) {
if (plSet.getLocatorsColumn() != null && plSet.getLocatorsColumn().getData() != null
&& !plSet.getLocatorsColumn().getData().isEmpty()) {
List<LocatorSet> plsList = new ArrayList<>();
- for (UUID pLocUUID : plSet.getLocatorsColumn().getData()) {
- PhysicalLocator pLoc = updatedPLocRows.get(pLocUUID);
+ for (UUID locUUID : plSet.getLocatorsColumn().getData()) {
+ PhysicalLocator locator = updatedPLocRows.get(locUUID);
+ if (locator == null) {
+ locator = getOvsdbConnectionInstance().getDeviceInfo().getPhysicalLocator(locUUID);
+ }
InstanceIdentifier<TerminationPoint> tpIid = HwvtepSouthboundMapper.createInstanceIdentifier(
- getOvsdbConnectionInstance().getInstanceIdentifier(), pLoc);
+ getOvsdbConnectionInstance().getInstanceIdentifier(), locator);
plsList.add(new LocatorSetBuilder()
.setLocatorRef(new HwvtepPhysicalLocatorRef(tpIid)).build());
}
- mMacLocalBuilder.setLocatorSet(plsList);
+ macLocalBuilder.setLocatorSet(plsList);
}
}
}
}
-
}
Code Review / ovsdb.git / blobdiff