From 362be285c9b43d7664eddfd1025b76bfae6fdfa0 Mon Sep 17 00:00:00 2001
From: Tomofumi Hayashi <tohayash@redhat.com>
Date: Mon, 23 Apr 2018 15:49:16 +0900
Subject: [PATCH] Revert "Fix error type for NoK8sNetworkError"

This reverts commit 3245ed85778ae8469fd43112ba045004bc1d4e5d, due to
missing pull request process. will file it again as pull request.
---
 k8sclient/k8sclient.go |  8 +++-----
 multus/multus.go       | 18 ++++++++----------
 2 files changed, 11 insertions(+), 15 deletions(-)

diff --git a/k8sclient/k8sclient.go b/k8sclient/k8sclient.go
index 460f9bd54..4927bdd9c 100644
--- a/k8sclient/k8sclient.go
+++ b/k8sclient/k8sclient.go
@@ -30,11 +30,9 @@ import (
 )
 
 // NoK8sNetworkError indicates error, no network in kubernetes
-type NoK8sNetworkError struct {
-	message string
-}
+type NoK8sNetworkError string
 
-func (e *NoK8sNetworkError) Error() string { return string(e.message) }
+func (e NoK8sNetworkError) Error() string { return string(e) }
 
 func createK8sClient(kubeconfig string) (*kubernetes.Clientset, error) {
 
@@ -260,7 +258,7 @@ func GetK8sNetwork(args *skel.CmdArgs, kubeconfig string) ([]map[string]interfac
 	}
 
 	if len(netAnnot) == 0 {
-		return podNet, &NoK8sNetworkError{"no kubernetes network found"}
+		return podNet, NoK8sNetworkError("no kubernetes network found")
 	}
 
 	netObjs, err := parsePodNetworkObject(netAnnot)
diff --git a/multus/multus.go b/multus/multus.go
index 9495ff4e5..696821e00 100644
--- a/multus/multus.go
+++ b/multus/multus.go
@@ -336,19 +336,17 @@ func cmdDel(args *skel.CmdArgs) error {
 
 	if in.Kubeconfig != "" {
 		podDelegate, r := k8s.GetK8sNetwork(args, in.Kubeconfig)
-		if r != nil {
-			if _, ok := r.(*NoK8sNetworkError); ok {
-				nopodnet = true
-				// no network found from default and annotaed network,
-				// we do nothing to remove network for the pod!
-				if !defaultcninetwork {
-					return fmt.Errorf("Multus: Err in getting k8s network from the poc spec, check the pod spec or set delegate for the default network, Refer the README.md: %v", r)
-				}
-			} else {
-				return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", r)
+		if r != nil && r.Error() == "nonet" {
+			nopodnet = true
+			if !defaultcninetwork {
+				return fmt.Errorf("Multus: Err in getting k8s network from the poc spec, check the pod spec or set delegate for the default network, Refer the README.md: %v", r)
 			}
 		}
 
+		if r != nil && !defaultcninetwork {
+			return fmt.Errorf("Multus: Err in getting k8s network from pod: %v", r)
+		}
+
 		if len(podDelegate) != 0 {
 			if in.UseDefault {
 				// In the case that we force the default