wip

cni.go

@@ -148,7 +148,7 @@ func (c *libcni) Status() error {
 				plugin := plug.Network.Type
 
 				if !FileExistsInDir(dir, plugin) {
-					return ErrCNINotInitialized
+					return ErrCNIPluginNotFound
 				}
 			}
 		 }
@@ -329,8 +329,5 @@ func (c *libcni) reset() {
 func FileExistsInDir(directory, filename string) bool {
 	filePath := filepath.Join(directory, filename)
 	_, err := os.Stat(filePath)
-	if os.IsNotExist(err) {
-		return false
-	}
-	return true
+	return os.IsExist(err)
 }

errors.go

@@ -21,12 +21,14 @@ import (
 )
 
 var (
-	ErrCNINotInitialized = errors.New("cni plugin not initialized")
-	ErrInvalidConfig     = errors.New("invalid cni config")
-	ErrNotFound          = errors.New("not found")
-	ErrRead              = errors.New("failed to read config file")
-	ErrInvalidResult     = errors.New("invalid result")
-	ErrLoad              = errors.New("failed to load cni config")
+	ErrCNINotInitialized    = errors.New("cni plugin not initialized")
+	ErrInvalidConfig        = errors.New("invalid cni config")
+	ErrNotFound             = errors.New("not found")
+	ErrRead                 = errors.New("failed to read config file")
+	ErrInvalidResult        = errors.New("invalid result")
+	ErrLoad                 = errors.New("failed to load cni config")
+	ErrCNIPluginNotFound    = errors.New("cni plugin not found")
+	ErrCNIPluginDirNotFound = errors.New("cni plugin directory not found")
 )
 
 // IsCNINotInitialized returns true if the error is due to cni config not being initialized