Modify validation conditions

Author: xiangpengzhao

pkg/cmd/admin/network/project_options.go

@@ -11,6 +11,7 @@ import (
 	"github.com/spf13/cobra"
 
 	kapi "k8s.io/kubernetes/pkg/api"
+	kapierrors "k8s.io/kubernetes/pkg/api/errors"
 	"k8s.io/kubernetes/pkg/api/meta"
 	kclient "k8s.io/kubernetes/pkg/client/unversioned"
 	"k8s.io/kubernetes/pkg/kubectl/resource"
@@ -86,10 +87,13 @@ func (p *ProjectOptions) Validate() error {
 
 	clusterNetwork, err := p.Oclient.ClusterNetwork().Get(sdnapi.ClusterNetworkDefault)
 	if err != nil {
-		errList = append(errList, errors.New("could not manage pod network: error on getting the running network plugin"))
+		if kapierrors.IsNotFound(err) {
+			errList = append(errList, errors.New("Managing pod network is only supported for openshift multitenant network plugin"))
+		} else {
+			errList = append(errList, errors.New("Failed to fetch current network plugin info"))
+		}
 	} else if !sdnapi.IsOpenShiftMultitenantNetworkPlugin(clusterNetwork.PluginName) {
-		err := fmt.Errorf("could not manage pod network: the running plugin %s is not OpenShift mutitenant network plugin", clusterNetwork.PluginName)
-		errList = append(errList, err)
+		errList = append(errList, fmt.Errorf("Using plugin: %q, managing pod network is only supported for openshift multitenant network plugin", clusterNetwork.PluginName))
 	}
 
 	return kerrors.NewAggregate(errList)