@@ -588,6 +588,48 @@ _oc_project()

     must_have_one_noun=()

 }

+_oc_projects()

+{

+    last_command="oc_projects"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--short")

+    flags+=("-q")

+    flags+=("--api-version=")

+    flags+=("--as=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--context=")

+    flags+=("--google-json-key=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--log-flush-frequency=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--server=")

+    flags+=("--token=")

+    flags+=("--user=")

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+}

+

 _oc_explain()

 {

     last_command="oc_explain"

@@ -8851,6 +8893,7 @@ _oc()

     commands+=("new-app")

     commands+=("status")

     commands+=("project")

+    commands+=("projects")

     commands+=("explain")

     commands+=("cluster")

     commands+=("deploy")

@@ -4176,6 +4176,48 @@ _openshift_cli_project()

     must_have_one_noun=()

 }

+_openshift_cli_projects()

+{

+    last_command="openshift_cli_projects"

+    commands=()

+

+    flags=()

+    two_word_flags=()

+    flags_with_completion=()

+    flags_completion=()

+

+    flags+=("--short")

+    flags+=("-q")

+    flags+=("--api-version=")

+    flags+=("--as=")

+    flags+=("--certificate-authority=")

+    flags_with_completion+=("--certificate-authority")

+    flags_completion+=("_filedir")

+    flags+=("--client-certificate=")

+    flags_with_completion+=("--client-certificate")

+    flags_completion+=("_filedir")

+    flags+=("--client-key=")

+    flags_with_completion+=("--client-key")

+    flags_completion+=("_filedir")

+    flags+=("--cluster=")

+    flags+=("--config=")

+    flags_with_completion+=("--config")

+    flags_completion+=("_filedir")

+    flags+=("--context=")

+    flags+=("--google-json-key=")

+    flags+=("--insecure-skip-tls-verify")

+    flags+=("--log-flush-frequency=")

+    flags+=("--match-server-version")

+    flags+=("--namespace=")

+    two_word_flags+=("-n")

+    flags+=("--server=")

+    flags+=("--token=")

+    flags+=("--user=")

+

+    must_have_one_flag=()

+    must_have_one_noun=()

+}

+

 _openshift_cli_explain()

 {

     last_command="openshift_cli_explain"

@@ -12439,6 +12481,7 @@ _openshift_cli()

     commands+=("new-app")

     commands+=("status")

     commands+=("project")

+    commands+=("projects")

     commands+=("explain")

     commands+=("cluster")

     commands+=("deploy")

@@ -1621,6 +1621,19 @@ Switch to another project

 ====

+== oc projects

+Display existing projects

+

+====

+

+[options="nowrap"]

+----

+  # Display the projects that currently exist

+  oc

+----

+====

+

+

 == oc proxy

 Run a proxy to the Kubernetes API server

@@ -97,6 +97,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *

 				cmd.NewCmdNewApplication(fullName, f, out),

 				cmd.NewCmdStatus(cmd.StatusRecommendedName, fullName+" "+cmd.StatusRecommendedName, f, out),

 				cmd.NewCmdProject(fullName+" project", f, out),

+				cmd.NewCmdProjects(fullName, f, out),

 				cmd.NewCmdExplain(fullName, f, out),

 				cluster.NewCmdCluster(cluster.ClusterRecommendedName, fullName+" "+cluster.ClusterRecommendedName, f, out),

 			},

@@ -66,7 +66,6 @@ func NewCmdProject(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.

 		Short:   "Switch to another project",

 		Long:    projectLong,

 		Example: fmt.Sprintf(projectExample, fullName),

-		Aliases: []string{"projects"},

 		Run: func(cmd *cobra.Command, args []string) {

 			options.PathOptions = cliconfig.NewPathOptions(cmd)

new file mode 100644

@@ -0,0 +1,175 @@

+package cmd

+

+import (

+	"fmt"

+	"io"

+

+	"k8s.io/kubernetes/pkg/client/restclient"

+	clientcmdapi "k8s.io/kubernetes/pkg/client/unversioned/clientcmd/api"

+	kubecmdconfig "k8s.io/kubernetes/pkg/kubectl/cmd/config"

+	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

+

+	"github.com/openshift/origin/pkg/client"

+	cliconfig "github.com/openshift/origin/pkg/cmd/cli/config"

+	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

+	"github.com/openshift/origin/pkg/project/api"

+

+	"github.com/spf13/cobra"

+)

+

+type ProjectsOptions struct {

+	Config       clientcmdapi.Config

+	ClientConfig *restclient.Config

+	Client       *client.Client

+	Out          io.Writer

+	PathOptions  *kubecmdconfig.PathOptions

+

+	DisplayShort bool

+}

+

+const (

+	projectsLong = `

+Display information about the current active project and existing projects on the server.

+

+For advanced configuration, or to manage the contents of your config file, use the 'config'

+command.`

+

+	projectsExample = `  # Display the projects that currently exist

+  %[1]s`

+)

+

+// NewCmdProjects implements the OpenShift cli rollback command

+func NewCmdProjects(fullName string, f *clientcmd.Factory, out io.Writer) *cobra.Command {

+	options := &ProjectsOptions{}

+

+	cmd := &cobra.Command{

+		Use:     "projects",

+		Short:   "Display existing projects",

+		Long:    projectsLong,

+		Example: fmt.Sprintf(projectsExample, fullName),

+		Run: func(cmd *cobra.Command, args []string) {

+			options.PathOptions = cliconfig.NewPathOptions(cmd)

+

+			if err := options.Complete(f, args, out); err != nil {

+				kcmdutil.CheckErr(kcmdutil.UsageError(cmd, err.Error()))

+			}

+

+			if err := options.RunProjects(); err != nil {

+				kcmdutil.CheckErr(err)

+			}

+		},

+	}

+

+	cmd.Flags().BoolVarP(&options.DisplayShort, "short", "q", false, "If true, display only the project names")

+	return cmd

+}

+

+func (o *ProjectsOptions) Complete(f *clientcmd.Factory, args []string, out io.Writer) error {

+	if len(args) > 0 {

+		return fmt.Errorf("no arguments should be passed")

+	}

+

+	var err error

+	o.Config, err = f.OpenShiftClientConfig.RawConfig()

+	if err != nil {

+		return err

+	}

+

+	o.ClientConfig, err = f.OpenShiftClientConfig.ClientConfig()

+	if err != nil {

+		return err

+	}

+

+	o.Client, _, err = f.Clients()

+	if err != nil {

+		return err

+	}

+

+	o.Out = out

+

+	return nil

+}

+

+// RunProjects lists all projects a user belongs to

+func (o ProjectsOptions) RunProjects() error {

+	config := o.Config

+	clientCfg := o.ClientConfig

+	out := o.Out

+

+	currentContext := config.Contexts[config.CurrentContext]

+	currentProject := currentContext.Namespace

+

+	var currentProjectExists bool = false

+	var currentProjectErr error = nil

+

+	client := o.Client

+

+	if len(currentProject) > 0 {

+		if _, currentProjectErr := client.Projects().Get(currentProject); currentProjectErr == nil {

+			currentProjectExists = true

+		}

+	}

+

+	defaultContextName := cliconfig.GetContextNickname(currentContext.Namespace, currentContext.Cluster, currentContext.AuthInfo)

+

+	var msg string

+	var current string

+	projects, err := getProjects(client)

+	if err == nil {

+		switch len(projects) {

+		case 0:

+			msg += "You are not a member of any projects. You can request a project to be created with the 'new-project' command."

+		case 1:

+			msg += fmt.Sprintf("You have one project on this server: %q.", api.DisplayNameAndNameForProject(&projects[0]))

+		default:

+			asterisk := ""

+			count := 0

+			if !o.DisplayShort {

+				msg += "You have access to the following projects and can switch between them with 'oc project <projectname>':\n"

+				asterisk = "  * "

+			}

+			for _, project := range projects {

+				count = count + 1

+				displayName := project.Annotations["openshift.io/display-name"]

+				linebreak := "\n"

+				if len(displayName) == 0 {

+					displayName = project.Annotations["displayName"]

+				}

+

+				current = ""

+				if currentProjectExists && currentProject == project.Name && !o.DisplayShort {

+					current = " (current)"

+				}

+				if len(displayName) > 0 && displayName != project.Name && !o.DisplayShort {

+					msg += fmt.Sprintf("\n  * %s (%s)%s", displayName, project.Name, current)

+				} else {

+					if o.DisplayShort && count == 1 {

+						linebreak = ""

+					}

+					msg += fmt.Sprintf(linebreak+asterisk+"%s%s", project.Name, current)

+				}

+			}

+		}

+		fmt.Println(msg)

+

+		if len(projects) > 0 && !o.DisplayShort {

+			if !currentProjectExists {

+				if clientcmd.IsForbidden(currentProjectErr) {

+					fmt.Printf("you do not have rights to view project %q. Please switch to an existing one.", currentProject)

+				}

+				return currentProjectErr

+			}

+

+			// if they specified a project name and got a generated context, then only show the information they care about.  They won't recognize

+			// a context name they didn't choose

+			if config.CurrentContext == defaultContextName {

+				fmt.Fprintf(out, "\nUsing project %q on server %q.\n", currentProject, clientCfg.Host)

+			} else {

+				fmt.Fprintf(out, "\nUsing project %q from context named %q on server %q.\n", currentProject, config.CurrentContext, clientCfg.Host)

+			}

+		}

+		return nil

+	}

+

+	return err

+}

@@ -303,6 +303,17 @@ os::test::junit::declare_suite_end

 # service accounts should not be allowed to request new projects

 os::cmd::expect_failure_and_text "oc new-project --token="$( oc sa get-token builder )" will-fail" 'Error from server: You may not request a new project via this API'

+# test oc projects

+os::cmd::expect_failure_and_text 'oc projects test_arg' 'no arguments'

+os::cmd::expect_success_and_text 'oc projects' 'You have access'

+# log in as a test user and expect no projects

+os::cmd::expect_success 'oc login -u test -p test'

+os::cmd::expect_success_and_text 'oc projects' 'You are not a member of any projects'

+# add a project and expect text for a single project

+os::cmd::expect_success_and_text 'oc new-project test4; sleep 2; oc projects' 'You have one project on this server: "test4".'

+os::cmd::expect_success_and_text 'oc new-project test5; sleep 2; oc projects' 'You have access'

+echo 'projects command ok'

+

 os::test::junit::declare_suite_start "cmd/basicresources/patch"

 # Validate patching works correctly

 oc login -u system:admin

@@ -95,9 +95,9 @@ os::cmd::expect_success_and_text 'openshift start --help' 'Start an all-in-one s

 os::cmd::expect_success_and_text 'openshift start master --help' 'Start a master'

 os::cmd::expect_success_and_text 'openshift start node --help' 'Start a node'

 os::cmd::expect_success_and_text 'oc project --help' 'Switch to another project'

-os::cmd::expect_success_and_text 'oc projects --help' 'Switch to another project'

+os::cmd::expect_success_and_text 'oc projects --help' 'existing projects'

 os::cmd::expect_success_and_text 'openshift cli project --help' 'Switch to another project'

-os::cmd::expect_success_and_text 'openshift cli projects --help' 'Switch to another project'

+os::cmd::expect_success_and_text 'openshift cli projects --help' 'current active project and existing projects on the server'

 os::cmd::expect_success_and_text 'oc get --help' 'oc'

 # help for given command through help command must be consistent

@@ -108,7 +108,7 @@ os::cmd::expect_success_and_text 'openshift help start' 'Start an all-in-one ser

 os::cmd::expect_success_and_text 'openshift help start master' 'Start a master'

 os::cmd::expect_success_and_text 'openshift help start node' 'Start a node'

 os::cmd::expect_success_and_text 'oc help project' 'Switch to another project'

-os::cmd::expect_success_and_text 'oc help projects' 'Switch to another project'

+os::cmd::expect_success_and_text 'oc help projects' 'current active project and existing projects on the server'

 # runnable commands with required flags must error consistently

 os::cmd::expect_failure_and_text 'oc get' 'Required resource not specified'