import java.math.BigInteger;
import java.net.InetAddress;
-import java.net.NetworkInterface;
-import java.net.SocketException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
import org.eclipse.osgi.framework.console.CommandInterpreter;
import org.eclipse.osgi.framework.console.CommandProvider;
-import org.opendaylight.ovsdb.lib.database.OVSBridge;
+import org.opendaylight.controller.sal.connection.ConnectionConstants;
+import org.opendaylight.controller.sal.core.Node;
+import org.opendaylight.controller.sal.core.NodeConnector;
+import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
+import org.opendaylight.controller.sal.networkconfig.bridgedomain.IPluginInBridgeDomainConfigService;
+import org.opendaylight.controller.sal.utils.Status;
+import org.opendaylight.controller.sal.utils.StatusCode;
import org.opendaylight.ovsdb.lib.database.OVSInstance;
import org.opendaylight.ovsdb.lib.database.OvsdbType;
import org.opendaylight.ovsdb.lib.message.TransactBuilder;
import org.opendaylight.ovsdb.lib.message.operations.MutateOperation;
import org.opendaylight.ovsdb.lib.message.operations.Operation;
import org.opendaylight.ovsdb.lib.message.operations.OperationResult;
+import org.opendaylight.ovsdb.lib.message.operations.UpdateOperation;
import org.opendaylight.ovsdb.lib.notation.Condition;
import org.opendaylight.ovsdb.lib.notation.Function;
import org.opendaylight.ovsdb.lib.notation.Mutation;
import org.opendaylight.ovsdb.lib.notation.OvsDBSet;
import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.lib.table.Bridge;
+import org.opendaylight.ovsdb.lib.table.Capability;
import org.opendaylight.ovsdb.lib.table.Controller;
import org.opendaylight.ovsdb.lib.table.Interface;
+import org.opendaylight.ovsdb.lib.table.Manager;
+import org.opendaylight.ovsdb.lib.table.Mirror;
+import org.opendaylight.ovsdb.lib.table.NetFlow;
import org.opendaylight.ovsdb.lib.table.Open_vSwitch;
import org.opendaylight.ovsdb.lib.table.Port;
+import org.opendaylight.ovsdb.lib.table.Qos;
+import org.opendaylight.ovsdb.lib.table.Queue;
+import org.opendaylight.ovsdb.lib.table.SFlow;
+import org.opendaylight.ovsdb.lib.table.SSL;
import org.opendaylight.ovsdb.lib.table.internal.Table;
-import org.opendaylight.controller.clustering.services.IClusterGlobalServices;
-import org.opendaylight.controller.sal.connection.ConnectionConstants;
-import org.opendaylight.controller.sal.core.Node;
-import org.opendaylight.controller.sal.core.NodeConnector;
-import org.opendaylight.controller.sal.networkconfig.bridgedomain.ConfigConstants;
-import org.opendaylight.controller.sal.networkconfig.bridgedomain.IPluginInBridgeDomainConfigService;
-import org.opendaylight.controller.sal.utils.NetUtils;
-import org.opendaylight.controller.sal.utils.Status;
-import org.opendaylight.controller.sal.utils.StatusCode;
import org.osgi.framework.BundleContext;
import org.osgi.framework.FrameworkUtil;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.fasterxml.jackson.databind.ObjectMapper;
import com.google.common.util.concurrent.ListenableFuture;
-public class ConfigurationService implements IPluginInBridgeDomainConfigService, CommandProvider
+public class ConfigurationService implements IPluginInBridgeDomainConfigService, OVSDBConfigService,
+ CommandProvider
{
private static final Logger logger = LoggerFactory
.getLogger(ConfigurationService.class);
IConnectionServiceInternal connectionService;
InventoryServiceInternal inventoryServiceInternal;
- private IClusterGlobalServices clusterServices;
boolean forceConnect = false;
void init() {
}
}
- public void setClusterServices(IClusterGlobalServices i) {
- this.clusterServices = i;
- }
-
- public void unsetClusterServices(IClusterGlobalServices i) {
- if (this.clusterServices == i) {
- this.clusterServices = null;
- }
- }
-
private Connection getConnection (Node node) {
Connection connection = connectionService.getConnection(node);
if (connection == null || !connection.getChannel().isActive()) {
TransactBuilder transaction = new TransactBuilder();
transaction.addOperations(new ArrayList<Operation>(
- Arrays.asList(addSwitchRequest, addIntfRequest, addPortRequest, addBridgeRequest, updateCfgVerRequest)));
+ Arrays.asList(addSwitchRequest,
+ addIntfRequest,
+ addPortRequest,
+ addBridgeRequest,
+ updateCfgVerRequest)));
ListenableFuture<List<OperationResult>> transResponse = connection.getRpc().transact(transaction);
List<OperationResult> tr = transResponse.get();
}
return status;
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Error in createBridgeDomain(): ",e);
}
return new Status(StatusCode.INTERNALERROR);
}
return new Status(StatusCode.INTERNALERROR);
}
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Error in addPort()",e);
}
return new Status(StatusCode.INTERNALERROR);
}
}
}catch(Exception e){
- e.printStackTrace();
+ logger.error("Error in setManager(): ",e);
}
return true;
}
@Override
public Status deletePort(Node node, String bridgeIdentifier, String portIdentifier) {
- try{
- if (connectionService == null) {
- logger.error("Couldn't refer to the ConnectionService");
- return new Status(StatusCode.NOSERVICE);
- }
+ try{
+ if (connectionService == null) {
+ logger.error("Couldn't refer to the ConnectionService");
+ return new Status(StatusCode.NOSERVICE);
+ }
- Connection connection = this.getConnection(node);
- if (connection == null) {
- return new Status(StatusCode.NOSERVICE, "Connection to ovsdb-server not available");
- }
+ Connection connection = this.getConnection(node);
+ if (connection == null) {
+ return new Status(StatusCode.NOSERVICE, "Connection to ovsdb-server not available");
+ }
- Map<String, Table<?>> brTable = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
- Map<String, Table<?>> portTable = inventoryServiceInternal.getTableCache(node, Port.NAME.getName());
- Operation delPortRequest = null;
- String brUuid = null;
- String portUuid = null;
- if(brTable != null){
- for (String uuid : brTable.keySet()) {
- Bridge bridge = (Bridge) brTable.get(uuid);
- if (bridge.getName().contains(bridgeIdentifier)) {
- brUuid = uuid;
+ Map<String, Table<?>> brTable = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
+ Map<String, Table<?>> portTable = inventoryServiceInternal.getTableCache(node, Port.NAME.getName());
+ Operation delPortRequest = null;
+ String brUuid = null;
+ String portUuid = null;
+ if(brTable != null){
+ for (String uuid : brTable.keySet()) {
+ Bridge bridge = (Bridge) brTable.get(uuid);
+ if (bridge.getName().contains(bridgeIdentifier)) {
+ brUuid = uuid;
+ }
}
}
- }
if(portTable != null){
for (String uuid : portTable.keySet()) {
Port port = (Port) portTable.get(uuid);
}
return status;
} catch(Exception e){
- e.printStackTrace();
+ logger.error("Error in deletePort()",e);
}
return new Status(StatusCode.INTERNALERROR);
}
@Override
public Status deleteBridgeDomain(Node node, String bridgeIdentifier) {
- // TODO Auto-generated method stub
- return null;
+
+ try {
+ if (connectionService == null) {
+ logger.error("Couldn't refer to the ConnectionService");
+ return new Status(StatusCode.NOSERVICE);
+ }
+ Connection connection = this.getConnection(node);
+ if (connection == null) {
+ return new Status(StatusCode.NOSERVICE, "Connection to ovsdb-server not available");
+ }
+ Map<String, Table<?>> ovsTable = inventoryServiceInternal.getTableCache(node, Open_vSwitch.NAME.getName());
+ Map<String, Table<?>> brTable = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
+ Operation delBrRequest = null;
+ String ovsUuid = null;
+ String brUuid = null;
+
+ if (brTable != null) {
+ for (String uuid : brTable.keySet()) {
+ Bridge bridge = (Bridge) brTable.get(uuid);
+ if (bridge.getName().contains(bridgeIdentifier)) {
+ brUuid = uuid;
+ }
+ }
+ }
+ if (ovsTable != null) {
+ ovsUuid = (String) ovsTable.keySet().toArray()[0];
+ }
+ UUID bridgeUuidPair = new UUID(brUuid);
+ Mutation bm = new Mutation("bridges", Mutator.DELETE, bridgeUuidPair);
+ List<Mutation> mutations = new ArrayList<Mutation>();
+ mutations.add(bm);
+
+ UUID uuid = new UUID(ovsUuid);
+ Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ delBrRequest = new MutateOperation(Open_vSwitch.NAME.getName(), where, mutations);
+
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperations(new ArrayList<Operation>(Arrays.asList(delBrRequest)));
+
+ ListenableFuture<List<OperationResult>> transResponse = connection.getRpc().transact(transaction);
+ List<OperationResult> tr = transResponse.get();
+ List<Operation> requests = transaction.getRequests();
+ Status status = new Status(StatusCode.SUCCESS);
+ for (int i = 0; i < tr.size(); i++) {
+ if (i < requests.size()) requests.get(i).setResult(tr.get(i));
+ if (tr.get(i) != null && tr.get(i).getError() != null && tr.get(i).getError().trim().length() > 0) {
+ OperationResult result = tr.get(i);
+ status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
+ }
+ }
+
+ if (tr.size() > requests.size()) {
+ OperationResult result = tr.get(tr.size() - 1);
+ logger.error("Error deleting Bridge : {}\n Error : {}\n Details : {}",
+ bridgeIdentifier, result.getError(), result.getDetails());
+ status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
+ }
+ return status;
+ } catch (Exception e) {
+ logger.error("Error in deleteBridgeDomain(): ",e);
+ }
+ return new Status(StatusCode.INTERNALERROR);
}
@Override
return null;
}
- private short getControllerOFPort() {
- Short defaultOpenFlowPort = 6633;
- Short openFlowPort = defaultOpenFlowPort;
- String portString = System.getProperty("of.listenPort");
- if (portString != null) {
- try {
- openFlowPort = Short.decode(portString).shortValue();
- } catch (NumberFormatException e) {
- logger.warn("Invalid port:{}, use default({})", portString,
- openFlowPort);
+ Boolean setBridgeOFController(Node node, String bridgeIdentifier) {
+ if (connectionService == null) {
+ logger.error("Couldn't refer to the ConnectionService");
+ return false;
+ }
+
+ try{
+ Map<String, Table<?>> brTableCache = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
+ for (String uuid : brTableCache.keySet()) {
+ Bridge bridge = (Bridge)brTableCache.get(uuid);
+ if (bridge.getName().contains(bridgeIdentifier)) {
+ return connectionService.setOFController(node, uuid);
+ }
}
+ } catch(Exception e) {
+ logger.error("Error in setBridgeOFController()",e);
}
- return openFlowPort;
+ return false;
}
- private List<InetAddress> getControllerIPAddresses() {
- List<InetAddress> controllers = null;
- if (clusterServices != null) {
- controllers = clusterServices.getClusteredControllers();
- if (controllers != null && controllers.size() > 0) {
- if (controllers.size() == 1) {
- InetAddress controller = controllers.get(0);
- if (!controller.equals(InetAddress.getLoopbackAddress())) {
- return controllers;
- }
- } else {
- return controllers;
+ @Override
+ public StatusWithUuid insertRow(Node node, String tableName, String parent_uuid, Table<?> row) {
+ logger.info("tableName : {}, parent_uuid : {} Row : {}", tableName, parent_uuid, row.toString());
+ StatusWithUuid statusWithUUID = null;
+
+ // Schema based Table handling will help fix this static Table handling.
+
+ if (row.getTableName().getName().equalsIgnoreCase("Bridge")) {
+ statusWithUUID = insertBridgeRow(node, parent_uuid, (Bridge)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Capbility")) {
+ statusWithUUID = insertCapabilityRow(node, parent_uuid, (Capability)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Controller")) {
+ statusWithUUID = insertControllerRow(node, parent_uuid, (Controller)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Interface")) {
+ statusWithUUID = insertInterfaceRow(node, parent_uuid, (Interface)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Manager")) {
+ statusWithUUID = insertManagerRow(node, parent_uuid, (Manager)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Mirror")) {
+ statusWithUUID = insertMirrorRow(node, parent_uuid, (Mirror)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("NetFlow")) {
+ statusWithUUID = insertNetFlowRow(node, parent_uuid, (NetFlow)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Open_vSwitch")) {
+ statusWithUUID = insertOpen_vSwitchRow(node, (Open_vSwitch)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Port")) {
+ statusWithUUID = insertPortRow(node, parent_uuid, (Port)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("QoS")) {
+ statusWithUUID = insertQosRow(node, parent_uuid, (Qos)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("Queue")) {
+ statusWithUUID = insertQueueRow(node, parent_uuid, (Queue)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("sFlow")) {
+ statusWithUUID = insertSflowRow(node, parent_uuid, (SFlow)row);
+ }
+ else if (row.getTableName().getName().equalsIgnoreCase("SSL")) {
+ statusWithUUID = insertSSLRow(node, parent_uuid, (SSL)row);
+ }
+ return statusWithUUID;
+ }
+
+
+ @Override
+ public Status updateRow (Node node, String tableName, String parentUUID, String rowUUID, Table<?> row) {
+ try{
+ if (connectionService == null) {
+ logger.error("Couldn't refer to the ConnectionService");
+ return new Status(StatusCode.NOSERVICE);
+ }
+
+ Connection connection = this.getConnection(node);
+ if (connection == null) {
+ return new Status(StatusCode.NOSERVICE, "Connection to ovsdb-server not available");
+ }
+
+ Map<String, Table<?>> ovsTable = inventoryServiceInternal.getTableCache(node, Open_vSwitch.NAME.getName());
+
+ if (ovsTable == null) {
+ return new Status(StatusCode.NOTFOUND, "There are no Open_vSwitch instance in the Open_vSwitch table");
+ }
+
+ UUID uuid = new UUID(rowUUID);
+ Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ Operation updateRequest = new UpdateOperation(tableName, where, row);
+
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperations(new ArrayList<Operation>(
+ Arrays.asList(updateRequest)));
+
+ ListenableFuture<List<OperationResult>> transResponse = connection.getRpc().transact(transaction);
+ List<OperationResult> tr = transResponse.get();
+ List<Operation> requests = transaction.getRequests();
+ Status status = new Status(StatusCode.SUCCESS);
+ for (int i = 0; i < tr.size() ; i++) {
+ if (i < requests.size()) requests.get(i).setResult(tr.get(i));
+ if (tr.get(i) != null && tr.get(i).getError() != null && tr.get(i).getError().trim().length() > 0) {
+ OperationResult result = tr.get(i);
+ status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
}
}
+
+ if (tr.size() > requests.size()) {
+ OperationResult result = tr.get(tr.size()-1);
+ logger.error("Error Updating Row : {}/{}\n Error : {}\n Details : {}", tableName, row,
+ result.getError(),
+ result.getDetails());
+ status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
+ }
+ if (status.isSuccess()) {
+ status = new Status(StatusCode.SUCCESS);
+ }
+ return status;
+ } catch(Exception e){
+ logger.error("Error in updateRow(): ",e);
}
+ return new Status(StatusCode.INTERNALERROR);
+ }
- controllers = new ArrayList<InetAddress>();
- InetAddress controllerIP;
- Enumeration<NetworkInterface> nets;
- try {
- nets = NetworkInterface.getNetworkInterfaces();
- for (NetworkInterface netint : Collections.list(nets)) {
- Enumeration<InetAddress> inetAddresses = netint.getInetAddresses();
- for (InetAddress inetAddress : Collections.list(inetAddresses)) {
- if (!inetAddress.isLoopbackAddress() &&
- NetUtils.isIPv4AddressValid(inetAddress.getHostAddress())) {
- controllers.add(inetAddress);
+ @Override
+ public Status deleteRow(Node node, String tableName, String uuid) {
+ if (tableName.equalsIgnoreCase("Bridge")) {
+ return deleteBridgeRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Capbility")) {
+ return deleteCapabilityRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Controller")) {
+ return deleteControllerRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Interface")) {
+ return deleteInterfaceRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Manager")) {
+ return deleteManagerRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Mirror")) {
+ return deleteMirrorRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("NetFlow")) {
+ return deleteNetFlowRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Open_vSwitch")) {
+ return deleteOpen_vSwitchRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Port")) {
+ return deletePortRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("QoS")) {
+ return deleteQosRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("Queue")) {
+ return deleteQueueRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("sFlow")) {
+ return deleteSflowRow(node, uuid);
+ }
+ else if (tableName.equalsIgnoreCase("SSL")) {
+ return deleteSSLRow(node, uuid);
+ }
+ return new Status(StatusCode.NOTFOUND, "Table "+tableName+" not supported");
+ }
+
+ @Override
+ public Map<String, Table<?>> getRows(Node node, String tableName) throws Exception{
+ try{
+ if (inventoryServiceInternal == null) {
+ throw new Exception("Inventory Service is Unavailable.");
+ }
+ Map<String, Table<?>> ovsTable = inventoryServiceInternal.getTableCache(node, tableName);
+ return ovsTable;
+ } catch(Exception e){
+ throw new Exception("Unable to read table due to "+e.getMessage());
+ }
+ }
+
+ @Override
+ public Table<?> getRow(Node node, String tableName, String uuid) throws Exception {
+ try{
+ if (inventoryServiceInternal == null) {
+ throw new Exception("Inventory Service is Unavailable.");
+ }
+ Map<String, Table<?>> ovsTable = inventoryServiceInternal.getTableCache(node, tableName);
+ if (ovsTable == null) return null;
+ return ovsTable.get(uuid);
+ } catch(Exception e){
+ throw new Exception("Unable to read table due to "+e.getMessage());
+ }
+ }
+
+ @Override
+ public String getSerializedRows(Node node, String tableName) throws Exception{
+ try{
+ Map<String, Table<?>> ovsTable = this.getRows(node, tableName);
+ if (ovsTable == null) return null;
+ ObjectMapper mapper = new ObjectMapper();
+ return mapper.writeValueAsString(ovsTable);
+ } catch(Exception e){
+ throw new Exception("Unable to read table due to "+e.getMessage());
+ }
+ }
+
+ @Override
+ public String getSerializedRow(Node node, String tableName, String uuid) throws Exception {
+ try{
+ Table<?> row = this.getRow(node, tableName, uuid);
+ if (row == null) return null;
+ ObjectMapper mapper = new ObjectMapper();
+ return mapper.writeValueAsString(row);
+ } catch(Exception e){
+ throw new Exception("Unable to read table due to "+e.getMessage());
+ }
+ }
+
+ @Override
+ public List<String> getTables(Node node) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
+ private StatusWithUuid insertBridgeRow(Node node, String open_VSwitch_uuid, Bridge bridgeRow) {
+
+ String insertErrorMsg = "bridge";
+ String rowName=bridgeRow.getName();
+
+ try{
+ Map<String, Table<?>> ovsTable = inventoryServiceInternal.getTableCache(node, Open_vSwitch.NAME.getName());
+
+ if (ovsTable == null) {
+ return new StatusWithUuid(StatusCode.NOTFOUND, "There are no Open_vSwitch instance in the Open_vSwitch table");
+ }
+
+ String newBridge = "new_bridge";
+
+ Operation addSwitchRequest = null;
+
+ String ovsTableUUID = open_VSwitch_uuid;
+ if (ovsTableUUID == null) ovsTableUUID = (String) ovsTable.keySet().toArray()[0];
+ UUID bridgeUuidPair = new UUID(newBridge);
+ Mutation bm = new Mutation("bridges", Mutator.INSERT, bridgeUuidPair);
+ List<Mutation> mutations = new ArrayList<Mutation>();
+ mutations.add(bm);
+
+ UUID uuid = new UUID(ovsTableUUID);
+ Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ addSwitchRequest = new MutateOperation(Open_vSwitch.NAME.getName(), where, mutations);
+
+ InsertOperation addBridgeRequest = new InsertOperation(Bridge.NAME.getName(), newBridge, bridgeRow);
+
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperations(new ArrayList<Operation>(
+ Arrays.asList(addSwitchRequest,
+ addBridgeRequest)));
+
+ int bridgeInsertIndex = transaction.getRequests().indexOf(addBridgeRequest);
+
+ return _insertTableRow(node,transaction,bridgeInsertIndex,insertErrorMsg,rowName);
+
+ } catch(Exception e){
+ logger.error("Error in insertBridgeRow(): ",e);
+ }
+ return new StatusWithUuid(StatusCode.INTERNALERROR);
+ }
+
+
+ private StatusWithUuid insertPortRow(Node node, String bridge_uuid, Port portRow) {
+
+ String insertErrorMsg = "port";
+ String rowName=portRow.getName();
+
+ try{
+ Map<String, Table<?>> brTable = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
+ if (brTable == null || brTable.get(bridge_uuid) == null) {
+ return new StatusWithUuid(StatusCode.NOTFOUND, "Bridge with UUID "+bridge_uuid+" Not found");
+ }
+ String newPort = "new_port";
+ UUID portUUID = new UUID(newPort);
+ Mutation bm = new Mutation("ports", Mutator.INSERT, portUUID);
+ List<Mutation> mutations = new ArrayList<Mutation>();
+ mutations.add(bm);
+
+ UUID uuid = new UUID(bridge_uuid);
+ Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ Operation addBrMutRequest = new MutateOperation(Bridge.NAME.getName(), where, mutations);
+
+ // Default OVS schema is to have 1 or more interface part of Bridge. Hence it is mandatory to
+ // Insert an Interface in a Port add case :-(.
+
+ String newInterface = "new_interface";
+ Interface interfaceRow = new Interface();
+ interfaceRow.setName(portRow.getName());
+ InsertOperation addIntfRequest = new InsertOperation(Interface.NAME.getName(),
+ newInterface, interfaceRow);
+
+ OvsDBSet<UUID> interfaces = new OvsDBSet<UUID>();
+ UUID interfaceid = new UUID(newInterface);
+ interfaces.add(interfaceid);
+ portRow.setInterfaces(interfaces);
+
+ InsertOperation addPortRequest = new InsertOperation(Port.NAME.getName(), newPort, portRow);
+
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperations(new ArrayList<Operation>
+ (Arrays.asList(addBrMutRequest, addPortRequest, addIntfRequest)));
+ int portInsertIndex = transaction.getRequests().indexOf(addPortRequest);
+
+ return _insertTableRow(node,transaction,portInsertIndex,insertErrorMsg,rowName);
+
+ } catch (Exception e) {
+ logger.error("Error in insertPortRow(): ",e);
+ }
+ return new StatusWithUuid(StatusCode.INTERNALERROR);
+ }
+
+ private StatusWithUuid insertInterfaceRow(Node node, String port_uuid, Interface interfaceRow) {
+
+ String insertErrorMsg = "interface";
+ String rowName=interfaceRow.getName();
+
+ try{
+
+ // Interface table must have entry in Port table, checking port table for port
+ Map<String, Table<?>> portTable = inventoryServiceInternal.getTableCache(node, Port.NAME.getName());
+ if (portTable == null || portTable.get(port_uuid) == null) {
+ return new StatusWithUuid(StatusCode.NOTFOUND, "Port with UUID "+port_uuid+" Not found");
+ }
+ // MUTATOR, need to insert the interface UUID to LIST of interfaces in PORT TABLE for port_uuid
+ String newInterface = "new_interface";
+ UUID interfaceUUID = new UUID(newInterface);
+ Mutation portTableMutation = new Mutation("interfaces", Mutator.INSERT, interfaceUUID); // field name to append is "interfaces"
+ List<Mutation> mutations = new ArrayList<Mutation>();
+ mutations.add(portTableMutation);
+
+ // Create the Operation which will be used in Transact to perform the PORT TABLE mutation
+ UUID uuid = new UUID(port_uuid);
+ Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ Operation addPortMutationRequest = new MutateOperation(Port.NAME.getName(), where, mutations);
+
+ // Create the interface row request
+ InsertOperation addIntfRequest = new InsertOperation(Interface.NAME.getName(),newInterface, interfaceRow);
+
+ // Transaction to insert/modify tables - validate using "sudo ovsdb-client dump" on host running OVSDB process
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperations(new ArrayList<Operation>(Arrays.asList(addIntfRequest,addPortMutationRequest)));
+
+ // Check the results. Iterates over the results of the Array of transaction Operations, and reports STATUS
+ int interfaceInsertIndex = transaction.getRequests().indexOf(addIntfRequest);
+
+ return _insertTableRow(node,transaction,interfaceInsertIndex,insertErrorMsg,rowName);
+
+ } catch (Exception e) {
+ logger.error("Error in insertInterfaceRow(): ",e);
+ }
+ return new StatusWithUuid(StatusCode.INTERNALERROR);
+ }
+
+ private StatusWithUuid insertOpen_vSwitchRow(Node node, Open_vSwitch row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertControllerRow(Node node, String bridge_uuid, Controller row) {
+
+ String insertErrorMsg = "controller";
+ String rowName=row.getTableName().toString();
+
+ try{
+
+ Map<String, Table<?>> brTable = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
+ if (brTable == null || brTable.get(bridge_uuid) == null) {
+ return new StatusWithUuid(StatusCode.NOTFOUND, "Bridge with UUID "+bridge_uuid+" Not found");
+ }
+
+ Map<String, Table<?>> controllerCache = inventoryServiceInternal.getTableCache(node, Controller.NAME.getName());
+
+ String uuid_name = "new_controller";
+ boolean controllerExists = false;
+ if (controllerCache != null) {
+ for (String uuid : controllerCache.keySet()) {
+ Controller controller = (Controller)controllerCache.get(uuid);
+ if (controller.getTarget().equals(row.getTarget())) {
+ uuid_name = uuid;
+ controllerExists = true;
+ break;
}
}
}
- } catch (SocketException e) {
- controllers.add(InetAddress.getLoopbackAddress());
+
+ UUID controllerUUID = new UUID(uuid_name);
+ Mutation bm = new Mutation("controller", Mutator.INSERT, controllerUUID);
+ List<Mutation> mutations = new ArrayList<Mutation>();
+ mutations.add(bm);
+
+ UUID uuid = new UUID(bridge_uuid);
+ Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ Operation addBrMutRequest = new MutateOperation(Bridge.NAME.getName(), where, mutations);
+ InsertOperation addControllerRequest = null;
+
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperation(addBrMutRequest);
+ int portInsertIndex = -1;
+ if (!controllerExists) {
+ addControllerRequest = new InsertOperation(Controller.NAME.getName(), uuid_name, row);
+ transaction.addOperation(addControllerRequest);
+ portInsertIndex = transaction.getRequests().indexOf(addControllerRequest);
+ }
+
+ StatusWithUuid status = _insertTableRow(node,transaction,portInsertIndex,insertErrorMsg,rowName);
+ if (status.isSuccess() && controllerExists) {
+ // We won't get the uuid from the transact, so we set it here
+ status = new StatusWithUuid(status.getCode(), controllerUUID);
+ }
+ return status;
+
+ } catch (Exception e) {
+ logger.error("Error in insertControllerRow(): ",e);
}
- return controllers;
+ return new StatusWithUuid(StatusCode.INTERNALERROR);
+ }
+
+ private StatusWithUuid insertSSLRow(Node node, String parent_uuid, SSL row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertSflowRow(Node node, String parent_uuid, SFlow row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertQueueRow(Node node, String parent_uuid, Queue row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertQosRow(Node node, String parent_uuid, Qos row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertNetFlowRow(Node node, String parent_uuid, NetFlow row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertMirrorRow(Node node, String parent_uuid, Mirror row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertManagerRow(Node node, String parent_uuid, Manager row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
+ }
+
+ private StatusWithUuid insertCapabilityRow(Node node, String parent_uuid, Capability row) {
+ return new StatusWithUuid(StatusCode.NOTIMPLEMENTED, "Insert operation for this Table is not implemented yet.");
}
- public Boolean setBridgeOFController(Node node, String bridgeIdentifier) {
+ private StatusWithUuid _insertTableRow(Node node, TransactBuilder transaction, Integer insertIndex, String insertErrorMsg,String rowName){
+
try{
+ //Check for connection before calling RPC to perform transaction
if (connectionService == null) {
logger.error("Couldn't refer to the ConnectionService");
- return false;
+ return new StatusWithUuid(StatusCode.NOSERVICE);
}
+
Connection connection = this.getConnection(node);
if (connection == null) {
- return false;
+ return new StatusWithUuid(StatusCode.NOSERVICE, "Connection to ovsdb-server not available");
}
- if (connection != null) {
- List<InetAddress> ofControllerAddrs = getControllerIPAddresses();
- short ofControllerPort = getControllerOFPort();
- OvsDBSet<UUID> controllerUUIDs = new OvsDBSet<UUID>();
- List<Operation> controllerInsertOperations = new ArrayList<Operation>();
- Map<String, Table<?>> controllerCache = inventoryServiceInternal.getTableCache(node, Controller.NAME.getName());
-
- int count = 0;
- for (InetAddress ofControllerAddress : ofControllerAddrs) {
- String cntrlUuid = null;
- String newController = "tcp:"+ofControllerAddress.getHostAddress()+":"+ofControllerPort;
- if (controllerCache != null) {
- for (String uuid : controllerCache.keySet()) {
- Controller controller = (Controller)controllerCache.get(uuid);
- if (controller.getTarget().equals(newController)) {
- cntrlUuid = uuid;
- controllerUUIDs.add(new UUID(uuid));
- break;
- }
- }
- }
- if (cntrlUuid == null) {
- count++;
- String uuid_name = "new_controller_"+count;
- controllerUUIDs.add(new UUID(uuid_name));
- Controller controllerRow = new Controller();
- controllerRow.setTarget(newController);
- InsertOperation addCtlRequest = new InsertOperation(Controller.NAME.getName(), uuid_name, controllerRow);
- controllerInsertOperations.add(addCtlRequest);
- }
- }
- String brCntrlUuid = null;
- Map<String, Table<?>> brTableCache = inventoryServiceInternal.getTableCache(node, Bridge.NAME.getName());
- for (String uuid : brTableCache.keySet()) {
- Bridge bridge = (Bridge)brTableCache.get(uuid);
- if (bridge.getName().contains(bridgeIdentifier)) {
- brCntrlUuid = uuid;
- }
+ ListenableFuture<List<OperationResult>> transResponse = connection.getRpc().transact(transaction);
+ List<OperationResult> tr = transResponse.get();
+ List<Operation> requests = transaction.getRequests();
+ StatusWithUuid status = new StatusWithUuid(StatusCode.SUCCESS);
+ for (int i = 0; i < tr.size() ; i++) {
+ if (i < requests.size()) requests.get(i).setResult(tr.get(i));
+ if (tr.get(i) != null && tr.get(i).getError() != null && tr.get(i).getError().trim().length() > 0) {
+ OperationResult result = tr.get(i);
+ status = new StatusWithUuid(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
}
- Operation addControlRequest = null;
- Mutation bm = new Mutation("controller", Mutator.INSERT, controllerUUIDs);
- List<Mutation> mutations = new ArrayList<Mutation>();
- mutations.add(bm);
+ }
- UUID uuid = new UUID(brCntrlUuid);
- Condition condition = new Condition("_uuid", Function.EQUALS, uuid);
- List<Condition> where = new ArrayList<Condition>();
- where.add(condition);
- addControlRequest = new MutateOperation(Bridge.NAME.getName(), where, mutations);
-
- TransactBuilder transaction = new TransactBuilder();
- transaction.addOperations(controllerInsertOperations);
- transaction.addOperation(addControlRequest);
-
- ListenableFuture<List<OperationResult>> transResponse = connection.getRpc().transact(transaction);
- List<OperationResult> tr = transResponse.get();
- List<Operation> requests = transaction.getRequests();
- Status status = new Status(StatusCode.SUCCESS);
- for (int i = 0; i < tr.size() ; i++) {
- if (i < requests.size()) requests.get(i).setResult(tr.get(i));
- if (tr.get(i) != null && tr.get(i).getError() != null && tr.get(i).getError().trim().length() > 0) {
- OperationResult result = tr.get(i);
- status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
- }
+ if (tr.size() > requests.size()) {
+ OperationResult result = tr.get(tr.size()-1);
+ logger.error("Error creating {} : {}\n Error : {}\n Details : {}", insertErrorMsg,
+ rowName,
+ result.getError(),
+ result.getDetails());
+ status = new StatusWithUuid(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
+ }
+ if (status.isSuccess()) {
+ if (insertIndex >0 && insertIndex < tr.size() && tr.get(insertIndex) != null) {
+ UUID uuid = tr.get(insertIndex).getUuid();
+ status = new StatusWithUuid(StatusCode.SUCCESS, uuid);
+ } else {
+ // We can't get the uuid from the transact as the insertIndex is invalid or -1
+ // return null uuid.
+ status = new StatusWithUuid(StatusCode.SUCCESS, (UUID) null);
}
+ }
+ return status;
+ } catch(Exception e){
+ logger.error("Error in _insertTableRow(): ",e);
+ }
+ return new StatusWithUuid(StatusCode.INTERNALERROR);
+ }
- if (tr.size() > requests.size()) {
- OperationResult result = tr.get(tr.size()-1);
- logger.error("Error creating Bridge : {}\n Error : {}\n Details : {}", bridgeIdentifier,
- result.getError(),
- result.getDetails());
- status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
+ private Status deleteBridgeRow(Node node, String uuid) {
+ // Set up variables for generic _deleteTableRow()
+ String parentTableName=Open_vSwitch.NAME.getName();
+ String childTableName=Bridge.NAME.getName();
+ String parentColumn = "bridges";
+
+ return _deleteTableRow(node,uuid,parentTableName,childTableName,parentColumn);
+ }
+
+ private Status deletePortRow(Node node, String uuid) {
+ // Set up variables for generic _deleteTableRow()
+ String parentTableName=Bridge.NAME.getName();
+ String childTableName=Port.NAME.getName();
+ String parentColumn = "ports";
+
+ return _deleteTableRow(node,uuid,parentTableName,childTableName,parentColumn);
+ }
+
+ private Status deleteInterfaceRow(Node node, String uuid) {
+ // Since Port<-Interface tables have a 1:n relationship, need to test if this is the last interface
+ // assigned to a port before attempting delete.
+ Map<String, Table<?>> portTable = inventoryServiceInternal.getTableCache(node, Port.NAME.getName());
+ Map<String, Table<?>> interfaceTable = inventoryServiceInternal.getTableCache(node, Interface.NAME.getName());
+ // Check that the UUID exists
+ if (portTable == null || interfaceTable == null || uuid == null || interfaceTable.get(uuid) == null) {
+ return new Status(StatusCode.NOTFOUND, "");
+ }
+
+ // Need to check if this is the last interface for that port. Cannot delete last interface.
+ UUID compareUuid = new UUID(uuid);
+ for (int i=0 ; i < portTable.values().size(); i++){
+ Port port = (Port)portTable.values().toArray()[i];
+ if ((port.getInterfaces().size() == 1) && (port.getInterfaces().contains(compareUuid))){
+ return new Status(StatusCode.BADREQUEST, "Cannot delete last interface from port");
+ }
+ }
+
+ // Since the above past, it's safe to use the generic _deleteTableRow method
+ // Set up variables for generic _deleteTableRow()
+ String parentTableName=Port.NAME.getName();
+ String childTableName=Interface.NAME.getName();
+ String parentColumn = "interfaces";
+
+ return _deleteTableRow(node,uuid,parentTableName,childTableName,parentColumn);
+ }
+
+ private Status deleteControllerRow(Node node, String uuid) {
+ // Set up variables for generic _deleteTableRow()
+ String parentTableName=Bridge.NAME.getName();
+ String childTableName=Controller.NAME.getName();
+ String parentColumn = "controller";
+
+ return _deleteTableRow(node,uuid,parentTableName,childTableName,parentColumn);
+ }
+
+ private Status deleteOpen_vSwitchRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteSSLRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteSflowRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteQueueRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteQosRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteNetFlowRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteMirrorRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteManagerRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+
+ private Status deleteCapabilityRow(Node node, String uuid) {
+ return new Status(StatusCode.NOTIMPLEMENTED, "delete operation for this Table is not implemented yet.");
+ }
+ private Status _deleteTableRow(Node node,String uuid,String parentTableName, String childTableName, String parentColumn) {
+ try {
+ // Check there is a connectionService
+ if (connectionService == null) {
+ logger.error("Couldn't refer to the ConnectionService");
+ return new Status(StatusCode.NOSERVICE);
+ }
+
+ // Establish the connection
+ Connection connection = this.getConnection(node);
+ if (connection == null) {
+ return new Status(StatusCode.NOSERVICE, "Connection to ovsdb-server not available");
+ }
+
+ // Ports have a 0:n relationship with Bridges, so need to MUTATE BRIDGE row and DELETE PORT row
+ Map<String, Table<?>> parentTable = inventoryServiceInternal.getTableCache(node, parentTableName);
+ Map<String, Table<?>> childTable = inventoryServiceInternal.getTableCache(node, childTableName);
+
+ // Check that the UUID exists
+ if (parentTable == null || childTable == null || uuid == null || childTable.get(uuid) == null) {
+ return new Status(StatusCode.NOTFOUND, "");
+ }
+
+ // Initialise the actual request var
+ Operation delRequest = null;
+
+ // Prepare the mutator to remove the port UUID from the "ports" list in the BRIDGE TABLE
+ UUID rowUuid = new UUID(uuid);
+ Mutation mutator = new Mutation(parentColumn, Mutator.DELETE, rowUuid);
+ List<Mutation> mutations = new ArrayList<Mutation>();
+ mutations.add(mutator);
+
+ Status status = new Status(StatusCode.SUCCESS);
+
+ // INCLUDES condition ensures that it captures all rows in the parent table (ie duplicates) that have the child UUID
+ Condition condition = new Condition(parentColumn, Function.INCLUDES, rowUuid);
+ List<Condition> where = new ArrayList<Condition>();
+ where.add(condition);
+ delRequest = new MutateOperation(parentTableName, where, mutations);
+
+ TransactBuilder transaction = new TransactBuilder();
+ transaction.addOperations(new ArrayList<Operation>(Arrays.asList(delRequest)));
+
+ // This executes the transaction.
+ ListenableFuture<List<OperationResult>> transResponse = connection.getRpc().transact(transaction);
+
+ // Pull the responses
+ List<OperationResult> tr = transResponse.get();
+ List<Operation> requests = transaction.getRequests();
+
+ for (int i = 0; i < tr.size(); i++) {
+ if (i < requests.size()) requests.get(i).setResult(tr.get(i));
+ if (tr.get(i) != null && tr.get(i).getError() != null && tr.get(i).getError().trim().length() > 0) {
+ OperationResult result = tr.get(i);
+ status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
}
}
- }catch(Exception e){
- e.printStackTrace();
+
+ if (tr.size() > requests.size()) {
+ OperationResult result = tr.get(tr.size() - 1);
+ logger.error("Error deleting: {}\n Error : {}\n Details : {}",
+ uuid, result.getError(), result.getDetails());
+ status = new Status(StatusCode.BADREQUEST, result.getError() + " : " + result.getDetails());
+ }
+ return status;
+ } catch (Exception e) {
+ logger.error("Error in _deleteTableRow",e);
}
- return true;
+ return new Status(StatusCode.INTERNALERROR);
}
public void _ovsconnect (CommandInterpreter ci) {
ci.println("Please enter Node Name");
return;
}
-
String bridgeName = ci.nextArgument();
if (bridgeName == null) {
ci.println("Please enter Bridge Name");
return;
}
Status status;
+
try {
- status = this.createBridgeDomain(Node.fromString(nodeName), bridgeName, null);
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ status = this.createBridgeDomain(node, bridgeName, null);
ci.println("Bridge creation status : "+status.toString());
} catch (Throwable e) {
// TODO Auto-generated catch block
return;
}
Status status;
+
List<String> brlist = new ArrayList<String>();
try {
- brlist = this.getBridgeDomains(Node.fromString(nodeName));
+ Node node = Node.fromString(nodeName);
+ brlist = this.getBridgeDomains(node);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
ci.println("Existing Bridges: "+brlist.toString());
} catch (Throwable e) {
e.printStackTrace();
}
}
+ public void _deleteBridgeDomain (CommandInterpreter ci) {
+ String nodeName = ci.nextArgument();
+ if (nodeName == null) {
+ ci.println("Please enter Node Name");
+ return;
+ }
+ String bridgeName = ci.nextArgument();
+ if (bridgeName == null) {
+ ci.println("Please enter Bridge Name");
+ return;
+ }
+ Status status;
+ try {
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ status = this.deleteBridgeDomain(node, bridgeName);
+ ci.println("Bridge deletion status : "+status.toString());
+ } catch (Throwable e) {
+ e.printStackTrace();
+ ci.println("Failed to delete Bridge "+bridgeName);
+ }
+ }
+
public void _addPort (CommandInterpreter ci) {
String nodeName = ci.nextArgument();
if (nodeName == null) {
}
Status status;
try {
- status = this.addPort(Node.fromString(nodeName), bridgeName, portName, customConfigs);
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ status = this.addPort(node, bridgeName, portName, customConfigs);
ci.println("Port creation status : "+status.toString());
} catch (Throwable e) {
// TODO Auto-generated catch block
Status status;
try {
- status = this.deletePort(Node.fromString(nodeName), bridgeName, portName);
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ status = this.deletePort(node, bridgeName, portName);
ci.println("Port deletion status : "+status.toString());
} catch (Throwable e) {
// TODO Auto-generated catch block
Status status;
try {
- status = this.addPort(Node.fromString(nodeName), bridgeName, portName, configs);
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ status = this.addPort(node, bridgeName, portName, configs);
ci.println("Port creation status : "+status.toString());
} catch (Throwable e) {
// TODO Auto-generated catch block
Status status;
try {
- status = this.addPort(Node.fromString(nodeName), bridgeName, portName, configs);
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ status = this.addPort(node, bridgeName, portName, configs);
ci.println("Port creation status : "+status.toString());
} catch (Throwable e) {
// TODO Auto-generated catch block
ci.println("Please enter Node Name");
return;
}
- inventoryServiceInternal.printCache(Node.fromString(nodeName));
+ Node node = Node.fromString(nodeName);
+ if (node == null) {
+ ci.println("Invalid Node");
+ return;
+ }
+ inventoryServiceInternal.printCache(node);
}
public void _forceConnect (CommandInterpreter ci) {
help.append("---OVSDB CLI---\n");
help.append("\t ovsconnect <ConnectionName> <ip-address> - Connect to OVSDB\n");
help.append("\t addBridge <Node> <BridgeName> - Add Bridge\n");
- help.append("\t getBridgeDomains - Get Bridges\n");
+ help.append("\t getBridgeDomains <Node> - Get Bridges\n");
+ help.append("\t deleteBridgeDomain <Node> <BridgeName> - Delete a Bridge\n");
help.append("\t addPort <Node> <BridgeName> <PortName> <type> <options pairs> - Add Port\n");
- help.append("\t delPort <Node> <BridgeName> <PortName> - Delete Port\n");
+ help.append("\t deletePort <Node> <BridgeName> <PortName> - Delete Port\n");
help.append("\t addPortVlan <Node> <BridgeName> <PortName> <vlan> - Add Port, Vlan\n");
help.append("\t addTunnel <Node> <Bridge> <Port> <tunnel-type> <remote-ip> - Add Tunnel\n");
help.append("\t printCache <Node> - Prints Table Cache");
return help.toString();
}
}
+
Code Review / ovsdb.git / blobdiff