Add the logic of bootstrap kubevirt nodes on injection of apiConfig
Change-Id: I4de30be648bd70873ac6e36779b1c7ca638d7fe4
diff --git a/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtPhyInterface.java b/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtPhyInterface.java
index 40e8661..b3e0061 100644
--- a/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtPhyInterface.java
+++ b/apps/kubevirt-node/api/src/main/java/org/onosproject/kubevirtnode/api/KubevirtPhyInterface.java
@@ -15,6 +15,9 @@
*/
package org.onosproject.kubevirtnode.api;
+/**
+ * Representation of a KubeVirt physical interface used in KubeVirt networking service.
+ */
public interface KubevirtPhyInterface {
/**
* Returns physical network name that this interface binds to.
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtApiConfigListCommand.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtApiConfigListCommand.java
index d88cd0d..ce64d1e 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtApiConfigListCommand.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtApiConfigListCommand.java
@@ -44,8 +44,13 @@
print("%s", json(config));
} else {
print(FORMAT, "Scheme", "IpAddress", "Port", "State");
- print(FORMAT, config.scheme().name(), config.ipAddress().toString(),
- config.port(), config.state().name());
+ if (config != null) {
+ print(FORMAT, config.scheme().name(), config.ipAddress().toString(),
+ config.port(), config.state().name());
+ } else {
+ print("Kubevirt config not found!");
+ }
+
}
}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtNodeListCommand.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtNodeListCommand.java
index 97c6eaf..8503821 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtNodeListCommand.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtNodeListCommand.java
@@ -32,7 +32,6 @@
import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.genFormatString;
import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.prettyJson;
-
/**
* Lists all nodes registered to the service.
*/
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DefaultKubevirtApiConfigHandler.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DefaultKubevirtApiConfigHandler.java
new file mode 100644
index 0000000..699c41b
--- /dev/null
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DefaultKubevirtApiConfigHandler.java
@@ -0,0 +1,200 @@
+/*
+ * Copyright 2020-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.kubevirtnode.impl;
+
+import io.fabric8.kubernetes.api.model.Node;
+import io.fabric8.kubernetes.api.model.NodeAddress;
+import io.fabric8.kubernetes.client.KubernetesClient;
+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.kubevirtnode.api.DefaultKubevirtNode;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigAdminService;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigEvent;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigListener;
+import org.onosproject.kubevirtnode.api.KubevirtNode;
+import org.onosproject.kubevirtnode.api.KubevirtNodeAdminService;
+import org.onosproject.kubevirtnode.api.KubevirtNodeState;
+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.Objects;
+import java.util.concurrent.ExecutorService;
+
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
+import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfig.State.CONNECTED;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfigService.APP_ID;
+import static org.onosproject.kubevirtnode.api.KubevirtNode.Type.MASTER;
+import static org.onosproject.kubevirtnode.api.KubevirtNode.Type.WORKER;
+import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.k8sClient;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Handles the state of KubeVirt API server configuration.
+ */
+@Component(immediate = true)
+public class DefaultKubevirtApiConfigHandler {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String INTERNAL_IP = "InternalIP";
+ private static final String K8S_ROLE = "node-role.kubernetes.io";
+
+ private static final long SLEEP_MS = 10000; // we wait 10s
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected CoreService coreService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected LeadershipService leadershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected ClusterService clusterService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtApiConfigAdminService configAdminService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtNodeAdminService nodeAdminService;
+
+ private final ExecutorService eventExecutor = newSingleThreadExecutor(
+ groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
+
+ private final KubevirtApiConfigListener configListener = new InternalKubevirtApiConfigListener();
+
+ private ApplicationId appId;
+ private NodeId localNode;
+
+ @Activate
+ protected void activate() {
+ appId = coreService.getAppId(APP_ID);
+ localNode = clusterService.getLocalNode().id();
+ leadershipService.runForLeadership(appId.name());
+ configAdminService.addListener(configListener);
+
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ configAdminService.removeListener(configListener);
+ leadershipService.withdraw(appId.name());
+ eventExecutor.shutdown();
+
+ log.info("Stopped");
+ }
+
+ /**
+ * Checks the validity of the given kubernetes API server configuration.
+ *
+ * @param config kubernetes API server configuration
+ * @return validity result
+ */
+ private boolean checkApiServerConfig(KubevirtApiConfig config) {
+ KubernetesClient k8sClient = k8sClient(config);
+ return k8sClient != null && k8sClient.getApiVersion() != null;
+ }
+
+ private void bootstrapKubevirtNodes(KubevirtApiConfig config) {
+ KubernetesClient k8sClient = k8sClient(config);
+
+ if (k8sClient == null) {
+ log.warn("Failed to connect to kubernetes API server");
+ return;
+ }
+
+ for (Node node : k8sClient.nodes().list().getItems()) {
+ KubevirtNode kubevirtNode = buildKubevirtNode(node);
+ nodeAdminService.createNode(kubevirtNode);
+ }
+ }
+
+ private KubevirtNode buildKubevirtNode(Node node) {
+ String hostname = node.getMetadata().getName();
+ IpAddress managementIp = null;
+ IpAddress dataIp = null;
+
+ for (NodeAddress nodeAddress:node.getStatus().getAddresses()) {
+ if (nodeAddress.getType().equals(INTERNAL_IP)) {
+ managementIp = IpAddress.valueOf(nodeAddress.getAddress());
+ dataIp = IpAddress.valueOf(nodeAddress.getAddress());
+ }
+ }
+
+ String roleStr = node.getMetadata().getLabels().keySet().stream()
+ .filter(l -> l.contains(K8S_ROLE))
+ .findFirst().orElse(null);
+
+ KubevirtNode.Type nodeType = WORKER;
+ if (roleStr != null) {
+ String role = roleStr.split("/")[1];
+ if (MASTER.name().equalsIgnoreCase(role)) {
+ nodeType = MASTER;
+ } else {
+ nodeType = WORKER;
+ }
+ }
+
+ // TODO: need to config the physnet obtained from node's annotation
+ return DefaultKubevirtNode.builder()
+ .hostname(hostname)
+ .managementIp(managementIp)
+ .dataIp(dataIp)
+ .type(nodeType)
+ .state(KubevirtNodeState.ON_BOARDED)
+ .build();
+ }
+
+ private class InternalKubevirtApiConfigListener implements KubevirtApiConfigListener {
+
+ private boolean isRelevantHelper() {
+ return Objects.equals(localNode, leadershipService.getLeader(appId.name()));
+ }
+
+ @Override
+ public void event(KubevirtApiConfigEvent event) {
+ switch (event.type()) {
+ case KUBEVIRT_API_CONFIG_CREATED:
+ eventExecutor.execute(() -> processConfigCreation(event.subject()));
+ break;
+ default:
+ break;
+ }
+ }
+
+ private void processConfigCreation(KubevirtApiConfig config) {
+ if (!isRelevantHelper()) {
+ return;
+ }
+
+ if (checkApiServerConfig(config)) {
+ KubevirtApiConfig newConfig = config.updateState(CONNECTED);
+ configAdminService.updateApiConfig(newConfig);
+
+ bootstrapKubevirtNodes(config);
+ }
+ }
+ }
+}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtNodeStore.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtNodeStore.java
index ee488d4..d0bde71 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtNodeStore.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtNodeStore.java
@@ -15,10 +15,6 @@
*/
package org.onosproject.kubevirtnode.impl;
-/**
- * Implementation of kubevirt node store using consistent map.
- */
-
import com.google.common.collect.ImmutableSet;
import org.onlab.util.KryoNamespace;
import org.onosproject.core.ApplicationId;
@@ -60,6 +56,9 @@
import static org.onosproject.kubevirtnode.api.KubevirtNodeEvent.Type.KUBEVIRT_NODE_UPDATED;
import static org.slf4j.LoggerFactory.getLogger;
+/**
+ * Implementation of kubevirt node store using consistent map.
+ */
@Component(immediate = true, service = KubevirtNodeStore.class)
public class DistributedKubevirtNodeStore
extends AbstractStore<KubevirtNodeEvent, KubevirtNodeStoreDelegate>
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManager.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManager.java
index 06e2ccf..f99b1a2 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManager.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManager.java
@@ -15,10 +15,6 @@
*/
package org.onosproject.kubevirtnode.impl;
-/**
- * Service administering the inventory of KubeVirt API configs.
- */
-
import com.google.common.base.Strings;
import org.onosproject.cluster.ClusterService;
import org.onosproject.cluster.LeadershipService;
@@ -49,6 +45,9 @@
import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.endpoint;
import static org.slf4j.LoggerFactory.getLogger;
+/**
+ * Service administering the inventory of KubeVirt API configs.
+ */
@Component(
immediate = true,
service = {KubevirtApiConfigService.class, KubevirtApiConfigAdminService.class }
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtNodeManager.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtNodeManager.java
index 6578def..c77efa3 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtNodeManager.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtNodeManager.java
@@ -15,10 +15,6 @@
*/
package org.onosproject.kubevirtnode.impl;
-/**
- * Service administering the inventory of kubevirt nodes.
- */
-
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import org.onlab.packet.IpAddress;
@@ -66,6 +62,9 @@
import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.genDpid;
import static org.slf4j.LoggerFactory.getLogger;
+/**
+ * Service administering the inventory of kubevirt nodes.
+ */
@Component(
immediate = true,
service = {KubevirtNodeService.class, KubevirtNodeAdminService.class},
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/util/KubevirtNodeUtil.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/util/KubevirtNodeUtil.java
index dba7d35..57f989e 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/util/KubevirtNodeUtil.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/util/KubevirtNodeUtil.java
@@ -16,6 +16,9 @@
package org.onosproject.kubevirtnode.util;
import com.fasterxml.jackson.databind.ObjectMapper;
+import io.fabric8.kubernetes.client.ConfigBuilder;
+import io.fabric8.kubernetes.client.DefaultKubernetesClient;
+import io.fabric8.kubernetes.client.KubernetesClient;
import org.apache.commons.lang.StringUtils;
import org.onlab.packet.IpAddress;
import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
@@ -129,4 +132,34 @@
}
return null;
}
+
+ /**
+ * Obtains workable kubernetes client.
+ *
+ * @param config kubernetes API config
+ * @return kubernetes client
+ */
+ public static KubernetesClient k8sClient(KubevirtApiConfig config) {
+ if (config == null) {
+ log.warn("Kubernetes API server config is empty.");
+ return null;
+ }
+
+ String endpoint = endpoint(config);
+
+ ConfigBuilder configBuilder = new ConfigBuilder().withMasterUrl(endpoint);
+
+ if (config.scheme() == KubevirtApiConfig.Scheme.HTTPS) {
+ configBuilder.withTrustCerts(true)
+ .withCaCertData(config.caCertData())
+ .withClientCertData(config.clientCertData())
+ .withClientKeyData(config.clientKeyData());
+
+ if (StringUtils.isNotEmpty(config.token())) {
+ configBuilder.withOauthToken(config.token());
+ }
+ }
+
+ return new DefaultKubernetesClient(configBuilder.build());
+ }
}