.setInterface(NetworkingProvider.class.getName(), props1)
.setImplementation(OF13Provider.class)
.add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
- .add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
- .add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
- .add(createServiceDependency().setService(SecurityServicesManager.class).setRequired(true))
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
- .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
- .add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true))
+ //.add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
+ //.add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true)));
+ //.add(createServiceDependency().setService(SecurityServicesManager.class).setRequired(true))
+ //.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+ //.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true))
.add(createServiceDependency().setService(ClassifierProvider.class).setRequired(true))
.add(createServiceDependency().setService(IngressAclProvider.class).setRequired(true))
- .add(createServiceDependency().setService(EgressAclProvider.class).setRequired(true))
+ ////.add(createServiceDependency().setService(EgressAclProvider.class).setRequired(true))
.add(createServiceDependency().setService(L2ForwardingProvider.class).setRequired(true)));
manager.add(createComponent()
props2.put(Constants.PROVIDER_NAME_PROPERTY, OF13Provider.NAME);
manager.add(createComponent()
- .setInterface(new String[]{AbstractServiceInstance.class.getName(), ClassifierProvider.class.getName()},
- props2)
+ .setInterface(new String[]{AbstractServiceInstance.class.getName(),
+ ClassifierProvider.class.getName()},props2)
.setImplementation(ClassifierService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[]{AbstractServiceInstance.class.getName(), ArpProvider.class.getName()},
props3)
.setImplementation(ArpResponderService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[]{AbstractServiceInstance.class.getName(),
InboundNatProvider.class.getName()}, props4)
.setImplementation(InboundNatService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[]{AbstractServiceInstance.class.getName(), IngressAclProvider.class.getName()},
props5)
.setImplementation(IngressAclService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[] {AbstractServiceInstance.class.getName(),
LoadBalancerProvider.class.getName()}, props6)
.setImplementation(LoadBalancerService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[] {AbstractServiceInstance.class.getName(), RoutingProvider.class.getName()},
props7)
.setImplementation(RoutingService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[] {AbstractServiceInstance.class.getName(),
L3ForwardingProvider.class.getName()}, props8)
.setImplementation(L3ForwardingService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
manager.add(createComponent()
.setInterface(AbstractServiceInstance.class.getName(), props9)
.setImplementation(L2RewriteService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
L2ForwardingProvider.class.getName()},
props10)
.setImplementation(L2ForwardingService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
.setInterface(new String[]{AbstractServiceInstance.class.getName(), EgressAclProvider.class.getName()},
props11)
.setImplementation(EgressAclService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
manager.add(createComponent()
.setInterface(new String[]{AbstractServiceInstance.class.getName(),
- OutboundNatProvider.class.getName()},
- props12)
+ OutboundNatProvider.class.getName()}, props12)
.setImplementation(OutboundNatService.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(PipelineOrchestrator.class).setRequired(true))
.add(createServiceDependency().setService(MdsalConsumer.class).setRequired(true)));
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
-import org.opendaylight.ovsdb.lib.notation.Row;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
-import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
import org.opendaylight.ovsdb.utils.mdsal.node.StringConvertor;
import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils;
import org.opendaylight.yang.gen.v1.urn.opendaylight.flow.inventory.rev130819.FlowCapableNode;
// OSGi Services that we are dependent on.
/* TODO SB_MIGRATION */
private volatile OvsdbConnectionService connectionService;
- private volatile OvsdbConfigurationService ovsdbConfigService;
private volatile MdsalConsumer mdsalConsumer;
private volatile PipelineOrchestrator orchestrator;
- // Concrete Service that this AbstractServiceInstance represent
+ // Concrete Service that this AbstractServiceInstance represents
private Service service;
public AbstractServiceInstance (Service service) {
}
void init() {
- logger.info(">>>>> init {}", this.getClass());
+ logger.info(">>>>> init service: {}", this.getClass());
}
private String getBridgeName(Node node) {
* 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
- *
- * Authors : Madhu Venugopal, Brent Salisbury, Dave Tucker
*/
package org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13;
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
import org.opendaylight.neutron.spi.NeutronNetwork;
import org.opendaylight.neutron.spi.NeutronSecurityGroup;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler;
import org.opendaylight.ovsdb.openstack.netvirt.api.*;
import org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalUtils;
-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.SouthboundMapper;
import org.opendaylight.ovsdb.utils.mdsal.node.StringConvertor;
import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.NodeKey;
+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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* Open vSwitch OpenFlow 1.3 Networking Provider for OpenStack Neutron
+ *
+ * @author Madhu Venugopal
+ * @author Brent Salisbury
+ * @author Dave Tucker
+ * @author Sam Hague
*/
public class OF13Provider implements NetworkingProvider {
private static final Logger logger = LoggerFactory.getLogger(OF13Provider.class);
private volatile ConfigurationService configurationService;
private volatile BridgeConfigurationManager bridgeConfigurationManager;
private volatile TenantNetworkManager tenantNetworkManager;
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
+ private volatile SecurityServicesManager securityServicesManager;
private volatile OvsdbConnectionService connectionService;
private volatile MdsalConsumer mdsalConsumer;
- private volatile SecurityServicesManager securityServicesManager;
- private volatile IngressAclProvider ingressAclProvider;
- private volatile EgressAclProvider egressAclProvider;
private volatile ClassifierProvider classifierProvider;
+ private volatile IngressAclProvider ingressAclProvider;
+ //private volatile EgressAclProvider egressAclProvider;
private volatile L2ForwardingProvider l2ForwardingProvider;
public static final String NAME = "OF13Provider";
public void init() {
- logger.info(">>>>> init {}", this.getClass());
+ logger.info(">>>>>> init OF13Provider {}", this.getClass());
}
@Override
return tunnelType+"-"+dst.getHostAddress();
}
- private boolean isTunnelPresent(Node node, String tunnelName, String bridgeUUID) throws Exception {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- Row bridgeRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUUID);
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeRow);
- if (bridge != null) {
- Set<UUID> ports = bridge.getPortsColumn().getData();
- for (UUID portUUID : ports) {
- Row portRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Port.class), portUUID.toString());
- Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- if (port != null && tunnelName.equalsIgnoreCase(port.getName())) return true;
- }
- }
- return false;
- }
-
- private String getPortUuid(Node node, String name, String bridgeUUID) throws Exception {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- Row bridgeRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUUID);
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeRow);
- if (bridge != null) {
- Set<UUID> ports = bridge.getPortsColumn().getData();
- for (UUID portUUID : ports) {
- Row portRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Port.class), portUUID.toString());
- Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- if (port != null && name.equalsIgnoreCase(port.getName())) return portUUID.toString();
- }
+ private boolean addTunnelPort (Node node, String tunnelType, InetAddress src, InetAddress dst) {
+ String tunnelBridgeName = configurationService.getIntegrationBridgeName();
+ String portName = getTunnelName(tunnelType, dst);
+ if (MdsalUtils.getPort(node, portName) != null) {
+ logger.trace("Tunnel {} is present in {} of {}", portName, tunnelBridgeName, node);
+ return true;
}
- return null;
- }
- private Status addTunnelPort (Node node, String tunnelType, InetAddress src, InetAddress dst) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- try {
- String bridgeUUID = null;
- String tunnelBridgeName = configurationService.getIntegrationBridgeName();
- Map<String, Row> bridgeTable = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Bridge.class));
- if (bridgeTable != null) {
- for (String uuid : bridgeTable.keySet()) {
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node,Bridge.class, bridgeTable.get(uuid));
- if (bridge.getName().equals(tunnelBridgeName)) {
- bridgeUUID = uuid;
- break;
- }
- }
- }
- if (bridgeUUID == null) {
- logger.error("Could not find Bridge {} in {}", tunnelBridgeName, node);
- return new Status(StatusCode.NOTFOUND, "Could not find "+tunnelBridgeName+" in "+node);
- }
- String portName = getTunnelName(tunnelType, dst);
-
- if (this.isTunnelPresent(node, portName, bridgeUUID)) {
- logger.trace("Tunnel {} is present in {} of {}", portName, tunnelBridgeName, node);
- return new Status(StatusCode.SUCCESS);
- }
-
- Port tunnelPort = ovsdbConfigurationService.createTypedRow(node, Port.class);
- tunnelPort.setName(portName);
- StatusWithUuid statusWithUuid = ovsdbConfigurationService
- .insertRow(node, ovsdbConfigurationService.getTableName(node, Port.class), bridgeUUID, tunnelPort.getRow());
- if (!statusWithUuid.isSuccess()) {
- logger.error("Failed to insert Tunnel port {} in {}", portName, bridgeUUID);
- return statusWithUuid;
- }
+ Map<String, String> options = Maps.newHashMap();
+ options.put("key", "flow");
+ options.put("local_ip", src.getHostAddress());
+ options.put("remote_ip", dst.getHostAddress());
- String tunnelPortUUID = statusWithUuid.getUuid().toString();
- String interfaceUUID = null;
- int timeout = 6;
- while ((interfaceUUID == null) && (timeout > 0)) {
- Row portRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Port.class), tunnelPortUUID);
- tunnelPort = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- Set<UUID> interfaces = tunnelPort.getInterfacesColumn().getData();
- if (interfaces == null || interfaces.size() == 0) {
- // Wait for the OVSDB update to sync up the Local cache.
- Thread.sleep(500);
- timeout--;
- continue;
- }
- interfaceUUID = interfaces.toArray()[0].toString();
- Row intfRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Interface.class), interfaceUUID);
- Interface intf = ovsdbConfigurationService.getTypedRow(node, Interface.class, intfRow);
- if (intf == null) interfaceUUID = null;
- }
-
- if (interfaceUUID == null) {
- logger.error("Cannot identify Tunnel Interface for port {}/{}", portName, tunnelPortUUID);
- return new Status(StatusCode.INTERNALERROR);
- }
-
- Interface tunInterface = ovsdbConfigurationService.createTypedRow(node, Interface.class);
- tunInterface.setType(tunnelType);
- Map<String, String> options = Maps.newHashMap();
- options.put("key", "flow");
- options.put("local_ip", src.getHostAddress());
- options.put("remote_ip", dst.getHostAddress());
- tunInterface.setOptions(options);
- Status status = ovsdbConfigurationService
- .updateRow(node, ovsdbConfigurationService.getTableName(node, Interface.class), tunnelPortUUID, interfaceUUID, tunInterface.getRow());
- logger.debug("Tunnel {} add status : {}", tunInterface, status);
- return status;
- } catch (Exception e) {
- logger.error("Exception in addTunnelPort", e);
- return new Status(StatusCode.INTERNALERROR);
+ if (!MdsalUtils.addTunnelPort(node, tunnelBridgeName, portName, tunnelType, options)) {
+ logger.error("Failed to insert Tunnel port {} in {}", portName, tunnelBridgeName);
+ return false;
}
+
+ return true;
}
/* delete port from ovsdb port table */
- private Status deletePort(Node node, String bridgeName, String portName) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- try {
- String bridgeUUID = null;
- Map<String, Row> bridgeTable = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Bridge.class));
- if (bridgeTable != null) {
- for (String uuid : bridgeTable.keySet()) {
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeTable.get(uuid));
- if (bridge.getName().equals(bridgeName)) {
- bridgeUUID = uuid;
- break;
- }
- }
- }
- if (bridgeUUID == null) {
- logger.debug("Could not find Bridge {} in {}", bridgeName, node);
- return new Status(StatusCode.SUCCESS);
- }
-
- String portUUID = this.getPortUuid(node, portName, bridgeUUID);
- Status status = new Status(StatusCode.SUCCESS);
- if (portUUID != null) {
- status = ovsdbConfigurationService
- .deleteRow(node, ovsdbConfigurationService.getTableName(node, Port.class), portUUID);
- if (!status.isSuccess()) {
- logger.error("Failed to delete port {} in {} status : {}", portName, bridgeUUID,
- status);
- return status;
- }
- logger.debug("Port {} delete status : {}", portName, status);
- }
- return status;
- } catch (Exception e) {
- logger.error("Exception in deletePort", e);
- return new Status(StatusCode.INTERNALERROR);
- }
+ private boolean deletePort(Node node, String bridgeName, String portName) {
+ // TODO SB_MIGRATION
+ // might need to convert from ovsdb node to bridge node
+ return MdsalUtils.deletePort(node, portName);
}
- private Status deleteTunnelPort(Node node, String tunnelType, InetAddress src, InetAddress dst) {
+ private boolean deleteTunnelPort(Node node, String tunnelType, InetAddress src, InetAddress dst) {
String tunnelBridgeName = configurationService.getIntegrationBridgeName();
String portName = getTunnelName(tunnelType, dst);
return deletePort(node, tunnelBridgeName, portName);
}
- private Status deletePhysicalPort(Node node, String phyIntfName) {
+ private boolean deletePhysicalPort(Node node, String phyIntfName) {
String intBridgeName = configurationService.getIntegrationBridgeName();
return deletePort(node, intBridgeName, phyIntfName);
}
- private void programLocalBridgeRules(Node node, Long dpid, String segmentationId, String attachedMac, long localPort) {
+ private void programLocalBridgeRules(Node node, Long dpid, String segmentationId,
+ String attachedMac, long localPort) {
/*
* Table(0) Rule #3
* ----------------
* Action:Action: Set Tunnel ID and GOTO Local Table (5)
*/
- handleLocalInPort(dpid, TABLE_0_DEFAULT_INGRESS, TABLE_1_ISOLATE_TENANT, segmentationId, localPort, attachedMac, true);
+ handleLocalInPort(dpid, TABLE_0_DEFAULT_INGRESS, TABLE_1_ISOLATE_TENANT,
+ segmentationId, localPort, attachedMac, true);
/*
* Table(0) Rule #4
private void programTunnelRules (String tunnelType, String segmentationId, InetAddress dst, Node node,
OvsdbTerminationPointAugmentation intf, boolean local) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
-
try {
Long dpid = this.getIntegrationBridgeOFDPID(node);
if (dpid == 0L) {
return;
}
- Map<String, OvsdbTerminationPointAugmentation> intfs = ovsdbConfigurationService.getInterfaces(node);
- if (intfs != null) {
- for (OvsdbTerminationPointAugmentation tunIntf : intfs.values()) {
- Long ofPort = 0L;
- if (tunIntf.getName().equals(this.getTunnelName(tunnelType, dst))) {
- long tunnelOFPort = (Long)intf.getOfport();
-
- if (tunnelOFPort == -1) {
- logger.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
- tunIntf.getName(), tunnelOFPort, node);
- return;
- }
- logger.debug("Identified Tunnel port {} -> OF ({}) on {}",
- tunIntf.getName(), tunnelOFPort, node);
+ List<OvsdbTerminationPointAugmentation> intfs = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation tunIntf : intfs) {
+ Long ofPort = 0L;
+ if (tunIntf.getName().equals(this.getTunnelName(tunnelType, dst))) {
+ long tunnelOFPort = (Long)intf.getOfport();
- if (!local) {
- programRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
- tunnelOFPort, localPort);
- }
- logger.trace("program local ingress tunnel rules: node {}, intf {}",
- node.getNodeId().getValue(), intf.getName());
- if (local) {
- programLocalIngressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
- tunnelOFPort, localPort);
- }
+ if (tunnelOFPort == -1) {
+ logger.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
+ tunIntf.getName(), tunnelOFPort, node);
return;
}
+ logger.debug("Identified Tunnel port {} -> OF ({}) on {}",
+ tunIntf.getName(), tunnelOFPort, node);
+
+ if (!local) {
+ programRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
+ tunnelOFPort, localPort);
+ }
+ logger.trace("program local ingress tunnel rules: node {}, intf {}",
+ node.getNodeId().getValue(), intf.getName());
+ if (local) {
+ programLocalIngressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
+ tunnelOFPort, localPort);
+ }
+ return;
}
}
} catch (Exception e) {
private void removeTunnelRules (String tunnelType, String segmentationId, InetAddress dst, Node node,
OvsdbTerminationPointAugmentation intf,
boolean local, boolean isLastInstanceOnNode) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
try {
Long dpid = this.getIntegrationBridgeOFDPID(node);
if (dpid == 0L) {
return;
}
- Map<String, OvsdbTerminationPointAugmentation> intfs = ovsdbConfigurationService.getInterfaces(node);
- if (intfs != null) {
- for (OvsdbTerminationPointAugmentation tunIntf : intfs.values()) {
- Long ofPort = 0L;
- if (tunIntf.getName().equals(this.getTunnelName(tunnelType, dst))) {
- long tunnelOFPort = (Long)intf.getOfport();
-
- if (tunnelOFPort == -1) {
- logger.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
- tunIntf.getName(), tunnelOFPort, node);
- return;
- }
- logger.debug("Identified Tunnel port {} -> OF ({}) on {}",
- tunIntf.getName(), tunnelOFPort, node);
+ List<OvsdbTerminationPointAugmentation> intfs = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation tunIntf : intfs) {
+ Long ofPort = 0L;
+ if (tunIntf.getName().equals(this.getTunnelName(tunnelType, dst))) {
+ long tunnelOFPort = (Long)intf.getOfport();
- if (!local) {
- removeRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
- tunnelOFPort, localPort);
- }
- if (local && isLastInstanceOnNode) {
- removePerTunnelRules(node, dpid, segmentationId, tunnelOFPort);
- }
+ if (tunnelOFPort == -1) {
+ logger.error("Could not Identify Tunnel port {} -> OF ({}) on {}",
+ tunIntf.getName(), tunnelOFPort, node);
return;
}
+ logger.debug("Identified Tunnel port {} -> OF ({}) on {}",
+ tunIntf.getName(), tunnelOFPort, node);
+
+ if (!local) {
+ removeRemoteEgressTunnelBridgeRules(node, dpid, segmentationId, attachedMac,
+ tunnelOFPort, localPort);
+ }
+ if (local && isLastInstanceOnNode) {
+ removePerTunnelRules(node, dpid, segmentationId, tunnelOFPort);
+ }
+ return;
}
}
} catch (Exception e) {
}
private void programVlanRules (NeutronNetwork network, Node node, OvsdbTerminationPointAugmentation intf) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
logger.debug("Program vlan rules for interface {}", intf.getName());
- try {
- Long dpid = this.getIntegrationBridgeOFDPID(node);
- if (dpid == 0L) {
- logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
- return;
- }
+ Long dpid = getIntegrationBridgeOFDPID(node);
+ if (dpid == 0L) {
+ logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
+ return;
+ }
- long localPort = (Long)intf.getOfport();
+ long localPort = (Long)intf.getOfport();
- String attachedMac = MdsalUtils.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
- if (attachedMac == null) {
- logger.error("No AttachedMac seen in {}", intf);
- return;
- }
+ String attachedMac = MdsalUtils.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
+ if (attachedMac == null) {
+ logger.error("No AttachedMac seen in {}", intf);
+ return;
+ }
- Map<String, OvsdbTerminationPointAugmentation> intfs = ovsdbConfigurationService.getInterfaces(node);
- if (intfs != null) {
- for (OvsdbTerminationPointAugmentation ethIntf : intfs.values()) {
- Long ofPort = 0L;
- if (ethIntf.getName().equalsIgnoreCase(bridgeConfigurationManager.getPhysicalInterfaceName(
- node, network.getProviderPhysicalNetwork()))) {
- long ethOFPort = (Long)ethIntf.getOfport();
-
- if (ethOFPort == -1) {
- logger.error("Could Not Identify eth port {} -> OF ({}) on {}",
- ethIntf.getName(), ethOFPort, node);
- throw new Exception("port number < 0");
- }
- logger.debug("Identified eth port {} -> OF ({}) on {}", ethIntf.getName(), ethOFPort, node);
- // TODO: add logic to only add rule on remote nodes
- programRemoteEgressVlanRules(node, dpid, network.getProviderSegmentationID(),
- attachedMac, ethOFPort);
- programLocalIngressVlanRules(node, dpid, network.getProviderSegmentationID(),
- attachedMac, localPort, ethOFPort);
- return;
- }
- }
+ List<OvsdbTerminationPointAugmentation> intfs = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation ethIntf : intfs) {
+ Long ofPort = 0L;
+ if (ethIntf.getName().equalsIgnoreCase(bridgeConfigurationManager.getPhysicalInterfaceName(
+ node, network.getProviderPhysicalNetwork()))) {
+ long ethOFPort = (Long)ethIntf.getOfport();
+ logger.debug("Identified eth port {} -> OF ({}) on {}",
+ ethIntf.getName(), ethOFPort, node);
+ // TODO: add logic to only add rule on remote nodes
+ programRemoteEgressVlanRules(node, dpid, network.getProviderSegmentationID(),
+ attachedMac, ethOFPort);
+ programLocalIngressVlanRules(node, dpid, network.getProviderSegmentationID(),
+ attachedMac, localPort, ethOFPort);
+ return;
}
- } catch (Exception e) {
- logger.error("", e);
}
}
private void removeVlanRules (NeutronNetwork network, Node node, OvsdbTerminationPointAugmentation intf,
boolean isLastInstanceOnNode) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- logger.debug("Remove vlan rules for interface {}", intf.getName());
- try {
- Long dpid = this.getIntegrationBridgeOFDPID(node);
- if (dpid == 0L) {
- logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
- return;
- }
+ logger.debug("Program vlan rules for interface {}", intf.getName());
+ Long dpid = this.getIntegrationBridgeOFDPID(node);
+ if (dpid == 0L) {
+ logger.debug("Openflow Datapath-ID not set for the integration bridge in {}", node);
+ return;
+ }
- long localPort = (Long)intf.getOfport();
+ long localPort = (Long)intf.getOfport();
- String attachedMac = MdsalUtils.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
- if (attachedMac == null) {
- logger.error("No AttachedMac seen in {}", intf);
- return;
- }
+ String attachedMac = MdsalUtils.getInterfaceExternalIdsValue(intf, Constants.EXTERNAL_ID_VM_MAC);
+ if (attachedMac == null) {
+ logger.error("No AttachedMac seen in {}", intf);
+ return;
+ }
- Map<String, OvsdbTerminationPointAugmentation> intfs = ovsdbConfigurationService.getInterfaces(node);
- if (intfs != null) {
- for (OvsdbTerminationPointAugmentation ethIntf : intfs.values()) {
- Long ofPort = 0L;
- if (ethIntf.getName().equalsIgnoreCase(bridgeConfigurationManager.getPhysicalInterfaceName(
- node, network.getProviderPhysicalNetwork()))) {
- long ethOFPort = (Long)ethIntf.getOfport();
-
- if (ethOFPort == -1) {
- logger.error("Could Not Identify eth port {} -> OF ({}) on {}",
- ethIntf.getName(), ethOFPort, node);
- throw new Exception("port number < 0");
- }
- logger.debug("Identified eth port {} -> OF ({}) on {}", ethIntf.getName(), ethOFPort, node);
- removeRemoteEgressVlanRules(node, dpid, network.getProviderSegmentationID(),
- attachedMac, localPort, ethOFPort);
- if (isLastInstanceOnNode) {
- removePerVlanRules(node, dpid, network.getProviderSegmentationID(), localPort, ethOFPort);
- }
- return;
- }
+ List<OvsdbTerminationPointAugmentation> intfs = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation ethIntf : intfs) {
+ Long ofPort = 0L;
+ if (ethIntf.getName().equalsIgnoreCase(bridgeConfigurationManager.getPhysicalInterfaceName(
+ node, network.getProviderPhysicalNetwork()))) {
+ long ethOFPort = (Long)ethIntf.getOfport();
+ logger.debug("Identified eth port {} -> OF ({}) on {}",
+ ethIntf.getName(), ethOFPort, node);
+ removeRemoteEgressVlanRules(node, dpid, network.getProviderSegmentationID(),
+ attachedMac, localPort, ethOFPort);
+ if (isLastInstanceOnNode) {
+ removePerVlanRules(node, dpid, network.getProviderSegmentationID(), localPort, ethOFPort);
}
+ return;
}
- } catch (Exception e) {
- logger.error("", e);
}
}
@Override
- public Status handleInterfaceUpdate(NeutronNetwork network, Node srcNode,
- OvsdbTerminationPointAugmentation intf) {
- /* TODO SB_MIGRATION */
+ public boolean handleInterfaceUpdate(NeutronNetwork network, Node srcNode,
+ OvsdbTerminationPointAugmentation intf) {
Preconditions.checkNotNull(connectionService);
List<Node> nodes = connectionService.getNodes();
nodes.remove(srcNode);
- this.programLocalRules(network.getProviderNetworkType(), network.getProviderSegmentationID(), srcNode, intf);
-
- if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- this.programVlanRules(network, srcNode, intf);
- } else if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)
- || network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)){
+ String networkType = network.getProviderNetworkType();
+ String segmentationId = network.getProviderSegmentationID();
+ programLocalRules(networkType, network.getProviderSegmentationID(), srcNode, intf);
+
+ if (networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
+ programVlanRules(network, srcNode, intf);
+ } else if (networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)
+ || networkType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)){
for (Node dstNode : nodes) {
InetAddress src = configurationService.getTunnelEndPoint(srcNode);
InetAddress dst = configurationService.getTunnelEndPoint(dstNode);
if ((src != null) && (dst != null)) {
- Status status = addTunnelPort(srcNode, network.getProviderNetworkType(), src, dst);
- if (status.isSuccess()) {
- this.programTunnelRules(network.getProviderNetworkType(), network.getProviderSegmentationID(), dst, srcNode, intf, true);
+ if (addTunnelPort(srcNode, networkType, src, dst)) {
+ programTunnelRules(networkType, segmentationId, dst, srcNode, intf, true);
}
- addTunnelPort(dstNode, network.getProviderNetworkType(), dst, src);
- if (status.isSuccess()) {
- this.programTunnelRules(network.getProviderNetworkType(), network.getProviderSegmentationID(), src, dstNode, intf, false);
+ if (addTunnelPort(dstNode, networkType, dst, src)) {
+ programTunnelRules(networkType, segmentationId, src, dstNode, intf, false);
}
} else {
- logger.warn("Tunnel end-point configuration missing. Please configure it in OpenVSwitch Table. " +
- "Check source {} or destination {}",
+ logger.warn("Tunnel end-point configuration missing. Please configure it in OpenVSwitch Table. "
+ + "Check source {} or destination {}",
src != null ? src.getHostAddress() : "null",
dst != null ? dst.getHostAddress() : "null");
}
}
}
- return new Status(StatusCode.SUCCESS);
+ return true;
}
- private Status triggerInterfaceUpdates(Node node) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- try {
- Map<String, Row> intfs = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Interface.class));
- if (intfs != null) {
- for (Row row : intfs.values()) {
- Interface intf = ovsdbConfigurationService.getTypedRow(node, Interface.class, row);
- NeutronNetwork network = tenantNetworkManager.getTenantNetwork(intf);
- logger.debug("Trigger Interface update for {}", intf);
- if (network != null) {
- /* TODO SB_MIGRATION */
- //this.handleInterfaceUpdate(network, node, intf);
- }
- }
+ private void triggerInterfaceUpdates(Node node) {
+ List<TerminationPoint> tps = MdsalUtils.getTerminationPoints(node);
+ for (TerminationPoint tp : tps) {
+ OvsdbTerminationPointAugmentation port = tp.getAugmentation(OvsdbTerminationPointAugmentation.class);
+ if (port != null) {
+ logger.debug("Trigger Interface update for {}", port);
+ handleInterfaceUpdate(tenantNetworkManager.getTenantNetwork(port), node, port);
}
- } catch (Exception e) {
- logger.error("Error Triggering the lost interface updates for "+ node, e);
- return new Status(StatusCode.INTERNALERROR, e.getLocalizedMessage());
}
- return new Status(StatusCode.SUCCESS);
- }
- @Override
- public Status handleInterfaceUpdate(String tunnelType, String tunnelKey) {
- // TODO Auto-generated method stub
- return null;
- }
-
- private boolean isInterfaceOfInterest(OvsdbTerminationPointAugmentation terminationPoint) {
- return (SouthboundMapper.createOvsdbInterfaceType(
- terminationPoint.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_VXLAN)
- ||
- SouthboundMapper.createOvsdbInterfaceType(
- terminationPoint.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_GRE));
}
@Override
- public Status handleInterfaceDelete(String tunnelType, NeutronNetwork network, Node srcNode,
- OvsdbTerminationPointAugmentation intf, boolean isLastInstanceOnNode) {
- /* TODO SB_MIGRATION */
+ public boolean handleInterfaceDelete(String tunnelType, NeutronNetwork network, Node srcNode,
+ OvsdbTerminationPointAugmentation intf, boolean isLastInstanceOnNode) {
Preconditions.checkNotNull(connectionService);
- Status status = new Status(StatusCode.SUCCESS);
List<Node> nodes = connectionService.getNodes();
nodes.remove(srcNode);
logger.info("Delete intf " + intf.getName() + " isLastInstanceOnNode " + isLastInstanceOnNode);
List<String> phyIfName = bridgeConfigurationManager.getAllPhysicalInterfaceNames(srcNode);
- if (isInterfaceOfInterest(intf)) {
+ if (MdsalUtils.isTunnel(intf)) {
// Delete tunnel port
try {
InetAddress src = InetAddress.getByName(
MdsalUtils.getOptionsValue(intf.getOptions(), "local_ip"));
InetAddress dst = InetAddress.getByName(
MdsalUtils.getOptionsValue(intf.getOptions(), "remote_ip"));
- status = deleteTunnelPort(srcNode,
+ deleteTunnelPort(srcNode,
SouthboundMapper.createOvsdbInterfaceType(intf.getInterfaceType()),
src, dst);
} catch (Exception e) {
deletePhysicalPort(srcNode, intf.getName());
} else {
// delete all other interfaces
- this.removeLocalRules(network.getProviderNetworkType(), network.getProviderSegmentationID(),
+ removeLocalRules(network.getProviderNetworkType(), network.getProviderSegmentationID(),
srcNode, intf);
if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- this.removeVlanRules(network, srcNode,
- intf, isLastInstanceOnNode);
+ removeVlanRules(network, srcNode, intf, isLastInstanceOnNode);
} else if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)
|| network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)) {
this.removeTunnelRules(tunnelType, network.getProviderSegmentationID(),
src, dstNode, intf, false, isLastInstanceOnNode);
} else {
- logger.warn("Tunnel end-point configuration missing. Please configure it in OpenVSwitch Table. ",
- "Check source {} or destination {}",
+ logger.warn("Tunnel end-point configuration missing. Please configure it in "
+ + "OpenVSwitch Table. "
+ + "Check source {} or destination {}",
src != null ? src.getHostAddress() : "null",
dst != null ? dst.getHostAddress() : "null");
}
}
}
}
- return status;
+ return true;
}
@Override
public void initializeFlowRules(Node node) {
- this.initializeFlowRules(node, configurationService.getIntegrationBridgeName());
- this.initializeFlowRules(node, configurationService.getExternalBridgeName());
- this.triggerInterfaceUpdates(node);
+ initializeFlowRules(node, configurationService.getIntegrationBridgeName());
+ initializeFlowRules(node, configurationService.getExternalBridgeName());
+ triggerInterfaceUpdates(node);
}
private void initializeFlowRules(Node node, String bridgeName) {
builder.setKey(new NodeKey(builder.getId()));
return builder;
}
-
- private InstanceIdentifier<org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node> nodeBuilderToInstanceId(NodeBuilder
- node) {
- return InstanceIdentifier.builder(Nodes.class).child(org.opendaylight.yang.gen.v1.urn.opendaylight.inventory.rev130819.nodes.Node.class,
- node.getKey()).toInstance();
- }
-
- private String getInternalBridgeUUID (Node node, String bridgeName) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- try {
- Map<String, Row> bridgeTable = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Bridge.class));
- if (bridgeTable == null) return null;
- for (String key : bridgeTable.keySet()) {
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeTable.get(key));
- if (bridge.getName().equals(bridgeName)) return key;
- }
- } catch (Exception e) {
- logger.error("Error getting Bridge Identifier for {} / {}", node, bridgeName, e);
- }
- //return null;
- return "ignore";
- }
}
private static final Logger logger = LoggerFactory.getLogger(ClassifierService.class);
- public void init() {
- logger.info(">>>>> init ClassifierService");
- }
-
/*
* (Table:Classifier) Egress VM Traffic Towards TEP
* Match: Destination Ethernet Addr and OpenFlow InPort
import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
/* TODO SB_MIGRATION */
-//import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
//import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
import org.opendaylight.ovsdb.utils.mdsal.openflow.InstructionUtils;
@InjectMocks AbstractServiceInstance abstractServiceInstance = mock(AbstractServiceInstance.class, Mockito.CALLS_REAL_METHODS);
/* TODO SB_MIGRATION */
- //@Mock private OvsdbConfigurationService ovsdbConfigService;
//@Mock private OvsdbConnectionService connectionService;
@Mock private PipelineOrchestrator orchestrator;
@Mock private MdsalConsumer mdsalConsumer;
import org.opendaylight.ovsdb.openstack.netvirt.LBaaSPoolHandler;
import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler;
import org.opendaylight.ovsdb.openstack.netvirt.NeutronCacheUtils;
-import org.opendaylight.ovsdb.openstack.netvirt.api.*;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
+import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.ClassifierProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EgressAclProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.IngressAclProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.L2ForwardingProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.SecurityServicesManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Status;
+import org.opendaylight.ovsdb.openstack.netvirt.api.StatusCode;
+import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
import org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl;
-//import org.opendaylight.ovsdb.plugin.api.OvsdbConfigurationService;
//import org.opendaylight.ovsdb.plugin.api.OvsdbConnectionService;
import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
import org.opendaylight.ovsdb.schema.openvswitch.Interface;
@Mock private BridgeConfigurationManager bridgeConfigurationManager;
@Mock private TenantNetworkManager tenantNetworkManager;
/* TODO SB_MIGRATION */
- //@Mock private OvsdbConfigurationService ovsdbConfigurationService;
//@Mock private OvsdbConnectionService connectionService;
@Mock private MdsalConsumer mdsalConsumer;
@Mock private SecurityServicesManager securityServicesManager;
bridgeConfigurationManager = Mockito.mock(BridgeConfigurationManager.class);
tenantNetworkManager = Mockito.mock(TenantNetworkManager.class);
/* TODO SB_MIGRATION */
- //ovsdbConfigurationService = Mockito.mock(OvsdbConfigurationService.class);
//connectionService = Mockito.mock(OvsdbConnectionService.class);
mdsalConsumer = Mockito.mock(MdsalConsumer.class);
securityServicesManager = Mockito.mock(SecurityServicesManager.class);
NeutronNetwork network = Mockito.mock(NeutronNetwork.class);
when(network.getProviderNetworkType()).thenReturn(NetworkHandler.NETWORK_TYPE_VLAN);
- when(tenantNetworkManager.getTenantNetwork(intf)).thenReturn(network);
+ //when(tenantNetworkManager.getTenantNetwork(intf)).thenReturn(network);
//when(ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Interface.class))).thenReturn(intfs);
of13Provider.initializeFlowRules(node);
//this.of13Provider.handleInterfaceUpdate(network, node, intf);this.of13Provider.handleInterfaceUpdate(network, node, intf);
//verify(configurationService, times(8)).getTunnelEndPoint(node);
- assertEquals("Error, handleInterfaceUpdate(String, String) - is returning a non NULL value.", null, this.of13Provider.handleInterfaceUpdate("",""));
+ //assertEquals("Error, handleInterfaceUpdate(String, String) - is returning a non NULL value.", null, this.of13Provider.handleInterfaceUpdate("",""));
}
/**
<groupId>org.opendaylight.ovsdb</groupId>
<artifactId>schema.openvswitch</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.opendaylight.ovsdb</groupId>
+ <artifactId>southbound-api</artifactId>
+ <version>1.1.0-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.opendaylight.ovsdb</groupId>
<artifactId>southbound-impl</artifactId>
<Export-Package>
org.opendaylight.ovsdb.openstack.netvirt,
org.opendaylight.ovsdb.openstack.netvirt.api,
- org.opendaylight.ovsdb.openstack.netvirt.impl
+ org.opendaylight.ovsdb.openstack.netvirt.impl,
+ org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalUtils
</Export-Package>
<Bundle-Activator>org.opendaylight.ovsdb.openstack.netvirt.Activator</Bundle-Activator>
</instructions>
import org.opendaylight.neutron.spi.INeutronSecurityRuleAware;
import org.opendaylight.neutron.spi.INeutronSubnetAware;
import org.opendaylight.neutron.spi.INeutronSubnetCRUD;
-import org.opendaylight.ovsdb.openstack.netvirt.api.*;
+import org.opendaylight.ovsdb.openstack.netvirt.api.ArpProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
+import org.opendaylight.ovsdb.openstack.netvirt.api.EventDispatcher;
+import org.opendaylight.ovsdb.openstack.netvirt.api.InboundNatProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.L3ForwardingProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.LoadBalancerProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.MultiTenantAwareRouter;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NetworkingProviderManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheListener;
+import org.opendaylight.ovsdb.openstack.netvirt.api.NodeCacheManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.OutboundNatProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryListener;
+import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
+import org.opendaylight.ovsdb.openstack.netvirt.api.RoutingProvider;
+import org.opendaylight.ovsdb.openstack.netvirt.api.SecurityServicesManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
+import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache;
import org.opendaylight.ovsdb.openstack.netvirt.impl.BridgeConfigurationManagerImpl;
import org.opendaylight.ovsdb.openstack.netvirt.impl.ConfigurationServiceImpl;
import org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl;
manager.add(createComponent()
.setInterface(ConfigurationService.class.getName(), null)
- .setImplementation(ConfigurationServiceImpl.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class)));
+ .setImplementation(ConfigurationServiceImpl.class));
manager.add(createComponent()
.setInterface(BridgeConfigurationManager.class.getName(), null)
.setImplementation(BridgeConfigurationManagerImpl.class)
.add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
- .add(createServiceDependency().setService(NetworkingProviderManager.class))
- .add(createServiceDependency().setService(OvsdbConfigurationService.class)));
+ .add(createServiceDependency().setService(NetworkingProviderManager.class)));
manager.add(createComponent()
.setInterface(TenantNetworkManager.class.getName(), null)
.setImplementation(TenantNetworkManagerImpl.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class))
- .add(createServiceDependency().setService(OvsdbConnectionService.class))
.add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
.add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
.add(createServiceDependency().setService(VlanConfigurationCache.class)));
manager.add(createComponent()
.setInterface(VlanConfigurationCache.class.getName(), null)
.setImplementation(VlanConfigurationCacheImpl.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class))
.add(createServiceDependency().setService(TenantNetworkManager.class)));
Dictionary<String, Object> floatingIPHandlerPorperties = new Hashtable<>();
.setImplementation(NetworkHandler.class)
.add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
.add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
.add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
.setInterface(new String[]{INeutronPortAware.class.getName(), AbstractHandler.class.getName()},
portHandlerProperties)
.setImplementation(PortHandler.class)
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
.add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true)));
.setImplementation(SouthboundHandler.class)
.add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(BridgeConfigurationManager.class).setRequired(true))
- //.add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
- .add(createServiceDependency().setService(NetworkingProviderManager.class).setRequired(true))
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
- .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
+ //.add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
+ .add(createServiceDependency().setService(NetworkingProviderManager.class).setRequired(true))
+ .add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(EventDispatcher.class).setRequired(true))
- //.add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true))
+ //.add(createServiceDependency().setService(NeutronL3Adapter.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbInventoryService.class).setRequired(true))
.add(createServiceDependency().setService(NodeCacheManager.class).setRequired(true)));
.setImplementation(NeutronL3Adapter.class)
.add(createServiceDependency().setService(ConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(TenantNetworkManager.class).setRequired(true))
- .add(createServiceDependency().setService(OvsdbConfigurationService.class).setRequired(true))
.add(createServiceDependency().setService(OvsdbConnectionService.class).setRequired(true))
.add(createServiceDependency().setService(INeutronNetworkCRUD.class).setRequired(true))
.add(createServiceDependency().setService(INeutronSubnetCRUD.class).setRequired(true))
.add(createServiceDependency().setService(INeutronPortCRUD.class).setRequired(true))
- /* ToDo, we should probably just use the NetworkingProvider interface
- * This should provide a way of getting service implementations
- * Either that, or we should do service lookup at runtime based on getProvider().getName()
- * This is a shortcut as for now there will only be one implementation of these classes.
- */
.add(createServiceDependency().setService(ArpProvider.class).setRequired(false))
.add(createServiceDependency().setService(InboundNatProvider.class).setRequired(false))
.add(createServiceDependency().setService(OutboundNatProvider.class).setRequired(false))
manager.add(createComponent()
.setInterface(new String[] {OvsdbConnectionService.class.getName(),
- OvsdbConfigurationService.class.getName(),
OvsdbInventoryService.class.getName()}, null)
.setImplementation(OvsdbInventoryServiceImpl.class)
.add(createServiceDependency().setService(OvsdbInventoryListener.class)
import org.opendaylight.neutron.spi.INeutronNetworkAware;
import org.opendaylight.neutron.spi.INeutronNetworkCRUD;
import org.opendaylight.neutron.spi.NeutronNetwork;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.BridgeConfigurationManager;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
+import org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalUtils;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
-import org.opendaylight.ovsdb.schema.openvswitch.Port;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import java.net.HttpURLConnection;
import java.util.List;
-import java.util.concurrent.ConcurrentMap;
/**
* Handle requests for Neutron Network.
private volatile TenantNetworkManager tenantNetworkManager;
private volatile BridgeConfigurationManager bridgeConfigurationManager;
/* TODO SB_MIGRATION */
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
private volatile OvsdbConnectionService connectionService;
- //private volatile OvsdbInventoryService mdsalConsumer; // TODO SB_MIGRATION
private volatile INeutronNetworkCRUD neutronNetworkCache;
private volatile NeutronL3Adapter neutronL3Adapter;
enqueueEvent(new NorthboundEvent(network, Action.DELETE));
}
private void doNeutronNetworkDeleted(NeutronNetwork network) {
- /* TODO SB_MIGRATION */
neutronL3Adapter.handleNeutronNetworkEvent(network, Action.DELETE);
/* Is this the last Neutron tenant network */
for (Node node : nodes) {
List<String> phyIfName = bridgeConfigurationManager.getAllPhysicalInterfaceNames(node);
try {
- ConcurrentMap<String, Row> ports =
- this.ovsdbConfigurationService.getRows(node,
- ovsdbConfigurationService.getTableName(node, Port.class));
- if (ports != null) {
- for (Row portRow : ports.values()) {
- Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- for (UUID interfaceUuid : port.getInterfacesColumn().getData()) {
- Row ifaceRow = ovsdbConfigurationService
- .getRow(node,
- ovsdbConfigurationService.getTableName(node, Interface.class),
- interfaceUuid.toString());
- Interface iface = ovsdbConfigurationService.getTypedRow(node, Interface.class, ifaceRow);
- String interfaceType = iface.getTypeColumn().getData();
- if (interfaceType.equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN)
- || interfaceType.equalsIgnoreCase(
- NetworkHandler.NETWORK_TYPE_GRE)) {
- // delete tunnel ports on this node
- logger.trace("Delete tunnel interface {}", iface.getName());
- ovsdbConfigurationService.deleteRow(node,
- ovsdbConfigurationService.getTableName(node, Port.class),
- port.getUuid().toString());
- break;
- } else if (!phyIfName.isEmpty() && phyIfName.contains(iface.getName())) {
- logger.trace("Delete physical interface {}", iface.getName());
- ovsdbConfigurationService.deleteRow(node,
- ovsdbConfigurationService.getTableName(node, Port.class),
- port.getUuid().toString());
- break;
- }
- }
+ List<OvsdbTerminationPointAugmentation> ports = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation port : ports) {
+ if (MdsalUtils.isTunnel(port)) {
+ logger.trace("Delete tunnel interface {}", port.getName());
+ MdsalUtils.deletePort(node, port.getName());
+ } else if (!phyIfName.isEmpty() && phyIfName.contains(port.getName())) {
+ logger.trace("Delete physical interface {}", port.getName());
+ MdsalUtils.deletePort(node, port.getName());
}
}
} catch (Exception e) {
import org.opendaylight.neutron.spi.INeutronPortAware;
import org.opendaylight.neutron.spi.NeutronPort;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.openstack.netvirt.api.Action;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
+import org.opendaylight.ovsdb.openstack.netvirt.impl.MdsalUtils;
import org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
-import org.opendaylight.ovsdb.schema.openvswitch.Port;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import java.net.HttpURLConnection;
import java.util.List;
-import java.util.Map;
-import java.util.concurrent.ConcurrentMap;
/**
* Handle requests for Neutron Port.
static final Logger logger = LoggerFactory.getLogger(PortHandler.class);
// The implementation for each of these services is resolved by the OSGi Service Manager
- /* TODO SB_MIGRATION */
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
private volatile OvsdbConnectionService connectionService;
- //private volatile OvsdbInventoryService mdsalConsumer;
private volatile NeutronL3Adapter neutronL3Adapter;
/**
logger.debug("Handling neutron delete port " + neutronPort);
neutronL3Adapter.handleNeutronPortEvent(neutronPort, Action.DELETE);
- /* TODO SB_MIGRATION */
List<Node> nodes = connectionService.getNodes();
for (Node node : nodes) {
try {
- ConcurrentMap<String, Row> portRows =
- this.ovsdbConfigurationService.getRows(node,
- ovsdbConfigurationService.getTableName(node, Port.class));
- if (portRows != null) {
- for (Row portRow : portRows.values()) {
- Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- for (UUID interfaceUuid : port.getInterfacesColumn().getData()) {
- Row ifaceRow = ovsdbConfigurationService
- .getRow(node,
- ovsdbConfigurationService.getTableName(node, Interface.class),
- interfaceUuid.toString());
- Interface iface = ovsdbConfigurationService.getTypedRow(node, Interface.class, ifaceRow);
- Map<String, String> externalIds = iface.getExternalIdsColumn().getData();
-
- if (externalIds == null) {
- logger.trace("No external_ids seen in {}", iface.getName());
- continue;
- }
-
- // Compare Neutron port uuid
- String neutronPortId = externalIds.get(Constants.EXTERNAL_ID_INTERFACE_ID);
- if (neutronPortId == null) {
- continue;
- }
-
- if (neutronPortId.equalsIgnoreCase(neutronPort.getPortUUID())) {
- logger.trace("neutronPortDeleted: Delete interface {}", iface.getName());
- ovsdbConfigurationService.deleteRow(node,
- ovsdbConfigurationService.getTableName(node, Port.class),
- port.getUuid().toString());
- break;
- }
- }
+ List<OvsdbTerminationPointAugmentation> ports = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation port : ports) {
+ String neutronPortId =
+ MdsalUtils.getInterfaceExternalIdsValue(port, Constants.EXTERNAL_ID_INTERFACE_ID);
+ if (neutronPortId != null && neutronPortId.equalsIgnoreCase(neutronPort.getPortUUID())) {
+ logger.trace("neutronPortDeleted: Delete interface {}", port.getName());
+ MdsalUtils.deletePort(node, port.getName());
+ break;
}
}
} catch (Exception e) {
private volatile BridgeConfigurationManager bridgeConfigurationManager;
private volatile TenantNetworkManager tenantNetworkManager;
private volatile NetworkingProviderManager networkingProviderManager;
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
private volatile OvsdbConnectionService connectionService;
private volatile NeutronL3Adapter neutronL3Adapter;
this.triggerUpdates();
}
+ void init() {
+ logger.info(">>>>>> init {}", this.getClass());
+ }
+
private SouthboundEvent.Type ovsdbTypeToSouthboundEventType(OvsdbType ovsdbType) {
SouthboundEvent.Type type = SouthboundEvent.Type.NODE;
}
private void processBridgeUpdate(Node node, Action action) {
- OvsdbBridgeAugmentation bridge = MdsalUtils.getBridge(node);
+ OvsdbBridgeAugmentation bridge = MdsalUtils.readBridge(node);
switch (action) {
case ADD:
case UPDATE:
package org.opendaylight.ovsdb.openstack.netvirt.api;
+import java.net.UnknownHostException;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.apache.commons.lang3.tuple.Pair;
package org.opendaylight.ovsdb.openstack.netvirt.api;
import org.opendaylight.neutron.spi.NeutronNetwork;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
/**
* Handle Interface Update Callback Method
*/
- public Status handleInterfaceUpdate(String tunnelType, String tunnelKey);
-
- /**
- * Handle Interface Update Callback Method
- */
- public Status handleInterfaceUpdate(NeutronNetwork network, Node source, OvsdbTerminationPointAugmentation intf);
+ public boolean handleInterfaceUpdate(NeutronNetwork network, Node source, OvsdbTerminationPointAugmentation intf);
/**
* Handle Interface Delete Callback Method
*/
- public Status handleInterfaceDelete(String tunnelType, NeutronNetwork network, Node source,
- OvsdbTerminationPointAugmentation intf, boolean isLastInstanceOnNode);
+ public boolean handleInterfaceDelete(String tunnelType, NeutronNetwork network, Node source,
+ OvsdbTerminationPointAugmentation intf, boolean isLastInstanceOnNode);
/**
* Initialize the Flow rules given the OVSDB node.
+++ /dev/null
-package org.opendaylight.ovsdb.openstack.netvirt.api;
-
-import java.util.List;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
-import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
-import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
-import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-
-/**
- * Created by shague on 4/20/15.
- */
-public interface OvsdbConfigurationService {
-
- /**
- * @deprecated This version of insertRow is a short-term replacement for the older & now deprecated method of the same name.
- * This API assumes an Open_vSwitch database Schema.
- *
- * This API is replaced by
- * {@link #insertRow(Node, String, String, String, Row < GenericTableSchema >) insertRow} and
- * {@link #insertTree(Node, String, String, String, Row<GenericTableSchema>) insertTree}
- *
- * @param node OVSDB Node
- * @param tableName Table on which the row is inserted
- * @param parentUuid UUID of the parent table to which this operation will result in attaching/mutating.
- * @param row Row of table Content to be inserted
- * @return UUID of the inserted Row
- */
- @Deprecated
- public StatusWithUuid insertRow(Node node, String tableName, String parentUuid, Row<GenericTableSchema> row);
-
- /**
- * @deprecated This version of updateRow is a short-term replacement for the older & now deprecated method of the same name.
- * This API assumes an Open_vSwitch database Schema.
- *
- * This API is replaced by
- * {@link #updateRow(Node, String, String, UUID, Row<GenericTableSchema>, boolean) updateRow}
- *
- * @param node OVSDB Node
- * @param tableName Table on which the row is Updated
- * @param parentUuid UUID of the parent row on which this operation might result in mutating.
- * @param rowUuid UUID of the row that is being updated
- * @param row Row of table Content to be Updated. Include just those columns that needs to be updated.
- */
- @Deprecated
- public Status updateRow (Node node, String tableName, String parentUuid, String rowUuid, Row row);
-
- /**
- * @deprecated This version of deleteRow is a short-term replacement for the older & now deprecated method of the same name.
- * This API assumes an Open_vSwitch database Schema.
- *
- * This API is replaced by {@link #deleteRow(Node, String, String, UUID) deleteRow}
- *
- * @param node OVSDB Node
- * @param tableName Table on which the row is Updated
- * @param rowUuid UUID of the row that is being deleted
- */
- @Deprecated
- public Status deleteRow (Node node, String tableName, String rowUuid);
-
- /**
- * @deprecated This version of getRow is a short-term replacement for the older & now deprecated method of the same name.
- * This API assumes an Open_vSwitch database Schema.
- *
- * This API is replaced by {@link #getRow(Node, String, String, UUID) getRow}
- *
- * @param node OVSDB Node
- * @param tableName Table Name
- * @param rowUuid UUID of the row being queried
- * @return a row with a list of Column data that corresponds to an unique Row-identifier called uuid in a given table.
- */
- @Deprecated
- public Row getRow(Node node, String tableName, String uuid);
-
- /**
- * Returns a Row from a table for the specified uuid.
- *
- * @param node OVSDB Node
- * @param databaseName Database Name that represents the Schema supported by the node.
- * @param tableName Table Name
- * @param uuid UUID of the row being queried
- * @throws OvsdbPluginException Any failure during the get operation will result in a specific exception.
- * @return a row with a list of Column data that corresponds to an unique Row-identifier called uuid in a given table.
- */
- public Row<GenericTableSchema> getRow(Node node, String databaseName, String tableName, UUID uuid) throws OvsdbPluginException;
-
- /**
- * @Deprecated This version of getRows is a short-term replacement for the older & now deprecated method of the same name.
- * This API assumes an Open_vSwitch database Schema.
- *
- * This API is replaced by
- * {@link #getRows(Node, String, String) getRows} and {@link #getRows(Node, String, String, String) getRows}
- *
- * @param node OVSDB Node
- * @param tableName Table Name
- * @return List of rows that makes the entire Table.
- */
- @Deprecated
- public ConcurrentMap<String, Row> getRows(Node node, String tableName);
-
- /**
- * Returns all rows of a table.
- *
- * @param node OVSDB Node
- * @param databaseName Database Name that represents the Schema supported by the node.
- * @param tableName Table Name
- * @throws OvsdbPluginException Any failure during the get operation will result in a specific exception.
- * @return Map of rows to its UUID that makes the entire Table.
- */
- public ConcurrentMap<UUID, Row<GenericTableSchema>> getRows(Node node, String databaseName, String tableName) throws OvsdbPluginException;
-
- /**
- * Returns all rows of a table filtered by query string.
- *
- * @param node OVSDB Node
- * @param databaseName Database Name that represents the Schema supported by the node.
- * @param tableName Table Name
- * @param fiqlQuery FIQL style String Query {@link http://tools.ietf.org/html/draft-nottingham-atompub-fiql-00} to filter rows
- * @throws OvsdbPluginException Any failure during the get operation will result in a specific exception.
- * @return Map of rows to its UUID that makes the entire Table.
- */
- public ConcurrentMap<UUID, Row<GenericTableSchema>> getRows(Node node, String databaseName, String tableName, String fiqlQuery) throws OvsdbPluginException;
-
- /**
- * @Deprecated Returns all the Tables in a given Ndoe.
- * This API assumes an Open_vSwitch database Schema.
- *
- * This API is replaced by
- * {@link #getTables(Node, String) getTables}
- * @param node OVSDB node
- * @return List of Table Names that make up Open_vSwitch schema.
- */
- @Deprecated
- public List<String> getTables(Node node);
-
- /**
- * setOFController is a convenience method used by existing applications to setup Openflow Controller on
- * a Open_vSwitch Bridge.
- * This API assumes an Open_vSwitch database Schema.
- *
- * @param node Node
- * @param bridgeUUID uuid of the Bridge for which the ip-address of Openflow Controller should be programmed.
- * @return Boolean representing success or failure of the operation.
- *
- * @throws InterruptedException
- * @throws ExecutionException
- */
- public Boolean setOFController(Node node, String bridgeUUID) throws InterruptedException, ExecutionException;
-
- public <T extends TypedBaseTable<?>> String getTableName(Node node, Class<T> typedClass);
- public <T extends TypedBaseTable<?>> T getTypedRow(Node node, Class<T> typedClass, Row row);
- public <T extends TypedBaseTable<?>> T createTypedRow(Node node, Class<T> typedClass);
-
- public ConcurrentMap<String, OvsdbTerminationPointAugmentation> getInterfaces(Node node);
-}
public interface OvsdbConnectionService {
public Connection getConnection(Node node);
public List<Node> getNodes();
+ public List<Node> getOvsdbNodes();
+ public List<Node> getBridgeNodes();
public Node getNode(String identifier);
public Node connect(String identifier, Map<ConnectionConstants, String> params);
}
*/
public String getNetworkId (String segmentationId);
- /**
- * Get the {@link org.opendaylight.neutron.spi.NeutronNetwork} for a given Interface
- */
- public NeutronNetwork getTenantNetwork(Interface intf);
-
/**
* Network Created Callback
*/
import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
import org.opendaylight.ovsdb.schema.openvswitch.Port;
import org.opendaylight.ovsdb.utils.config.ConfigProperties;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbBridgeAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import com.google.common.base.Preconditions;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
// The implementation for each of these services is resolved by the OSGi Service Manager
private volatile ConfigurationService configurationService;
private volatile NetworkingProviderManager networkingProviderManager;
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
- public BridgeConfigurationManagerImpl() {
+ void init() {
+ LOGGER.info(">>>>>> init {}", this.getClass());
}
@Override
@Override
public boolean isNodeNeutronReady(Node node) {
Preconditions.checkNotNull(configurationService);
- return this.getBridgeUuid(node, configurationService.getIntegrationBridgeName()) != null;
+ return MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName()) != null;
}
@Override
public boolean isNodeOverlayReady(Node node) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- return this.isNodeNeutronReady(node)
- && this.getBridgeUuid(node, configurationService.getNetworkBridgeName()) != null;
+ Preconditions.checkNotNull(configurationService);
+ return isNodeNeutronReady(node)
+ && MdsalUtils.getBridge(node, configurationService.getNetworkBridgeName()) != null;
}
@Override
public boolean isPortOnBridge (Node node, Bridge bridge, String portName) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- for (UUID portsUUID : bridge.getPortsColumn().getData()) {
- try {
- Row portRow = ovsdbConfigurationService.getRow(node,
- ovsdbConfigurationService.getTableName(node, Port.class),
- portsUUID.toString());
-
- Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- if ((port != null) && port.getName().equalsIgnoreCase(portName)) {
- return true;
- }
- } catch (Exception e) {
- LOGGER.error("Error getting port {} for bridge domain {}/{}", portsUUID, node, bridge.getName(), e);
- }
- }
- return false;
+ return MdsalUtils.getPort(node, portName) != null;
}
@Override
public boolean isNodeTunnelReady(Node node) {
Preconditions.checkNotNull(configurationService);
- Preconditions.checkNotNull(networkingProviderManager);
-
- /* Is br-int created? */
- Bridge intBridge = this.getBridge(node, configurationService.getIntegrationBridgeName());
- if (intBridge == null) {
- return false;
- }
-
- if (networkingProviderManager.getProvider(node).hasPerTenantTunneling()) {
- /* Is br-net created? */
- Bridge netBridge = this.getBridge(node, configurationService.getNetworkBridgeName());
- if (netBridge == null) {
- return false;
- }
-
- if (!isNetworkPatchCreated(node, intBridge, netBridge)) {
- return false;
- }
- }
- return true;
+ return MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName()) != null;
}
@Override
public boolean isNodeVlanReady(Node node, NeutronNetwork network) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
Preconditions.checkNotNull(networkingProviderManager);
/* is br-int created */
- Bridge intBridge = this.getBridge(node, configurationService.getIntegrationBridgeName());
+ OvsdbBridgeAugmentation intBridge = MdsalUtils.getBridge(node, configurationService.getIntegrationBridgeName());
if (intBridge == null) {
LOGGER.trace("isNodeVlanReady: node: {}, br-int missing", node);
return false;
}
- if (networkingProviderManager.getProvider(node).hasPerTenantTunneling()) {
- /* is br-net created? */
- Bridge netBridge = this.getBridge(node, configurationService.getNetworkBridgeName());
-
- if (netBridge == null) {
- LOGGER.trace("isNodeVlanReady: node: {}, br-net missing", node);
- return false;
- }
-
- if (!isNetworkPatchCreated(node, intBridge, netBridge)) {
- LOGGER.trace("isNodeVlanReady: node: {}, patch missing", node);
- return false;
- }
-
- /* Check if physical device is added to br-net. */
- String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
- if (isPortOnBridge(node, netBridge, phyNetName)) {
- return true;
- }
- } else {
- /* Check if physical device is added to br-int. */
- String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
- if (isPortOnBridge(node, intBridge, phyNetName)) {
- return true;
- }
+ /* Check if physical device is added to br-int. */
+ String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
+ if (MdsalUtils.getPort(node, phyNetName) == null) {
+ LOGGER.trace("isNodeVlanReady: node: {}, eth missing", node);
+ return false;
}
- LOGGER.trace("isNodeVlanReady: node: {}, eth missing", node);
- return false;
+ return true;
}
@Override
Preconditions.checkNotNull(networkingProviderManager);
try {
- this.createIntegrationBridge(node);
+ createIntegrationBridge(node);
} catch (Exception e) {
LOGGER.error("Error creating Integration Bridge on {}", node, e);
return;
}
- /* TODO SB_MIGRATION
- networkingProviderManager.getProvider(node).initializeFlowRules(node);*/
+ networkingProviderManager.getProvider(node).initializeFlowRules(node);
}
- /*
+ /**
* Check if the full network setup is available. If not, create it.
*/
@Override
public boolean createLocalNetwork (Node node, NeutronNetwork network) {
boolean isCreated = false;
if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- if (!this.isNodeVlanReady(node, network)) {
+ if (!isNodeVlanReady(node, network)) {
try {
- isCreated = this.createBridges(node, network);
+ isCreated = createBridges(node, network);
} catch (Exception e) {
LOGGER.error("Error creating internal net network " + node, e);
}
}
} else if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VXLAN) ||
network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_GRE)) {
- if (!this.isNodeTunnelReady(node)) {
+ if (!isNodeTunnelReady(node)) {
try {
- isCreated = this.createBridges(node, network);
+ isCreated = createBridges(node, network);
} catch (Exception e) {
LOGGER.error("Error creating internal net network " + node, e);
}
@Override
public String getPhysicalInterfaceName (Node node, String physicalNetwork) {
String phyIf = null;
- /* TODO SB_MIGRATION */
- try {
- Map<String, Row> ovsTable =
- ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, OpenVSwitch.class));
-
- if (ovsTable == null) {
- LOGGER.error("OpenVSwitch table is null for Node {} ", node);
- return null;
- }
-
- // Loop through all the Open_vSwitch rows looking for the first occurrence of other_config.
- // The specification does not restrict the number of rows so we choose the first we find.
- for (Row row : ovsTable.values()) {
- String providerMaps;
- OpenVSwitch ovsRow = ovsdbConfigurationService.getTypedRow(node, OpenVSwitch.class, row);
- Map<String, String> configs = ovsRow.getOtherConfigColumn().getData();
-
- if (configs == null) {
- LOGGER.debug("OpenVSwitch table is null for Node {} ", node);
- continue;
- }
-
- providerMaps = configs.get(configurationService.getProviderMappingsKey());
- if (providerMaps == null) {
- providerMaps = configurationService.getDefaultProviderMapping();
- }
-
- if (providerMaps != null) {
- for (String map : providerMaps.split(",")) {
- String[] pair = map.split(":");
- if (pair[0].equals(physicalNetwork)) {
- phyIf = pair[1];
- break;
- }
- }
- }
+ String providerMaps = MdsalUtils.getOtherConfig(node, OvsdbTables.OPENVSWITCH,
+ configurationService.getProviderMappingsKey());
+ if (providerMaps == null) {
+ providerMaps = configurationService.getDefaultProviderMapping();
+ }
- if (phyIf != null) {
+ if (providerMaps != null) {
+ for (String map : providerMaps.split(",")) {
+ String[] pair = map.split(":");
+ if (pair[0].equals(physicalNetwork)) {
+ phyIf = pair[1];
break;
}
}
- } catch (Exception e) {
- LOGGER.error("Unable to find physical interface for Node: {}, Network {}",
- node, physicalNetwork, e);
}
if (phyIf == null) {
@Override
public List<String> getAllPhysicalInterfaceNames(Node node) {
List<String> phyIfName = Lists.newArrayList();
- /* TODO SB_MIGRATION */
- try {
- Map<String, Row> ovsTable =
- ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, OpenVSwitch.class));
-
- if (ovsTable == null) {
- LOGGER.error("OpenVSwitch table is null for Node {} ", node);
- return null;
- }
-
- // While there is only one entry in the HashMap, we can't access it by index...
- for (Row row : ovsTable.values()) {
- String bridgeMaps;
- OpenVSwitch ovsRow = ovsdbConfigurationService.getTypedRow(node, OpenVSwitch.class, row);
- Map<String, String> configs = ovsRow.getOtherConfigColumn().getData();
-
- if (configs == null) {
- LOGGER.debug("OpenVSwitch table is null for Node {} ", node);
- continue;
- }
-
- bridgeMaps = configs.get(configurationService.getProviderMappingsKey());
- if (bridgeMaps == null) {
- bridgeMaps = configurationService.getDefaultProviderMapping();
- }
-
- if (bridgeMaps != null) {
- for (String map : bridgeMaps.split(",")) {
- String[] pair = map.split(":");
- phyIfName.add(pair[1]);
- }
- }
- }
- } catch (Exception e) {
- LOGGER.error("Unable to find physical interface for Node: " + node, e);
+ String phyIf = null;
+ String providerMaps = MdsalUtils.getOtherConfig(node, OvsdbTables.OPENVSWITCH,
+ configurationService.getProviderMappingsKey());
+ if (providerMaps == null) {
+ providerMaps = configurationService.getDefaultProviderMapping();
}
- LOGGER.debug("Physical interface for Node: {}, If: {}",
- node, phyIfName);
-
- return phyIfName;
- }
-
- /**
- * Returns the Bridge for a given node and bridgeName
- */
- public Bridge getBridge (Node node, String bridgeName) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- try {
- Map<String, Row> bridgeTable =
- ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Bridge.class));
- if (bridgeTable != null) {
- for (String key : bridgeTable.keySet()) {
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeTable.get(key));
- if (bridge.getName().equals(bridgeName)) {
- return bridge;
- }
- }
+ if (providerMaps != null) {
+ for (String map : providerMaps.split(",")) {
+ String[] pair = map.split(":");
+ phyIfName.add(pair[1]);
}
- } catch (Exception e) {
- LOGGER.error("Error getting Bridge Identifier for {} / {}", node, bridgeName, e);
}
- return null;
+ return phyIfName;
}
/**
* Returns true if a patch port exists between the Integration Bridge and Network Bridge
*/
- private boolean isNetworkPatchCreated (Node node, Bridge intBridge, Bridge netBridge) {
+ private boolean isNetworkPatchCreated(Node node, Bridge intBridge, Bridge netBridge) {
Preconditions.checkNotNull(configurationService);
boolean isPatchCreated = false;
/**
* Creates the Integration Bridge
*/
- private void createIntegrationBridge (Node node) throws Exception {
+ private void createIntegrationBridge(Node node) throws Exception {
Preconditions.checkNotNull(configurationService);
String brIntName = configurationService.getIntegrationBridgeName();
- Status status = addBridge(node, brIntName, null, null);
- if (!status.isSuccess()) {
- LOGGER.debug("Integration Bridge Creation Status: {}", status);
+ if (!addBridge(node, brIntName, null, null)) {
+ LOGGER.debug("Integration Bridge Creation failed");
}
}
LOGGER.debug("createBridges: node: {}, network type: {}", node, network.getProviderNetworkType());
- if (networkingProviderManager.getProvider(node).hasPerTenantTunneling()) { /* indicates OF 1.0 */
- String brInt = configurationService.getIntegrationBridgeName();
- String brNet = configurationService.getNetworkBridgeName();
- String patchNet = configurationService.getPatchPortName(new ImmutablePair<>(brInt, brNet));
- String patchInt = configurationService.getPatchPortName(new ImmutablePair<>(brNet, brInt));
-
- status = this.addBridge(node, brInt, patchNet, patchInt);
- if (!status.isSuccess()) {
- LOGGER.debug("{} Bridge Creation Status: {}", brInt, status);
- return false;
- }
- status = this.addBridge(node, brNet, patchInt, patchNet);
- if (!status.isSuccess()) {
- LOGGER.debug("{} Bridge Creation Status: {}", brNet, status);
- return false;
- }
+ String brInt = configurationService.getIntegrationBridgeName();
+ if (!addBridge(node, brInt, null, null)) {
+ LOGGER.debug("{} Bridge creation failed", brInt);
+ return false;
+ }
- /* For vlan network types add physical port to br-net. */
- if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
- status = addPortToBridge(node, brNet, phyNetName);
- if (!status.isSuccess()) {
- LOGGER.debug("Add Port {} to Bridge {} Status: {}", phyNetName, brNet, status);
- return false;
- }
- }
- } else {
- String brInt = configurationService.getIntegrationBridgeName();
- status = this.addBridge(node, brInt, null, null);
- if (!status.isSuccess()) {
- LOGGER.debug("{} Bridge Creation Status: {}", brInt, status);
+ /* For vlan network types add physical port to br-int. */
+ if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
+ String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
+ if (!addPortToBridge(node, brInt, phyNetName)) {
+ LOGGER.debug("Add Port {} to Bridge {} failed", phyNetName, brInt);
return false;
}
-
- /* For vlan network types add physical port to br-int. */
- if (network.getProviderNetworkType().equalsIgnoreCase(NetworkHandler.NETWORK_TYPE_VLAN)) {
- String phyNetName = this.getPhysicalInterfaceName(node, network.getProviderPhysicalNetwork());
- status = addPortToBridge(node, brInt, phyNetName);
- if (!status.isSuccess()) {
- LOGGER.debug("Add Port {} to Bridge {} Status: {}", phyNetName, brInt, status);
- return false;
- }
- }
}
LOGGER.debug("createNetNetwork: node: {}, status: success", node);
/**
* Add a Port to a Bridge
*/
- private Status addPortToBridge (Node node, String bridgeName, String portName) throws Exception {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
-
- LOGGER.debug("addPortToBridge: Adding port: {} to Bridge {}, Node {}", portName, bridgeName, node);
-
- String bridgeUUID = this.getBridgeUuid(node, bridgeName);
- if (bridgeUUID == null) {
- LOGGER.error("addPortToBridge: Could not find Bridge {} in Node {}", bridgeName, node);
- return new Status(StatusCode.NOTFOUND, "Could not find "+bridgeName+" in "+node);
- }
-
- /* Check if the port already exists. */
- Row row = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUUID);
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, row);
- if (bridge != null) {
- if (isPortOnBridge(node, bridge, portName)) {
- LOGGER.debug("addPortToBridge: Port {} already in Bridge {}, Node {}", portName, bridgeName, node);
- return new Status(StatusCode.SUCCESS);
- }
- } else {
- LOGGER.error("addPortToBridge: Could not find Port {} in Bridge {}, Node {}", portName, bridgeName, node);
- return new Status(StatusCode.NOTFOUND, "Could not find "+portName+" in "+bridgeName);
- }
-
- Port port = ovsdbConfigurationService.createTypedRow(node, Port.class);
- port.setName(portName);
- StatusWithUuid statusWithUuid =
- ovsdbConfigurationService.insertRow(node, port.getSchema().getName(), bridgeUUID, port.getRow());
- if (!statusWithUuid.isSuccess()) {
- LOGGER.error("addPortToBridge: Failed to add Port {} in Bridge {}, Node {}", portName, bridgeName, node);
- return statusWithUuid;
- }
-
- String portUUID = statusWithUuid.getUuid().toString();
- String interfaceUUID = null;
- int timeout = 6;
- while ((interfaceUUID == null) && (timeout > 0)) {
- Row portRow = ovsdbConfigurationService.getRow(node, port.getSchema().getName(), portUUID);
- port = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- Set<UUID> interfaces = port.getInterfacesColumn().getData();
- if (interfaces == null || interfaces.size() == 0) {
- // Wait for the OVSDB update to sync up the Local cache.
- Thread.sleep(500);
- timeout--;
- continue;
- }
- interfaceUUID = interfaces.toArray()[0].toString();
- Row intf = ovsdbConfigurationService.getRow(node,
- ovsdbConfigurationService.getTableName(node, Interface.class), interfaceUUID);
- if (intf == null) {
- interfaceUUID = null;
- }
- }
+ private boolean addPortToBridge (Node node, String bridgeName, String portName) throws Exception {
+ boolean rv = true;
- if (interfaceUUID == null) {
- LOGGER.error("addPortToBridge: Cannot identify Interface for port {}/{}", portName, portUUID);
- return new Status(StatusCode.INTERNALERROR);
+ if (MdsalUtils.getPort(node, portName) == null) {
+ rv = MdsalUtils.addPort(node, bridgeName, portName);
}
- return new Status(StatusCode.SUCCESS);
+ return rv;
}
/**
* Add a Patch Port to a Bridge
*/
- private Status addPatchPort (Node node, String bridgeUUID, String portName, String peerPortName) throws Exception {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
-
- LOGGER.debug("addPatchPort: node: {}, bridgeUUID: {}, port: {}, peer: {}",
- node, bridgeUUID, portName, peerPortName);
-
- /* Check if the port already exists. */
- Row bridgeRow = ovsdbConfigurationService.getRow(node,
- ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUUID);
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeRow);
- if (bridge != null) {
- if (isPortOnBridge(node, bridge, portName)) {
- LOGGER.debug("addPatchPort: Port {} already in Bridge, Node {}", portName, node);
- return new Status(StatusCode.SUCCESS);
- }
- } else {
- LOGGER.error("addPatchPort: Could not find Port {} in Bridge, Node {}", portName, node);
- return new Status(StatusCode.NOTFOUND, "Could not find "+portName+" in Bridge");
- }
-
- Port patchPort = ovsdbConfigurationService.createTypedRow(node, Port.class);
- patchPort.setName(portName);
- // Create patch port and interface
- StatusWithUuid statusWithUuid =
- ovsdbConfigurationService.insertRow(node, patchPort.getSchema().getName(), bridgeUUID, patchPort.getRow());
- if (!statusWithUuid.isSuccess()) {
- return statusWithUuid;
- }
-
- String patchPortUUID = statusWithUuid.getUuid().toString();
-
- String interfaceUUID = null;
- int timeout = 6;
- while ((interfaceUUID == null) && (timeout > 0)) {
- Row portRow = ovsdbConfigurationService.getRow(node, patchPort.getSchema().getName(), patchPortUUID);
- patchPort = ovsdbConfigurationService.getTypedRow(node, Port.class, portRow);
- Set<UUID> interfaces = patchPort.getInterfacesColumn().getData();
- if (interfaces == null || interfaces.size() == 0) {
- // Wait for the OVSDB update to sync up the Local cache.
- Thread.sleep(500);
- timeout--;
- continue;
- }
- interfaceUUID = interfaces.toArray()[0].toString();
- }
+ private boolean addPatchPort (Node node, String bridgeName, String portName, String peerPortName) throws Exception {
+ boolean rv = true;
- if (interfaceUUID == null) {
- return new Status(StatusCode.INTERNALERROR);
+ if (MdsalUtils.getPort(node, portName) == null) {
+ rv = MdsalUtils.addPatchPort(node, bridgeName, portName, peerPortName);
}
- Interface intf = ovsdbConfigurationService.createTypedRow(node, Interface.class);
- intf.setType("patch");
- Map<String, String> options = Maps.newHashMap();
- options.put("peer", peerPortName);
- intf.setOptions(options);
- return ovsdbConfigurationService.updateRow(node,
- intf.getSchema().getName(),
- patchPortUUID,
- interfaceUUID,
- intf.getRow());
-
+ return rv;
}
/**
* Add Bridge to a Node
*/
- private Status addBridge(Node node, String bridgeName,
- String localPatchName, String remotePatchName) throws Exception {
+ private boolean addBridge(Node node, String bridgeName,
+ String localPatchName, String remotePatchName) throws Exception {
Preconditions.checkNotNull(networkingProviderManager);
- /* TODO SB_MIGRATION */
-
- //String bridgeUUID = getBridgeUuid(node, bridgeName);
//sb will also add port and interface if this is a new bridge
- boolean result = MdsalUtils.addBridge(node, bridgeName, getControllerTarget());
-
- /*// TODO use the bridge it code to add bridge
- Bridge bridge = ovsdbConfigurationService.createTypedRow(node, Bridge.class);
- Set<String> failMode = new HashSet<>();
- failMode.add("secure");
- bridge.setFailMode(failMode);
-
- Set<String> protocols = new HashSet<>();
-
- // ToDo: Plugin should expose an easy way to get the OVS Version or Schema Version
- // or, alternatively it should not attempt to add set unsupported fields
- //
-
- try {
- protocols.add(Constants.OPENFLOW13);
- bridge.setProtocols(protocols);
- } catch (SchemaVersionMismatchException e) {
- LOGGER.info("Failed to add protocol.", e);
- }
-
- if (bridgeUUID == null) {
- bridge.setName(bridgeName);
-
- StatusWithUuid statusWithUuid = ovsdbConfigurationService.insertRow(node,
- bridge.getSchema().getName(),
- null,
- bridge.getRow());
- if (!statusWithUuid.isSuccess()) {
- return statusWithUuid;
- }
- bridgeUUID = statusWithUuid.getUuid().toString();
- Port port = ovsdbConfigurationService.createTypedRow(node, Port.class);
- port.setName(bridgeName);
- Status status = ovsdbConfigurationService.insertRow(node, port.getSchema().getName(), bridgeUUID, port.getRow());
- LOGGER.debug("addBridge: Inserting Bridge {} {} with protocols {} and status {}",
- bridgeName, bridgeUUID, protocols, status);
- } else {
- Status status = ovsdbConfigurationService.updateRow(node,
- bridge.getSchema().getName(),
- null,
- bridgeUUID,
- bridge.getRow());
- LOGGER.debug("addBridge: Updating Bridge {} {} with protocols {} and status {}",
- bridgeName, bridgeUUID, protocols, status);
- }
-
- ovsdbConfigurationService.setOFController(node, bridgeUUID);
-
- if (localPatchName != null &&
- remotePatchName != null &&
- networkingProviderManager.getProvider(node).hasPerTenantTunneling()) {
- return addPatchPort(node, bridgeUUID, localPatchName, remotePatchName);
- }*/
- return new Status(StatusCode.SUCCESS);
+ return MdsalUtils.addBridge(node, bridgeName, getControllerTarget());
}
private InetAddress getControllerIPAddress(/*Connection connection*/) {
*/
package org.opendaylight.ovsdb.openstack.netvirt.impl;
+import com.google.common.collect.Maps;
import java.net.InetAddress;
+import java.net.UnknownHostException;
import java.util.Map;
import org.apache.commons.lang3.tuple.ImmutablePair;
import org.apache.commons.lang3.tuple.Pair;
-import org.opendaylight.ovsdb.lib.notation.Row;
import org.opendaylight.ovsdb.openstack.netvirt.api.ConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
-import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
+import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbTables;
import org.opendaylight.ovsdb.utils.config.ConfigProperties;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.common.collect.Maps;
-
public class ConfigurationServiceImpl implements ConfigurationService {
static final Logger logger = LoggerFactory.getLogger(ConfigurationServiceImpl.class);
- // Values set with dependency injection from OSGi
- /* TODO SB_MIGRATION */
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
- //private volatile MdsalConsumer mdsalConsumer;
-
private String integrationBridgeName;
private String networkBridgeName;
private String externalBridgeName;
private String providerMappingsKey;
private String providerMapping;
+ void init() {
+ logger.info(">>>>>> init {}", this.getClass());
+ }
+
public ConfigurationServiceImpl() {
tunnelEndpointKey = Constants.TUNNEL_ENDPOINT_KEY;
integrationBridgeName = Constants.INTEGRATION_BRIDGE;
@Override
public InetAddress getTunnelEndPoint(Node node) {
- //InetAddress address = mdsalConsumer.getTunnelEndPoint(node);
- /* TODO SB_MIGRATION */
InetAddress address = null;
- try {
- Map<String, Row> ovsTable = ovsdbConfigurationService.getRows(node,
- ovsdbConfigurationService.getTableName(node, OpenVSwitch.class));
-
- if (ovsTable == null) {
- logger.error("OpenVSwitch table is null for Node {} ", node);
- return null;
- }
-
- // While there is only one entry in the HashMap, we can't access it by index...
- for (Row row : ovsTable.values()) {
- OpenVSwitch ovsRow = ovsdbConfigurationService.getTypedRow(node, OpenVSwitch.class, row);
- Map<String, String> configs = ovsRow.getOtherConfigColumn().getData();
-
- if (configs == null) {
- logger.debug("OpenVSwitch table is null for Node {} ", node);
- continue;
- }
-
- String tunnelEndpoint = configs.get(tunnelEndpointKey);
-
- if (tunnelEndpoint == null) {
- continue;
- }
-
+ String tunnelEndpoint = MdsalUtils.getOtherConfig(node, OvsdbTables.OPENVSWITCH, tunnelEndpointKey);
+ if (tunnelEndpoint != null) {
+ try {
address = InetAddress.getByName(tunnelEndpoint);
- logger.debug("Tunnel Endpoint for Node {} {}", node, address.getHostAddress());
- break;
+ } catch (UnknownHostException e) {
+ logger.error("Error populating Tunnel Endpoint for Node {} ", node, e);
}
+ logger.debug("Tunnel Endpoint for Node {} {}", node, address.getHostAddress());
}
- catch (Exception e) {
- logger.error("Error populating Tunnel Endpoint for Node {} ", node, e);
- }
-
return address;
}
@Override
public String getDefaultGatewayMacAddress(Node node) {
- /* TODO SB_MIGRATION */
- final String l3gatewayForNode =
- node != null ?
- ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac." + node.getNodeId().getValue()) : null;
- return l3gatewayForNode != null ?
- l3gatewayForNode : ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac");
+ String l3gatewayForNode = null;
+ if (node != null) {
+ l3gatewayForNode = ConfigProperties.getProperty(this.getClass(),
+ "ovsdb.l3gateway.mac." + node.getNodeId().getValue());
+ if (l3gatewayForNode == null) {
+ l3gatewayForNode = ConfigProperties.getProperty(this.getClass(), "ovsdb.l3gateway.mac");
+ }
+ }
+ return l3gatewayForNode;
}
}
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableBiMap;
import com.google.common.util.concurrent.CheckedFuture;
+import java.math.BigInteger;
import java.security.InvalidParameterException;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
import org.opendaylight.controller.md.sal.common.api.data.ReadFailedException;
import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.ovsdb.openstack.netvirt.NetworkHandler;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbTables;
import org.opendaylight.ovsdb.southbound.SouthboundConstants;
import org.opendaylight.ovsdb.southbound.SouthboundMapper;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ProtocolEntry;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.bridge.attributes.ProtocolEntryBuilder;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.ConnectionInfo;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.node.attributes.OpenvswitchExternalIds;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.InterfaceExternalIds;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Options;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology;
return value;
}
+ public static String getOpenVSwitchExternalIdsValue(OvsdbNodeAugmentation ovsdbNodeAugmentation, String key) {
+ String value = null;
+ List<OpenvswitchExternalIds> pairs = ovsdbNodeAugmentation.getOpenvswitchExternalIds();
+ for (OpenvswitchExternalIds pair : pairs) {
+ if (pair.getKey().equals(key)) {
+ value = pair.getExternalIdValue();
+ }
+ }
+ return value;
+ }
+
public static String getInterfaceExternalIdsValue(OvsdbTerminationPointAugmentation terminationPointAugmentation,
String key) {
String value = null;
return connectionInfo;
}
- public static OvsdbBridgeAugmentation getBridge(Node node, String name) {
+ public static OvsdbBridgeAugmentation readBridge(Node node, String name) {
OvsdbBridgeAugmentation ovsdbBridgeAugmentation = null;
ConnectionInfo connectionInfo = getConnectionInfo(node);
if (connectionInfo != null) {
public static Uuid getBridgeUuid(Node node, String name) {
Uuid uuid = null;
- OvsdbBridgeAugmentation ovsdbBridgeAugmentation = getBridge(node, name);
+ OvsdbBridgeAugmentation ovsdbBridgeAugmentation = readBridge(node, name);
if (ovsdbBridgeAugmentation != null) {
uuid = ovsdbBridgeAugmentation.getBridgeUuid();
}
return datapathId;
}
+ public static long getDataPathId(Node node) {
+ long dpid = 0L;
+ String datapathId = getDatapathId(node);
+ if (datapathId != null) {
+ dpid = new BigInteger(datapathId.replaceAll(":", ""), 16).longValue();
+ }
+ return dpid;
+ }
+
public static String getDatapathId(OvsdbBridgeAugmentation ovsdbBridgeAugmentation) {
String datapathId = null;
if (ovsdbBridgeAugmentation != null && ovsdbBridgeAugmentation.getDatapathId() != null) {
return datapathId;
}
+ public static OvsdbBridgeAugmentation getBridge(Node node, String name) {
+ OvsdbBridgeAugmentation bridge = node.getAugmentation(OvsdbBridgeAugmentation.class);
+ if (bridge != null) {
+ if (!bridge.getBridgeName().equals(name)) {
+ bridge = null;
+ }
+ }
+ return bridge;
+ }
+
public static String getBridgeName(Node node) {
return (node.getAugmentation(OvsdbBridgeAugmentation.class).getBridgeName().getValue());
}
- public static OvsdbBridgeAugmentation getBridge(Node node) {
+ public static OvsdbBridgeAugmentation readBridge(Node node) {
return (node.getAugmentation(OvsdbBridgeAugmentation.class));
}
return false;
}
+ public static Boolean addTunnelPort(Node node, String bridgeName, String portName, String type,
+ Map<String, String> options) {
+ return false;
+ }
+
public static Boolean addPatchPort(Node node, String bridgeName, String portName, String peerPortName) {
return false;
}
public static boolean addVlanToTp(long vlan) {
return false;
}
+
+ public static boolean isTunnel(OvsdbTerminationPointAugmentation port) {
+ return SouthboundMapper.createOvsdbInterfaceType(
+ port.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_VXLAN)
+ || SouthboundMapper.createOvsdbInterfaceType(
+ port.getInterfaceType()).equals(NetworkHandler.NETWORK_TYPE_GRE);
+ }
+
+ public static String getNodeUUID(Node node) {
+ String nodeUUID = null;
+ OvsdbNodeAugmentation ovsdbNodeAugmentation = node.getAugmentation(OvsdbNodeAugmentation.class);
+ if (ovsdbNodeAugmentation != null) {
+ // TODO replace with proper uuid and not the system-id
+ nodeUUID = getOpenVSwitchExternalIdsValue(ovsdbNodeAugmentation, "system-id");
+ }
+ return nodeUUID;
+ }
}
import org.opendaylight.neutron.spi.NeutronRouter_Interface;
import org.opendaylight.neutron.spi.NeutronSubnet;
import org.opendaylight.neutron.spi.Neutron_IPs;
-import org.opendaylight.ovsdb.lib.notation.Row;
import org.opendaylight.ovsdb.openstack.netvirt.api.*;
-import org.opendaylight.ovsdb.schema.openvswitch.Bridge;
import org.opendaylight.ovsdb.utils.config.ConfigProperties;
-import org.opendaylight.ovsdb.utils.mdsal.node.StringConvertor;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
// The implementation for each of these services is resolved by the OSGi Service Manager
private volatile ConfigurationService configurationService;
private volatile TenantNetworkManager tenantNetworkManager;
- /* TODO SB_MIGRATION */
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
private volatile OvsdbConnectionService connectionService;
- //private volatile OvsdbInventoryService mdsalConsumer;
private volatile INeutronNetworkCRUD neutronNetworkCache;
private volatile INeutronSubnetCRUD neutronSubnetCache;
private volatile INeutronPortCRUD neutronPortCache;
}
final Action action = isDelete ? Action.DELETE : Action.ADD;
- /* TODO SB_MIGRATION
- List<Node> nodes = connectionService.getNodes();
- */
- List<Node> nodes = new ArrayList<>(); // TODO SB_MIGRATION
+ List<Node> nodes = connectionService.getBridgeNodes();
if (nodes.isEmpty()) {
logger.trace("updateL3ForNeutronPort has no nodes to work with");
}
subnetIdToRouterInterfaceCache.put(subnet.getSubnetUUID(), destNeutronRouterInterface);
}
- /* TODO SB_MIGRATION
- List<Node> nodes = connectionService.getNodes();*/
- List<Node> nodes = new ArrayList<>(); // TODO SB_MIGRATION
+ List<Node> nodes = connectionService.getBridgeNodes();
if (nodes.isEmpty()) {
logger.trace("programFlowsForNeutronRouterInterface has no nodes to work with");
}
}
final Action action = isDelete ? Action.DELETE : Action.ADD;
- /* TODO SB_MIGRATION
- List<Node> nodes = connectionService.getNodes();*/
- List<Node> nodes = new ArrayList<>(); // TODO SB_MIGRATION
+ List<Node> nodes = connectionService.getBridgeNodes();
if (nodes.isEmpty()) {
logger.trace("programFlowsForFloatingIP has no nodes to work with");
}
return status;
}
- //
- // More Internals
- //
-
private int getMaskLenFromCidr(String cidr) {
if (cidr == null) return 0;
String[] splits = cidr.split("/");
return result;
}
- private Long getDpid (Node node) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
-
- String bridgeName = configurationService.getIntegrationBridgeName();
- String bridgeUuid = this.getInternalBridgeUUID(node, bridgeName);
- if (bridgeUuid == null) {
- logger.error("Unable to spot Bridge Identifier for {} in {}", bridgeName, node);
- return 0L;
- }
-
- try {
- Row bridgeRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Bridge.class), bridgeUuid);
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeRow);
- Set<String> dpids = bridge.getDatapathIdColumn().getData();
- if (dpids == null || dpids.size() == 0) return 0L;
- return StringConvertor.dpidStringToLong((String) dpids.toArray()[0]);
- } catch (Exception e) {
- logger.error("Error finding Bridge's OF DPID", e);
- return 0L;
- }
- }
-
- private String getInternalBridgeUUID (Node node, String bridgeName) {
+ private Long getDpid(Node node) {
/* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- try {
- Map<String, Row> bridgeTable =
- ovsdbConfigurationService.getRows(node,
- ovsdbConfigurationService.getTableName(node, Bridge.class));
- if (bridgeTable == null) return null;
- for (String key : bridgeTable.keySet()) {
- Bridge bridge = ovsdbConfigurationService.getTypedRow(node, Bridge.class, bridgeTable.get(key));
- if (bridge.getName().equals(bridgeName)) return key;
- }
- } catch (Exception e) {
- logger.error("Error getting Bridge Identifier for {} / {}", node, bridgeName, e);
- }
- return null;
+ // may need to go from OvsdbNode to BridgeNode
+ // get integration bridge on this node and then get dpid
+ return MdsalUtils.getDataPathId(node);
}
}
import java.util.List;
import java.util.Map;
import java.util.Set;
-import java.util.concurrent.ConcurrentMap;
-import java.util.concurrent.ExecutionException;
import org.apache.felix.dm.Component;
import org.opendaylight.controller.md.sal.binding.api.DataBroker;
//import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ConsumerContext;
import org.opendaylight.controller.sal.binding.api.BindingAwareConsumer;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
-import org.opendaylight.ovsdb.lib.schema.GenericTableSchema;
-import org.opendaylight.ovsdb.lib.schema.typed.TypedBaseTable;
import org.opendaylight.ovsdb.openstack.netvirt.api.Connection;
import org.opendaylight.ovsdb.openstack.netvirt.api.ConnectionConstants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryListener;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbPluginException;
-import org.opendaylight.ovsdb.openstack.netvirt.api.Status;
-import org.opendaylight.ovsdb.openstack.netvirt.api.StatusWithUuid;
-import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
* @author Sam Hague (shague@redhat.com)
*/
public class OvsdbInventoryServiceImpl implements BindingAwareConsumer,
- OvsdbConfigurationService, OvsdbConnectionService, OvsdbInventoryService {
+ OvsdbConnectionService, OvsdbInventoryService {
private static final Logger LOG = LoggerFactory.getLogger(OvsdbInventoryServiceImpl.class);
private static DataBroker dataBroker = null;
return null;
}
- // get vlan and network id
-
public static Set<OvsdbInventoryListener> getMdsalConsumerListeners () {
return mdsalConsumerListeners;
}
@Override
- public StatusWithUuid insertRow(Node node, String tableName, String parentUuid, Row<GenericTableSchema> row) {
- return null;
- }
-
- @Override
- public Status updateRow(Node node, String tableName, String parentUuid, String rowUuid, Row row) {
- return null;
- }
-
- @Override
- public Status deleteRow(Node node, String tableName, String rowUuid) {
- return null;
- }
-
- @Override
- public Row getRow(Node node, String tableName, String uuid) {
- return null;
- }
-
- @Override
- public Row<GenericTableSchema> getRow(Node node, String databaseName, String tableName, UUID uuid) throws OvsdbPluginException {
- return null;
- }
-
- @Override
- public ConcurrentMap<String, Row> getRows(Node node, String tableName) {
- return null;
- }
-
- @Override
- public ConcurrentMap<UUID, Row<GenericTableSchema>> getRows(Node node, String databaseName, String tableName) throws OvsdbPluginException {
- return null;
- }
-
- @Override
- public ConcurrentMap<UUID, Row<GenericTableSchema>> getRows(Node node, String databaseName, String tableName, String fiqlQuery) throws OvsdbPluginException {
- return null;
- }
-
- @Override
- public List<String> getTables(Node node) {
- return null;
- }
-
- @Override
- public Boolean setOFController(Node node, String bridgeUUID) throws InterruptedException, ExecutionException {
- return null;
- }
-
- @Override
- public <T extends TypedBaseTable<?>> String getTableName(Node node, Class<T> typedClass) {
- return null;
- }
-
- @Override
- public <T extends TypedBaseTable<?>> T getTypedRow(Node node, Class<T> typedClass, Row row) {
- return null;
- }
-
- @Override
- public <T extends TypedBaseTable<?>> T createTypedRow(Node node, Class<T> typedClass) {
+ public Connection getConnection(Node node) {
return null;
}
@Override
- public ConcurrentMap<String, OvsdbTerminationPointAugmentation> getInterfaces(Node node) {
+ public List<Node> getNodes() {
return null;
}
@Override
- public Connection getConnection(Node node) {
+ public List<Node> getOvsdbNodes() {
return null;
}
@Override
- public List<Node> getNodes() {
+ public List<Node> getBridgeNodes() {
return null;
}
private HashMap<Node, NetworkingProvider> nodeToProviderMapping = Maps.newHashMap();
public void init() {
- logger.info(">>>>> init ProviderNetworkManagerImpl");
+ logger.info(">>>>>> init ProviderNetworkManagerImpl");
}
@Override
public void providerAdded(final ServiceReference ref, final NetworkingProvider provider){
Map <String, String> properties = Maps.newHashMap();
Long pid = (Long) ref.getProperty(org.osgi.framework.Constants.SERVICE_ID);
- properties.put(Constants.SOUTHBOUND_PROTOCOL_PROPERTY, (String) ref.getProperty(Constants.SOUTHBOUND_PROTOCOL_PROPERTY));
- properties.put(Constants.OPENFLOW_VERSION_PROPERTY, (String) ref.getProperty(Constants.OPENFLOW_VERSION_PROPERTY));
+ properties.put(Constants.SOUTHBOUND_PROTOCOL_PROPERTY,
+ (String) ref.getProperty(Constants.SOUTHBOUND_PROTOCOL_PROPERTY));
+ properties.put(Constants.OPENFLOW_VERSION_PROPERTY,
+ (String) ref.getProperty(Constants.OPENFLOW_VERSION_PROPERTY));
properties.put(Constants.PROVIDER_TYPE_PROPERTY, (String) ref.getProperty(Constants.PROVIDER_TYPE_PROPERTY));
providers.put(pid, new ProviderEntry(provider, properties));
- logger.info("Neutron Networking Provider Registered: {}, with {} and pid={}", provider.getClass().getName(), properties.toString(), pid);
+ logger.info("Neutron Networking Provider Registered: {}, with {} and pid={}",
+ provider.getClass().getName(), properties.toString(), pid);
}
public void providerRemoved(final ServiceReference ref){
static final Logger logger = LoggerFactory.getLogger(TenantNetworkManagerImpl.class);
private volatile INeutronPortCRUD neutronPortService;
- public SecurityServicesImpl() {
+ void init() {
+ logger.info(">>>>>> init {}", this.getClass());
}
/**
import org.opendaylight.neutron.spi.INeutronPortCRUD;
import org.opendaylight.neutron.spi.NeutronNetwork;
import org.opendaylight.neutron.spi.NeutronPort;
-import org.opendaylight.ovsdb.lib.notation.OvsdbSet;
-import org.opendaylight.ovsdb.lib.notation.Row;
import org.opendaylight.ovsdb.openstack.netvirt.api.Constants;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbInventoryService;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConnectionService;
import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
-import org.opendaylight.ovsdb.schema.openvswitch.Port;
import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import com.google.common.base.Preconditions;
+import java.util.List;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.List;
-import java.util.Map;
-
public class TenantNetworkManagerImpl implements TenantNetworkManager {
static final Logger logger = LoggerFactory.getLogger(TenantNetworkManagerImpl.class);
// The implementation for each of these services is resolved by the OSGi Service Manager
- /* TODO SB_MIGRATION */
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
- //private volatile OvsdbConnectionService connectionService;
- //private volatile OvsdbInventoryService mdsalConsumer;
private volatile INeutronNetworkCRUD neutronNetworkCache;
private volatile INeutronPortCRUD neutronPortCache;
private volatile VlanConfigurationCache vlanConfigurationCache;
- public TenantNetworkManagerImpl() {
+ void init() {
+ logger.info(">>>>>> init {}", this.getClass());
}
@Override
@Override
public void programInternalVlan(Node node, OvsdbTerminationPointAugmentation tp, NeutronNetwork network) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
-
int vlan = vlanConfigurationCache.getInternalVlan(node, network.getID());
logger.debug("Programming Vlan {} on {}", vlan, tp);
if (vlan <= 0) {
@Override
public boolean isTenantNetworkPresentInNode(Node node, String segmentationId) {
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
-
String networkId = this.getNetworkId(segmentationId);
if (networkId == null) {
logger.debug("Tenant Network not found with Segmenation-id {}",segmentationId);
}
try {
- /* TODO SB_MIGRATION this code was already commented out
- // Vlan Tag based identification
- Map<String, Row> portTable = ovsdbConfigService.getRows(node, Port.NAME.getName());
- if (portTable == null) {
- logger.debug("Port table is null for Node {} ", node);
- return false;
- }
-
- for (Row row : portTable.values()) {
- Port port = (Port)row;
- Set<BigInteger> tags = port.getTag();
- if (tags.contains(internalVlan)) {
- logger.debug("Tenant Network {} with Segmenation-id {} is present in Node {} / Port {}",
- networkId, segmentationId, node, port);
+ List<OvsdbTerminationPointAugmentation> ports = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation port : ports) {
+ String ifaceId = MdsalUtils.getInterfaceExternalIdsValue(port, Constants.EXTERNAL_ID_INTERFACE_ID);
+ if (ifaceId != null && isInterfacePresentInTenantNetwork(ifaceId, networkId)) {
+ logger.debug("Tenant Network {} with Segmentation-id {} is present in Node {} / Interface {}",
+ networkId, segmentationId, node, port);
return true;
}
}
- */ //TODO SB_MIGRATION this code was already commented out
- // External-id based more accurate VM Location identification
- Map<String, Row> ifTable = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Interface.class));
- if (ifTable == null) {
- logger.debug("Interface table is null for Node {} ", node);
- return false;
- }
-
- for (Row row : ifTable.values()) {
- Interface intf = ovsdbConfigurationService.getTypedRow(node, Interface.class, row);
- Map<String, String> externalIds = intf.getExternalIdsColumn().getData();
- if (externalIds != null && externalIds.get(Constants.EXTERNAL_ID_INTERFACE_ID) != null) {
- if (this.isInterfacePresentInTenantNetwork(externalIds.get(Constants.EXTERNAL_ID_INTERFACE_ID), networkId)) {
- logger.debug("Tenant Network {} with Segmentation-id {} is present in Node {} / Interface {}",
- networkId, segmentationId, node, intf);
- return true;
- }
- }
- }
-
} catch (Exception e) {
logger.error("Error while trying to determine if network is present on node", e);
return false;
return null;
}
- @Override
- public NeutronNetwork getTenantNetwork(Interface intf) {
- logger.trace("getTenantNetwork for {}", intf);
- if (intf == null) return null;
- Map<String, String> externalIds = intf.getExternalIdsColumn().getData();
- logger.trace("externalIds {}", externalIds);
- if (externalIds == null) return null;
- String neutronPortId = externalIds.get(Constants.EXTERNAL_ID_INTERFACE_ID);
- if (neutronPortId == null) return null;
- NeutronPort neutronPort = neutronPortCache.getPort(neutronPortId);
- logger.trace("neutronPort {}", neutronPort);
- if (neutronPort == null) return null;
- NeutronNetwork neutronNetwork = neutronNetworkCache.getNetwork(neutronPort.getNetworkUUID());
- logger.debug("{} mapped to {}", intf, neutronNetwork);
- return neutronNetwork;
- }
-
@Override
public NeutronNetwork getTenantNetwork(OvsdbTerminationPointAugmentation terminationPointAugmentation) {
NeutronNetwork neutronNetwork = null;
@Override
public void networkDeleted(String id) {
- //ToDo: Delete? This method does nothing how we dropped container support...
+ //ToDo: Delete? This method does nothing since container support was dropped...
}
private boolean isInterfacePresentInTenantNetwork (String portId, String networkId) {
NeutronPort neutronPort = neutronPortCache.getPort(portId);
return neutronPort != null && neutronPort.getNetworkUUID().equalsIgnoreCase(networkId);
}
-
}
/*
- * Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
+ * Copyright (c) 2013 Hewlett-Packard Development Company, L.P. 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
- *
- * Authors: Dave Tucker
*/
-
package org.opendaylight.ovsdb.openstack.netvirt.impl;
-import org.opendaylight.ovsdb.lib.notation.Row;
-import org.opendaylight.ovsdb.lib.notation.UUID;
import org.opendaylight.ovsdb.openstack.netvirt.NodeConfiguration;
-import org.opendaylight.ovsdb.openstack.netvirt.api.OvsdbConfigurationService;
import org.opendaylight.ovsdb.openstack.netvirt.api.TenantNetworkManager;
import org.opendaylight.ovsdb.openstack.netvirt.api.VlanConfigurationCache;
-import org.opendaylight.ovsdb.schema.openvswitch.Interface;
-import org.opendaylight.ovsdb.schema.openvswitch.OpenVSwitch;
-import org.opendaylight.ovsdb.schema.openvswitch.Port;
+import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbTerminationPointAugmentation;
import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node;
-import com.google.common.base.Preconditions;
import com.google.common.collect.Maps;
+import java.util.List;
+import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.Map;
-import java.util.Set;
-
+/**
+ * @author Dave Tucker
+ * @author Sam Hague
+ */
public class VlanConfigurationCacheImpl implements VlanConfigurationCache {
static final Logger logger = LoggerFactory.getLogger(VlanConfigurationCacheImpl.class);
-
private Map<String, NodeConfiguration> configurationCache = Maps.newConcurrentMap();
-
private volatile TenantNetworkManager tenantNetworkManager;
- /* TODO SB_MIGRATION */
- private volatile OvsdbConfigurationService ovsdbConfigurationService;
+
+ void init() {
+ logger.info(">>>>>> init {}", this.getClass());
+ }
private NodeConfiguration getNodeConfiguration(Node node){
String nodeUuid = getNodeUUID(node);
}
// Cache miss
- initializeNodeConfiguration(nodeUuid, node);
+ initializeNodeConfiguration(node, nodeUuid);
return configurationCache.get(nodeUuid);
}
private String getNodeUUID(Node node) {
- //String nodeUuid = mdsalConsumer.getNodeUUID(node);
- /* TODO SB_MIGRATION */
- Preconditions.checkNotNull(ovsdbConfigurationService);
- String nodeUuid = new String();
-
- try {
- Map<String, Row> ovsTable = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, OpenVSwitch.class));
- nodeUuid = (String)ovsTable.keySet().toArray()[0];
- }
- catch (Exception e) {
- logger.error("Unable to get the Open_vSwitch table for Node {}", node, e);
- }
-
- return nodeUuid;
+ return MdsalUtils.getNodeUUID(node);
}
- private void initializeNodeConfiguration(String nodeUuid, Node node) {
- /* TODO SB_MIGRATION */
+ private void initializeNodeConfiguration(Node node, String nodeUuid) {
NodeConfiguration nodeConfiguration = new NodeConfiguration();
- Integer vlan;
+ Integer vlan = 0;
String networkId = null;
-
- try {
- Map<String, Row> portRows = ovsdbConfigurationService.getRows(node, ovsdbConfigurationService.getTableName(node, Port.class));
-
- if (portRows == null){
- logger.debug("Port table is null for Node {}", node);
- return;
- }
-
- for (Row row : portRows.values()) {
- Port port = ovsdbConfigurationService.getTypedRow(node, Port.class, row);
-
- if (port.getTagColumn() == null) continue;
- Set<Long> tags = port.getTagColumn().getData();
- if (tags.size() == 1)
- {
- //There is only one tag here
- vlan = tags.iterator().next().intValue();
- }
- else {
- logger.debug("This port ({}) has {} tags", port.getName(), tags.size());
- continue;
- }
-
- for (UUID ifaceId : port.getInterfacesColumn().getData()) {
- Row ifaceRow = ovsdbConfigurationService
- .getRow(node, ovsdbConfigurationService.getTableName(node, Interface.class),
- ifaceId.toString());
- Interface iface = ovsdbConfigurationService.getTypedRow(node, Interface.class, ifaceRow);
-
- if (iface == null) {
- logger.debug("Interface table is null");
- continue;
- }
-
- networkId = tenantNetworkManager.getTenantNetwork(iface).getNetworkUUID();
-
- if (networkId != null) break;
- }
-
- if (vlan != 0 && networkId != null) {
-
- this.internalVlanInUse(nodeConfiguration, vlan);
- nodeConfiguration.getTenantVlanMap().put(networkId, vlan);
-
- } else {
- logger.debug("Node: {} initialized without a vlan", node);
- }
+ List<OvsdbTerminationPointAugmentation> ports = MdsalUtils.getPorts(node);
+ for (OvsdbTerminationPointAugmentation port : ports) {
+ vlan = port.getVlanTag().getValue();
+ networkId = tenantNetworkManager.getTenantNetwork(port).getNetworkUUID();
+ if (vlan != 0 && networkId != null) {
+ internalVlanInUse(nodeConfiguration, vlan);
+ nodeConfiguration.getTenantVlanMap().put(networkId, vlan);
+ } else {
+ logger.debug("Node: {} initialized without a vlan", node);
}
-
- configurationCache.put(nodeUuid, nodeConfiguration);
- }
- catch (Exception e) {
- logger.debug("Error getting Port table for Node {}", node, e);
}
+ configurationCache.put(nodeUuid, nodeConfiguration);
}
- /*
+ /**
* Return the currently mapped internal vlan or get the next
* free internal vlan from the available pool and map it to the networkId.
*/
return mappedVlan;
}
- /*
+ /**
* Return the mapped internal vlan to the available pool.
*/
@Override
- public Integer reclaimInternalVlan (Node node, String networkId) {
+ public Integer reclaimInternalVlan(Node node, String networkId) {
NodeConfiguration nodeConfiguration = getNodeConfiguration(node);
Integer mappedVlan = nodeConfiguration.getTenantVlanMap().get(networkId);
if (mappedVlan != null) {
return 0;
}
- private void internalVlanInUse (NodeConfiguration nodeConfiguration, Integer vlan) {
+ private void internalVlanInUse(NodeConfiguration nodeConfiguration, Integer vlan) {
nodeConfiguration.getInternalVlans().remove(vlan);
}
@Override
- public Integer getInternalVlan (Node node, String networkId) {
+ public Integer getInternalVlan(Node node, String networkId) {
NodeConfiguration nodeConfiguration = getNodeConfiguration(node);
Integer vlan = nodeConfiguration.getTenantVlanMap().get(networkId);
- if (vlan == null) return 0;
- return vlan;
+ return vlan == null ? 0 : vlan;
}
-
}
verifyNoMoreInteractions(networkingProviderManager);
when(configurationService.getIntegrationBridgeName()).thenReturn(bridgeMockName);
- // getBridge() is private method - cannot be mocked with mockito
- // when(bridgeConfigurationManagerImpl.getBridge(any(Node.class), anyString())).thenReturn(bridgeMock);
+ // readBridge() is private method - cannot be mocked with mockito
+ // when(bridgeConfigurationManagerImpl.readBridge(any(Node.class), anyString())).thenReturn(bridgeMock);
// Negative testing only due to private method call
assertEquals("Error, did not return correct boolean from isNodeTunnelReady", false,
verifyNoMoreInteractions(configurationService);
verifyNoMoreInteractions(networkingProviderManager);
- // getBridge() is private method - cannot be mocked with mockito
+ // readBridge() is private method - cannot be mocked with mockito
// Negative testing only due to private method call
assertEquals("Error, did not return correct boolean from isNodeVlanReady", false,
bridgeConfigurationManagerImpl.isNodeVlanReady(nodeMock, neutronNetworkMock));
verify(configurationService, times(1)).getProviderMappingsKey();
verify(configurationService, times(0)).getDefaultProviderMapping();
}
-
+ /* TODO SB_MIGRATION
@Test
public void testGetBridge() throws Exception {
Row row = mock(Row.class);
hashMap = new ConcurrentHashMap<>();
hashMap.put("row1", row);
- /* TODO SB_MIGRATION */
//when(ovsdbConfigurationService.getRows(any(Node.class), anyString())).thenReturn(hashMap);
//when(ovsdbConfigurationService.getTypedRow(any(Node.class), same(Bridge.class),
// any(Row.class))).thenReturn(bridge);
//verify(ovsdbConfigurationService, times(1)).getRows(any(Node.class), anyString());
//verify(ovsdbConfigurationService, times(1)).getTableName(any(Node.class), any(Class.class));
//verify(ovsdbConfigurationService, times(1)).getTypedRow(any(Node.class), any(Class.class), any(Row.class));
- }
+ }*/
}
\ No newline at end of file
when(neutronPortCache.getPort(anyString())).thenReturn(neutronPort);
when(neutronNetworkCache.getNetwork(anyString())).thenReturn(neutronNetwork);
- assertEquals("Error, did not return the correct tenant", neutronNetwork, tenantNetworkManagerImpl.getTenantNetwork(intf));
+ // TODO SB_MIGRATION
+ //assertEquals("Error, did not return the correct tenant", neutronNetwork, tenantNetworkManagerImpl.getTenantNetwork(intf));
verify(neutronPortCache, times(1)).getPort(anyString());
verify(neutronNetworkCache, times(1)).getNetwork(anyString());
/**
* Unit test for {@link VlanConfigurationCacheImpl}
*/
+// TODO SB_MIGRATION
+@Ignore
@RunWith(MockitoJUnitRunner.class)
public class VlanConfigurationCacheImplTest {
//when(ovsdbConfigurationService.getRow(any(Node.class), anyString(), anyString())).thenReturn(row);
//when(ovsdbConfigurationService.getTypedRow(any(Node.class), same(Interface.class), any(Row.class))).thenReturn(iface);
- when(tenantNetworkManagerImpl.getTenantNetwork(any(Interface.class))).thenReturn(neutronNetwork);
+ //when(tenantNetworkManagerImpl.getTenantNetwork(any(Interface.class))).thenReturn(neutronNetwork);
when(neutronNetwork.getNetworkUUID()).thenReturn(NETWORK_ID);
}
Code Review / ovsdb.git / commitdiff