commit 186fde552dbbbbb5804da7a4a3c409bbb0ef18b3
author Jian Li <pyguni@gmail.com> Mon Aug 26 14:54:43 2019 +0900
committer Jian Li <pyguni@gmail.com> Fri Aug 30 10:59:42 2019 +0900
tree 3ac481b76f34ff1bf9bb66e6db2770d8a967a82d
parent 142b309d8e9e309071297dde095817adfabaaa26

Add CLI for querying available and allocated IP addresses for k8s

Change-Id: Id50ff4b155f613845aa5130adf4b98216200bb2b

apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIpamHandler.java

diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIpamHandler.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIpamHandler.java
index 4bc6f7c..fefb952 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIpamHandler.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sIpamHandler.java
@@ -43,6 +43,7 @@
 import java.util.Set;
 import java.util.concurrent.ExecutorService;
 
+import static java.lang.Thread.sleep;
 import static java.util.concurrent.Executors.newSingleThreadExecutor;
 import static org.onlab.util.Tools.groupedThreads;
 import static org.onosproject.k8snetworking.api.Constants.K8S_NETWORKING_APP_ID;
@@ -60,6 +61,9 @@
     private static final String IP_ADDRESS = "ipAddress";
     private static final String NETWORK_ID = "networkId";
 
+    private static final int RETRY_NUM = 5;
+    private static final int RETRY_DELAY_MS = 3000;
+
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected CoreService coreService;
 
@@ -195,7 +199,25 @@
                 return;
             }
 
+            k8sIpamAdminService.availableIps(annotNetwork);
+
+            int cnt = 0;
+            while ((RETRY_NUM - cnt > 0) && !containIp(annotIp, annotNetwork)) {
+                try {
+                    sleep(RETRY_DELAY_MS);
+                } catch (InterruptedException e) {
+                    log.error("Exception caused during checking available IP addresses");
+                }
+
+                cnt++;
+            }
+
             k8sIpamAdminService.reserveIp(annotNetwork, IpAddress.valueOf(podIp));
         }
+
+        private boolean containIp(String podIp, String networkId) {
+            return k8sIpamAdminService.availableIps(networkId).stream()
+                    .anyMatch(i -> i.toString().equals(podIp));
+        }
     }
 }