Feed kubevirt port info from K8S port, add a CLI to query port info
Change-Id: Id791fbae66b72cbb8908687463355ecb62ef8543
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtDhcpHandler.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtDhcpHandler.java
index 74b7c8a..e3b9469 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtDhcpHandler.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtDhcpHandler.java
@@ -25,6 +25,7 @@
import org.onlab.packet.IpAddress;
import org.onlab.packet.IpPrefix;
import org.onlab.packet.MacAddress;
+import org.onlab.packet.TpPort;
import org.onlab.packet.UDP;
import org.onlab.packet.dhcp.DhcpOption;
import org.onlab.util.Tools;
@@ -40,11 +41,14 @@
import org.onosproject.kubevirtnetworking.api.KubevirtNetworkService;
import org.onosproject.kubevirtnetworking.api.KubevirtPort;
import org.onosproject.kubevirtnetworking.api.KubevirtPortService;
+import org.onosproject.kubevirtnode.api.KubevirtNode;
import org.onosproject.kubevirtnode.api.KubevirtNodeEvent;
import org.onosproject.kubevirtnode.api.KubevirtNodeListener;
import org.onosproject.kubevirtnode.api.KubevirtNodeService;
import org.onosproject.net.ConnectPoint;
+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.net.packet.DefaultOutboundPacket;
import org.onosproject.net.packet.PacketContext;
@@ -79,7 +83,9 @@
import static org.onlab.packet.DHCP.MsgType.DHCPACK;
import static org.onlab.packet.DHCP.MsgType.DHCPOFFER;
import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.kubevirtnetworking.api.Constants.DHCP_TABLE;
import static org.onosproject.kubevirtnetworking.api.Constants.KUBEVIRT_NETWORKING_APP_ID;
+import static org.onosproject.kubevirtnetworking.api.Constants.PRIORITY_DHCP_RULE;
import static org.onosproject.kubevirtnetworking.impl.OsgiPropertyConstants.DHCP_SERVER_MAC;
import static org.onosproject.kubevirtnetworking.impl.OsgiPropertyConstants.DHCP_SERVER_MAC_DEFAULT;
import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.getBroadcastAddr;
@@ -616,7 +622,47 @@
@Override
public void event(KubevirtNodeEvent event) {
+ KubevirtNode node = event.subject();
+ switch (event.type()) {
+ case KUBEVIRT_NODE_COMPLETE:
+ eventExecutor.execute(() -> processNodeCompletion(node));
+ break;
+ case KUBEVIRT_NODE_CREATED:
+ case KUBEVIRT_NODE_INCOMPLETE:
+ case KUBEVIRT_NODE_REMOVED:
+ case KUBEVIRT_NODE_UPDATED:
+ default:
+ break;
+ }
+ }
+ private void processNodeCompletion(KubevirtNode node) {
+ if (!isRelevantHelper()) {
+ return;
+ }
+ setDhcpRule(node, true);
+ }
+
+ private void setDhcpRule(KubevirtNode node, boolean install) {
+ TrafficSelector selector = DefaultTrafficSelector.builder()
+ .matchEthType(Ethernet.TYPE_IPV4)
+ .matchIPProtocol(IPv4.PROTOCOL_UDP)
+ .matchUdpDst(TpPort.tpPort(UDP.DHCP_SERVER_PORT))
+ .matchUdpSrc(TpPort.tpPort(UDP.DHCP_CLIENT_PORT))
+ .build();
+
+ TrafficTreatment treatment = DefaultTrafficTreatment.builder()
+ .punt()
+ .build();
+
+ flowService.setRule(
+ appId,
+ node.intgBridge(),
+ selector,
+ treatment,
+ PRIORITY_DHCP_RULE,
+ DHCP_TABLE,
+ install);
}
}
}
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManager.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManager.java
index 581fd29..d761ff7 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManager.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkManager.java
@@ -18,6 +18,7 @@
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
+import org.onlab.packet.IpAddress;
import org.onosproject.core.ApplicationId;
import org.onosproject.core.CoreService;
import org.onosproject.event.ListenerRegistry;
@@ -64,6 +65,7 @@
private static final String ERR_NULL_NETWORK = "Kubernetes network cannot be null";
private static final String ERR_NULL_NETWORK_ID = "Kubernetes network ID cannot be null";
+ private static final String ERR_NULL_IP = "IP address cannot be null";
private static final String ERR_IN_USE = " still in use";
@@ -129,6 +131,35 @@
}
@Override
+ public IpAddress allocateIp(String networkId) {
+ checkArgument(!Strings.isNullOrEmpty(networkId), ERR_NULL_NETWORK_ID);
+
+ try {
+ KubevirtNetwork network = networkStore.network(networkId);
+ IpAddress ip = network.ipPool().allocateIp();
+ networkStore.updateNetwork(network);
+ return ip;
+ } catch (Exception e) {
+ log.error("Failed to allocate IP address");
+ }
+ return null;
+ }
+
+ @Override
+ public void releaseIp(String networkId, IpAddress ip) {
+ checkArgument(!Strings.isNullOrEmpty(networkId), ERR_NULL_NETWORK_ID);
+ checkArgument(ip != null, ERR_NULL_IP);
+
+ try {
+ KubevirtNetwork network = networkStore.network(networkId);
+ network.ipPool().releaseIp(ip);
+ networkStore.updateNetwork(network);
+ } catch (Exception e) {
+ log.error("Failed to allocate IP address");
+ }
+ }
+
+ @Override
public void clear() {
networkStore.clear();
}
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java
new file mode 100644
index 0000000..595b775
--- /dev/null
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtPodPortMapper.java
@@ -0,0 +1,231 @@
+/*
+ * Copyright 2021-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.kubevirtnetworking.impl;
+
+import io.fabric8.kubernetes.api.model.Pod;
+import io.fabric8.kubernetes.api.model.PodBuilder;
+import io.fabric8.kubernetes.client.KubernetesClient;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cluster.ClusterService;
+import org.onosproject.cluster.LeadershipService;
+import org.onosproject.cluster.NodeId;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.kubevirtnetworking.api.KubevirtNetwork;
+import org.onosproject.kubevirtnetworking.api.KubevirtNetworkAdminService;
+import org.onosproject.kubevirtnetworking.api.KubevirtPodAdminService;
+import org.onosproject.kubevirtnetworking.api.KubevirtPodEvent;
+import org.onosproject.kubevirtnetworking.api.KubevirtPodListener;
+import org.onosproject.kubevirtnetworking.api.KubevirtPort;
+import org.onosproject.kubevirtnetworking.api.KubevirtPortAdminService;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigService;
+import org.onosproject.mastership.MastershipService;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.net.driver.DriverService;
+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.Map;
+import java.util.Objects;
+import java.util.concurrent.ExecutorService;
+
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
+import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.kubevirtnetworking.api.Constants.KUBEVIRT_NETWORKING_APP_ID;
+import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.getPort;
+import static org.onosproject.kubevirtnetworking.util.KubevirtNetworkingUtil.k8sClient;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Associates the kubevirt container port and pod.
+ */
+@Component(immediate = true)
+public class KubevirtPodPortMapper {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String NETWORK_STATUS_KEY = "k8s.v1.cni.cncf.io/network-status";
+ private static final String NAME = "name";
+ private static final String IPS = "ips";
+ private static final String NETWORK_PREFIX = "default/";
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected CoreService coreService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected MastershipService mastershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected ClusterService clusterService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected LeadershipService leadershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected DeviceService deviceService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected DriverService driverService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtPortAdminService kubevirtPortAdminService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtNetworkAdminService kubevirtNetworkAdminService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtPodAdminService kubevirtPodAdminService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtApiConfigService kubevirtApiConfigService;
+
+ private final ExecutorService eventExecutor = newSingleThreadExecutor(
+ groupedThreads(this.getClass().getSimpleName(), "event-handler"));
+
+ private final InternalKubevirtPodListener kubevirtPodListener =
+ new InternalKubevirtPodListener();
+
+ private ApplicationId appId;
+ private NodeId localNodeId;
+
+ @Activate
+ protected void activate() {
+ appId = coreService.registerApplication(KUBEVIRT_NETWORKING_APP_ID);
+ localNodeId = clusterService.getLocalNode().id();
+ leadershipService.runForLeadership(appId.name());
+ kubevirtPodAdminService.addListener(kubevirtPodListener);
+
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ kubevirtPodAdminService.removeListener(kubevirtPodListener);
+ leadershipService.withdraw(appId.name());
+ eventExecutor.shutdown();
+
+ log.info("Stopped");
+ }
+
+ private class InternalKubevirtPodListener implements KubevirtPodListener {
+
+ private boolean isRelevantHelper() {
+ return Objects.equals(localNodeId, leadershipService.getLeader(appId.name()));
+ }
+
+ @Override
+ public void event(KubevirtPodEvent event) {
+ switch (event.type()) {
+ case KUBEVIRT_POD_UPDATED:
+ eventExecutor.execute(() -> processPodUpdate(event.subject()));
+ break;
+ case KUBEVIRT_POD_REMOVED:
+ eventExecutor.execute(() -> processPodDeletion(event.subject()));
+ break;
+ case KUBEVIRT_POD_CREATED:
+ default:
+ // do nothing
+ break;
+ }
+ }
+
+ private void processPodUpdate(Pod pod) {
+ if (!isRelevantHelper()) {
+ return;
+ }
+
+ KubernetesClient client = k8sClient(kubevirtApiConfigService);
+
+ if (client == null) {
+ return;
+ }
+
+ KubevirtPort port = getPort(kubevirtNetworkAdminService.networks(), pod);
+ if (port == null) {
+ return;
+ }
+
+ if (kubevirtPortAdminService.port(port.macAddress()) != null) {
+ return;
+ }
+
+ if (port.ipAddress() == null) {
+ try {
+ IpAddress ip = kubevirtNetworkAdminService.allocateIp(port.networkId());
+ port = port.updateIpAddress(ip);
+
+ // update the POD annotation to inject the allocated IP address
+ String networkStatusStr = pod.getMetadata().getAnnotations().get(NETWORK_STATUS_KEY);
+ JSONArray networkStatus = new JSONArray(networkStatusStr);
+ for (int i = 0; i < networkStatus.length(); i++) {
+ JSONObject object = networkStatus.getJSONObject(i);
+ String name = object.getString(NAME);
+ KubevirtNetwork jsonNetwork = kubevirtNetworkAdminService.networks().stream()
+ .filter(n -> (NETWORK_PREFIX + n.name()).equals(name))
+ .findAny().orElse(null);
+ if (jsonNetwork != null) {
+ JSONArray ipsJson = new JSONArray();
+ ipsJson.put(ip.toString());
+ object.put(IPS, ipsJson);
+ }
+ }
+ Map<String, String> annots = pod.getMetadata().getAnnotations();
+ annots.put(NETWORK_STATUS_KEY, networkStatus.toString(4));
+
+ client.pods().inNamespace(pod.getMetadata().getNamespace())
+ .withName(pod.getMetadata().getName())
+ .edit(r -> new PodBuilder(r)
+ .editMetadata()
+ .addToAnnotations(annots)
+ .endMetadata().build()
+ );
+ } catch (Exception e) {
+ log.error("Failed to allocate IP address", e);
+ }
+ }
+ kubevirtPortAdminService.createPort(port);
+ }
+
+ private void processPodDeletion(Pod pod) {
+ if (!isRelevantHelper()) {
+ return;
+ }
+
+ KubernetesClient client = k8sClient(kubevirtApiConfigService);
+
+ if (client == null) {
+ return;
+ }
+
+ KubevirtPort port = getPort(kubevirtNetworkAdminService.networks(), pod);
+ if (port == null) {
+ return;
+ }
+
+ if (port.ipAddress() != null) {
+ kubevirtNetworkAdminService.releaseIp(port.networkId(), port.ipAddress());
+ }
+
+ kubevirtPortAdminService.removePort(port.macAddress());
+ }
+ }
+}