/*
- * Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+ * Copyright (c) 2015, 2016 Cisco Systems, Inc. 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,
import static org.opendaylight.ovsdb.lib.operations.Operations.op;
+import com.google.common.base.Optional;
+import com.google.common.collect.Sets;
+import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-
+import javax.annotation.Nonnull;
+import org.opendaylight.controller.md.sal.binding.api.DataTreeModification;
import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.lib.operations.Insert;
+import org.opendaylight.ovsdb.lib.operations.Mutate;
import org.opendaylight.ovsdb.lib.operations.TransactionBuilder;
import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
import org.opendaylight.ovsdb.southbound.SouthboundConstants;
import org.opendaylight.ovsdb.southbound.SouthboundMapper;
import org.opendaylight.ovsdb.southbound.SouthboundUtil;
+import org.opendaylight.ovsdb.utils.yang.YangUtils;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.InterfaceTypeInternal;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.BridgeExternalIds;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.BridgeOtherConfigs;
+import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yangtools.yang.binding.DataObject;
import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.base.Optional;
-import com.google.common.collect.Sets;
-
-public class BridgeUpdateCommand extends AbstractTransactCommand {
+public class BridgeUpdateCommand implements TransactCommand {
private static final Logger LOG = LoggerFactory.getLogger(BridgeUpdateCommand.class);
- public BridgeUpdateCommand(BridgeOperationalState state,
- AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
- super(state, changes);
+ @Override
+ public void execute(TransactionBuilder transaction, BridgeOperationalState state,
+ AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> events) {
+ execute(transaction, state, TransactUtils.extractCreatedOrUpdated(events, OvsdbBridgeAugmentation.class));
}
-
-
@Override
- public void execute(TransactionBuilder transaction) {
- Map<InstanceIdentifier<OvsdbBridgeAugmentation>, OvsdbBridgeAugmentation> created =
- TransactUtils.extractCreated(getChanges(),OvsdbBridgeAugmentation.class);
- for (Entry<InstanceIdentifier<OvsdbBridgeAugmentation>, OvsdbBridgeAugmentation> ovsdbManagedNodeEntry:
- created.entrySet()) {
- updateBridge(transaction, ovsdbManagedNodeEntry.getKey(), ovsdbManagedNodeEntry.getValue());
- }
+ public void execute(TransactionBuilder transaction, BridgeOperationalState state,
+ Collection<DataTreeModification<Node>> modifications) {
+ execute(transaction, state,
+ TransactUtils.extractCreatedOrUpdated(modifications, OvsdbBridgeAugmentation.class));
}
-
+ private void execute(TransactionBuilder transaction, BridgeOperationalState state,
+ Map<InstanceIdentifier<OvsdbBridgeAugmentation>, OvsdbBridgeAugmentation> createdOrUpdated) {
+ for (Entry<InstanceIdentifier<OvsdbBridgeAugmentation>, OvsdbBridgeAugmentation> ovsdbManagedNodeEntry :
+ createdOrUpdated.entrySet()) {
+ updateBridge(transaction, state, ovsdbManagedNodeEntry.getKey(), ovsdbManagedNodeEntry.getValue());
+ }
+ }
private void updateBridge(
- TransactionBuilder transaction,
+ TransactionBuilder transaction, BridgeOperationalState state,
InstanceIdentifier<OvsdbBridgeAugmentation> iid, OvsdbBridgeAugmentation ovsdbManagedNode) {
LOG.debug("Received request to create ovsdb bridge name: {} uuid: {}",
- ovsdbManagedNode.getBridgeName(),
- ovsdbManagedNode.getBridgeUuid());
- Optional<OvsdbBridgeAugmentation> operationalBridgeOptional =
- getOperationalState().getOvsdbBridgeAugmentation(iid);
+ ovsdbManagedNode.getBridgeName(),
+ ovsdbManagedNode.getBridgeUuid());
Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
setFailMode(bridge, ovsdbManagedNode);
setDataPathType(bridge, ovsdbManagedNode);
- setOpenDaylightIidExternalId(bridge, iid);
+ setOpenDaylightExternalIds(bridge, iid, ovsdbManagedNode);
+ setOpenDaylightOtherConfig(bridge, ovsdbManagedNode);
+ Optional<OvsdbBridgeAugmentation> operationalBridgeOptional =
+ state.getOvsdbBridgeAugmentation(iid);
if (!operationalBridgeOptional.isPresent()) {
setName(bridge, ovsdbManagedNode,operationalBridgeOptional);
setPort(transaction, bridge, ovsdbManagedNode);
transaction.add(op.insert(bridge));
- } else if (bridge.getName() != null) {
+ LOG.info("Added ovsdb Bridge name: {} uuid: {}",
+ ovsdbManagedNode.getBridgeName(),
+ ovsdbManagedNode.getBridgeUuid());
+ } else {
+ String existingBridgeName = operationalBridgeOptional.get().getBridgeName().getValue();
// Name is immutable, and so we *can't* update it. So we use extraBridge for the schema stuff
Bridge extraBridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
extraBridge.setName("");
transaction.add(op.update(bridge)
- .where(extraBridge.getNameColumn().getSchema().opEqual(bridge.getName()))
+ .where(extraBridge.getNameColumn().getSchema().opEqual(existingBridgeName))
.build());
+ stampInstanceIdentifier(transaction, iid.firstIdentifierOf(Node.class),existingBridgeName);
}
}
-
-
private void setDataPathType(Bridge bridge,OvsdbBridgeAugmentation ovsdbManagedNode) {
if (ovsdbManagedNode.getDatapathType() != null) {
bridge.setDatapathType(SouthboundMapper.createDatapathType(ovsdbManagedNode));
}
}
-
-
private void setName(Bridge bridge, OvsdbBridgeAugmentation ovsdbManagedNode,
Optional<OvsdbBridgeAugmentation> operationalBridgeOptional) {
if (ovsdbManagedNode.getBridgeName() != null) {
}
}
-
-
- private void setOpenDaylightIidExternalId(Bridge bridge,
- InstanceIdentifier<OvsdbBridgeAugmentation> iid) {
+ private void setOpenDaylightExternalIds(Bridge bridge, InstanceIdentifier<OvsdbBridgeAugmentation> iid,
+ OvsdbBridgeAugmentation ovsdbManagedNode) {
// Set the iid external_id
- Map<String,String> externalIds = new HashMap<String,String>();
- externalIds.put(SouthboundConstants.IID_EXTERNAL_ID_KEY,
- SouthboundUtil.serializeInstanceIdentifier(iid));
- bridge.setExternalIds(externalIds);
+ Map<String, String> externalIdMap = new HashMap<>();
+ externalIdMap.put(SouthboundConstants.IID_EXTERNAL_ID_KEY, SouthboundUtil.serializeInstanceIdentifier(iid));
+ // Set user provided external ids
+ try {
+ YangUtils.copyYangKeyValueListToMap(externalIdMap, ovsdbManagedNode.getBridgeExternalIds(),
+ BridgeExternalIds::getBridgeExternalIdKey, BridgeExternalIds::getBridgeExternalIdValue);
+ } catch (NullPointerException e) {
+ LOG.warn("Incomplete bridge external Id", e);
+ }
+ bridge.setExternalIds(externalIdMap);
}
-
+ private void setOpenDaylightOtherConfig(@Nonnull Bridge bridge, @Nonnull OvsdbBridgeAugmentation ovsdbManagedNode) {
+ try {
+ bridge.setOtherConfig(YangUtils.convertYangKeyValueListToMap(ovsdbManagedNode.getBridgeOtherConfigs(),
+ BridgeOtherConfigs::getBridgeOtherConfigKey, BridgeOtherConfigs::getBridgeOtherConfigValue));
+ } catch (NullPointerException e) {
+ LOG.warn("Incomplete bridge other config", e);
+ }
+ }
private void setPort(TransactionBuilder transaction, Bridge bridge,
OvsdbBridgeAugmentation ovsdbManagedNode) {
Insert<GenericTableSchema> interfaceInsert = setInterface(transaction,ovsdbManagedNode);
// Port part
- String portNamedUuid = "Port_" + SouthboundMapper.getRandomUUID();
+ String portNamedUuid = "Port_" + SouthboundMapper.getRandomUuid();
Port port = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Port.class);
port.setName(ovsdbManagedNode.getBridgeName().getValue());
port.setInterfaces(Sets.newHashSet(TransactUtils.extractNamedUuid(interfaceInsert)));
private Insert<GenericTableSchema> setInterface(TransactionBuilder transaction,
OvsdbBridgeAugmentation ovsdbManagedNode) {
// Interface part
- String interfaceNamedUuid = "Interface_" + SouthboundMapper.getRandomUUID();
+ String interfaceNamedUuid = "Interface_" + SouthboundMapper.getRandomUuid();
Interface interfaceOvs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class);
interfaceOvs.setName(ovsdbManagedNode.getBridgeName().getValue());
interfaceOvs.setType(SouthboundMapper.createOvsdbInterfaceType(InterfaceTypeInternal.class));
return result;
}
-
-
private void setFailMode(Bridge bridge,
OvsdbBridgeAugmentation ovsdbManagedNode) {
if (ovsdbManagedNode.getFailMode() != null
}
}
-}
+ private void stampInstanceIdentifier(TransactionBuilder transaction,InstanceIdentifier<Node> iid,
+ String bridgeName) {
+ Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
+ bridge.setName(bridgeName);
+ bridge.setExternalIds(Collections.<String,String>emptyMap());
+ Mutate mutate = TransactUtils.stampInstanceIdentifierMutation(transaction,
+ iid,
+ bridge.getSchema(),
+ bridge.getExternalIdsColumn().getSchema());
+ transaction.add(mutate
+ .where(bridge.getNameColumn().getSchema().opEqual(bridgeName))
+ .build());
+ }
+
+}
\ No newline at end of file
Code Review / ovsdb.git / blobdiff