As it now handles Update as well as simple create.
Change-Id: I6fb1db60cbce5553a7a5350e34cb8119d28de736
Signed-off-by: Ed Warnicke <eaw@cisco.com>
+++ /dev/null
-/*
- * Copyright (c) 2014 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,
- * and is available at http://www.eclipse.org/legal/epl-v10.html
- */
-package org.opendaylight.ovsdb.southbound.ovsdb.transact;
-
-import static org.opendaylight.ovsdb.lib.operations.Operations.op;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Map.Entry;
-
-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.TransactionBuilder;
-import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
-import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
-import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
-import org.opendaylight.ovsdb.schema.openvswitch.Port;
-import org.opendaylight.ovsdb.southbound.SouthboundConstants;
-import org.opendaylight.ovsdb.southbound.SouthboundMapper;
-import org.opendaylight.ovsdb.southbound.SouthboundUtil;
-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.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 BridgeCreateCommand extends AbstractTransactCommand {
-
- private static final Logger LOG = LoggerFactory.getLogger(BridgeCreateCommand.class);
-
- public BridgeCreateCommand(BridgeOperationalState state,
- AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
- super(state, changes);
- }
-
-
-
- @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());
- }
- }
-
-
-
- private void updateBridge(
- TransactionBuilder transaction,
- 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);
- Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
- setName(bridge, ovsdbManagedNode,operationalBridgeOptional);
- setFailMode(bridge, ovsdbManagedNode);
- setDataPathType(bridge, ovsdbManagedNode);
- setOpenDaylightIidExternalId(bridge, iid);
- if (!operationalBridgeOptional.isPresent()) {
- setPort(transaction, bridge, ovsdbManagedNode);
- transaction.add(op.insert(bridge));
- } else if (bridge.getName() != null) {
- transaction.add(op.update(bridge)
- .where(bridge.getNameColumn().getSchema().opEqual(bridge.getName()))
- .build());
- }
- }
-
-
-
- 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) {
- bridge.setName(ovsdbManagedNode.getBridgeName().getValue());
- } else if (operationalBridgeOptional.isPresent() && operationalBridgeOptional.get().getBridgeName() != null) {
- bridge.setName(operationalBridgeOptional.get().getBridgeName().getValue());
- }
- }
-
-
-
- private void setOpenDaylightIidExternalId(Bridge bridge,
- InstanceIdentifier<OvsdbBridgeAugmentation> iid) {
- // 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);
- }
-
-
-
- private void setPort(TransactionBuilder transaction, Bridge bridge,
- OvsdbBridgeAugmentation ovsdbManagedNode) {
-
- Insert<GenericTableSchema> interfaceInsert = setInterface(transaction,ovsdbManagedNode);
- // Port part
- 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)));
- transaction.add(op.insert(port).withId(portNamedUuid));
- bridge.setPorts(Sets.newHashSet(new UUID(portNamedUuid)));
- }
-
- private Insert<GenericTableSchema> setInterface(TransactionBuilder transaction,
- OvsdbBridgeAugmentation ovsdbManagedNode) {
- // Interface part
- String interfaceNamedUuid = "Interface_" + SouthboundMapper.getRandomUUID();
- Interface interfaceOvs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class);
- interfaceOvs.setName(ovsdbManagedNode.getBridgeName().getValue());
- interfaceOvs.setType(SouthboundMapper.createOvsdbInterfaceType(InterfaceTypeInternal.class));
- Insert<GenericTableSchema> result = op.insert(interfaceOvs).withId(interfaceNamedUuid);
- transaction.add(result);
- return result;
- }
-
-
-
- private void setFailMode(Bridge bridge,
- OvsdbBridgeAugmentation ovsdbManagedNode) {
- if (ovsdbManagedNode.getFailMode() != null
- && SouthboundConstants.OVSDB_FAIL_MODE_MAP.get(ovsdbManagedNode.getFailMode()) != null ) {
- bridge.setFailMode(Sets.newHashSet(
- SouthboundConstants.OVSDB_FAIL_MODE_MAP.get(ovsdbManagedNode.getFailMode())));
- }
- }
-
-}
+/*
+ * Copyright (c) 2015 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,
+ * and is available at http://www.eclipse.org/legal/epl-v10.html
+ */
package org.opendaylight.ovsdb.southbound.ovsdb.transact;
-import org.opendaylight.controller.md.sal.binding.api.ReadWriteTransaction;
-import org.opendaylight.ovsdb.southbound.transactions.md.TransactionCommand;
+import static org.opendaylight.ovsdb.lib.operations.Operations.op;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Map.Entry;
+
+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.TransactionBuilder;
+import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
+import org.opendaylight.ovsdb.lib.schema.typed.TyperUtils;
+import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
+import org.opendaylight.ovsdb.schema.openvswitch.Interface;
+import org.opendaylight.ovsdb.schema.openvswitch.Port;
+import org.opendaylight.ovsdb.southbound.SouthboundConstants;
+import org.opendaylight.ovsdb.southbound.SouthboundMapper;
+import org.opendaylight.ovsdb.southbound.SouthboundUtil;
+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.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 {
+
+ private static final Logger LOG = LoggerFactory.getLogger(BridgeUpdateCommand.class);
+
+ public BridgeUpdateCommand(BridgeOperationalState state,
+ AsyncDataChangeEvent<InstanceIdentifier<?>, DataObject> changes) {
+ super(state, changes);
+ }
+
-public class BridgeUpdateCommand implements TransactionCommand {
@Override
- public void execute(ReadWriteTransaction transaction) {
- // TODO Auto-generated method stub
+ 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());
+ }
+ }
+
+
+
+ private void updateBridge(
+ TransactionBuilder transaction,
+ 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);
+ Bridge bridge = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Bridge.class);
+ setName(bridge, ovsdbManagedNode,operationalBridgeOptional);
+ setFailMode(bridge, ovsdbManagedNode);
+ setDataPathType(bridge, ovsdbManagedNode);
+ setOpenDaylightIidExternalId(bridge, iid);
+ if (!operationalBridgeOptional.isPresent()) {
+ setPort(transaction, bridge, ovsdbManagedNode);
+ transaction.add(op.insert(bridge));
+ } else if (bridge.getName() != null) {
+ transaction.add(op.update(bridge)
+ .where(bridge.getNameColumn().getSchema().opEqual(bridge.getName()))
+ .build());
+ }
+ }
+
+
+
+ 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) {
+ bridge.setName(ovsdbManagedNode.getBridgeName().getValue());
+ } else if (operationalBridgeOptional.isPresent() && operationalBridgeOptional.get().getBridgeName() != null) {
+ bridge.setName(operationalBridgeOptional.get().getBridgeName().getValue());
+ }
+ }
+
+
+
+ private void setOpenDaylightIidExternalId(Bridge bridge,
+ InstanceIdentifier<OvsdbBridgeAugmentation> iid) {
+ // 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);
+ }
+
+
+
+ private void setPort(TransactionBuilder transaction, Bridge bridge,
+ OvsdbBridgeAugmentation ovsdbManagedNode) {
+
+ Insert<GenericTableSchema> interfaceInsert = setInterface(transaction,ovsdbManagedNode);
+ // Port part
+ 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)));
+ transaction.add(op.insert(port).withId(portNamedUuid));
+ bridge.setPorts(Sets.newHashSet(new UUID(portNamedUuid)));
+ }
+
+ private Insert<GenericTableSchema> setInterface(TransactionBuilder transaction,
+ OvsdbBridgeAugmentation ovsdbManagedNode) {
+ // Interface part
+ String interfaceNamedUuid = "Interface_" + SouthboundMapper.getRandomUUID();
+ Interface interfaceOvs = TyperUtils.getTypedRowWrapper(transaction.getDatabaseSchema(), Interface.class);
+ interfaceOvs.setName(ovsdbManagedNode.getBridgeName().getValue());
+ interfaceOvs.setType(SouthboundMapper.createOvsdbInterfaceType(InterfaceTypeInternal.class));
+ Insert<GenericTableSchema> result = op.insert(interfaceOvs).withId(interfaceNamedUuid);
+ transaction.add(result);
+ return result;
+ }
+
+
+ private void setFailMode(Bridge bridge,
+ OvsdbBridgeAugmentation ovsdbManagedNode) {
+ if (ovsdbManagedNode.getFailMode() != null
+ && SouthboundConstants.OVSDB_FAIL_MODE_MAP.get(ovsdbManagedNode.getFailMode()) != null ) {
+ bridge.setFailMode(Sets.newHashSet(
+ SouthboundConstants.OVSDB_FAIL_MODE_MAP.get(ovsdbManagedNode.getFailMode())));
+ }
}
}
DataObject> changes) {
this.operationalState = state;
this.changes = changes;
- commands.add(new BridgeCreateCommand(state,changes));
+ commands.add(new BridgeUpdateCommand(state,changes));
commands.add(new OpenVSwitchBridgeAddCommand());
commands.add(new ControllerUpdateCommand(state,changes));
commands.add(new ControllerRemovedCommand(state,changes));
import com.google.common.util.concurrent.ListenableFuture;
public class TransactInvokerImpl implements TransactInvoker {
- private static final Logger LOG = LoggerFactory.getLogger(BridgeCreateCommand.class);
+ private static final Logger LOG = LoggerFactory.getLogger(BridgeUpdateCommand.class);
private OvsdbConnectionInstance connectionInstance;
private DatabaseSchema dbSchema;
Code Review / ovsdb.git / commitdiff