fixes log level, and adds a few tests

Signed-off-by: Skyler Clark <[email protected]>

Author: Skyler Clark

pkg/ocicni/ocicni.go

@@ -278,13 +278,13 @@ func loadNetworks(confDir string, cni *libcni.CNIConfig) (map[string]*cniNetwork
 		if strings.HasSuffix(confFile, ".conflist") {
 			confList, err = libcni.ConfListFromFile(confFile)
 			if err != nil {
-				logrus.Warningf("Error loading CNI config list file %s: %v", confFile, err)
+				logrus.Errorf("Error loading CNI config list file %s: %v", confFile, err)
 				continue
 			}
 		} else {
 			conf, err := libcni.ConfFromFile(confFile)
 			if err != nil {
-				logrus.Warningf("Error loading CNI config file %s: %v", confFile, err)
+				logrus.Errorf("Error loading CNI config file %s: %v", confFile, err)
 				continue
 			}
 			if conf.Network.Type == "" {
@@ -293,7 +293,7 @@ func loadNetworks(confDir string, cni *libcni.CNIConfig) (map[string]*cniNetwork
 			}
 			confList, err = libcni.ConfListFromConf(conf)
 			if err != nil {
-				logrus.Warningf("Error converting CNI config file %s to list: %v", confFile, err)
+				logrus.Errorf("Error converting CNI config file %s to list: %v", confFile, err)
 				continue
 			}
 		}
@@ -482,8 +482,8 @@ func (plugin *cniNetworkPlugin) forEachNetwork(podNetwork *PodNetwork, fromCache
 			var newRt *libcni.RuntimeConf
 			cniNet, newRt, err = plugin.loadNetworkFromCache(network.Name, rt)
 			if err != nil {
-				logrus.Debugf("error loading cached network config: %v", err)
-				logrus.Debugf("falling back to loading from existing plugins on disk")
+				logrus.Errorf("error loading cached network config: %v", err)
+				logrus.Warnf("falling back to loading from existing plugins on disk")
 			} else {
 				// Use the updated RuntimeConf
 				rt = newRt
@@ -519,7 +519,7 @@ func bringUpLoopback(netns string) error {
 			return err
 		}
 		if len(v4Addrs) != 0 {
-			// sanity check that this is a loopback address
+			// check that this is a loopback address
 			for _, addr := range v4Addrs {
 				if !addr.IP.IsLoopback() {
 					return fmt.Errorf("loopback interface found with non-loopback address %q", addr.IP)
@@ -532,7 +532,7 @@ func bringUpLoopback(netns string) error {
 			return err
 		}
 		if len(v6Addrs) != 0 {
-			// sanity check that this is a loopback address
+			// check that this is a loopback address
 			for _, addr := range v6Addrs {
 				if !addr.IP.IsLoopback() {
 					return fmt.Errorf("loopback interface found with non-loopback address %q", addr.IP)
@@ -616,7 +616,7 @@ func (plugin *cniNetworkPlugin) getCachedNetworkInfo(containerID string) ([]NetA
 		cacheFile := filepath.Join(dirPath, fname)
 		bytes, err := ioutil.ReadFile(cacheFile)
 		if err != nil {
-			logrus.Warningf("failed to read CNI cache file %s: %v", cacheFile, err)
+			logrus.Errorf("failed to read CNI cache file %s: %v", cacheFile, err)
 			continue
 		}
 
@@ -628,7 +628,7 @@ func (plugin *cniNetworkPlugin) getCachedNetworkInfo(containerID string) ([]NetA
 		}{}
 
 		if err := json.Unmarshal(bytes, &cachedInfo); err != nil {
-			logrus.Warningf("failed to unmarshal CNI cache file %s: %v", cacheFile, err)
+			logrus.Errorf("failed to unmarshal CNI cache file %s: %v", cacheFile, err)
 			continue
 		}
 		if cachedInfo.Kind != libcni.CNICacheV1 {

pkg/ocicni/ocicni_test.go

@@ -758,6 +758,19 @@ var _ = Describe("ocicni operations", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(fake.delIndex).To(Equal(len(fake.plugins)))
 		})
+		It("verifies that network operations can be locked for a pod using cached networks", func() {
+			podNet.Networks = []NetAttachment{}
+			tmp := ocicni.(*cniNetworkPlugin)
+			Expect(len(tmp.pods)).To(Equal(0))
+			tmp.podLock(podNet)
+			Expect(len(tmp.pods)).To(Equal(1))
+		})
+		It("verifies that network operations can be unlocked for a pod using cached networks", func() {
+			podNet.Networks = []NetAttachment{}
+			tmp := ocicni.(*cniNetworkPlugin)
+			tmp.podUnlock(podNet)
+			Expect(len(tmp.pods)).To(Equal(0))
+		})
 	})
 
 	It("tears down a pod using specified networks when cached info is missing", func() {