Upon a CNF Pod delete, clear Pod VF cache at secondary network's podw…

…atch controller

Signed-off-by: Arunkumar Velayutham <arunkumar.velayutham@intel.com>

pkg/agent/secondarynetwork/podwatch/controller.go

@@ -147,6 +147,16 @@ func (pc *PodController) buildVFDeviceIDListPerPod(podName, podNamespace string)
 	return vfDeviceIDInfoCache, nil
 }
 
+func (pc *PodController) deleteVFDeviceIDListPerPod(podName, podNamespace string) {
+	podKey := podNamespace + "/" + podName
+	_, cacheFound := pc.vfDeviceIDUsageMap.Load(podKey)
+	if cacheFound {
+		pc.vfDeviceIDUsageMap.Delete(podKey)
+		klog.V(2).InfoS("Pod specific VF Cache cleared", "Key", podKey)
+	}
+	return
+}
+
 func (pc *PodController) assignUnusedSriovVFDeviceIDPerPod(podName, podNamespace, interfaceName string) (string, error) {
 	var cache []podSriovVFDeviceIDInfo
 	cache, err := pc.buildVFDeviceIDListPerPod(podName, podNamespace)
@@ -290,6 +300,8 @@ func (pc *PodController) handleRemovePod(key string) error {
 		} else {
 			// Delete cache entry from podCNIInfo.
 			pc.podCache.DeleteCNIConfigInfo(containerInfo)
+			// Delete Pod specific VF cache (if one exists)
+			pc.deleteVFDeviceIDListPerPod(containerInfo.PodName, containerInfo.PodNameSpace)
 		}
 	}
 	return nil

pkg/agent/secondarynetwork/podwatch/controller_test.go

@@ -510,4 +510,23 @@ func TestPodControllerAddPod(t *testing.T) {
 		// we don't expect an error here, no requeueing
 		assert.NoError(t, podController.handleAddUpdatePod(pod))
 	})
+
+	t.Run("Error when adding VF deviceID cache per Pod", func(t *testing.T) {
+		ctrl := gomock.NewController(t)
+		defer ctrl.Finish()
+		network := testNetwork(networkName)
+		podController, _, _ := newPodController(ctrl)
+		podController.podCache.AddCNIConfigInfo(cniConfig)
+		_, err := podController.kubeClient.CoreV1().Pods(testNamespace).Create(context.Background(), pod, metav1.CreateOptions{})
+		require.NoError(t, err, "error when creating test Pod")
+		_, err = podController.netAttachDefClient.NetworkAttachmentDefinitions(testNamespace).Create(context.Background(), network, metav1.CreateOptions{})
+		require.NoError(t, err, "error when creating test NetworkAttachmentDefinition")
+
+		_, err = podController.assignUnusedSriovVFDeviceIDPerPod(podName, testNamespace, interfaceName)
+		require.NoError(t, err, "error while assigning unused VfDevice ID")
+
+		podController.deleteVFDeviceIDListPerPod(podName, testNamespace)
+		require.NoError(t, err, "error deleting cache")
+
+	})
 }