commit 1cee988ec602020af073323746921f3607e97abb
author Jian Li <pyguni@gmail.com> Wed Feb 13 11:25:25 2019 +0900
committer Jian Li <pyguni@gmail.com> Wed Mar 06 05:28:38 2019 +0000
tree 7a1b59658d64caca918590087460d70880eb206e
parent 3defa842ebcaa50faaa0cb5df2eb13530b046652

Manage k8s API config life cycle, bootstrap k8s node using k8s client

Change-Id: I9926c6d4903da514b66a3bcbe05358c605c9cc1a

apps/k8s-node/app/src/main/java/org/onosproject/k8snode/impl/K8sNodeManager.java

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
index d80ef21..0289422 100644
--- 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
@@ -33,6 +33,7 @@
 import org.onosproject.k8snode.api.K8sNodeStoreDelegate;
 import org.onosproject.net.DeviceId;
 import org.onosproject.net.device.DeviceService;
+import org.onosproject.store.service.AtomicCounter;
 import org.onosproject.store.service.StorageService;
 import org.osgi.service.component.ComponentContext;
 import org.osgi.service.component.annotations.Activate;
@@ -45,6 +46,7 @@
 
 import java.util.Dictionary;
 import java.util.Objects;
+import java.util.Optional;
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 import java.util.stream.Collectors;
@@ -56,6 +58,7 @@
 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.onosproject.k8snode.util.K8sNodeUtil.genDpid;
 import static org.slf4j.LoggerFactory.getLogger;
 
 /**
@@ -81,6 +84,10 @@
 
     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";
+    private static final String ERR_NULL_DEVICE_ID = "Kubernetes node device ID cannot be null";
+
+    private static final String DEVICE_ID_COUNTER_NAME = "device-id-counter";
+    private static final String NOT_DUPLICATED_MSG = "% cannot be duplicated";
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected K8sNodeStore nodeStore;
@@ -108,6 +115,8 @@
 
     private final K8sNodeStoreDelegate delegate = new K8sNodeManager.InternalNodeStoreDelegate();
 
+    private AtomicCounter deviceIdCounter;
+
     private ApplicationId appId;
 
     @Activate
@@ -117,6 +126,8 @@
 
         leadershipService.runForLeadership(appId.name());
 
+        deviceIdCounter = storageService.getAtomicCounter(DEVICE_ID_COUNTER_NAME);
+
         log.info("Started");
     }
 
@@ -144,15 +155,48 @@
     @Override
     public void createNode(K8sNode node) {
         checkNotNull(node, ERR_NULL_NODE);
-        nodeStore.createNode(node);
-        log.info(String.format(MSG_NODE, node.hostname(), MSG_CREATED));
+
+        K8sNode updatedNode;
+
+        if (node.intgBridge() == null) {
+            String deviceIdStr = genDpid(deviceIdCounter.incrementAndGet());
+            checkNotNull(deviceIdStr, ERR_NULL_DEVICE_ID);
+            updatedNode = node.updateIntgBridge(DeviceId.deviceId(deviceIdStr));
+            checkArgument(!hasIntgBridge(updatedNode.intgBridge(), updatedNode.hostname()),
+                    NOT_DUPLICATED_MSG, updatedNode.intgBridge());
+        } else {
+            updatedNode = node;
+            checkArgument(!hasIntgBridge(updatedNode.intgBridge(), updatedNode.hostname()),
+                    NOT_DUPLICATED_MSG, updatedNode.intgBridge());
+        }
+
+        nodeStore.createNode(updatedNode);
+        log.info(String.format(MSG_NODE, updatedNode.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));
+
+        K8sNode updatedNode;
+
+        K8sNode existingNode = nodeStore.node(node.hostname());
+        checkNotNull(existingNode, ERR_NULL_NODE);
+
+        DeviceId existDeviceId = nodeStore.node(node.hostname()).intgBridge();
+
+        if (node.intgBridge() == null) {
+            updatedNode = node.updateIntgBridge(existDeviceId);
+            checkArgument(!hasIntgBridge(updatedNode.intgBridge(), updatedNode.hostname()),
+                    NOT_DUPLICATED_MSG, updatedNode.intgBridge());
+        } else {
+            updatedNode = node;
+            checkArgument(!hasIntgBridge(updatedNode.intgBridge(), updatedNode.hostname()),
+                    NOT_DUPLICATED_MSG, updatedNode.intgBridge());
+        }
+
+        nodeStore.updateNode(updatedNode);
+        log.info(String.format(MSG_NODE, updatedNode.hostname(), MSG_UPDATED));
     }
 
     @Override
@@ -206,6 +250,15 @@
                 .findFirst().orElse(null);
     }
 
+    private boolean hasIntgBridge(DeviceId deviceId, String hostname) {
+        Optional<K8sNode> existNode = nodeStore.nodes().stream()
+                .filter(n -> !n.hostname().equals(hostname))
+                .filter(n -> n.intgBridge().equals(deviceId))
+                .findFirst();
+
+        return existNode.isPresent();
+    }
+
     private class InternalNodeStoreDelegate implements K8sNodeStoreDelegate {
 
         @Override