Support tenant overlay network mode at kubevirt networking
Change-Id: Ife40e40e3ee5e342ac8b90ddea6eb81744ace18a
diff --git a/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/DefaultKubevirtNode.java b/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/DefaultKubevirtNode.java
index 246d6c4..1d3512a 100644
--- a/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/DefaultKubevirtNode.java
+++ b/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/DefaultKubevirtNode.java
@@ -17,8 +17,12 @@
import com.google.common.base.MoreObjects;
import org.apache.commons.lang.StringUtils;
+import org.onlab.osgi.DefaultServiceDirectory;
import org.onlab.packet.IpAddress;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.Port;
+import org.onosproject.net.PortNumber;
+import org.onosproject.net.device.DeviceService;
import java.util.ArrayList;
import java.util.Collection;
@@ -26,6 +30,10 @@
import static com.google.common.base.Preconditions.checkArgument;
import static org.onosproject.kubevirtnode.api.Constants.DEFAULT_CLUSTER_NAME;
+import static org.onosproject.kubevirtnode.api.Constants.GENEVE;
+import static org.onosproject.kubevirtnode.api.Constants.GRE;
+import static org.onosproject.kubevirtnode.api.Constants.VXLAN;
+import static org.onosproject.net.AnnotationKeys.PORT_NAME;
/**
* Representation of a KubeVirt node.
@@ -173,6 +181,33 @@
return phyIntfs;
}
+ @Override
+ public PortNumber vxlanPort() {
+ return tunnelPort(VXLAN);
+ }
+
+ @Override
+ public PortNumber grePort() {
+ return tunnelPort(GRE);
+ }
+
+ @Override
+ public PortNumber genevePort() {
+ return tunnelPort(GENEVE);
+ }
+
+ private PortNumber tunnelPort(String tunnelType) {
+ if (dataIp == null) {
+ return null;
+ }
+ DeviceService deviceService = DefaultServiceDirectory.getService(DeviceService.class);
+ Port port = deviceService.getPorts(tunBridge).stream()
+ .filter(p -> p.isEnabled() &&
+ Objects.equals(p.annotations().value(PORT_NAME), tunnelType))
+ .findAny().orElse(null);
+ return port != null ? port.number() : null;
+ }
+
/**
* Returns new builder instance.
*
diff --git a/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtNode.java b/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtNode.java
index 2cbb471..382c662 100644
--- a/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtNode.java
+++ b/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtNode.java
@@ -17,6 +17,7 @@
import org.onlab.packet.IpAddress;
import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
import java.util.Collection;
@@ -135,6 +136,27 @@
Collection<KubevirtPhyInterface> phyIntfs();
/**
+ * Returns the VXLAN tunnel port.
+ *
+ * @return VXLAN port number; null if tunnel port does not exist
+ */
+ PortNumber vxlanPort();
+
+ /**
+ * Returns the GRE tunnel port.
+ *
+ * @return GRE port number; null if the GRE tunnel port does not exist
+ */
+ PortNumber grePort();
+
+ /**
+ * Returns the GENEVE tunnel port number.
+ *
+ * @return GENEVE port number; null if the GRE tunnel port does not exist
+ */
+ PortNumber genevePort();
+
+ /**
* Builder of new node entity.
*/
interface Builder {