Support to provision and unprovision physical bridge along with ports
Change-Id: I16868a264ea95099b2184e652859a9adbec9eacd
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java
index 5608bce..e1f579e 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackFlowRuleManager.java
@@ -24,6 +24,7 @@
import org.onosproject.core.CoreService;
import org.onosproject.net.DeviceId;
import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
import org.onosproject.net.device.DeviceService;
import org.onosproject.net.flow.DefaultFlowRule;
import org.onosproject.net.flow.DefaultTrafficSelector;
@@ -59,6 +60,8 @@
import static org.onosproject.openstacknetworking.api.Constants.OPENSTACK_NETWORKING_APP_ID;
import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_FLAT_JUMP_UPSTREAM_RULE;
import static org.onosproject.openstacknetworking.api.Constants.STAT_FLAT_OUTBOUND_TABLE;
+import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.structurePortName;
+import static org.onosproject.openstacknode.api.Constants.INTEGRATION_TO_PHYSICAL_PREFIX;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.COMPUTE;
import static org.slf4j.LoggerFactory.getLogger;
@@ -255,50 +258,44 @@
osNodeService.node(deviceId)
.phyIntfs()
.forEach(phyInterface ->
- setFlatJumpRulesForPhyIntf(deviceId, phyInterface));
+ setFlatJumpRulesForPatchPort(deviceId, phyInterface));
}
- private void setFlatJumpRulesForPhyIntf(DeviceId deviceId,
- OpenstackPhyInterface phyInterface) {
- Optional<Port> phyPort = deviceService.getPorts(deviceId).stream()
- .filter(port ->
- Objects.equals(port.annotations().value(PORT_NAME), phyInterface.intf()))
+ private void setFlatJumpRuleForPatchPort(DeviceId deviceId,
+ PortNumber portNumber, short ethType) {
+ TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
+ selector.matchInPort(portNumber)
+ .matchEthType(ethType);
+
+ TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
+ treatment.transition(STAT_FLAT_OUTBOUND_TABLE);
+ FlowRule flowRuleForIp = DefaultFlowRule.builder()
+ .forDevice(deviceId)
+ .withSelector(selector.build())
+ .withTreatment(treatment.build())
+ .withPriority(PRIORITY_FLAT_JUMP_UPSTREAM_RULE)
+ .fromApp(appId)
+ .makePermanent()
+ .forTable(DHCP_TABLE)
+ .build();
+
+ applyRule(flowRuleForIp, true);
+ }
+
+ private void setFlatJumpRulesForPatchPort(DeviceId deviceId,
+ OpenstackPhyInterface phyIntf) {
+ Optional<Port> patchPort = deviceService.getPorts(deviceId).stream()
+ .filter(port -> {
+ String annotPortName = port.annotations().value(PORT_NAME);
+ String portName = structurePortName(
+ INTEGRATION_TO_PHYSICAL_PREFIX + phyIntf.network());
+ return Objects.equals(annotPortName, portName);
+ })
.findAny();
- phyPort.ifPresent(port -> {
- TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
- selector.matchInPort(port.number())
- .matchEthType(Ethernet.TYPE_IPV4);
-
- TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
- treatment.transition(STAT_FLAT_OUTBOUND_TABLE);
- FlowRule flowRuleForIp = DefaultFlowRule.builder()
- .forDevice(deviceId)
- .withSelector(selector.build())
- .withTreatment(treatment.build())
- .withPriority(PRIORITY_FLAT_JUMP_UPSTREAM_RULE)
- .fromApp(appId)
- .makePermanent()
- .forTable(DHCP_TABLE)
- .build();
-
- applyRule(flowRuleForIp, true);
-
- selector = DefaultTrafficSelector.builder();
- selector.matchInPort(port.number())
- .matchEthType(Ethernet.TYPE_ARP);
-
- FlowRule flowRuleForArp = DefaultFlowRule.builder()
- .forDevice(deviceId)
- .withSelector(selector.build())
- .withTreatment(treatment.build())
- .withPriority(PRIORITY_FLAT_JUMP_UPSTREAM_RULE)
- .fromApp(appId)
- .makePermanent()
- .forTable(DHCP_TABLE)
- .build();
-
- applyRule(flowRuleForArp, true);
+ patchPort.ifPresent(port -> {
+ setFlatJumpRuleForPatchPort(deviceId, port.number(), Ethernet.TYPE_IPV4);
+ setFlatJumpRuleForPatchPort(deviceId, port.number(), Ethernet.TYPE_ARP);
});
}
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingPhysicalHandler.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingPhysicalHandler.java
new file mode 100644
index 0000000..6a9686b
--- /dev/null
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/impl/OpenstackSwitchingPhysicalHandler.java
@@ -0,0 +1,208 @@
+/*
+ * Copyright 2019-present Open Networking Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.openstacknetworking.impl;
+
+import org.onlab.packet.Ethernet;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.LeadershipService;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceEvent;
+import org.onosproject.net.device.DeviceListener;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.driver.DriverService;
+import org.onosproject.net.flow.DefaultTrafficSelector;
+import org.onosproject.net.flow.DefaultTrafficTreatment;
+import org.onosproject.net.flow.TrafficSelector;
+import org.onosproject.net.flow.TrafficTreatment;
+import org.onosproject.openstacknetworking.api.OpenstackFlowRuleService;
+import org.onosproject.openstacknode.api.OpenstackNode;
+import org.onosproject.openstacknode.api.OpenstackNodeService;
+import org.osgi.service.component.annotations.Activate;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Deactivate;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.slf4j.Logger;
+
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
+
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
+import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.net.AnnotationKeys.PORT_NAME;
+import static org.onosproject.openstacknetworking.api.Constants.DHCP_TABLE;
+import static org.onosproject.openstacknetworking.api.Constants.OPENSTACK_NETWORKING_APP_ID;
+import static org.onosproject.openstacknetworking.api.Constants.PRIORITY_FLAT_JUMP_UPSTREAM_RULE;
+import static org.onosproject.openstacknetworking.api.Constants.STAT_FLAT_OUTBOUND_TABLE;
+import static org.onosproject.openstacknetworking.util.OpenstackNetworkingUtil.structurePortName;
+import static org.onosproject.openstacknode.api.Constants.INTEGRATION_TO_PHYSICAL_PREFIX;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Populates switching flow rules on OVS for the physical interfaces.
+ */
+@Component(immediate = true)
+public class OpenstackSwitchingPhysicalHandler {
+
+ private final Logger log = getLogger(getClass());
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected CoreService coreService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected MastershipService mastershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected DeviceService deviceService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected DriverService driverService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected ClusterService clusterService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected LeadershipService leadershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected OpenstackFlowRuleService osFlowRuleService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected OpenstackNodeService osNodeService;
+
+ private final ExecutorService eventExecutor = newSingleThreadExecutor(
+ groupedThreads(this.getClass().getSimpleName(), "event-handler"));
+ private final InternalDeviceListener internalDeviceListener = new InternalDeviceListener();
+
+ private ApplicationId appId;
+
+ @Activate
+ protected void activate() {
+ appId = coreService.registerApplication(OPENSTACK_NETWORKING_APP_ID);
+ deviceService.addListener(internalDeviceListener);
+
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ eventExecutor.shutdown();
+ deviceService.removeListener(internalDeviceListener);
+
+ log.info("Stopped");
+ }
+
+ /**
+ * An internal device listener which listens the port events generated from
+ * OVS integration bridge.
+ */
+ private class InternalDeviceListener implements DeviceListener {
+
+ @Override
+ public boolean isRelevant(DeviceEvent event) {
+ Port port = event.port();
+ if (port == null) {
+ return false;
+ }
+
+ OpenstackNode osNode = osNodeService.node(event.subject().id());
+ if (osNode == null) {
+ return false;
+ }
+
+ Set<String> intPatchPorts = osNode.phyIntfs().stream()
+ .map(pi -> structurePortName(INTEGRATION_TO_PHYSICAL_PREFIX
+ + pi.network())).collect(Collectors.toSet());
+ String portName = port.annotations().value(PORT_NAME);
+
+ return intPatchPorts.contains(portName);
+ }
+
+ private boolean isRelevantHelper(DeviceEvent event) {
+ return mastershipService.isLocalMaster(event.subject().id());
+ }
+
+ @Override
+ public void event(DeviceEvent event) {
+ log.info("Device event occurred with type {}", event.type());
+
+ switch (event.type()) {
+ case PORT_ADDED:
+ case PORT_UPDATED:
+ eventExecutor.execute(() -> processPortAddition(event));
+ break;
+ case PORT_REMOVED:
+ eventExecutor.execute(() -> processPortRemoval(event));
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void processPortAddition(DeviceEvent event) {
+ if (!isRelevantHelper(event)) {
+ return;
+ }
+
+ setFlatJumpRulesForPatchPort(event.subject().id(),
+ event.port().number(), true);
+ }
+
+ private void processPortRemoval(DeviceEvent event) {
+ if (!isRelevantHelper(event)) {
+ return;
+ }
+
+ setFlatJumpRulesForPatchPort(event.subject().id(),
+ event.port().number(), false);
+ }
+
+ private void setFlatJumpRulesForPatchPort(DeviceId deviceId,
+ PortNumber portNumber,
+ boolean install) {
+ setFlatJumpRuleForPatchPort(deviceId, portNumber,
+ Ethernet.TYPE_IPV4, install);
+ setFlatJumpRuleForPatchPort(deviceId, portNumber,
+ Ethernet.TYPE_ARP, install);
+ }
+
+ private void setFlatJumpRuleForPatchPort(DeviceId deviceId,
+ PortNumber portNumber,
+ short ethType, boolean install) {
+ TrafficSelector.Builder selector = DefaultTrafficSelector.builder();
+ selector.matchInPort(portNumber)
+ .matchEthType(ethType);
+
+ TrafficTreatment.Builder treatment = DefaultTrafficTreatment.builder();
+ treatment.transition(STAT_FLAT_OUTBOUND_TABLE);
+
+ osFlowRuleService.setRule(
+ appId,
+ deviceId,
+ selector.build(),
+ treatment.build(),
+ PRIORITY_FLAT_JUMP_UPSTREAM_RULE,
+ DHCP_TABLE,
+ install);
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
index 5402ca5..40d07f5 100644
--- a/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
+++ b/apps/openstacknetworking/app/src/main/java/org/onosproject/openstacknetworking/util/OpenstackNetworkingUtil.java
@@ -187,6 +187,7 @@
private static final int SSH_PORT = 22;
private static final int TAP_PORT_LENGTH = 11;
+ private static final int PORT_NAME_MAX_LENGTH = 15;
/**
* Prevents object instantiation from external.
@@ -1303,6 +1304,23 @@
}
/**
+ * Re-structures the OVS port name.
+ * The length of OVS port name should be not large than 15.
+ *
+ * @param portName original port name
+ * @return re-structured OVS port name
+ */
+ public static String structurePortName(String portName) {
+
+ // The size of OVS port name should not be larger than 15
+ if (portName.length() > PORT_NAME_MAX_LENGTH) {
+ return StringUtils.substring(portName, 0, PORT_NAME_MAX_LENGTH);
+ }
+
+ return portName;
+ }
+
+ /**
* Builds up and a complete endpoint URL from gateway node.
*
* @param node gateway node