[ONOS-7842] Implement host annotation using netcfg
Change-Id: I2c5c516d642b34f11cae994b3fea31ebd7d76219
diff --git a/core/api/src/main/java/org/onosproject/net/config/HostConfigOperator.java b/core/api/src/main/java/org/onosproject/net/config/HostConfigOperator.java
new file mode 100644
index 0000000..8134f49
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/config/HostConfigOperator.java
@@ -0,0 +1,52 @@
+/*
+ * 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.net.config;
+
+import com.google.common.annotations.Beta;
+import org.onosproject.net.HostId;
+import org.onosproject.net.host.HostDescription;
+
+import java.util.Optional;
+
+
+/**
+ * {@link ConfigOperator} for Host.
+ * <p>
+ * Note: We currently assume {@link HostConfigOperator}s are commutative.
+ */
+@Beta
+public interface HostConfigOperator extends ConfigOperator {
+
+ /**
+ * Binds {@link NetworkConfigService} to use for retrieving configuration.
+ *
+ * @param networkConfigService the service to use
+ */
+ void bindService(NetworkConfigService networkConfigService);
+
+
+ /**
+ * Generates a HostDescription containing fields from a HostDescription and
+ * configuration.
+ *
+ * @param hostId {@link HostId} representing the port.
+ * @param descr input {@link HostDescription}
+ * @param prevConfig previous config {@link Config}
+ * @return Combined {@link HostDescription}
+ */
+ HostDescription combine(HostId hostId, HostDescription descr,
+ Optional<Config> prevConfig);
+}
diff --git a/core/api/src/main/java/org/onosproject/net/config/basics/HostAnnotationConfig.java b/core/api/src/main/java/org/onosproject/net/config/basics/HostAnnotationConfig.java
new file mode 100644
index 0000000..4cca68b
--- /dev/null
+++ b/core/api/src/main/java/org/onosproject/net/config/basics/HostAnnotationConfig.java
@@ -0,0 +1,174 @@
+/*
+ * 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.net.config.basics;
+
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onosproject.net.HostId;
+import org.onosproject.net.config.BaseConfig;
+import org.onosproject.net.config.InvalidFieldException;
+import org.slf4j.Logger;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Configuration to add extra annotations to a host via netcfg subsystem.
+ */
+public class HostAnnotationConfig
+ extends BaseConfig<HostId> {
+
+ /**
+ * {@value #CONFIG_KEY} : a netcfg ConfigKey for {@link HostAnnotationConfig}.
+ */
+ public static final String CONFIG_KEY = "annotations";
+
+ /**
+ * JSON key for annotation entries.
+ * Value is a String.
+ */
+ private static final String ENTRIES = "entries";
+
+ private final Logger log = getLogger(getClass());
+
+ private static final int KEY_MAX_LENGTH = 1024;
+ private static final int VALUE_MAX_LENGTH = 1024;
+
+ @Override
+ public boolean isValid() {
+ JsonNode jsonNode = object.path(ENTRIES);
+ if (jsonNode.isObject()) {
+ jsonNode.fields().forEachRemaining(entry -> {
+ if (entry.getKey().length() > KEY_MAX_LENGTH) {
+ throw new InvalidFieldException(entry.getKey(),
+ entry.getKey() + " exceeds maximum length " + KEY_MAX_LENGTH);
+ }
+ if (entry.getValue().asText("").length() > VALUE_MAX_LENGTH) {
+ throw new InvalidFieldException(entry.getKey(),
+ entry.getKey() + " exceeds maximum length " + VALUE_MAX_LENGTH);
+ }
+ });
+ }
+ return hasField(ENTRIES) && object.get(ENTRIES).isObject();
+ }
+
+ /**
+ * Returns annotations to add to a Host.
+ *
+ * @return annotations as a map. null value represent key removal request
+ */
+ public Map<String, String> annotations() {
+ Map<String, String> map = new HashMap<>();
+
+ JsonNode jsonNode = object.path(ENTRIES);
+ if (!jsonNode.isObject()) {
+ return map;
+ }
+
+ jsonNode.fields().forEachRemaining(entry -> {
+ String key = entry.getKey();
+ JsonNode value = entry.getValue();
+ if (value.isTextual()) {
+ map.put(key, value.asText());
+ } else if (value.isNull()) {
+ map.put(key, null);
+ } else {
+ try {
+ map.put(key, mapper().writeValueAsString(value));
+ } catch (JsonProcessingException e) {
+ log.warn("Error processing JSON value for {}.", key, e);
+ }
+ }
+ });
+ return map;
+ }
+
+ /**
+ * Sets annotations to add to a Host.
+ *
+ * @param replace annotations to be added by this configuration.
+ * null value represent key removal request
+ * @return self
+ */
+ public HostAnnotationConfig annotations(Map<String, String> replace) {
+ ObjectNode anns = object.objectNode();
+ if (replace != null) {
+ replace.forEach(anns::put);
+ }
+ object.set(ENTRIES, anns);
+ return this;
+ }
+
+ /**
+ * Add configuration to set or remove annotation entry.
+ *
+ * @param key annotations key
+ * @param value annotations value. specifying null removes the entry.
+ * @return self
+ */
+ public HostAnnotationConfig annotation(String key, String value) {
+ JsonNode ent = object.path(ENTRIES);
+ ObjectNode obj = (ent.isObject()) ? (ObjectNode) ent : object.objectNode();
+
+ obj.put(key, value);
+
+ object.set(ENTRIES, obj);
+ return this;
+ }
+
+ /**
+ * Remove configuration about specified key.
+ *
+ * @param key annotations key
+ * @return self
+ */
+ public HostAnnotationConfig annotation(String key) {
+ JsonNode ent = object.path(ENTRIES);
+ ObjectNode obj = (ent.isObject()) ? (ObjectNode) ent : object.objectNode();
+
+ obj.remove(key);
+
+ object.set(ENTRIES, obj);
+ return this;
+ }
+
+ /**
+ * Create a detached {@link HostAnnotationConfig}.
+ * <p>
+ * Note: created instance needs to be initialized by #init(..) before using.
+ */
+ public HostAnnotationConfig() {
+ super();
+ }
+
+ /**
+ * Create a detached {@link HostAnnotationConfig} for specified host.
+ * <p>
+ * Note: created instance is not bound to NetworkConfigService,
+ * thus cannot use {@link #apply()}. Must be passed to the service
+ * using NetworkConfigService#applyConfig
+ *
+ * @param hostId Host id
+ */
+ public HostAnnotationConfig(HostId hostId) {
+ ObjectMapper mapper = new ObjectMapper();
+ init(hostId, CONFIG_KEY, mapper.createObjectNode(), mapper, null);
+ }
+}
diff --git a/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
index 1992283..c83c2c1 100644
--- a/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
+++ b/core/api/src/main/java/org/onosproject/net/host/DefaultHostDescription.java
@@ -167,6 +167,28 @@
this.configured = configured;
}
+ /**
+ * Creates a host description using the supplied information.
+ * @param base HostDescription to basic information
+ * @param annotations Annotations to use.
+ */
+ public DefaultHostDescription(HostDescription base, SparseAnnotations annotations) {
+ this(base.hwAddress(), base.vlan(), base.locations(), base.ipAddress(), base.innerVlan(), base.tpid(),
+ base.configured(), annotations);
+ }
+
+ /**
+ * Creates a host description using the supplied information.
+ *
+ * @param base base
+ * @param annotations annotations
+ * @return host description
+ */
+ public static DefaultHostDescription copyReplacingAnnotation(HostDescription base,
+ SparseAnnotations annotations) {
+ return new DefaultHostDescription(base, annotations);
+ }
+
@Override
public MacAddress hwAddress() {
return mac;