commit 46592cfbb70b7a42f268bdc1b3c8747eb8c65b4d
author Jian Li <pyguni@gmail.com> Tue May 11 18:12:55 2021 +0900
committer Jian Li <pyguni@gmail.com> Tue May 11 09:58:03 2021 +0000
tree 1ada97f73d652995c1e6a8e6618038cbb0dbc699
parent 4673237526377a8750694efbffeabcf2b4fca049

Fix: support Container Network Addons (CNA) operator from kubevirt

Change-Id: I1146db430e70b9e626e80b8e2164e514e736179b
(cherry picked from commit fe3a90500f1d26dd1298d792f6601c7636ff25c2)

apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtVmWatcher.java

diff --git a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtVmWatcher.java b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtVmWatcher.java
index 308707e..0f74dfe 100644
--- a/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtVmWatcher.java
+++ b/apps/kubevirt-networking/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtVmWatcher.java
@@ -94,6 +94,7 @@
     private static final String MAC = "macAddress";
     private static final String IP = "ipAddress";
     private static final String DEFAULT = "default";
+    private static final String CNI_ZERO = "cni0";
     private static final String NETWORK_SUFFIX = "-net";
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
@@ -483,7 +484,7 @@
                     String network = intf.get(NAME).asText();
                     JsonNode macJson = intf.get(MAC);
 
-                    if (!DEFAULT.equals(network) && macJson != null) {
+                    if (!DEFAULT.equals(network) && !CNI_ZERO.equals(network) && macJson != null) {
                         String compact = StringUtils.substringBeforeLast(network, NETWORK_SUFFIX);
                         MacAddress mac = MacAddress.valueOf(macJson.asText());
                         result.put(mac, compact);