Add CLI for querying available and allocated IP addresses for k8s
Change-Id: Id50ff4b155f613845aa5130adf4b98216200bb2b
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIpAddressListCommand.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIpAddressListCommand.java
new file mode 100644
index 0000000..1abfee2
--- /dev/null
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sIpAddressListCommand.java
@@ -0,0 +1,106 @@
+/*
+ * 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.k8snetworking.cli;
+
+import com.google.common.collect.Maps;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
+import org.apache.karaf.shell.api.action.Option;
+import org.onlab.packet.IpAddress;
+import org.onlab.packet.MacAddress;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.k8snetworking.api.K8sIpamService;
+import org.onosproject.k8snetworking.api.K8sNetwork;
+import org.onosproject.k8snetworking.api.K8sNetworkService;
+import org.onosproject.k8snetworking.api.K8sPort;
+
+import java.util.Map;
+import java.util.Set;
+
+import static org.onlab.packet.MacAddress.ZERO;
+
+/**
+ * Lists kubernetes IP addresses.
+ */
+@Command(scope = "onos", name = "k8s-ips",
+ description = "Lists all kubernetes IP addresses")
+public class K8sIpAddressListCommand extends AbstractShellCommand {
+
+ private static final String FORMAT = "%-30s%-20s%-30s";
+
+ @Argument(index = 0, name = "networkIds", description = "Network identifiers",
+ required = false, multiValued = true)
+ private String[] networkIds = null;
+
+ @Option(name = "-a", aliases = "--available",
+ description = "Available IP addresses",
+ required = false, multiValued = false)
+ private boolean available = false;
+
+ @Option(name = "-r", aliases = "--reserved",
+ description = "Allocated IP addresses",
+ required = false, multiValued = false)
+ private boolean reserved = false;
+
+ @Override
+ protected void doExecute() {
+ K8sIpamService ipamService = get(K8sIpamService.class);
+ K8sNetworkService networkService = get(K8sNetworkService.class);
+
+ if (networkIds == null || networkIds.length == 0) {
+ networkIds = networkService.networks().stream()
+ .map(K8sNetwork::networkId).toArray(String[]::new);
+ }
+
+ Map<String, Map<IpAddress, MacAddress>> ipMacs = Maps.newConcurrentMap();
+
+ if (available && reserved) {
+ error("Only one of list options (available | reserved) can be specified.");
+ return;
+ }
+
+ if (!(available || reserved)) {
+ error("At least one of list options (available | reserved) should be specified.");
+ return;
+ }
+
+ for (String networkId : networkIds) {
+ Map<IpAddress, MacAddress> tmpIpMacs = Maps.newConcurrentMap();
+ if (available) {
+ ipamService.availableIps(networkId)
+ .forEach(n -> tmpIpMacs.put(n, ZERO));
+ }
+
+ if (reserved) {
+ Set<K8sPort> ports = networkService.ports(networkId);
+ ipamService.allocatedIps(networkId).forEach(ip -> {
+ MacAddress mac = ports.stream()
+ .filter(p -> p.ipAddress().equals(ip))
+ .map(K8sPort::macAddress).findAny().orElse(ZERO);
+ tmpIpMacs.put(ip, mac);
+ });
+ }
+ ipMacs.put(networkId, tmpIpMacs);
+ }
+
+ if (ipMacs.size() > 0) {
+ print(FORMAT, "Network ID", "IP Address", "MAC Address");
+ ipMacs.forEach((k, v) -> v.forEach((ip, mac) -> print(FORMAT, k, ip, mac)));
+ } else {
+ print("No IP addresses are available or reserved.");
+ }
+ }
+}
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkIdCompleter.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkIdCompleter.java
new file mode 100644
index 0000000..16251d2
--- /dev/null
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/cli/K8sNetworkIdCompleter.java
@@ -0,0 +1,49 @@
+/*
+ * 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.k8snetworking.cli;
+
+import org.apache.karaf.shell.api.console.CommandLine;
+import org.apache.karaf.shell.api.console.Completer;
+import org.apache.karaf.shell.api.console.Session;
+import org.apache.karaf.shell.support.completers.StringsCompleter;
+import org.onosproject.k8snetworking.api.K8sNetwork;
+import org.onosproject.k8snetworking.api.K8sNetworkService;
+
+import java.util.List;
+import java.util.Set;
+import java.util.SortedSet;
+import java.util.stream.Collectors;
+
+import static org.onosproject.cli.AbstractShellCommand.get;
+
+/**
+ * Kubernetes network ID completer.
+ */
+public class K8sNetworkIdCompleter implements Completer {
+ @Override
+ public int complete(Session session, CommandLine commandLine, List<String> candidates) {
+ StringsCompleter delegate = new StringsCompleter();
+ K8sNetworkService networkService = get(K8sNetworkService.class);
+
+ Set<String> netNames = networkService.networks().stream().map(K8sNetwork::name)
+ .collect(Collectors.toSet());
+ SortedSet<String> strings = delegate.getStrings();
+
+ strings.addAll(netNames);
+
+ return delegate.complete(session, commandLine, candidates);
+ }
+}
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));
+ }
}
}