| commit | a5c80c6905a353fc230118d2ed846722a5005c9e | [log] [tgz] |
|---|---|---|
| author | Jian Li <pyguni@gmail.com> | Fri Aug 30 17:57:53 2019 +0900 |
| committer | Jian Li <pyguni@gmail.com> | Sun Sep 01 23:30:49 2019 +0900 |
| tree | d4144e5a6322e5b86037dd2307ec14e7ef4f0c4b | |
| parent | 1ac5798815e65a0fb5c41eb2474510bf412c6987 [diff] [blame] |
Fix: guarantee to reserve an IP address from IPAM pool for k8s POD Returns port number as zero in case pod has null spec value. Also return null group bucket when we have zero port number returned. Change-Id: Iad6f307e950e263732db5f6349c83a60a194cb23
diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/util/K8sNetworkingUtil.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/util/K8sNetworkingUtil.java index 045b300..7d20b65 100644 --- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/util/K8sNetworkingUtil.java +++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/util/K8sNetworkingUtil.java
@@ -492,6 +492,11 @@ * return 0 if there is no port number mapped with the given port name */ public static int portNumberByName(Pod pod, String portName) { + + if (pod == null || pod.getSpec() == null) { + return 0; + } + for (Container container : pod.getSpec().getContainers()) { for (ContainerPort cp : container.getPorts()) { if (cp.getName() != null && cp.getName().equals(portName)) {