[ONOS-7627] Support the creation of sr-iov port type for LiquidIO smart NIC
Change-Id: I6d55d1dfd26ec6ed0b9df9fdeea31749b0c49b7c
diff --git a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeService.java b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeService.java
index 8ebb007..a692109 100644
--- a/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeService.java
+++ b/apps/openstacknode/api/src/main/java/org/onosproject/openstacknode/api/OpenstackNodeService.java
@@ -75,4 +75,20 @@
* @return openstack node
*/
OpenstackNode node(DeviceId deviceId);
+
+ /**
+ * Adds the vf port to the given openstack node.
+ *
+ * @param osNode openstack node
+ * @param portName port name
+ */
+ void addVfPort(OpenstackNode osNode, String portName);
+
+ /**
+ * Removes vf port to the given openstack node.
+ *
+ * @param osNode openstack node
+ * @param portName port name
+ */
+ void removeVfPort(OpenstackNode osNode, String portName);
}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
index b9e193a..6064267 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/DefaultOpenstackNodeHandler.java
@@ -59,9 +59,7 @@
import org.onosproject.openstacknode.api.OpenstackNodeListener;
import org.onosproject.openstacknode.api.OpenstackNodeService;
import org.onosproject.openstacknode.api.OpenstackPhyInterface;
-import org.onosproject.ovsdb.controller.OvsdbClientService;
import org.onosproject.ovsdb.controller.OvsdbController;
-import org.onosproject.ovsdb.controller.OvsdbNodeId;
import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
@@ -84,6 +82,7 @@
import static org.onosproject.openstacknode.api.NodeState.INCOMPLETE;
import static org.onosproject.openstacknode.api.OpenstackNode.NodeType.GATEWAY;
import static org.onosproject.openstacknode.api.OpenstackNodeService.APP_ID;
+import static org.onosproject.openstacknode.util.OpenstackNodeUtil.isOvsdbConnected;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -95,8 +94,8 @@
private final Logger log = getLogger(getClass());
private static final String OVSDB_PORT = "ovsdbPortNum";
- private static final int DEFAULT_OVSDB_PORT = 6640;
private static final String DEFAULT_OF_PROTO = "tcp";
+ private static final int DEFAULT_OVSDB_PORT = 6640;
private static final int DEFAULT_OFPORT = 6653;
private static final int DPID_BEGIN = 3;
@@ -180,7 +179,7 @@
@Override
public void processInitState(OpenstackNode osNode) {
- if (!isOvsdbConnected(osNode)) {
+ if (!isOvsdbConnected(osNode, ovsdbPort, ovsdbController, deviceService)) {
ovsdbController.connect(osNode.managementIp(), tpPort(ovsdbPort));
return;
}
@@ -192,13 +191,13 @@
@Override
public void processDeviceCreatedState(OpenstackNode osNode) {
try {
- if (!isOvsdbConnected(osNode)) {
+ if (!isOvsdbConnected(osNode, ovsdbPort, ovsdbController, deviceService)) {
ovsdbController.connect(osNode.managementIp(), tpPort(ovsdbPort));
return;
}
if (osNode.type() == GATEWAY) {
- addSystemInterface(osNode, INTEGRATION_BRIDGE, osNode.uplinkPort());
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, osNode.uplinkPort(), true);
}
if (osNode.dataIp() != null &&
@@ -208,12 +207,12 @@
if (osNode.vlanIntf() != null &&
!isIntfEnabled(osNode, osNode.vlanIntf())) {
- addSystemInterface(osNode, INTEGRATION_BRIDGE, osNode.vlanIntf());
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, osNode.vlanIntf(), true);
}
osNode.phyIntfs().forEach(i -> {
if (!isIntfEnabled(osNode, i.intf())) {
- addSystemInterface(osNode, INTEGRATION_BRIDGE, i.intf());
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, i.intf(), true);
}
});
@@ -224,11 +223,7 @@
@Override
public void processCompleteState(OpenstackNode osNode) {
- OvsdbClientService ovsdbClient = ovsdbController.getOvsdbClient(
- new OvsdbNodeId(osNode.managementIp(), DEFAULT_OVSDB_PORT));
- if (ovsdbClient != null && ovsdbClient.isConnected()) {
- ovsdbClient.disconnect();
- }
+ //Do something if needed
}
@Override
@@ -237,21 +232,6 @@
}
/**
- * Checks whether the controller has a connection with an OVSDB that resides
- * inside the given openstack node.
- *
- * @param osNode openstack node
- * @return true if the controller is connected to the OVSDB, false otherwise
- */
- private boolean isOvsdbConnected(OpenstackNode osNode) {
- OvsdbNodeId ovsdb = new OvsdbNodeId(osNode.managementIp(), ovsdbPort);
- OvsdbClientService client = ovsdbController.getOvsdbClient(ovsdb);
- return deviceService.isAvailable(osNode.ovsdb()) &&
- client != null &&
- client.isConnected();
- }
-
- /**
* Creates a bridge with a given name on a given openstack node.
*
* @param osNode openstack node
@@ -288,19 +268,27 @@
}
/**
- * Adds a network interface (aka port) into a given bridge of openstack node.
+ * Adds or removes a network interface (aka port) into a given bridge of openstack node.
*
* @param osNode openstack node
* @param bridgeName bridge name
* @param intfName interface name
+ * @param addOrRemove add port is true, remove it otherwise
*/
- private void addSystemInterface(OpenstackNode osNode, String bridgeName, String intfName) {
+ private void addOrRemoveSystemInterface(OpenstackNode osNode, String bridgeName, String intfName,
+ boolean addOrRemove) {
Device device = deviceService.getDevice(osNode.ovsdb());
if (device == null || !device.is(BridgeConfig.class)) {
+ log.info("device is null or this device if not ovsdb device");
return;
}
BridgeConfig bridgeConfig = device.as(BridgeConfig.class);
- bridgeConfig.addPort(BridgeName.bridgeName(bridgeName), intfName);
+
+ if (addOrRemove) {
+ bridgeConfig.addPort(BridgeName.bridgeName(bridgeName), intfName);
+ } else {
+ bridgeConfig.deletePort(BridgeName.bridgeName(bridgeName), intfName);
+ }
}
/**
@@ -377,6 +365,10 @@
private boolean isCurrentStateDone(OpenstackNode osNode) {
switch (osNode.state()) {
case INIT:
+ if (!isOvsdbConnected(osNode, ovsdbPort, ovsdbController, deviceService)) {
+ return false;
+ }
+
return deviceService.isAvailable(osNode.intgBridge());
case DEVICE_CREATED:
if (osNode.dataIp() != null &&
@@ -465,9 +457,6 @@
if (deviceService.isAvailable(device.id())) {
log.debug("OVSDB {} detected", device.id());
bootstrapNode(osNode);
- } else if (osNode.state() == COMPLETE) {
- log.debug("Removing OVSDB {}", device.id());
- deviceAdminService.removeDevice(device.id());
}
});
break;
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java
index fb8a871..f30787c 100644
--- a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/impl/OpenstackNodeManager.java
@@ -20,15 +20,22 @@
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Modified;
+import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.ReferenceCardinality;
import org.apache.felix.scr.annotations.Service;
+import org.onlab.util.Tools;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.event.ListenerRegistry;
+import org.onosproject.net.Device;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.behaviour.BridgeConfig;
+import org.onosproject.net.behaviour.BridgeName;
+import org.onosproject.net.device.DeviceService;
import org.onosproject.openstacknode.api.OpenstackNode;
import org.onosproject.openstacknode.api.OpenstackNodeAdminService;
import org.onosproject.openstacknode.api.OpenstackNodeEvent;
@@ -36,8 +43,12 @@
import org.onosproject.openstacknode.api.OpenstackNodeService;
import org.onosproject.openstacknode.api.OpenstackNodeStore;
import org.onosproject.openstacknode.api.OpenstackNodeStoreDelegate;
+import org.onosproject.ovsdb.controller.OvsdbController;
+import org.onosproject.store.service.StorageService;
+import org.osgi.service.component.ComponentContext;
import org.slf4j.Logger;
+import java.util.Dictionary;
import java.util.Objects;
import java.util.Set;
import java.util.concurrent.ExecutorService;
@@ -46,8 +57,11 @@
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.util.concurrent.Executors.newSingleThreadExecutor;
+import static org.onlab.packet.TpPort.tpPort;
import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.openstacknode.api.Constants.INTEGRATION_BRIDGE;
import static org.onosproject.openstacknode.api.NodeState.COMPLETE;
+import static org.onosproject.openstacknode.util.OpenstackNodeUtil.isOvsdbConnected;
import static org.slf4j.LoggerFactory.getLogger;
/**
@@ -64,6 +78,8 @@
private static final String MSG_CREATED = "created";
private static final String MSG_UPDATED = "updated";
private static final String MSG_REMOVED = "removed";
+ private static final String OVSDB_PORT = "ovsdbPortNum";
+ private static final int DEFAULT_OVSDB_PORT = 6640;
private static final String ERR_NULL_NODE = "OpenStack node cannot be null";
private static final String ERR_NULL_HOSTNAME = "OpenStack node hostname cannot be null";
@@ -80,6 +96,19 @@
@Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
protected LeadershipService leadershipService;
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected StorageService storageService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected OvsdbController ovsdbController;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY_UNARY)
+ protected DeviceService deviceService;
+
+ @Property(name = OVSDB_PORT, intValue = DEFAULT_OVSDB_PORT,
+ label = "OVSDB server listen port")
+ private int ovsdbPort = DEFAULT_OVSDB_PORT;
+
private final ExecutorService eventExecutor = newSingleThreadExecutor(
groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
@@ -107,6 +136,17 @@
log.info("Stopped");
}
+ @Modified
+ protected void modified(ComponentContext context) {
+ Dictionary<?, ?> properties = context.getProperties();
+ int updatedOvsdbPort = Tools.getIntegerProperty(properties, OVSDB_PORT);
+ if (!Objects.equals(updatedOvsdbPort, ovsdbPort)) {
+ ovsdbPort = updatedOvsdbPort;
+ }
+
+ log.info("Modified");
+ }
+
@Override
public void createNode(OpenstackNode osNode) {
checkNotNull(osNode, ERR_NULL_NODE);
@@ -172,6 +212,57 @@
.findFirst().orElse(null);
}
+ @Override
+ public void addVfPort(OpenstackNode osNode, String portName) {
+ log.trace("addVfPort called");
+
+ if (!isOvsdbConnected(osNode, ovsdbPort, ovsdbController, deviceService)) {
+ log.warn("There's no ovsdb connection with the device {}. Try to connect the device...",
+ osNode.ovsdb().toString());
+ try {
+ ovsdbController.connect(osNode.managementIp(), tpPort(ovsdbPort));
+ } catch (Exception e) {
+ log.error("Failed to connect to the openstackNode via ovsdb protocol because of exception {}",
+ e.toString());
+ }
+ }
+
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, portName, true);
+ }
+
+ @Override
+ public void removeVfPort(OpenstackNode osNode, String portName) {
+ log.trace("removeVfPort called");
+
+ if (!isOvsdbConnected(osNode, ovsdbPort, ovsdbController, deviceService)) {
+ log.warn("There's no ovsdb connection with the device {}. Try to connect the device...",
+ osNode.ovsdb().toString());
+ try {
+ ovsdbController.connect(osNode.managementIp(), tpPort(ovsdbPort));
+ } catch (Exception e) {
+ log.error("Failed to connect to the openstackNode via ovsdb protocol because of exception {}",
+ e.toString());
+ }
+ }
+
+ addOrRemoveSystemInterface(osNode, INTEGRATION_BRIDGE, portName, false);
+ }
+
+ private void addOrRemoveSystemInterface(OpenstackNode osNode, String bridgeName, String intfName,
+ boolean addOrRemove) {
+ Device device = deviceService.getDevice(osNode.ovsdb());
+ if (device == null || !device.is(BridgeConfig.class)) {
+ log.info("device is null or this device if not ovsdb device");
+ return;
+ }
+ BridgeConfig bridgeConfig = device.as(BridgeConfig.class);
+ if (addOrRemove) {
+ bridgeConfig.addPort(BridgeName.bridgeName(bridgeName), intfName);
+ } else {
+ bridgeConfig.deletePort(BridgeName.bridgeName(bridgeName), intfName);
+ }
+ }
+
private class InternalNodeStoreDelegate implements OpenstackNodeStoreDelegate {
@Override
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
new file mode 100644
index 0000000..79526e6
--- /dev/null
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/OpenstackNodeUtil.java
@@ -0,0 +1,58 @@
+/*
+ * Copyright 2018-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.openstacknode.util;
+
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.openstacknode.api.OpenstackNode;
+import org.onosproject.ovsdb.controller.OvsdbClientService;
+import org.onosproject.ovsdb.controller.OvsdbController;
+import org.onosproject.ovsdb.controller.OvsdbNodeId;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * An utility that used in openstack node app.
+ */
+public final class OpenstackNodeUtil {
+ protected static final Logger log = LoggerFactory.getLogger(OpenstackNodeUtil.class);
+
+ /**
+ * Prevents object instantiation from external.
+ */
+ private OpenstackNodeUtil() {
+ }
+
+ /**
+ * Checks whether the controller has a connection with an OVSDB that resides
+ * inside the given openstack node.
+ *
+ * @param osNode openstack node
+ * @param ovsdbPort ovsdb port
+ * @param ovsdbController ovsdb controller
+ * @param deviceService device service
+ * @return true if the controller is connected to the OVSDB, false otherwise
+ */
+ public static boolean isOvsdbConnected(OpenstackNode osNode,
+ int ovsdbPort,
+ OvsdbController ovsdbController,
+ DeviceService deviceService) {
+ OvsdbNodeId ovsdb = new OvsdbNodeId(osNode.managementIp(), ovsdbPort);
+ OvsdbClientService client = ovsdbController.getOvsdbClient(ovsdb);
+ return deviceService.isAvailable(osNode.ovsdb()) &&
+ client != null &&
+ client.isConnected();
+ }
+}
diff --git a/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/package-info.java b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/package-info.java
new file mode 100644
index 0000000..0f8165a
--- /dev/null
+++ b/apps/openstacknode/app/src/main/java/org/onosproject/openstacknode/util/package-info.java
@@ -0,0 +1,20 @@
+/*
+ * Copyright 2018-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.
+ */
+
+/**
+ * Openstack node utility package.
+ */
+package org.onosproject.openstacknode.util;
\ No newline at end of file
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/OpenstackNodeManagerTest.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/OpenstackNodeManagerTest.java
index df9ae73..cb0a73e 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/OpenstackNodeManagerTest.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/OpenstackNodeManagerTest.java
@@ -119,6 +119,7 @@
osNodeStore.createNode(GATEWAY_1);
target = new org.onosproject.openstacknode.impl.OpenstackNodeManager();
+ target.storageService = new TestStorageService();
target.coreService = new TestCoreService();
target.clusterService = new TestClusterService();
target.leadershipService = new TestLeadershipService();
diff --git a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/TestOpenstackNodeManager.java b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/TestOpenstackNodeManager.java
index cf877d7..ea9b8c6 100644
--- a/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/TestOpenstackNodeManager.java
+++ b/apps/openstacknode/app/src/test/java/org/onosproject/openstacknode/impl/TestOpenstackNodeManager.java
@@ -79,6 +79,15 @@
}
@Override
+ public void addVfPort(OpenstackNode osNode, String portName) {
+ }
+
+ @Override
+ public void removeVfPort(OpenstackNode osNode, String portName) {
+
+ }
+
+ @Override
public void addListener(OpenstackNodeListener listener) {
listeners.add(listener);
}