[ONOS-7902] Add default implementation of k8s node with unit tests
Change-Id: I283967ae14dc7f38e749d7407e4bec698536c18b
diff --git a/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/Constants.java b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/Constants.java
new file mode 100644
index 0000000..0cded63
--- /dev/null
+++ b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/Constants.java
@@ -0,0 +1,34 @@
+/*
+ * Copyright 2019-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.k8snode.api;
+
+/**
+ * Provides constants used in Kubernetes node services.
+ */
+public final class Constants {
+
+ private Constants() {
+ }
+
+ public static final String INTEGRATION_BRIDGE = "br-int";
+ public static final String VXLAN_TUNNEL = "vxlan";
+ public static final String GRE_TUNNEL = "gre";
+ public static final String GENEVE_TUNNEL = "geneve";
+
+ public static final String VXLAN = "vxlan";
+ public static final String GRE = "gre";
+ public static final String GENEVE = "geneve";
+}
diff --git a/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/DefaultK8sNode.java b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/DefaultK8sNode.java
new file mode 100644
index 0000000..60c02b4
--- /dev/null
+++ b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/DefaultK8sNode.java
@@ -0,0 +1,270 @@
+/*
+ * Copyright 2019-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.k8snode.api;
+
+import com.google.common.base.MoreObjects;
+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.Objects;
+
+import static com.google.common.base.Preconditions.checkArgument;
+import static org.onosproject.k8snode.api.Constants.GENEVE_TUNNEL;
+import static org.onosproject.k8snode.api.Constants.GRE_TUNNEL;
+import static org.onosproject.k8snode.api.Constants.VXLAN_TUNNEL;
+import static org.onosproject.net.AnnotationKeys.PORT_NAME;
+
+/**
+ * Representation of a kubernetes node.
+ */
+public class DefaultK8sNode implements K8sNode {
+
+ private final String hostname;
+ private final Type type;
+ private final DeviceId intgBridge;
+ private final IpAddress managementIp;
+ private final IpAddress dataIp;
+ private final K8sNodeState state;
+
+ private static final String NOT_NULL_MSG = "Node % cannot be null";
+
+ private static final String OVSDB = "ovsdb:";
+
+ /**
+ * A default constructor of kubernetes Node.
+ *
+ * @param hostname hostname
+ * @param type node type
+ * @param intgBridge integration bridge
+ * @param managementIp management IP address
+ * @param dataIp data IP address
+ * @param state node state
+ */
+ protected DefaultK8sNode(String hostname, Type type, DeviceId intgBridge,
+ IpAddress managementIp, IpAddress dataIp, K8sNodeState state) {
+ this.hostname = hostname;
+ this.type = type;
+ this.intgBridge = intgBridge;
+ this.managementIp = managementIp;
+ this.dataIp = dataIp;
+ this.state = state;
+ }
+
+ @Override
+ public String hostname() {
+ return hostname;
+ }
+
+ @Override
+ public Type type() {
+ return type;
+ }
+
+ @Override
+ public DeviceId ovsdb() {
+ return DeviceId.deviceId(OVSDB + managementIp().toString());
+ }
+
+ @Override
+ public DeviceId intgBridge() {
+ return intgBridge;
+ }
+
+ @Override
+ public IpAddress managementIp() {
+ return managementIp;
+ }
+
+ @Override
+ public IpAddress dataIp() {
+ return dataIp;
+ }
+
+ @Override
+ public K8sNodeState state() {
+ return state;
+ }
+
+ @Override
+ public K8sNode updateState(K8sNodeState newState) {
+ return new Builder()
+ .hostname(hostname)
+ .type(type)
+ .intgBridge(intgBridge)
+ .managementIp(managementIp)
+ .dataIp(dataIp)
+ .state(newState)
+ .build();
+ }
+
+ @Override
+ public PortNumber grePortNum() {
+ return tunnelPortNum(GRE_TUNNEL);
+ }
+
+ @Override
+ public PortNumber vxlanPortNum() {
+ return tunnelPortNum(VXLAN_TUNNEL);
+ }
+
+ @Override
+ public PortNumber genevePortNum() {
+ return tunnelPortNum(GENEVE_TUNNEL);
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) {
+ return true;
+ }
+
+ if (obj instanceof DefaultK8sNode) {
+ DefaultK8sNode that = (DefaultK8sNode) obj;
+
+ return hostname.equals(that.hostname) &&
+ type == that.type &&
+ intgBridge.equals(that.intgBridge) &&
+ managementIp.equals(that.managementIp) &&
+ dataIp.equals(that.dataIp) &&
+ state == that.state;
+ }
+
+ return false;
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hash(hostname, type, intgBridge, managementIp, dataIp, state);
+ }
+
+ @Override
+ public String toString() {
+ return MoreObjects.toStringHelper(this)
+ .add("hostname", hostname)
+ .add("type", type)
+ .add("intgBridge", intgBridge)
+ .add("managementIp", managementIp)
+ .add("dataIp", dataIp)
+ .add("state", state)
+ .toString();
+ }
+
+ private PortNumber tunnelPortNum(String tunnelType) {
+ if (dataIp == null) {
+ return null;
+ }
+ DeviceService deviceService = DefaultServiceDirectory.getService(DeviceService.class);
+ Port port = deviceService.getPorts(intgBridge).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.
+ *
+ * @return kubernetes node builder
+ */
+ public static Builder builder() {
+ return new Builder();
+ }
+
+ /**
+ * Returns new builder instance with the given node as a default value.
+ *
+ * @param node kubernetes node
+ * @return kubernetes node builder
+ */
+ public static Builder from(K8sNode node) {
+ return new Builder()
+ .hostname(node.hostname())
+ .type(node.type())
+ .intgBridge(node.intgBridge())
+ .managementIp(node.managementIp())
+ .dataIp(node.dataIp())
+ .state(node.state());
+ }
+
+ public static final class Builder implements K8sNode.Builder {
+
+ private String hostname;
+ private Type type;
+ private DeviceId intgBridge;
+ private IpAddress managementIp;
+ private IpAddress dataIp;
+ private K8sNodeState state;
+
+ // private constructor not intended to use from external
+ private Builder() {
+ }
+
+ @Override
+ public K8sNode build() {
+ checkArgument(hostname != null, NOT_NULL_MSG, "hostname");
+ checkArgument(type != null, NOT_NULL_MSG, "type");
+ checkArgument(state != null, NOT_NULL_MSG, "state");
+ checkArgument(managementIp != null, NOT_NULL_MSG, "management IP");
+
+ return new DefaultK8sNode(hostname,
+ type,
+ intgBridge,
+ managementIp,
+ dataIp,
+ state);
+ }
+
+ @Override
+ public Builder hostname(String hostname) {
+ this.hostname = hostname;
+ return this;
+ }
+
+ @Override
+ public Builder type(Type type) {
+ this.type = type;
+ return this;
+ }
+
+ @Override
+ public Builder intgBridge(DeviceId deviceId) {
+ this.intgBridge = deviceId;
+ return this;
+ }
+
+ @Override
+ public Builder managementIp(IpAddress managementIp) {
+ this.managementIp = managementIp;
+ return this;
+ }
+
+ @Override
+ public Builder dataIp(IpAddress dataIp) {
+ this.dataIp = dataIp;
+ return this;
+ }
+
+ @Override
+ public Builder state(K8sNodeState state) {
+ this.state = state;
+ return this;
+ }
+ }
+}
diff --git a/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNode.java b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNode.java
index 8f307b5..13b1f47 100644
--- a/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNode.java
+++ b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNode.java
@@ -89,6 +89,14 @@
K8sNodeState state();
/**
+ * Returns new kubernetes node instance with given state.
+ *
+ * @param newState updated state
+ * @return updated kubernetes node
+ */
+ K8sNode updateState(K8sNodeState newState);
+
+ /**
* Returns the GRE tunnel port number.
*
* @return GRE port number; null if the GRE tunnel port does not exist
diff --git a/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNodeEvent.java b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNodeEvent.java
index 841fe01..e9209184 100644
--- a/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNodeEvent.java
+++ b/apps/k8s-node/api/src/main/java/org/onosproject/k8snode/api/K8sNodeEvent.java
@@ -59,7 +59,7 @@
* @param type event type
* @param subject kubernetes node
*/
- protected K8sNodeEvent(Type type, K8sNode subject) {
+ public K8sNodeEvent(Type type, K8sNode subject) {
super(type, subject);
}
}
diff --git a/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java b/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java
new file mode 100644
index 0000000..d30c798
--- /dev/null
+++ b/apps/k8s-node/api/src/test/java/org/onosproject/k8snode/api/DefaultK8sNodeTest.java
@@ -0,0 +1,202 @@
+/*
+ * Copyright 2019-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.k8snode.api;
+
+import com.google.common.testing.EqualsTester;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.packet.ChassisId;
+import org.onlab.packet.IpAddress;
+import org.onosproject.k8snode.api.K8sNode.Type;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.provider.ProviderId;
+
+import static junit.framework.TestCase.assertEquals;
+import static junit.framework.TestCase.assertSame;
+import static org.onosproject.k8snode.api.K8sNode.Type.MINION;
+import static org.onosproject.k8snode.api.K8sNodeState.COMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeState.DEVICE_CREATED;
+import static org.onosproject.k8snode.api.K8sNodeState.INIT;
+import static org.onosproject.net.Device.Type.SWITCH;
+
+/**
+ * Unit test for DefaultK8sNode.
+ */
+public final class DefaultK8sNodeTest {
+
+ private static final IpAddress TEST_IP = IpAddress.valueOf("10.100.0.3");
+
+ private static final String HOSTNAME_1 = "hostname_1";
+ private static final String HOSTNAME_2 = "hostname_2";
+ private static final Device DEVICE_1 = createDevice(1);
+ private static final Device DEVICE_2 = createDevice(2);
+
+ private static final IpAddress MANAGEMENT_IP = IpAddress.valueOf("10.10.10.10");
+ private static final IpAddress DATA_IP = IpAddress.valueOf("20.20.20.20");
+
+ private K8sNode refNode;
+
+ private static final K8sNode K8S_NODE_1 = createNode(
+ HOSTNAME_1,
+ MINION,
+ DEVICE_1,
+ TEST_IP,
+ INIT);
+ private static final K8sNode K8S_NODE_2 = createNode(
+ HOSTNAME_1,
+ MINION,
+ DEVICE_1,
+ TEST_IP,
+ INIT);
+ private static final K8sNode K8S_NODE_3 = createNode(
+ HOSTNAME_2,
+ MINION,
+ DEVICE_2,
+ TEST_IP,
+ INIT);
+
+ /**
+ * Initial setup for this unit test.
+ */
+ @Before
+ public void setUp() {
+ refNode = DefaultK8sNode.builder()
+ .hostname(HOSTNAME_1)
+ .type(MINION)
+ .managementIp(MANAGEMENT_IP)
+ .dataIp(DATA_IP)
+ .intgBridge(DEVICE_1.id())
+ .state(COMPLETE)
+ .build();
+ }
+
+ /**
+ * Checks equals method works as expected.
+ */
+ @Test
+ public void testEquality() {
+ new EqualsTester().addEqualityGroup(K8S_NODE_1, K8S_NODE_2)
+ .addEqualityGroup(K8S_NODE_3)
+ .testEquals();
+ }
+
+ /**
+ * Test object construction.
+ */
+ @Test
+ public void testConstruction() {
+ checkCommonProperties(refNode);
+ assertSame(refNode.state(), COMPLETE);
+ assertEquals(refNode.intgBridge(), DEVICE_1.id());
+ }
+
+ /**
+ * Checks the functionality of update state method.
+ */
+ @Test
+ public void testUpdateState() {
+ K8sNode updatedNode = refNode.updateState(DEVICE_CREATED);
+
+ checkCommonProperties(updatedNode);
+ assertSame(updatedNode.state(), DEVICE_CREATED);
+ }
+
+ /**
+ * Checks the functionality of from method.
+ */
+ @Test
+ public void testFrom() {
+ K8sNode updatedNode = DefaultK8sNode.from(refNode).build();
+
+ assertEquals(updatedNode, refNode);
+ }
+
+ /**
+ * Checks building a node without hostname fails with proper exception.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testBuildWithoutHostname() {
+ DefaultK8sNode.builder()
+ .type(MINION)
+ .intgBridge(DEVICE_1.id())
+ .managementIp(TEST_IP)
+ .dataIp(TEST_IP)
+ .state(INIT)
+ .build();
+ }
+
+ /**
+ * Checks building a node without type fails with proper exception.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testBuildWithoutType() {
+ DefaultK8sNode.builder()
+ .hostname(HOSTNAME_1)
+ .intgBridge(DEVICE_1.id())
+ .managementIp(TEST_IP)
+ .dataIp(TEST_IP)
+ .state(INIT)
+ .build();
+ }
+
+ /**
+ * Checks building a node without management IP address fails with
+ * proper exception.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testBuildWithoutManagementIp() {
+ DefaultK8sNode.builder()
+ .hostname(HOSTNAME_1)
+ .type(MINION)
+ .intgBridge(DEVICE_1.id())
+ .dataIp(TEST_IP)
+ .state(INIT)
+ .build();
+ }
+
+ private void checkCommonProperties(K8sNode node) {
+ assertEquals(node.hostname(), HOSTNAME_1);
+ assertEquals(node.type(), MINION);
+ assertEquals(node.managementIp(), MANAGEMENT_IP);
+ assertEquals(node.dataIp(), DATA_IP);
+ }
+
+ private static Device createDevice(long devIdNum) {
+ return new DefaultDevice(new ProviderId("of", "foo"),
+ DeviceId.deviceId(String.format("of:%016d", devIdNum)),
+ SWITCH,
+ "manufacturer",
+ "hwVersion",
+ "swVersion",
+ "serialNumber",
+ new ChassisId(1));
+ }
+
+ private static K8sNode createNode(String hostname, Type type,
+ Device intgBridge, IpAddress ipAddr,
+ K8sNodeState state) {
+ return DefaultK8sNode.builder()
+ .hostname(hostname)
+ .type(type)
+ .intgBridge(intgBridge.id())
+ .managementIp(ipAddr)
+ .dataIp(ipAddr)
+ .state(state)
+ .build();
+ }
+}
diff --git a/apps/k8s-node/app/BUILD b/apps/k8s-node/app/BUILD
index 90dc6e9..fd859b9 100644
--- a/apps/k8s-node/app/BUILD
+++ b/apps/k8s-node/app/BUILD
@@ -3,9 +3,10 @@
"//apps/k8s-node/api:onos-apps-k8s-node-api",
]
-TEST_DEPS = TEST_ADAPTERS + [
+TEST_DEPS = TEST_ADAPTERS + TEST_REST + [
"//core/api:onos-api-tests",
"//core/common:onos-core-common-tests",
+ "//web/api:onos-rest-tests",
]
osgi_jar_with_tests(
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/codec/K8sNodeCodec.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/codec/K8sNodeCodec.java
new file mode 100644
index 0000000..e07ad6c
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/codec/K8sNodeCodec.java
@@ -0,0 +1,102 @@
+/*
+ * Copyright 2019-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.k8snode.codec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.onlab.packet.IpAddress;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.k8snode.api.DefaultK8sNode;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNodeState;
+import org.onosproject.net.DeviceId;
+import org.slf4j.Logger;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+import static org.onlab.util.Tools.nullIsIllegal;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Kubernetes node codec used for serializing and de-serializing JSON string.
+ */
+public final class K8sNodeCodec extends JsonCodec<K8sNode> {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String HOSTNAME = "hostname";
+ private static final String TYPE = "type";
+ private static final String MANAGEMENT_IP = "managementIp";
+ private static final String DATA_IP = "dataIp";
+ private static final String INTEGRATION_BRIDGE = "integrationBridge";
+ private static final String STATE = "state";
+
+ private static final String MISSING_MESSAGE = " is required in K8sNode";
+
+ @Override
+ public ObjectNode encode(K8sNode node, CodecContext context) {
+ checkNotNull(node, "Kubernetes node cannot be null");
+
+ ObjectNode result = context.mapper().createObjectNode()
+ .put(HOSTNAME, node.hostname())
+ .put(TYPE, node.type().name())
+ .put(STATE, node.state().name())
+ .put(MANAGEMENT_IP, node.managementIp().toString());
+
+ if (node.intgBridge() != null) {
+ result.put(INTEGRATION_BRIDGE, node.intgBridge().toString());
+ }
+
+ if (node.dataIp() != null) {
+ result.put(DATA_IP, node.dataIp().toString());
+ }
+
+ return result;
+ }
+
+ @Override
+ public K8sNode decode(ObjectNode json, CodecContext context) {
+ if (json == null || !json.isObject()) {
+ return null;
+ }
+
+ String hostname = nullIsIllegal(json.get(HOSTNAME).asText(),
+ HOSTNAME + MISSING_MESSAGE);
+ String type = nullIsIllegal(json.get(TYPE).asText(),
+ TYPE + MISSING_MESSAGE);
+ String mIp = nullIsIllegal(json.get(MANAGEMENT_IP).asText(),
+ MANAGEMENT_IP + MISSING_MESSAGE);
+
+ DefaultK8sNode.Builder nodeBuilder = DefaultK8sNode.builder()
+ .hostname(hostname)
+ .type(K8sNode.Type.valueOf(type))
+ .state(K8sNodeState.INIT)
+ .managementIp(IpAddress.valueOf(mIp));
+
+ if (json.get(DATA_IP) != null) {
+ nodeBuilder.dataIp(IpAddress.valueOf(json.get(DATA_IP).asText()));
+ }
+
+ JsonNode intBridgeJson = json.get(INTEGRATION_BRIDGE);
+ if (intBridgeJson != null) {
+ nodeBuilder.intgBridge(DeviceId.deviceId(intBridgeJson.asText()));
+ }
+
+ log.trace("node is {}", nodeBuilder.build().toString());
+
+ return nodeBuilder.build();
+ }
+}
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DistributedK8sNodeStore.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DistributedK8sNodeStore.java
new file mode 100644
index 0000000..15d2697
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/DistributedK8sNodeStore.java
@@ -0,0 +1,201 @@
+/*
+ * Copyright 2019-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.k8snode.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.k8snode.api.DefaultK8sNode;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNodeEvent;
+import org.onosproject.k8snode.api.K8sNodeState;
+import org.onosproject.k8snode.api.K8sNodeStore;
+import org.onosproject.k8snode.api.K8sNodeStoreDelegate;
+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.k8snode.api.K8sNodeEvent.Type.K8S_NODE_COMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_CREATED;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_INCOMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_REMOVED;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_UPDATED;
+import static org.onosproject.k8snode.api.K8sNodeState.COMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeState.INCOMPLETE;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Implementation of kubernetes node store using consistent map.
+ */
+@Component(immediate = true, service = K8sNodeStore.class)
+public class DistributedK8sNodeStore
+ extends AbstractStore<K8sNodeEvent, K8sNodeStoreDelegate>
+ implements K8sNodeStore {
+
+ 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.k8snode";
+
+ private static final KryoNamespace
+ SERIALIZER_K8S_NODE = KryoNamespace.newBuilder()
+ .register(KryoNamespaces.API)
+ .register(K8sNode.class)
+ .register(DefaultK8sNode.class)
+ .register(K8sNode.Type.class)
+ .register(K8sNodeState.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, K8sNode> nodeMapListener =
+ new K8sNodeMapListener();
+ private ConsistentMap<String, K8sNode> nodeStore;
+
+ @Activate
+ protected void activate() {
+ ApplicationId appId = coreService.registerApplication(APP_ID);
+ nodeStore = storageService.<String, K8sNode>consistentMapBuilder()
+ .withSerializer(Serializer.using(SERIALIZER_K8S_NODE))
+ .withName("k8s-nodestore")
+ .withApplicationId(appId)
+ .build();
+ nodeStore.addListener(nodeMapListener);
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ nodeStore.removeListener(nodeMapListener);
+ eventExecutor.shutdown();
+ log.info("Stopped");
+ }
+
+ @Override
+ public void createNode(K8sNode node) {
+ nodeStore.compute(node.hostname(), (hostname, existing) -> {
+ final String error = node.hostname() + ERR_DUPLICATE;
+ checkArgument(existing == null, error);
+ return node;
+ });
+ }
+
+ @Override
+ public void updateNode(K8sNode node) {
+ nodeStore.compute(node.hostname(), (hostname, existing) -> {
+ final String error = node.hostname() + ERR_NOT_FOUND;
+ checkArgument(existing != null, error);
+ return node;
+ });
+ }
+
+ @Override
+ public K8sNode removeNode(String hostname) {
+ Versioned<K8sNode> node = nodeStore.remove(hostname);
+ if (node == null) {
+ final String error = hostname + ERR_NOT_FOUND;
+ throw new IllegalArgumentException(error);
+ }
+ return node.value();
+ }
+
+ @Override
+ public Set<K8sNode> nodes() {
+ return ImmutableSet.copyOf(nodeStore.asJavaMap().values());
+ }
+
+ @Override
+ public K8sNode node(String hostname) {
+ return nodeStore.asJavaMap().get(hostname);
+ }
+
+ private class K8sNodeMapListener
+ implements MapEventListener<String, K8sNode> {
+
+ @Override
+ public void event(MapEvent<String, K8sNode> event) {
+
+ switch (event.type()) {
+ case INSERT:
+ log.debug("Kubernetes node created {}", event.newValue());
+ eventExecutor.execute(() ->
+ notifyDelegate(new K8sNodeEvent(
+ K8S_NODE_CREATED, event.newValue().value()
+ )));
+ break;
+ case UPDATE:
+ log.debug("Kubernetes node updated {}", event.newValue());
+ eventExecutor.execute(() -> {
+ notifyDelegate(new K8sNodeEvent(
+ K8S_NODE_UPDATED,
+ event.newValue().value()
+ ));
+
+ if (event.newValue().value().state() == COMPLETE) {
+ notifyDelegate(new K8sNodeEvent(
+ K8S_NODE_COMPLETE,
+ event.newValue().value()
+ ));
+ } else if (event.newValue().value().state() == INCOMPLETE) {
+ notifyDelegate(new K8sNodeEvent(
+ K8S_NODE_INCOMPLETE,
+ event.newValue().value()
+ ));
+ }
+ });
+ break;
+ case REMOVE:
+ log.debug("Kubernetes node removed {}", event.oldValue());
+ eventExecutor.execute(() ->
+ notifyDelegate(new K8sNodeEvent(
+ K8S_NODE_REMOVED, event.oldValue().value()
+ )));
+ break;
+ default:
+ // do nothing
+ break;
+ }
+ }
+ }
+}
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/K8sNodeManager.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/K8sNodeManager.java
new file mode 100644
index 0000000..d80ef21
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/K8sNodeManager.java
@@ -0,0 +1,219 @@
+/*
+ * Copyright 2019-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.k8snode.impl;
+
+import com.google.common.base.Strings;
+import com.google.common.collect.ImmutableSet;
+import org.onlab.util.Tools;
+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.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNode.Type;
+import org.onosproject.k8snode.api.K8sNodeAdminService;
+import org.onosproject.k8snode.api.K8sNodeEvent;
+import org.onosproject.k8snode.api.K8sNodeListener;
+import org.onosproject.k8snode.api.K8sNodeService;
+import org.onosproject.k8snode.api.K8sNodeStore;
+import org.onosproject.k8snode.api.K8sNodeStoreDelegate;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.device.DeviceService;
+import org.onosproject.store.service.StorageService;
+import org.osgi.service.component.ComponentContext;
+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.Modified;
+import org.osgi.service.component.annotations.Reference;
+import org.osgi.service.component.annotations.ReferenceCardinality;
+import org.slf4j.Logger;
+
+import java.util.Dictionary;
+import java.util.Objects;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.stream.Collectors;
+
+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.k8snode.api.K8sNodeState.COMPLETE;
+import static org.onosproject.k8snode.impl.OsgiPropertyConstants.OVSDB_PORT;
+import static org.onosproject.k8snode.impl.OsgiPropertyConstants.OVSDB_PORT_NUM_DEFAULT;
+import static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Service administering the inventory of kubernetes nodes.
+ */
+@Component(
+ immediate = true,
+ service = { K8sNodeService.class, K8sNodeAdminService.class },
+ property = {
+ OVSDB_PORT + ":Integer=" + OVSDB_PORT_NUM_DEFAULT
+ }
+)
+public class K8sNodeManager
+ extends ListenerRegistry<K8sNodeEvent, K8sNodeListener>
+ implements K8sNodeService, K8sNodeAdminService {
+
+ private final Logger log = getLogger(getClass());
+
+ private static final String MSG_NODE = "Kubernetes node %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_NODE = "Kubernetes node cannot be null";
+ private static final String ERR_NULL_HOSTNAME = "Kubernetes node hostname cannot be null";
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected K8sNodeStore nodeStore;
+
+ @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 DeviceService deviceService;
+
+ /** OVSDB server listen port. */
+ private int ovsdbPortNum = OVSDB_PORT_NUM_DEFAULT;
+
+ private final ExecutorService eventExecutor = newSingleThreadExecutor(
+ groupedThreads(this.getClass().getSimpleName(), "event-handler", log));
+
+ private final K8sNodeStoreDelegate delegate = new K8sNodeManager.InternalNodeStoreDelegate();
+
+ private ApplicationId appId;
+
+ @Activate
+ protected void activate() {
+ appId = coreService.registerApplication(APP_ID);
+ nodeStore.setDelegate(delegate);
+
+ leadershipService.runForLeadership(appId.name());
+
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+ nodeStore.unsetDelegate(delegate);
+
+ leadershipService.withdraw(appId.name());
+ eventExecutor.shutdown();
+
+ log.info("Stopped");
+ }
+
+ @Modified
+ protected void modified(ComponentContext context) {
+ Dictionary<?, ?> properties = context.getProperties();
+ int updatedOvsdbPort = Tools.getIntegerProperty(properties, OVSDB_PORT);
+ if (!Objects.equals(updatedOvsdbPort, ovsdbPortNum)) {
+ ovsdbPortNum = updatedOvsdbPort;
+ }
+
+ log.info("Modified");
+ }
+
+ @Override
+ public void createNode(K8sNode node) {
+ checkNotNull(node, ERR_NULL_NODE);
+ nodeStore.createNode(node);
+ log.info(String.format(MSG_NODE, node.hostname(), MSG_CREATED));
+ }
+
+ @Override
+ public void updateNode(K8sNode node) {
+ checkNotNull(node, ERR_NULL_NODE);
+ nodeStore.updateNode(node);
+ log.info(String.format(MSG_NODE, node.hostname(), MSG_UPDATED));
+ }
+
+ @Override
+ public K8sNode removeNode(String hostname) {
+ checkArgument(!Strings.isNullOrEmpty(hostname), ERR_NULL_HOSTNAME);
+ K8sNode node = nodeStore.removeNode(hostname);
+ log.info(String.format(MSG_NODE, hostname, MSG_REMOVED));
+ return node;
+ }
+
+ @Override
+ public Set<K8sNode> nodes() {
+ return nodeStore.nodes();
+ }
+
+ @Override
+ public Set<K8sNode> nodes(Type type) {
+ Set<K8sNode> nodes = nodeStore.nodes().stream()
+ .filter(node -> Objects.equals(node.type(), type))
+ .collect(Collectors.toSet());
+ return ImmutableSet.copyOf(nodes);
+ }
+
+ @Override
+ public Set<K8sNode> completeNodes() {
+ Set<K8sNode> nodes = nodeStore.nodes().stream()
+ .filter(node -> node.state() == COMPLETE)
+ .collect(Collectors.toSet());
+ return ImmutableSet.copyOf(nodes);
+ }
+
+ @Override
+ public Set<K8sNode> completeNodes(Type type) {
+ Set<K8sNode> nodes = nodeStore.nodes().stream()
+ .filter(node -> node.type() == type &&
+ node.state() == COMPLETE)
+ .collect(Collectors.toSet());
+ return ImmutableSet.copyOf(nodes);
+ }
+
+ @Override
+ public K8sNode node(String hostname) {
+ return nodeStore.node(hostname);
+ }
+
+ @Override
+ public K8sNode node(DeviceId deviceId) {
+ return nodeStore.nodes().stream()
+ .filter(node -> Objects.equals(node.intgBridge(), deviceId) ||
+ Objects.equals(node.ovsdb(), deviceId))
+ .findFirst().orElse(null);
+ }
+
+ private class InternalNodeStoreDelegate implements K8sNodeStoreDelegate {
+
+ @Override
+ public void notify(K8sNodeEvent event) {
+ if (event != null) {
+ log.trace("send kubernetes node event {}", event);
+ process(event);
+ }
+ }
+ }
+}
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/OsgiPropertyConstants.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/OsgiPropertyConstants.java
new file mode 100644
index 0000000..eed9d93
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/OsgiPropertyConstants.java
@@ -0,0 +1,31 @@
+/*
+ * Copyright 2019-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.k8snode.impl;
+
+/**
+ * Name/Value constants for properties.
+ */
+public final class OsgiPropertyConstants {
+ private OsgiPropertyConstants() {
+ }
+
+ static final String OVSDB_PORT = "ovsdbPortNum";
+ static final int OVSDB_PORT_NUM_DEFAULT = 6640;
+
+ static final String AUTO_RECOVERY = "autoRecovery";
+ static final boolean AUTO_RECOVERY_DEFAULT = true;
+}
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeCodecRegister.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeCodecRegister.java
new file mode 100644
index 0000000..cb283f9
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeCodecRegister.java
@@ -0,0 +1,56 @@
+/*
+ * Copyright 2019-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.k8snode.web;
+
+import org.onosproject.codec.CodecService;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.codec.K8sNodeCodec;
+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 static org.slf4j.LoggerFactory.getLogger;
+
+/**
+ * Implementation of the JSON codec brokering service for K8sNode.
+ */
+@Component(immediate = true)
+public class K8sNodeCodecRegister {
+
+ private final Logger log = getLogger(getClass());
+
+ @Reference(cardinality = ReferenceCardinality.MANDATORY)
+ protected CodecService codecService;
+
+ @Activate
+ protected void activate() {
+
+ codecService.registerCodec(K8sNode.class, new K8sNodeCodec());
+
+ log.info("Started");
+ }
+
+ @Deactivate
+ protected void deactivate() {
+
+ codecService.unregisterCodec(K8sNode.class);
+
+ log.info("Stopped");
+ }
+}
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebApplication.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebApplication.java
new file mode 100644
index 0000000..7b13666
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebApplication.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2019-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.k8snode.web;
+
+import org.onlab.rest.AbstractWebApplication;
+
+import java.util.Set;
+
+/**
+ * Kubernetes node REST APIs web application.
+ */
+public class K8sNodeWebApplication extends AbstractWebApplication {
+ @Override
+ public Set<Class<?>> getClasses() {
+ return getClasses(K8sNodeWebResource.class);
+ }
+}
diff --git a/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java
new file mode 100644
index 0000000..0367e0f
--- /dev/null
+++ b/apps/k8s-node/app/src/main/java/org/onosproject/k8snode/web/K8sNodeWebResource.java
@@ -0,0 +1,178 @@
+/*
+ * Copyright 2019-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.k8snode.web;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.node.ArrayNode;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Sets;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNodeAdminService;
+import org.onosproject.rest.AbstractWebResource;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import javax.ws.rs.Consumes;
+import javax.ws.rs.POST;
+import javax.ws.rs.PUT;
+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 java.util.Set;
+
+import static com.fasterxml.jackson.databind.SerializationFeature.INDENT_OUTPUT;
+import static javax.ws.rs.core.Response.created;
+import static org.onlab.util.Tools.nullIsIllegal;
+import static org.onlab.util.Tools.readTreeFromStream;
+
+/**
+ * Handles REST API call of kubernetes node config.
+ */
+
+@Path("configure")
+public class K8sNodeWebResource extends AbstractWebResource {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private static final String MESSAGE_NODE = "Received node %s request";
+ private static final String NODES = "nodes";
+ private static final String CREATE = "CREATE";
+ private static final String UPDATE = "UPDATE";
+ private static final String NODE_ID = "NODE_ID";
+ private static final String DELETE = "DELETE";
+
+ private static final String HOST_NAME = "hostname";
+ private static final String ERROR_MESSAGE = " cannot be null";
+
+ private final K8sNodeAdminService adminService = get(K8sNodeAdminService.class);
+
+ @Context
+ private UriInfo uriInfo;
+
+ /**
+ * Creates a set of kubernetes nodes' config from the JSON input stream.
+ *
+ * @param input kubernetes nodes JSON input stream
+ * @return 201 CREATED if the JSON is correct, 400 BAD_REQUEST if the JSON
+ * is malformed
+ * @onos.rsModel K8sNode
+ */
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response createNodes(InputStream input) {
+ log.trace(String.format(MESSAGE_NODE, CREATE));
+
+ readNodeConfiguration(input).forEach(node -> {
+ K8sNode existing = adminService.node(node.hostname());
+ if (existing == null) {
+ adminService.createNode(node);
+ }
+ });
+
+ UriBuilder locationBuilder = uriInfo.getBaseUriBuilder()
+ .path(NODES)
+ .path(NODE_ID);
+
+ return created(locationBuilder.build()).build();
+ }
+
+ /**
+ * Updates a set of kubernetes nodes' config from the JSON input stream.
+ *
+ * @param input kubernetes nodes JSON input stream
+ * @return 200 OK with the updated kubernetes node's config, 400 BAD_REQUEST
+ * if the JSON is malformed, and 304 NOT_MODIFIED without the updated config
+ * @onos.rsModel K8sNode
+ */
+ @PUT
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ public Response updateNodes(InputStream input) {
+ log.trace(String.format(MESSAGE_NODE, UPDATE));
+
+ Set<K8sNode> nodes = readNodeConfiguration(input);
+ for (K8sNode node: nodes) {
+ K8sNode existing = adminService.node(node.hostname());
+ if (existing == null) {
+ log.warn("There is no node configuration to update : {}", node.hostname());
+ return Response.notModified().build();
+ } else if (!existing.equals(node)) {
+ adminService.updateNode(node);
+ }
+ }
+
+ return Response.ok().build();
+ }
+
+ /**
+ * Removes a set of kubernetes nodes' config from the JSON input stream.
+ *
+ * @param hostname host name contained in kubernetes nodes configuration
+ * @return 204 NO_CONTENT, 400 BAD_REQUEST if the JSON is malformed, and
+ * 304 NOT_MODIFIED without the updated config
+ * @onos.rsModel K8sNode
+ */
+ @javax.ws.rs.DELETE
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @Path("{hostname}")
+ public Response deleteNodes(@PathParam("hostname") String hostname) {
+ log.trace(String.format(MESSAGE_NODE, DELETE));
+
+ K8sNode existing =
+ adminService.node(nullIsIllegal(hostname, HOST_NAME + ERROR_MESSAGE));
+
+ if (existing == null) {
+ log.warn("There is no node configuration to delete : {}", hostname);
+ return Response.notModified().build();
+ } else {
+ adminService.removeNode(hostname);
+ }
+
+ return Response.noContent().build();
+ }
+
+ private Set<K8sNode> readNodeConfiguration(InputStream input) {
+ Set<K8sNode> nodeSet = Sets.newHashSet();
+ try {
+ JsonNode jsonTree = readTreeFromStream(mapper().enable(INDENT_OUTPUT), input);
+ ArrayNode nodes = (ArrayNode) jsonTree.path(NODES);
+ nodes.forEach(node -> {
+ try {
+ ObjectNode objectNode = node.deepCopy();
+ K8sNode k8sNode =
+ codec(K8sNode.class).decode(objectNode, this);
+
+ nodeSet.add(k8sNode);
+ } catch (Exception e) {
+ log.error("Exception occurred due to {}", e);
+ throw new IllegalArgumentException();
+ }
+ });
+ } catch (Exception e) {
+ throw new IllegalArgumentException(e);
+ }
+
+ return nodeSet;
+ }
+}
diff --git a/apps/k8s-node/app/src/main/resources/definitions/K8sNode.json b/apps/k8s-node/app/src/main/resources/definitions/K8sNode.json
new file mode 100644
index 0000000..34823d2
--- /dev/null
+++ b/apps/k8s-node/app/src/main/resources/definitions/K8sNode.json
@@ -0,0 +1,43 @@
+{
+ "type": "object",
+ "required": [
+ "nodes"
+ ],
+ "properties": {
+ "nodes": {
+ "type": "array",
+ "items": {
+ "type": "object",
+ "required": [
+ "hostname",
+ "type",
+ "managementIp",
+ "dataIp",
+ "integrationBridge",
+ ],
+ "properties": {
+ "hostname": {
+ "type": "string",
+ "example": "host1"
+ },
+ "type": {
+ "type": "string",
+ "example": "GATEWAY"
+ },
+ "managementIp": {
+ "type": "string",
+ "example": "10.10.10.1"
+ },
+ "dataIp": {
+ "type": "string",
+ "example": "20.20.20.2"
+ },
+ "integrationBridge": {
+ "type": "string",
+ "example": "of:0000000000000001"
+ }
+ }
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/apps/k8s-node/app/src/main/webapp/WEB-INF/web.xml b/apps/k8s-node/app/src/main/webapp/WEB-INF/web.xml
new file mode 100644
index 0000000..1896e3f
--- /dev/null
+++ b/apps/k8s-node/app/src/main/webapp/WEB-INF/web.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ Copyright 2019-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.
+ -->
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd"
+ id="ONOS" version="2.5">
+ <display-name>Kubernetes Node REST API v1.0</display-name>
+
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource-name>Secured</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ </web-resource-collection>
+ <auth-constraint>
+ <role-name>admin</role-name>
+ <role-name>viewer</role-name>
+ </auth-constraint>
+ </security-constraint>
+
+ <security-role>
+ <role-name>admin</role-name>
+ <role-name>viewer</role-name>
+ </security-role>
+
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ <realm-name>karaf</realm-name>
+ </login-config>
+
+ <servlet>
+ <servlet-name>JAX-RS Service</servlet-name>
+ <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
+ <init-param>
+ <param-name>javax.ws.rs.Application</param-name>
+ <param-value>org.onosproject.k8snode.web.K8sNodeWebApplication</param-value>
+ </init-param>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+
+ <servlet-mapping>
+ <servlet-name>JAX-RS Service</servlet-name>
+ <url-pattern>/*</url-pattern>
+ </servlet-mapping>
+</web-app>
diff --git a/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/codec/K8sNodeCodecTest.java b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/codec/K8sNodeCodecTest.java
new file mode 100644
index 0000000..7f156e8
--- /dev/null
+++ b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/codec/K8sNodeCodecTest.java
@@ -0,0 +1,155 @@
+/*
+ * Copyright 2019-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.k8snode.codec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.packet.IpAddress;
+import org.onosproject.codec.CodecContext;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.codec.impl.CodecManager;
+import org.onosproject.core.CoreService;
+import org.onosproject.k8snode.api.DefaultK8sNode;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNodeState;
+import org.onosproject.net.DeviceId;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.HashMap;
+import java.util.Map;
+
+import static junit.framework.TestCase.assertEquals;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.notNullValue;
+import static org.onosproject.k8snode.codec.K8sNodeJsonMatcher.matchesK8sNode;
+import static org.onosproject.net.NetTestTools.APP_ID;
+
+/**
+ * Unit tests for Kubernetes Node codec.
+ */
+public class K8sNodeCodecTest {
+
+ MockCodecContext context;
+
+ JsonCodec<K8sNode> k8sNodeCodec;
+
+ final CoreService mockCoreService = createMock(CoreService.class);
+ private static final String REST_APP_ID = "org.onosproject.rest";
+
+ /**
+ * Initial setup for this unit test.
+ */
+ @Before
+ public void setUp() {
+ context = new MockCodecContext();
+ k8sNodeCodec = new K8sNodeCodec();
+
+ assertThat(k8sNodeCodec, notNullValue());
+
+ expect(mockCoreService.registerApplication(REST_APP_ID))
+ .andReturn(APP_ID).anyTimes();
+ replay(mockCoreService);
+ context.registerService(CoreService.class, mockCoreService);
+ }
+
+ /**
+ * Tests the kubernetes minion node encoding.
+ */
+ @Test
+ public void testK8sMinionNodeEncode() {
+ K8sNode node = DefaultK8sNode.builder()
+ .hostname("minion")
+ .type(K8sNode.Type.MINION)
+ .state(K8sNodeState.INIT)
+ .managementIp(IpAddress.valueOf("10.10.10.1"))
+ .dataIp(IpAddress.valueOf("20.20.20.2"))
+ .intgBridge(DeviceId.deviceId("kbr-int"))
+ .build();
+
+ ObjectNode nodeJson = k8sNodeCodec.encode(node, context);
+ assertThat(nodeJson, matchesK8sNode(node));
+ }
+
+ /**
+ * Tests the kubernetes minion node decoding.
+ *
+ * @throws IOException IO exception
+ */
+ @Test
+ public void testK8sMinionNodeDecode() throws IOException {
+ K8sNode node = getK8sNode("K8sMinionNode.json");
+
+ assertEquals("minion", node.hostname());
+ assertEquals("MINION", node.type().name());
+ assertEquals("172.16.130.4", node.managementIp().toString());
+ assertEquals("172.16.130.4", node.dataIp().toString());
+ assertEquals("of:00000000000000a1", node.intgBridge().toString());
+ }
+
+ private K8sNode getK8sNode(String resourceName) throws IOException {
+ InputStream jsonStream = K8sNodeCodecTest.class.getResourceAsStream(resourceName);
+ JsonNode json = context.mapper().readTree(jsonStream);
+ assertThat(json, notNullValue());
+ K8sNode node = k8sNodeCodec.decode((ObjectNode) json, context);
+ assertThat(node, notNullValue());
+ return node;
+ }
+
+ private class MockCodecContext implements CodecContext {
+ private final ObjectMapper mapper = new ObjectMapper();
+ private final CodecManager manager = new CodecManager();
+ private final Map<Class<?>, Object> services = new HashMap<>();
+
+ /**
+ * Constructs a new mock codec context.
+ */
+ public MockCodecContext() {
+ manager.activate();
+ }
+
+ @Override
+ public ObjectMapper mapper() {
+ return mapper;
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public <T> JsonCodec<T> codec(Class<T> entityClass) {
+ if (entityClass == K8sNode.class) {
+ return (JsonCodec<T>) k8sNodeCodec;
+ }
+ return manager.getCodec(entityClass);
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public <T> T getService(Class<T> serviceClass) {
+ return (T) services.get(serviceClass);
+ }
+
+ // for registering mock services
+ public <T> void registerService(Class<T> serviceClass, T impl) {
+ services.put(serviceClass, impl);
+ }
+ }
+}
diff --git a/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/codec/K8sNodeJsonMatcher.java b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/codec/K8sNodeJsonMatcher.java
new file mode 100644
index 0000000..58b15d2
--- /dev/null
+++ b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/codec/K8sNodeJsonMatcher.java
@@ -0,0 +1,113 @@
+/*
+ * Copyright 2019-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.k8snode.codec;
+
+import com.fasterxml.jackson.databind.JsonNode;
+import org.hamcrest.Description;
+import org.hamcrest.TypeSafeDiagnosingMatcher;
+import org.onosproject.k8snode.api.K8sNode;
+
+/**
+ * Hamcrest matcher for kubernetes node.
+ */
+public final class K8sNodeJsonMatcher extends TypeSafeDiagnosingMatcher<JsonNode> {
+
+ private final K8sNode node;
+
+ private static final String HOSTNAME = "hostname";
+ private static final String TYPE = "type";
+ private static final String MANAGEMENT_IP = "managementIp";
+ private static final String DATA_IP = "dataIp";
+ private static final String INTEGRATION_BRIDGE = "integrationBridge";
+ private static final String STATE = "state";
+
+ private K8sNodeJsonMatcher(K8sNode node) {
+ this.node = node;
+ }
+
+ @Override
+ protected boolean matchesSafely(JsonNode jsonNode, Description description) {
+
+ // check hostname
+ String jsonHostname = jsonNode.get(HOSTNAME).asText();
+ String hostname = node.hostname();
+ if (!jsonHostname.equals(hostname)) {
+ description.appendText("hostname was " + jsonHostname);
+ return false;
+ }
+
+ // check type
+ String jsonType = jsonNode.get(TYPE).asText();
+ String type = node.type().name();
+ if (!jsonType.equals(type)) {
+ description.appendText("type was " + jsonType);
+ return false;
+ }
+
+ // check management IP
+ String jsonMgmtIp = jsonNode.get(MANAGEMENT_IP).asText();
+ String mgmtIp = node.managementIp().toString();
+ if (!jsonMgmtIp.equals(mgmtIp)) {
+ description.appendText("management IP was " + jsonMgmtIp);
+ return false;
+ }
+
+ // check integration bridge
+ JsonNode jsonIntgBridge = jsonNode.get(INTEGRATION_BRIDGE);
+ if (jsonIntgBridge != null) {
+ String intgBridge = node.intgBridge().toString();
+ if (!jsonIntgBridge.asText().equals(intgBridge)) {
+ description.appendText("integration bridge was " + jsonIntgBridge);
+ return false;
+ }
+ }
+
+ // check state
+ String jsonState = jsonNode.get(STATE).asText();
+ String state = node.state().name();
+ if (!jsonState.equals(state)) {
+ description.appendText("state was " + jsonState);
+ return false;
+ }
+
+ // check data IP
+ JsonNode jsonDataIp = jsonNode.get(DATA_IP);
+ if (jsonDataIp != null) {
+ String dataIp = node.dataIp().toString();
+ if (!jsonDataIp.asText().equals(dataIp)) {
+ description.appendText("Data IP was " + jsonDataIp.asText());
+ return false;
+ }
+ }
+
+ return true;
+ }
+
+ @Override
+ public void describeTo(Description description) {
+ description.appendText(node.toString());
+ }
+
+ /**
+ * Factory to allocate an kubernetes node matcher.
+ *
+ * @param node kubernetes node object we are looking for
+ * @return matcher
+ */
+ public static K8sNodeJsonMatcher matchesK8sNode(K8sNode node) {
+ return new K8sNodeJsonMatcher(node);
+ }
+}
diff --git a/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/impl/K8sNodeManagerTest.java b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/impl/K8sNodeManagerTest.java
new file mode 100644
index 0000000..066647b
--- /dev/null
+++ b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/impl/K8sNodeManagerTest.java
@@ -0,0 +1,334 @@
+/*
+ * Copyright 2019-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.k8snode.impl;
+
+import com.google.common.collect.Lists;
+import com.google.common.util.concurrent.MoreExecutors;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.junit.TestUtils;
+import org.onlab.packet.ChassisId;
+import org.onlab.packet.IpAddress;
+import org.onosproject.cluster.ClusterServiceAdapter;
+import org.onosproject.cluster.LeadershipServiceAdapter;
+import org.onosproject.core.ApplicationId;
+import org.onosproject.core.CoreServiceAdapter;
+import org.onosproject.core.DefaultApplicationId;
+import org.onosproject.event.Event;
+import org.onosproject.k8snode.api.DefaultK8sNode;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNodeEvent;
+import org.onosproject.k8snode.api.K8sNodeListener;
+import org.onosproject.k8snode.api.K8sNodeState;
+import org.onosproject.net.DefaultDevice;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.provider.ProviderId;
+import org.onosproject.store.service.TestStorageService;
+
+import java.util.List;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.onosproject.k8snode.api.K8sNode.Type.MINION;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_COMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_CREATED;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_INCOMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_REMOVED;
+import static org.onosproject.k8snode.api.K8sNodeEvent.Type.K8S_NODE_UPDATED;
+import static org.onosproject.k8snode.api.K8sNodeState.COMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeState.INCOMPLETE;
+import static org.onosproject.k8snode.api.K8sNodeState.INIT;
+import static org.onosproject.net.Device.Type.SWITCH;
+
+/**
+ * Unit tests for Kubernetes node manager.
+ */
+public class K8sNodeManagerTest {
+
+ private static final ApplicationId TEST_APP_ID = new DefaultApplicationId(1, "test");
+
+ private static final String ERR_SIZE = "Number of nodes did not match";
+ private static final String ERR_NOT_MATCH = "Node did not match";
+ private static final String ERR_NOT_FOUND = "Node did not exist";
+
+ private static final String MINION_1_HOSTNAME = "minion_1";
+ private static final String MINION_2_HOSTNAME = "minion_2";
+ private static final String MINION_3_HOSTNAME = "minion_3";
+
+ private static final Device MINION_1_INTG_DEVICE = createDevice(1);
+ private static final Device MINION_2_INTG_DEVICE = createDevice(2);
+ private static final Device MINION_3_INTG_DEVICE = createDevice(3);
+
+ private static final K8sNode MINION_1 = createNode(
+ MINION_1_HOSTNAME,
+ MINION,
+ MINION_1_INTG_DEVICE,
+ IpAddress.valueOf("10.100.0.1"),
+ INIT
+ );
+ private static final K8sNode MINION_2 = createNode(
+ MINION_2_HOSTNAME,
+ MINION,
+ MINION_2_INTG_DEVICE,
+ IpAddress.valueOf("10.100.0.2"),
+ INIT
+ );
+ private static final K8sNode MINION_3 = createNode(
+ MINION_3_HOSTNAME,
+ MINION,
+ MINION_3_INTG_DEVICE,
+ IpAddress.valueOf("10.100.0.3"),
+ COMPLETE
+ );
+
+ private final TestK8sNodeListener testListener = new TestK8sNodeListener();
+
+ private K8sNodeManager target;
+ private DistributedK8sNodeStore nodeStore;
+
+ /**
+ * Initial setup for this unit test.
+ */
+ @Before
+ public void setUp() {
+ nodeStore = new DistributedK8sNodeStore();
+ TestUtils.setField(nodeStore, "coreService", new TestCoreService());
+ TestUtils.setField(nodeStore, "storageService", new TestStorageService());
+ TestUtils.setField(nodeStore, "eventExecutor", MoreExecutors.newDirectExecutorService());
+ nodeStore.activate();
+
+ nodeStore.createNode(MINION_2);
+ nodeStore.createNode(MINION_3);
+
+ target = new K8sNodeManager();
+ target.storageService = new TestStorageService();
+ target.coreService = new TestCoreService();
+ target.clusterService = new TestClusterService();
+ target.leadershipService = new TestLeadershipService();
+ target.nodeStore = nodeStore;
+ target.addListener(testListener);
+ target.activate();
+ testListener.events.clear();
+ }
+
+ /**
+ * Clean up unit test.
+ */
+ @After
+ public void tearDown() {
+ target.removeListener(testListener);
+ target.deactivate();
+ nodeStore.deactivate();
+ nodeStore = null;
+ target = null;
+ }
+
+ /**
+ * Checks if creating and removing a node work well with proper events.
+ */
+ @Test
+ public void testCreateAndRemoveNode() {
+ target.createNode(MINION_1);
+ assertEquals(ERR_SIZE, 3, target.nodes().size());
+ assertNotNull(target.node(MINION_1_HOSTNAME));
+
+ target.removeNode(MINION_1_HOSTNAME);
+ assertEquals(ERR_SIZE, 2, target.nodes().size());
+ assertNull(target.node(MINION_1_HOSTNAME));
+
+ validateEvents(K8S_NODE_CREATED, K8S_NODE_REMOVED);
+ }
+
+ /**
+ * Checks if creating null node fails with proper exception.
+ */
+ @Test(expected = NullPointerException.class)
+ public void testCreateNullNode() {
+ target.createNode(null);
+ }
+
+ /**
+ * Checks if creating a duplicated node fails with proper exception.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testCreateDuplicateNode() {
+ target.createNode(MINION_1);
+ target.createNode(MINION_1);
+ }
+
+ /**
+ * Checks if removing null node fails with proper exception.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testRemoveNullNode() {
+ target.removeNode(null);
+ }
+
+ /**
+ * Checks if updating a node works well with proper event.
+ */
+ @Test
+ public void testUpdateNode() {
+ K8sNode updated = DefaultK8sNode.from(MINION_2)
+ .dataIp(IpAddress.valueOf("10.200.0.100"))
+ .build();
+ target.updateNode(updated);
+ assertEquals(ERR_NOT_MATCH, updated, target.node(MINION_2_INTG_DEVICE.id()));
+ validateEvents(K8S_NODE_UPDATED);
+ }
+
+ /**
+ * Checks if updating a node state to complete generates proper events.
+ */
+ @Test
+ public void testUpdateNodeStateComplete() {
+ K8sNode updated = DefaultK8sNode.from(MINION_2)
+ .state(COMPLETE)
+ .build();
+ target.updateNode(updated);
+ assertEquals(ERR_NOT_MATCH, updated, target.node(MINION_2_HOSTNAME));
+ validateEvents(K8S_NODE_UPDATED, K8S_NODE_COMPLETE);
+ }
+
+ /**
+ * Checks if updating a node state to incomplete generates proper events.
+ */
+ @Test
+ public void testUpdateNodeStateIncomplete() {
+ K8sNode updated = DefaultK8sNode.from(MINION_3)
+ .state(INCOMPLETE)
+ .build();
+ target.updateNode(updated);
+ assertEquals(ERR_NOT_MATCH, updated, target.node(MINION_3_HOSTNAME));
+ validateEvents(K8S_NODE_UPDATED, K8S_NODE_INCOMPLETE);
+ }
+
+ /**
+ * Checks if updating a null node fails with proper exception.
+ */
+ @Test(expected = NullPointerException.class)
+ public void testUpdateNullNode() {
+ target.updateNode(null);
+ }
+
+ /**
+ * Checks if updating not existing node fails with proper exception.
+ */
+ @Test(expected = IllegalArgumentException.class)
+ public void testUpdateNotExistingNode() {
+ target.updateNode(MINION_1);
+ }
+
+ /**
+ * Checks if getting all nodes method returns correct set of nodes.
+ */
+ @Test
+ public void testGetAllNodes() {
+ assertEquals(ERR_SIZE, 2, target.nodes().size());
+ assertTrue(ERR_NOT_FOUND, target.nodes().contains(MINION_2));
+ assertTrue(ERR_NOT_FOUND, target.nodes().contains(MINION_3));
+ }
+
+ /**
+ * Checks if getting complete nodes method returns correct set of nodes.
+ */
+ @Test
+ public void testGetCompleteNodes() {
+ assertEquals(ERR_SIZE, 1, target.completeNodes().size());
+ assertTrue(ERR_NOT_FOUND, target.completeNodes().contains(MINION_3));
+ }
+
+ /**
+ * Checks if getting nodes by type method returns correct set of nodes.
+ */
+ @Test
+ public void testGetNodesByType() {
+ assertEquals(ERR_SIZE, 2, target.nodes(MINION).size());
+ assertTrue(ERR_NOT_FOUND, target.nodes(MINION).contains(MINION_2));
+ assertTrue(ERR_NOT_FOUND, target.nodes(MINION).contains(MINION_3));
+ }
+
+ /**
+ * Checks if getting a node by hostname returns correct node.
+ */
+ @Test
+ public void testGetNodeByHostname() {
+ assertEquals(ERR_NOT_FOUND, target.node(MINION_2_HOSTNAME), MINION_2);
+ assertEquals(ERR_NOT_FOUND, target.node(MINION_3_HOSTNAME), MINION_3);
+ }
+
+ private void validateEvents(Enum... types) {
+ int i = 0;
+ assertEquals("Number of events did not match", types.length, testListener.events.size());
+ for (Event event : testListener.events) {
+ assertEquals("Incorrect event received", types[i], event.type());
+ i++;
+ }
+ testListener.events.clear();
+ }
+
+ private static Device createDevice(long devIdNum) {
+ return new DefaultDevice(new ProviderId("of", "foo"),
+ DeviceId.deviceId(String.format("of:%016d", devIdNum)),
+ SWITCH,
+ "manufacturer",
+ "hwVersion",
+ "swVersion",
+ "serialNumber",
+ new ChassisId(1));
+ }
+
+ private static class TestK8sNodeListener implements K8sNodeListener {
+ private List<K8sNodeEvent> events = Lists.newArrayList();
+
+ @Override
+ public void event(K8sNodeEvent event) {
+ events.add(event);
+ }
+ }
+
+ private static class TestCoreService extends CoreServiceAdapter {
+ @Override
+ public ApplicationId registerApplication(String name) {
+ return TEST_APP_ID;
+ }
+ }
+
+ private class TestClusterService extends ClusterServiceAdapter {
+
+ }
+
+ private static class TestLeadershipService extends LeadershipServiceAdapter {
+
+ }
+
+ private static K8sNode createNode(String hostname, K8sNode.Type type,
+ Device intgBridge, IpAddress ipAddr,
+ K8sNodeState state) {
+ return DefaultK8sNode.builder()
+ .hostname(hostname)
+ .type(type)
+ .intgBridge(intgBridge.id())
+ .managementIp(ipAddr)
+ .dataIp(ipAddr)
+ .state(state)
+ .build();
+ }
+}
diff --git a/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/web/K8sNodeCodecRegisterTest.java b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/web/K8sNodeCodecRegisterTest.java
new file mode 100644
index 0000000..09958bd
--- /dev/null
+++ b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/web/K8sNodeCodecRegisterTest.java
@@ -0,0 +1,83 @@
+/*
+ * Copyright 2019-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.k8snode.web;
+
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Maps;
+import org.junit.Test;
+import org.onlab.junit.TestUtils;
+import org.onosproject.codec.CodecService;
+import org.onosproject.codec.JsonCodec;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.codec.K8sNodeCodec;
+
+import java.util.Map;
+import java.util.Set;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+
+/**
+ * Unit tests for kubernetes node codec register.
+ */
+public final class K8sNodeCodecRegisterTest {
+
+ private K8sNodeCodecRegister register;
+
+ /**
+ * Tests codec register activation and deactivation.
+ */
+ @Test
+ public void testActivateDeactivate() {
+ register = new K8sNodeCodecRegister();
+ CodecService codecService = new TestCodecService();
+
+ TestUtils.setField(register, "codecService", codecService);
+ register.activate();
+
+ assertEquals(K8sNodeCodec.class.getName(),
+ codecService.getCodec(K8sNode.class).getClass().getName());
+
+ register.deactivate();
+
+ assertNull(codecService.getCodec(K8sNode.class));
+ }
+
+ private static class TestCodecService implements CodecService {
+
+ private Map<String, JsonCodec> codecMap = Maps.newConcurrentMap();
+
+ @Override
+ public Set<Class<?>> getCodecs() {
+ return ImmutableSet.of();
+ }
+
+ @Override
+ public <T> JsonCodec<T> getCodec(Class<T> entityClass) {
+ return codecMap.get(entityClass.getName());
+ }
+
+ @Override
+ public <T> void registerCodec(Class<T> entityClass, JsonCodec<T> codec) {
+ codecMap.put(entityClass.getName(), codec);
+ }
+
+ @Override
+ public void unregisterCodec(Class<?> entityClass) {
+ codecMap.remove(entityClass.getName());
+ }
+ }
+}
diff --git a/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/web/K8sNodeWebResourceTest.java b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/web/K8sNodeWebResourceTest.java
new file mode 100644
index 0000000..c52f398
--- /dev/null
+++ b/apps/k8s-node/app/src/test/java/org/onosproject/k8snode/web/K8sNodeWebResourceTest.java
@@ -0,0 +1,214 @@
+/*
+ * Copyright 2019-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.k8snode.web;
+
+import org.glassfish.jersey.server.ResourceConfig;
+import org.junit.Before;
+import org.junit.Test;
+import org.onlab.osgi.ServiceDirectory;
+import org.onlab.osgi.TestServiceDirectory;
+import org.onlab.packet.IpAddress;
+import org.onosproject.codec.CodecService;
+import org.onosproject.codec.impl.CodecManager;
+import org.onosproject.k8snode.api.DefaultK8sNode;
+import org.onosproject.k8snode.api.K8sNode;
+import org.onosproject.k8snode.api.K8sNodeAdminService;
+import org.onosproject.k8snode.api.K8sNodeState;
+import org.onosproject.k8snode.codec.K8sNodeCodec;
+import org.onosproject.net.DeviceId;
+import org.onosproject.rest.resources.ResourceTest;
+
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import java.io.InputStream;
+
+import static org.easymock.EasyMock.anyObject;
+import static org.easymock.EasyMock.anyString;
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Unit test for Kubernetes node REST API.
+ */
+public class K8sNodeWebResourceTest extends ResourceTest {
+
+ final K8sNodeAdminService mockK8sNodeAdminService = createMock(K8sNodeAdminService.class);
+ private static final String PATH = "configure";
+
+ private K8sNode k8sNode;
+
+ /**
+ * Constructs a kubernetes node resource test instance.
+ */
+ public K8sNodeWebResourceTest() {
+ super(ResourceConfig.forApplicationClass(K8sNodeWebApplication.class));
+ }
+
+ /**
+ * Sets up the global values for all the tests.
+ */
+ @Before
+ public void setUpTest() {
+ final CodecManager codecService = new CodecManager();
+ codecService.activate();
+ codecService.registerCodec(K8sNode.class, new K8sNodeCodec());
+ ServiceDirectory testDirectory =
+ new TestServiceDirectory()
+ .add(K8sNodeAdminService.class, mockK8sNodeAdminService)
+ .add(CodecService.class, codecService);
+ setServiceDirectory(testDirectory);
+
+ k8sNode = DefaultK8sNode.builder()
+ .hostname("minion-node")
+ .type(K8sNode.Type.MINION)
+ .dataIp(IpAddress.valueOf("10.134.34.222"))
+ .managementIp(IpAddress.valueOf("10.134.231.30"))
+ .intgBridge(DeviceId.deviceId("of:00000000000000a1"))
+ .state(K8sNodeState.INIT)
+ .build();
+ }
+
+ /**
+ * Tests the results of the REST API POST method with creating new nodes operation.
+ */
+ @Test
+ public void testCreateNodesWithCreateOperation() {
+ expect(mockK8sNodeAdminService.node(anyString())).andReturn(null).once();
+ mockK8sNodeAdminService.createNode(anyObject());
+ replay(mockK8sNodeAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = K8sNodeWebResourceTest.class
+ .getResourceAsStream("k8s-node-minion-config.json");
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(201));
+
+ verify(mockK8sNodeAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API POST method without creating new nodes operation.
+ */
+ @Test
+ public void testCreateNodesWithoutCreateOperation() {
+ expect(mockK8sNodeAdminService.node(anyString())).andReturn(k8sNode).once();
+ replay(mockK8sNodeAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = K8sNodeWebResourceTest.class
+ .getResourceAsStream("k8s-node-minion-config.json");
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .post(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(201));
+
+ verify(mockK8sNodeAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API PUT method with modifying the nodes.
+ */
+ @Test
+ public void testUpdateNodesWithoutModifyOperation() {
+ expect(mockK8sNodeAdminService.node(anyString())).andReturn(k8sNode).once();
+ mockK8sNodeAdminService.updateNode(anyObject());
+ replay(mockK8sNodeAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = K8sNodeWebResourceTest.class
+ .getResourceAsStream("k8s-node-minion-config.json");
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .put(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(200));
+
+ verify(mockK8sNodeAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API PUT method without modifying the nodes.
+ */
+ @Test
+ public void testUpdateNodesWithModifyOperation() {
+ expect(mockK8sNodeAdminService.node(anyString())).andReturn(null).once();
+ replay(mockK8sNodeAdminService);
+
+ final WebTarget wt = target();
+ InputStream jsonStream = K8sNodeWebResourceTest.class
+ .getResourceAsStream("k8s-node-minion-config.json");
+ Response response = wt.path(PATH).request(MediaType.APPLICATION_JSON_TYPE)
+ .put(Entity.json(jsonStream));
+ final int status = response.getStatus();
+
+ assertThat(status, is(304));
+
+ verify(mockK8sNodeAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API DELETE method with deleting the nodes.
+ */
+ @Test
+ public void testDeleteNodesWithDeletionOperation() {
+ expect(mockK8sNodeAdminService.node(anyString())).andReturn(k8sNode).once();
+ expect(mockK8sNodeAdminService.removeNode(anyString())).andReturn(k8sNode).once();
+ replay(mockK8sNodeAdminService);
+
+ String location = PATH + "/minion-node";
+
+ final WebTarget wt = target();
+ Response response = wt.path(location).request(
+ MediaType.APPLICATION_JSON_TYPE).delete();
+
+ final int status = response.getStatus();
+
+ assertThat(status, is(204));
+
+ verify(mockK8sNodeAdminService);
+ }
+
+ /**
+ * Tests the results of the REST API DELETE method without deleting the nodes.
+ */
+ @Test
+ public void testDeleteNodesWithoutDeletionOperation() {
+ expect(mockK8sNodeAdminService.node(anyString())).andReturn(null).once();
+ replay(mockK8sNodeAdminService);
+
+ String location = PATH + "/minion-node";
+
+ final WebTarget wt = target();
+ Response response = wt.path(location).request(
+ MediaType.APPLICATION_JSON_TYPE).delete();
+
+ final int status = response.getStatus();
+
+ assertThat(status, is(304));
+
+ verify(mockK8sNodeAdminService);
+ }
+}
diff --git a/apps/k8s-node/app/src/test/resources/org/onosproject/k8snode/codec/K8sMinionNode.json b/apps/k8s-node/app/src/test/resources/org/onosproject/k8snode/codec/K8sMinionNode.json
new file mode 100644
index 0000000..a6760f5
--- /dev/null
+++ b/apps/k8s-node/app/src/test/resources/org/onosproject/k8snode/codec/K8sMinionNode.json
@@ -0,0 +1,7 @@
+{
+ "hostname": "minion",
+ "type": "MINION",
+ "managementIp": "172.16.130.4",
+ "dataIp": "172.16.130.4",
+ "integrationBridge": "of:00000000000000a1"
+}
\ No newline at end of file
diff --git a/apps/k8s-node/app/src/test/resources/org/onosproject/k8snode/web/k8s-node-minion-config.json b/apps/k8s-node/app/src/test/resources/org/onosproject/k8snode/web/k8s-node-minion-config.json
new file mode 100644
index 0000000..725766e
--- /dev/null
+++ b/apps/k8s-node/app/src/test/resources/org/onosproject/k8snode/web/k8s-node-minion-config.json
@@ -0,0 +1,11 @@
+{
+ "nodes" : [
+ {
+ "hostname" : "minion-node",
+ "type" : "MINION",
+ "managementIp" : "10.134.231.32",
+ "dataIp" : "10.134.34.224",
+ "integrationBridge" : "of:00000000000000a2"
+ }
+ ]
+}
\ No newline at end of file