commit | 56f241be23ebb2dbefc26192457f136be89e5dae | [log] [tgz] |
---|---|---|
author | Jian Li <pyguni@gmail.com> | Wed Jun 30 20:59:43 2021 +0900 |
committer | Jian Li <pyguni@gmail.com> | Wed Jun 30 13:15:41 2021 +0000 |
tree | 7d25a3111910b49e1076c715179a8699f62de94b | |
parent | f3a3c5acd2197983ab0f3affa67b4659ee653d1f [diff] [blame] |
Fix: wait for creation of patch ports which are on tenant bridges Resolve a NPE issue caused when missing name attribute in status object in VirtualMachineInstance Change-Id: I1315a63bbaae250abcc4ed6cec92fb1ed160dfd8 (cherry picked from commit dd4041e154a2850d48ed44800a7189cd04df0e6d)
diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/util/KubevirtNetworkingUtil.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/util/KubevirtNetworkingUtil.java index b49bbcc..89ff8b2 100644 --- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/util/KubevirtNetworkingUtil.java +++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/util/KubevirtNetworkingUtil.java
@@ -357,7 +357,15 @@ Set<KubevirtPort> ports = new HashSet<>(); for (JsonNode interfaceJson : interfacesJson) { - String name = interfaceJson.get(NAME).asText(); + JsonNode jsonName = interfaceJson.get(NAME); + + // in some cases, name attribute may not be available from the + // interface, we skip inspect this interface + if (jsonName == null) { + continue; + } + + String name = jsonName.asText(); KubevirtNetwork network = networks.stream() .filter(n -> (NETWORK_PREFIX + n.name()).equals(name) || (n.name() + "-net").equals(name))