Add kubevirt API config service, expose it via REST API and CLI
Change-Id: I45a867ad54622656475758e7b4af38c19e551790
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
new file mode 100644
index 0000000..d88cd0d
--- /dev/null
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/cli/KubevirtApiConfigListCommand.java
@@ -0,0 +1,57 @@
+/*
+ * 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.cli;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.lifecycle.Service;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigService;
+
+import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.prettyJson;
+
+/**
+ * Lists all KubeVirt API server configs registered to the service.
+ */
+@Service
+@Command(scope = "onos", name = "kubevirt-api-configs",
+ description = "Lists all KubeVirt API server configs registered to the service")
+public class KubevirtApiConfigListCommand extends AbstractShellCommand {
+
+ private static final String FORMAT = "%-10s%-25s%-10s%-10s";
+
+ @Override
+ protected void doExecute() throws Exception {
+ KubevirtApiConfigService service = get(KubevirtApiConfigService.class);
+ KubevirtApiConfig config = service.apiConfig();
+
+ if (outputJson()) {
+ print("%s", json(config));
+ } else {
+ print(FORMAT, "Scheme", "IpAddress", "Port", "State");
+ print(FORMAT, config.scheme().name(), config.ipAddress().toString(),
+ config.port(), config.state().name());
+ }
+ }
+
+ private String json(KubevirtApiConfig config) {
+ ObjectMapper mapper = new ObjectMapper();
+ ObjectNode node = jsonForEntity(config, KubevirtApiConfig.class);
+ return prettyJson(mapper, node.toString());
+ }
+}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodec.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodec.java
new file mode 100644
index 0000000..3c09605
--- /dev/null
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/codec/KubevirtApiConfigCodec.java
@@ -0,0 +1,161 @@
+/*
+ * 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.codec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.apache.commons.lang.StringUtils;
+import org.onlab.packet.IpAddress;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.kubevirtnode.api.DefaultKubevirtApiConfig;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
+
+import static org.onlab.util.Tools.nullIsIllegal;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfig.Scheme.HTTPS;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfig.State.DISCONNECTED;
+
+/**
+ * KubeVirt API server config codec used for serializing and de-serializing JSON string.
+ */
+public final class KubevirtApiConfigCodec extends JsonCodec<KubevirtApiConfig> {
+
+ private static final String SCHEME = "scheme";
+ private static final String IP_ADDRESS = "ipAddress";
+ private static final String PORT = "port";
+ private static final String STATE = "state";
+ private static final String TOKEN = "token";
+ private static final String CA_CERT_DATA = "caCertData";
+ private static final String CLIENT_CERT_DATA = "clientCertData";
+ private static final String CLIENT_KEY_DATA = "clientKeyData";
+
+ private static final String MISSING_MESSAGE = " is required in KubevirtApiConfig";
+
+ @Override
+ public ObjectNode encode(KubevirtApiConfig entity, CodecContext context) {
+ ObjectNode node = context.mapper().createObjectNode()
+ .put(SCHEME, entity.scheme().name())
+ .put(IP_ADDRESS, entity.ipAddress().toString())
+ .put(PORT, entity.port())
+ .put(STATE, entity.state().name());
+
+ if (entity.scheme() == HTTPS) {
+ node.put(CA_CERT_DATA, entity.caCertData())
+ .put(CLIENT_CERT_DATA, entity.clientCertData())
+ .put(CLIENT_KEY_DATA, entity.clientKeyData());
+
+ if (entity.token() != null) {
+ node.put(TOKEN, entity.token());
+ }
+
+ } else {
+ if (entity.token() != null) {
+ node.put(TOKEN, entity.token());
+ }
+
+ if (entity.caCertData() != null) {
+ node.put(CA_CERT_DATA, entity.caCertData());
+ }
+
+ if (entity.clientCertData() != null) {
+ node.put(CLIENT_CERT_DATA, entity.clientCertData());
+ }
+
+ if (entity.clientKeyData() != null) {
+ node.put(CLIENT_KEY_DATA, entity.clientKeyData());
+ }
+ }
+
+ return node;
+ }
+
+ @Override
+ public KubevirtApiConfig decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ KubevirtApiConfig.Scheme scheme = KubevirtApiConfig.Scheme.valueOf(nullIsIllegal(
+ json.get(SCHEME).asText(), SCHEME + MISSING_MESSAGE));
+ IpAddress ipAddress = IpAddress.valueOf(nullIsIllegal(
+ json.get(IP_ADDRESS).asText(), IP_ADDRESS + MISSING_MESSAGE));
+ int port = json.get(PORT).asInt();
+
+ KubevirtApiConfig.Builder builder = DefaultKubevirtApiConfig.builder()
+ .scheme(scheme)
+ .ipAddress(ipAddress)
+ .port(port)
+ .state(DISCONNECTED);
+
+ JsonNode tokenJson = json.get(TOKEN);
+ JsonNode caCertDataJson = json.get(CA_CERT_DATA);
+ JsonNode clientCertDataJson = json.get(CLIENT_CERT_DATA);
+ JsonNode clientKeyDataJson = json.get(CLIENT_KEY_DATA);
+
+ String token = "";
+ String caCertData = "";
+ String clientCertData = "";
+ String clientKeyData = "";
+
+ if (scheme == HTTPS) {
+ caCertData = nullIsIllegal(caCertDataJson.asText(),
+ CA_CERT_DATA + MISSING_MESSAGE);
+ clientCertData = nullIsIllegal(clientCertDataJson.asText(),
+ CLIENT_CERT_DATA + MISSING_MESSAGE);
+ clientKeyData = nullIsIllegal(clientKeyDataJson.asText(),
+ CLIENT_KEY_DATA + MISSING_MESSAGE);
+
+ if (tokenJson != null) {
+ token = tokenJson.asText();
+ }
+
+ } else {
+ if (tokenJson != null) {
+ token = tokenJson.asText();
+ }
+
+ if (caCertDataJson != null) {
+ caCertData = caCertDataJson.asText();
+ }
+
+ if (clientCertDataJson != null) {
+ clientCertData = clientCertDataJson.asText();
+ }
+
+ if (clientKeyDataJson != null) {
+ clientKeyData = clientKeyDataJson.asText();
+ }
+ }
+
+ if (StringUtils.isNotEmpty(token)) {
+ builder.token(token);
+ }
+
+ if (StringUtils.isNotEmpty(caCertData)) {
+ builder.caCertData(caCertData);
+ }
+
+ if (StringUtils.isNotEmpty(clientCertData)) {
+ builder.clientCertData(clientCertData);
+ }
+
+ if (StringUtils.isNotEmpty(clientKeyData)) {
+ builder.clientKeyData(clientKeyData);
+ }
+
+ return builder.build();
+ }
+}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtApiConfigStore.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtApiConfigStore.java
new file mode 100644
index 0000000..991b52a
--- /dev/null
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/DistributedKubevirtApiConfigStore.java
@@ -0,0 +1,184 @@
+/*
+ * 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 com.google.common.collect.ImmutableSet;
+import org.onlab.util.KryoNamespace;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreService;
+import org.onosproject.kubevirtnode.api.DefaultKubevirtApiConfig;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigEvent;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigStore;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigStoreDelegate;
+import org.onosproject.store.AbstractStore;
+import org.onosproject.store.serializers.KryoNamespaces;
+import org.onosproject.store.service.ConsistentMap;
+import org.onosproject.store.service.MapEvent;
+import org.onosproject.store.service.MapEventListener;
+import org.onosproject.store.service.Serializer;
+import org.onosproject.store.service.StorageService;
+import org.onosproject.store.service.Versioned;
+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.Collection;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static java.util.concurrent.Executors.newSingleThreadExecutor;
+import static org.onlab.util.Tools.groupedThreads;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfigEvent.Type.KUBEVIRT_API_CONFIG_CREATED;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfigEvent.Type.KUBEVIRT_API_CONFIG_REMOVED;
+import static org.onosproject.kubevirtnode.api.KubevirtApiConfigEvent.Type.KUBEVIRT_API_CONFIG_UPDATED;
+import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.endpoint;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Implementation of KubeVirt API config store using consistent map.
+ */
+@Component(immediate = true, service = KubevirtApiConfigStore.class)
+public class DistributedKubevirtApiConfigStore
+ extends AbstractStore<KubevirtApiConfigEvent, KubevirtApiConfigStoreDelegate>
+ implements KubevirtApiConfigStore {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String ERR_NOT_FOUND = " does not exist";
+ private static final String ERR_DUPLICATE = " already exists";
+ private static final String APP_ID = "org.onosproject.kubevirtnode";
+
+ private static final KryoNamespace
+ SERIALIZER_KUBEVIRT_API_CONFIG = KryoNamespace.newBuilder()
+ .register(KryoNamespaces.API)
+ .register(KubevirtApiConfig.class)
+ .register(DefaultKubevirtApiConfig.class)
+ .register(KubevirtApiConfig.Scheme.class)
+ .register(KubevirtApiConfig.State.class)
+ .register(Collection.class)
+ .build();
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected CoreService coreService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected StorageService storageService;
+
+ private final ExecutorService eventExecutor = newSingleThreadExecutor(
+ groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
+
+ private final MapEventListener<String, KubevirtApiConfig> apiConfigMapListener =
+ new KubevirtApiConfigMapListener();
+ private ConsistentMap<String, KubevirtApiConfig> apiConfigStore;
+
+ @Activate
+ protected void activate() {
+ ApplicationId appId = coreService.registerApplication(APP_ID);
+ apiConfigStore = storageService.<String, KubevirtApiConfig>consistentMapBuilder()
+ .withSerializer(Serializer.using(SERIALIZER_KUBEVIRT_API_CONFIG))
+ .withName("k8s-apiconfig-store")
+ .withApplicationId(appId)
+ .build();
+ apiConfigStore.addListener(apiConfigMapListener);
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ apiConfigStore.removeListener(apiConfigMapListener);
+ eventExecutor.shutdown();
+ log.info("Stopped");
+ }
+
+ @Override
+ public void createApiConfig(KubevirtApiConfig config) {
+ String key = endpoint(config);
+ apiConfigStore.compute(key, (endpoint, existing) -> {
+ final String error = key + ERR_DUPLICATE;
+ checkArgument(existing == null, error);
+ return config;
+ });
+ }
+
+ @Override
+ public void updateApiConfig(KubevirtApiConfig config) {
+ String key = endpoint(config);
+ apiConfigStore.compute(key, (endpoint, existing) -> {
+ final String error = key + ERR_NOT_FOUND;
+ checkArgument(existing != null, error);
+ return config;
+ });
+ }
+
+ @Override
+ public KubevirtApiConfig removeApiConfig(String endpoint) {
+ Versioned<KubevirtApiConfig> apiConfig = apiConfigStore.remove(endpoint);
+ if (apiConfig == null) {
+ final String error = endpoint + ERR_NOT_FOUND;
+ throw new IllegalArgumentException(error);
+ }
+ return apiConfig.value();
+ }
+
+ @Override
+ public Set<KubevirtApiConfig> apiConfigs() {
+ return ImmutableSet.copyOf(apiConfigStore.asJavaMap().values());
+ }
+
+ @Override
+ public KubevirtApiConfig apiConfig(String endpoint) {
+ return apiConfigStore.asJavaMap().get(endpoint);
+ }
+
+ private class KubevirtApiConfigMapListener
+ implements MapEventListener<String, KubevirtApiConfig> {
+
+ @Override
+ public void event(MapEvent<String, KubevirtApiConfig> event) {
+ switch (event.type()) {
+ case INSERT:
+ log.debug("Kubevirt API config created {}", event.newValue());
+ eventExecutor.execute(() ->
+ notifyDelegate(new KubevirtApiConfigEvent(
+ KUBEVIRT_API_CONFIG_CREATED, event.newValue().value()
+ )));
+ break;
+ case UPDATE:
+ log.debug("Kubevirt API config updated {}", event.newValue());
+ eventExecutor.execute(() ->
+ notifyDelegate(new KubevirtApiConfigEvent(
+ KUBEVIRT_API_CONFIG_UPDATED, event.newValue().value()
+ )));
+ break;
+ case REMOVE:
+ log.debug("Kubevirt API config removed {}", event.oldValue());
+ eventExecutor.execute(() ->
+ notifyDelegate(new KubevirtApiConfigEvent(
+ KUBEVIRT_API_CONFIG_REMOVED, event.oldValue().value()
+ )));
+ break;
+ default:
+ // do nothing
+ break;
+ }
+ }
+ }
+}
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
new file mode 100644
index 0000000..06e2ccf
--- /dev/null
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/impl/KubevirtApiConfigManager.java
@@ -0,0 +1,152 @@
+/*
+ * 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;
+
+/**
+ * Service administering the inventory of KubeVirt API configs.
+ */
+
+import com.google.common.base.Strings;
+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.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.KubevirtApiConfigService;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigStore;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigStoreDelegate;
+import org.onosproject.store.service.StorageService;
+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.concurrent.ExecutorService;
+
+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.util.Tools.groupedThreads;
+import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.endpoint;
+import static org.slf4j.LoggerFactory.getLogger;
+
+@Component(
+ immediate = true,
+ service = {KubevirtApiConfigService.class, KubevirtApiConfigAdminService.class }
+)
+public class KubevirtApiConfigManager
+ extends ListenerRegistry<KubevirtApiConfigEvent, KubevirtApiConfigListener>
+ implements KubevirtApiConfigService, KubevirtApiConfigAdminService {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String MSG_CONFIG = "KubeVirt API config %s %s";
+ 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 ERR_NULL_CONFIG = "KubeVirt API config cannot be null";
+ private static final String ERR_NULL_ENDPOINT = "KubeVirt API endpoint cannot be null";
+ private static final String ERR_UNIQUE_CONFIG = "KubeVirt API config should be unique";
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected CoreService coreService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected ClusterService clusterService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected LeadershipService leadershipService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected StorageService storageService;
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected KubevirtApiConfigStore configStore;
+
+ private final ExecutorService eventExecutor = newSingleThreadExecutor(
+ groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
+
+ private final KubevirtApiConfigStoreDelegate delegate = new InternalApiConfigStoreDelegate();
+
+ private ApplicationId appId;
+
+ @Activate
+ protected void activate() {
+ appId = coreService.registerApplication(APP_ID);
+ configStore.setDelegate(delegate);
+
+ leadershipService.runForLeadership(appId.name());
+
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ configStore.unsetDelegate(delegate);
+
+ leadershipService.withdraw(appId.name());
+ eventExecutor.shutdown();
+
+ log.info("Stopped");
+ }
+
+ @Override
+ public void createApiConfig(KubevirtApiConfig config) {
+ checkNotNull(config, ERR_NULL_CONFIG);
+ checkArgument(configStore.apiConfigs().size() == 0, ERR_UNIQUE_CONFIG);
+
+ configStore.createApiConfig(config);
+ log.info(String.format(MSG_CONFIG, endpoint(config), MSG_CREATED));
+ }
+
+ @Override
+ public void updateApiConfig(KubevirtApiConfig config) {
+ checkNotNull(config, ERR_NULL_CONFIG);
+ configStore.updateApiConfig(config);
+ log.info(String.format(MSG_CONFIG, endpoint(config), MSG_UPDATED));
+ }
+
+ @Override
+ public KubevirtApiConfig removeApiConfig(String endpoint) {
+ checkArgument(!Strings.isNullOrEmpty(endpoint), ERR_NULL_ENDPOINT);
+ KubevirtApiConfig config = configStore.removeApiConfig(endpoint);
+ log.info(String.format(MSG_CONFIG, endpoint, MSG_REMOVED));
+ return config;
+ }
+
+ @Override
+ public KubevirtApiConfig apiConfig() {
+ return configStore.apiConfigs().stream().findAny().orElse(null);
+ }
+
+ private class InternalApiConfigStoreDelegate implements KubevirtApiConfigStoreDelegate {
+
+ @Override
+ public void notify(KubevirtApiConfigEvent event) {
+ if (event != null) {
+ log.trace("send KubeVirt API config event {}", event);
+ process(event);
+ }
+ }
+ }
+}
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 646965b..dba7d35 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 org.apache.commons.lang.StringUtils;
+import org.onlab.packet.IpAddress;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,6 +46,37 @@
}
/**
+ * Generates endpoint URL by referring to scheme, ipAddress and port.
+ *
+ * @param apiConfig kubernetes API config
+ * @return generated endpoint URL
+ */
+ public static String endpoint(KubevirtApiConfig apiConfig) {
+ return endpoint(apiConfig.scheme(), apiConfig.ipAddress(), apiConfig.port());
+ }
+
+ /**
+ * Generates endpoint URL by referring to scheme, ipAddress and port.
+ *
+ * @param scheme scheme
+ * @param ipAddress IP address
+ * @param port port number
+ * @return generated endpoint URL
+ */
+ public static String endpoint(KubevirtApiConfig.Scheme scheme, IpAddress ipAddress, int port) {
+ StringBuilder endpoint = new StringBuilder();
+ String protocol = StringUtils.lowerCase(scheme.name());
+
+ endpoint.append(protocol);
+ endpoint.append(COLON_SLASH);
+ endpoint.append(ipAddress.toString());
+ endpoint.append(COLON);
+ endpoint.append(port);
+
+ return endpoint.toString();
+ }
+
+ /**
* Generates a DPID (of:0000000000000001) from an index value.
*
* @param index index value
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResource.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResource.java
new file mode 100644
index 0000000..1c6985b
--- /dev/null
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtApiConfigWebResource.java
@@ -0,0 +1,134 @@
+/*
+ * 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.web;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfigAdminService;
+import org.onosproject.rest.AbstractWebResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.UriBuilder;
+import javax.ws.rs.core.UriInfo;
+import java.io.InputStream;
+
+import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import static javax.ws.rs.core.Response.created;
+import static org.onlab.util.Tools.readTreeFromStream;
+import static org.onosproject.kubevirtnode.util.KubevirtNodeUtil.endpoint;
+
+/**
+ * Handles REST API call of kubernetes node config.
+ */
+@Path("api-config")
+public class KubevirtApiConfigWebResource extends AbstractWebResource {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private static final String MESSAGE_CONFIG = "Received API config %s request";
+
+ private static final String CREATE = "CREATE";
+ private static final String UPDATE = "UPDATE";
+ private static final String REMOVE = "REMOVE";
+ private static final String QUERY = "QUERY";
+ private static final String API_CONFIG = "apiConfig";
+
+ private static final String ENDPOINT = "endpoint";
+ private static final String ERROR_MESSAGE = " cannot be null";
+
+ private final KubevirtApiConfigAdminService service = get(KubevirtApiConfigAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
+
+ /**
+ * Creates a set of KubeVirt API config from the JSON input stream.
+ *
+ * @param input KubeVirt API configs JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is malformed
+ * @onos.rsModel KubevirtApiConfig
+ */
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response createApiConfigs(InputStream input) {
+ log.trace(String.format(MESSAGE_CONFIG, CREATE));
+
+ KubevirtApiConfig config = readApiConfig(input);
+ if (config != null) {
+ service.createApiConfig(config);
+ }
+
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(API_CONFIG);
+
+ return created(locationBuilder.build()).build();
+ }
+
+ /**
+ * Removes a KubeVirt API config.
+ *
+ * @param endpoint KubeVirt API endpoint
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the JSON is malformed
+ */
+ @DELETE
+ @Path("{endpoint : .+}")
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response deleteApiConfig(@PathParam("endpoint") String endpoint) {
+ log.trace(String.format(MESSAGE_CONFIG, REMOVE));
+
+ KubevirtApiConfig existing = service.apiConfig();
+
+ if (existing == null) {
+ log.warn("There is no API configuration to delete");
+ return Response.notModified().build();
+ } else {
+ if (endpoint.equals(endpoint(existing))) {
+ service.removeApiConfig(endpoint);
+ } else {
+ log.warn("There is no API configuration to delete for endpoint {}", endpoint);
+ }
+ }
+
+ return Response.noContent().build();
+ }
+
+ private KubevirtApiConfig readApiConfig(InputStream input) {
+ KubevirtApiConfig config;
+ try {
+ JsonNode jsonTree = readTreeFromStream(mapper().enable(INDENT_OUTPUT), input);
+ ObjectNode objectNode = jsonTree.deepCopy();
+ config = codec(KubevirtApiConfig.class).decode(objectNode, this);
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ return config;
+ }
+}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeCodecRegister.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeCodecRegister.java
index efdf164..55d740f 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeCodecRegister.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeCodecRegister.java
@@ -16,8 +16,10 @@
package org.onosproject.kubevirtnode.web;
import org.onosproject.codec.CodecService;
+import org.onosproject.kubevirtnode.api.KubevirtApiConfig;
import org.onosproject.kubevirtnode.api.KubevirtNode;
import org.onosproject.kubevirtnode.api.KubevirtPhyInterface;
+import org.onosproject.kubevirtnode.codec.KubevirtApiConfigCodec;
import org.onosproject.kubevirtnode.codec.KubevirtNodeCodec;
import org.onosproject.kubevirtnode.codec.KubevirtPhyInterfaceCodec;
import org.osgi.service.component.annotations.Activate;
@@ -44,6 +46,7 @@
protected void activate() {
codecService.registerCodec(KubevirtNode.class, new KubevirtNodeCodec());
codecService.registerCodec(KubevirtPhyInterface.class, new KubevirtPhyInterfaceCodec());
+ codecService.registerCodec(KubevirtApiConfig.class, new KubevirtApiConfigCodec());
log.info("Started");
}
@@ -52,6 +55,7 @@
protected void deactivate() {
codecService.unregisterCodec(KubevirtNode.class);
codecService.unregisterCodec(KubevirtPhyInterface.class);
+ codecService.unregisterCodec(KubevirtApiConfig.class);
log.info("Stopped");
}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebApplication.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebApplication.java
index aa30a6a..5d03a76 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebApplication.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebApplication.java
@@ -25,6 +25,6 @@
public class KubevirtNodeWebApplication extends AbstractWebApplication {
@Override
public Set<Class<?>> getClasses() {
- return getClasses(KubevirtNodeWebResource.class);
+ return getClasses(KubevirtNodeWebResource.class, KubevirtApiConfigWebResource.class);
}
}
diff --git a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java
index e3b18ba..137fc11 100644
--- a/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java
+++ b/apps/kubevirt-node/app/src/main/java/org/onosproject/kubevirtnode/web/KubevirtNodeWebResource.java
@@ -50,7 +50,7 @@
/**
* Handles REST API call of KubeVirt node config.
*/
-@Path("configure")
+@Path("node")
public class KubevirtNodeWebResource extends AbstractWebResource {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -84,7 +84,6 @@
* @onos.rsModel KubevirtNode
*/
@POST
- @Path("node")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response createNodes(InputStream input) {
@@ -113,7 +112,6 @@
* @onos.rsModel KubevirtNode
*/
@PUT
- @Path("node")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response updateNodes(InputStream input) {
@@ -141,7 +139,7 @@
* 304 NOT_MODIFIED without the updated config
*/
@DELETE
- @Path("node/{hostname}")
+ @Path("{hostname}")
@Consumes(MediaType.APPLICATION_JSON)
@Produces(MediaType.APPLICATION_JSON)
public Response deleteNode(@PathParam("hostname") String hostname) {
@@ -186,7 +184,7 @@
*/
@GET
@Produces(MediaType.APPLICATION_JSON)
- @Path("init/node/{hostname}")
+ @Path("init/{hostname}")
public Response initNode(@PathParam("hostname") String hostname) {
log.trace(String.format(MESSAGE_NODE, QUERY));