commit c886b648cc38da8775af26abd132977ba9be322d
author Jian Li <pyguni@gmail.com> Tue Jul 30 19:12:07 2019 +0900
committer Jian Li <pyguni@gmail.com> Thu Aug 29 16:28:58 2019 +0900
tree 63d256f73a3b2ee40487fffe54c9386dedc0fdfb
parent 6b9bf566fc494a27c540c0b70b22fe03c90e4b38

Fix: remove flow rules when removing POD and namespace

Change-Id: Iec3e48e0f2f14a024c7984ed36659a9aa3e4e9ab

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

diff --git a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java
index c7754fb..b67858a 100644
--- a/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java
+++ b/apps/k8s-networking/app/src/main/java/org/onosproject/k8snetworking/impl/K8sNetworkPolicyHandler.java
@@ -309,12 +309,9 @@
                 .setTunnelId(DEFAULT_SEGMENT_ID)
                 .transition(ROUTING_TABLE);
 
-        int table = 0;
         if (DIRECTION_INGRESS.equals(direction)) {
-            table = ACL_INGRESS_WHITE_TABLE;
+            setPolicyRulesBase(sBuilder, tBuilder, ACL_INGRESS_WHITE_TABLE, install);
         }
-
-        setPolicyRulesBase(sBuilder, tBuilder, table, install);
     }
 
     private void setAllowRulesByPolicy(NetworkPolicy policy, boolean install) {
@@ -357,7 +354,9 @@
                 // POD selector
                 Set<Pod> pods = podsFromPolicyPeer(peer, policy.getMetadata().getNamespace());
 
-                pods.forEach(pod -> {
+                pods.stream()
+                        .filter(pod -> pod.getStatus().getPodIP() != null)
+                        .forEach(pod -> {
                     white.compute(shiftIpDomain(pod.getStatus().getPodIP(),
                             SHIFTED_IP_PREFIX) + "/" + HOST_PREFIX, (m, n) -> direction);
                     white.compute(pod.getStatus().getPodIP() + "/" + HOST_PREFIX, (m, n) -> direction);
@@ -416,7 +415,9 @@
                 // POD selector
                 Set<Pod> pods = podsFromPolicyPeer(peer, policy.getMetadata().getNamespace());
 
-                pods.forEach(pod -> {
+                pods.stream()
+                        .filter(pod -> pod.getStatus().getPodIP() != null)
+                        .forEach(pod -> {
                     white.compute(shiftIpDomain(pod.getStatus().getPodIP(),
                             SHIFTED_IP_PREFIX) + "/" + HOST_PREFIX, (m, n) -> {
                         if (n != null) {
@@ -634,7 +635,6 @@
         nsSet.forEach(ns -> {
             setAllowNamespaceRulesBase(tunnelId, ns.hashCode(), direction, install);
         });
-
     }
 
     private void setAllowAllRule(int nsHash, String direction, boolean install) {
@@ -797,7 +797,8 @@
 
         Integer nsHash = namespaceHashByPodIp(k8sPodService, k8sNamespaceService, podIp);
 
-        if (nsHash == null) {
+        // in uninstall case, we will have null nsHash value
+        if (install && nsHash == null) {
             return;
         }
 
@@ -825,9 +826,12 @@
                     .matchEthType(TYPE_IPV4)
                     .matchIPSrc(IpPrefix.valueOf(IpAddress.valueOf(
                             shiftIpDomain(ip, SHIFTED_IP_PREFIX)), HOST_PREFIX));
-            TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder()
-                    .writeMetadata(nsHash, DEFAULT_METADATA_MASK)
-                    .transition(GROUPING_TABLE);
+            TrafficTreatment.Builder tBuilder = DefaultTrafficTreatment.builder();
+
+            if (install) {
+                tBuilder.writeMetadata(nsHash, DEFAULT_METADATA_MASK)
+                        .transition(GROUPING_TABLE);
+            }
 
             k8sFlowRuleService.setRule(
                     appId,
@@ -985,7 +989,6 @@
             Namespace ns = event.subject();
             switch (event.type()) {
                 case K8S_NAMESPACE_CREATED:
-                case K8S_NAMESPACE_UPDATED:
                     eventExecutor.execute(() -> processNamespaceCreation(ns));
                     break;
                 case K8S_NAMESPACE_REMOVED:
@@ -1010,7 +1013,7 @@
                 return;
             }
 
-            // do nothing for now
+            setDefaultAllowNamespaceRules(namespace, false);
         }
     }
 }