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 java.util.Map.Entry;
-
-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.lib.message.TableUpdates;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.lib.schema.DatabaseSchema;
import org.opendaylight.ovsdb.schema.hardwarevtep.McastMacsRemote;
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.inet.types.rev130715.IpAddressBuilder;
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;
public class HwvtepMcastMacsRemoteUpdateCommand extends AbstractTransactionCommand {
- private Map<UUID, McastMacsRemote> updatedMMacsRemoteRows;
- private Map<UUID, PhysicalLocatorSet> updatedPLocSetRows;
- private Map<UUID, PhysicalLocator> updatedPLocRows;
+ private final Map<UUID, McastMacsRemote> updatedMMacsRemoteRows;
+ private final Map<UUID, PhysicalLocatorSet> updatedPLocSetRows;
+ private final Map<UUID, PhysicalLocator> updatedPLocRows;
- public HwvtepMcastMacsRemoteUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates, DatabaseSchema dbSchema) {
+ public HwvtepMcastMacsRemoteUpdateCommand(HwvtepConnectionInstance key, TableUpdates updates,
+ DatabaseSchema dbSchema) {
super(key, updates, dbSchema);
updatedMMacsRemoteRows = TyperUtils.extractRowsUpdated(McastMacsRemote.class, getUpdates(), getDbSchema());
updatedPLocSetRows = TyperUtils.extractRowsUpdated(PhysicalLocatorSet.class, getUpdates(), getDbSchema());
}
}
- private void updateData(ReadWriteTransaction transaction, McastMacsRemote mMacRemote) {
+ private void updateData(ReadWriteTransaction transaction, McastMacsRemote macRemote) {
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 MCastMacsRemote
- Node connectionNode = buildConnectionNode(mMacRemote);
- transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode);
- InstanceIdentifier<RemoteMcastMacs> macIid = getMacIid(connectionIId, connectionNode);
- getOvsdbConnectionInstance().getDeviceInfo().updateDeviceOperData(RemoteMcastMacs.class,
- macIid, mMacRemote.getUuid(), mMacRemote);
- // TODO: Delete entries that are no longer needed
- }
+ Node connectionNode = buildConnectionNode(macRemote);
+ transaction.merge(LogicalDatastoreType.OPERATIONAL, connectionIId, connectionNode);
}
InstanceIdentifier<RemoteMcastMacs> getMacIid(InstanceIdentifier<Node> connectionIId, Node connectionNode) {
RemoteMcastMacsKey macsKey =
- connectionNode.getAugmentation(HwvtepGlobalAugmentation.class).getRemoteMcastMacs().get(0).getKey();
- InstanceIdentifier<RemoteMcastMacs> key = connectionIId.augmentation(HwvtepGlobalAugmentation.class).
- child(RemoteMcastMacs.class, macsKey);
+ connectionNode.augmentation(HwvtepGlobalAugmentation.class).getRemoteMcastMacs().get(0).key();
+ InstanceIdentifier<RemoteMcastMacs> key = connectionIId.augmentation(HwvtepGlobalAugmentation.class)
+ .child(RemoteMcastMacs.class, macsKey);
return key;
}
- private Node buildConnectionNode(McastMacsRemote mMacRemote) {
+ private Node buildConnectionNode(McastMacsRemote macRemote) {
NodeBuilder connectionNode = new NodeBuilder();
connectionNode.setNodeId(getOvsdbConnectionInstance().getNodeId());
- HwvtepGlobalAugmentationBuilder hgAugmentationBuilder = new HwvtepGlobalAugmentationBuilder();
- RemoteMcastMacsBuilder mMacRemoteBuilder = new RemoteMcastMacsBuilder();
- if (mMacRemote.getMac().equals(HwvtepSouthboundConstants.UNKNOWN_DST_STRING)) {
- mMacRemoteBuilder.setMacEntryKey(HwvtepSouthboundConstants.UNKNOWN_DST_MAC);
+ RemoteMcastMacsBuilder macRemoteBuilder = new RemoteMcastMacsBuilder();
+ if (macRemote.getMac().equals(HwvtepSouthboundConstants.UNKNOWN_DST_STRING)) {
+ macRemoteBuilder.setMacEntryKey(HwvtepSouthboundConstants.UNKNOWN_DST_MAC);
} else {
- mMacRemoteBuilder.setMacEntryKey(new MacAddress(mMacRemote.getMac()));
+ macRemoteBuilder.setMacEntryKey(new MacAddress(macRemote.getMac()));
}
- mMacRemoteBuilder.setMacEntryUuid(new Uuid(mMacRemote.getUuid().toString()));
- setIpAddress(mMacRemoteBuilder, mMacRemote);
- setLocatorSet(mMacRemoteBuilder, mMacRemote);
- setLogicalSwitch(mMacRemoteBuilder, mMacRemote);
+ macRemoteBuilder.setMacEntryUuid(new Uuid(macRemote.getUuid().toString()));
+ setIpAddress(macRemoteBuilder, macRemote);
+ setLocatorSet(macRemoteBuilder, macRemote);
+ setLogicalSwitch(macRemoteBuilder, macRemote);
+
+ List<RemoteMcastMacs> macRemoteList = new ArrayList<>();
+ RemoteMcastMacs mac = macRemoteBuilder.build();
+ macRemoteList.add(mac);
- List<RemoteMcastMacs> mMacRemoteList = new ArrayList<>();
- mMacRemoteList.add(mMacRemoteBuilder.build());
- hgAugmentationBuilder.setRemoteMcastMacs(mMacRemoteList);
+ HwvtepGlobalAugmentationBuilder hgAugmentationBuilder = new HwvtepGlobalAugmentationBuilder();
+ hgAugmentationBuilder.setRemoteMcastMacs(macRemoteList);
connectionNode.addAugmentation(HwvtepGlobalAugmentation.class, hgAugmentationBuilder.build());
+ InstanceIdentifier<RemoteMcastMacs> macIid = getOvsdbConnectionInstance().getInstanceIdentifier()
+ .augmentation(HwvtepGlobalAugmentation.class).child(RemoteMcastMacs.class, mac.key());
+ addToUpdateTx(RemoteMcastMacs.class, macIid, macRemote.getUuid(), macRemote);
return connectionNode.build();
}
- private void setLogicalSwitch(RemoteMcastMacsBuilder mMacRemoteBuilder, McastMacsRemote mMacRemote) {
- if (mMacRemote.getLogicalSwitchColumn() != null && mMacRemote.getLogicalSwitchColumn().getData() != null) {
- UUID lsUUID = mMacRemote.getLogicalSwitchColumn().getData();
- LogicalSwitch lSwitch = getOvsdbConnectionInstance().getDeviceInfo().getLogicalSwitch(lsUUID);
- if (lSwitch != null) {
- InstanceIdentifier<LogicalSwitches> lSwitchIid =
- HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), lSwitch);
- mMacRemoteBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(lSwitchIid));
+ private void setLogicalSwitch(RemoteMcastMacsBuilder macRemoteBuilder, McastMacsRemote macRemote) {
+ if (macRemote.getLogicalSwitchColumn() != null && macRemote.getLogicalSwitchColumn().getData() != null) {
+ UUID lsUUID = macRemote.getLogicalSwitchColumn().getData();
+ LogicalSwitch logicalSwitch = getOvsdbConnectionInstance().getDeviceInfo().getLogicalSwitch(lsUUID);
+ if (logicalSwitch != null) {
+ InstanceIdentifier<LogicalSwitches> switchIid =
+ HwvtepSouthboundMapper.createInstanceIdentifier(getOvsdbConnectionInstance(), logicalSwitch);
+ macRemoteBuilder.setLogicalSwitchRef(new HwvtepLogicalSwitchRef(switchIid));
}
}
}
- private void setIpAddress(RemoteMcastMacsBuilder mMacRemoteBuilder, McastMacsRemote mMacRemote) {
- if (mMacRemote.getIpAddr() != null && !mMacRemote.getIpAddr().isEmpty()) {
- mMacRemoteBuilder.setIpaddr(new IpAddress(mMacRemote.getIpAddr().toCharArray()));
+ private void setIpAddress(RemoteMcastMacsBuilder macRemoteBuilder, McastMacsRemote macRemote) {
+ if (macRemote.getIpAddr() != null && !macRemote.getIpAddr().isEmpty()) {
+ macRemoteBuilder.setIpaddr(IpAddressBuilder.getDefaultInstance(macRemote.getIpAddr()));
}
}
- private void setLocatorSet(RemoteMcastMacsBuilder mMacRemoteBuilder, McastMacsRemote mMacRemote) {
- if (mMacRemote.getLocatorSetColumn() != null && mMacRemote.getLocatorSetColumn().getData() != null) {
- UUID pLocSetUUID = mMacRemote.getLocatorSetColumn().getData();
- PhysicalLocatorSet plSet = updatedPLocSetRows.get(pLocSetUUID);
+ private void setLocatorSet(RemoteMcastMacsBuilder macRemoteBuilder, McastMacsRemote macRemote) {
+ if (macRemote.getLocatorSetColumn() != null && macRemote.getLocatorSetColumn().getData() != null) {
+ UUID locSetUUID = macRemote.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 = (PhysicalLocator) getOvsdbConnectionInstance()
+ .getDeviceInfo().getPhysicalLocator(locUUID);
+ }
InstanceIdentifier<TerminationPoint> tpIid = HwvtepSouthboundMapper.createInstanceIdentifier(
- getOvsdbConnectionInstance().getInstanceIdentifier(), pLoc);
+ getOvsdbConnectionInstance().getInstanceIdentifier(), locator);
plsList.add(new LocatorSetBuilder()
.setLocatorRef(new HwvtepPhysicalLocatorRef(tpIid)).build());
}
- mMacRemoteBuilder.setLocatorSet(plsList);
+ macRemoteBuilder.setLocatorSet(plsList);
}
}
}
Code Review / ovsdb.git / blobdiff