@@ -289,7 +289,7 @@ func (o *ResourceVisitor) Visit(fn MigrateVisitFunc) error {

 	if summarize {

 		if dryRun {

-			fmt.Fprintf(out, "summary (DRY RUN): total=%d errors=%d ignored=%d unchanged=%d migrated=%d\n", t.found, t.errors, t.ignored, t.unchanged, t.found-t.errors-t.unchanged-t.ignored)

+			fmt.Fprintf(out, "summary (dry run): total=%d errors=%d ignored=%d unchanged=%d migrated=%d\n", t.found, t.errors, t.ignored, t.unchanged, t.found-t.errors-t.unchanged-t.ignored)

 		} else {

 			fmt.Fprintf(out, "summary: total=%d errors=%d ignored=%d unchanged=%d migrated=%d\n", t.found, t.errors, t.ignored, t.unchanged, t.found-t.errors-t.unchanged-t.ignored)

 		}

@@ -403,7 +403,7 @@ func (t *migrateTracker) attempt(info *resource.Info, retries int) {

 	case result == attemptResultSuccess:

 		if glog.V(1) {

 			if t.dryRun {

-				t.report("migrated (DRY RUN):", info, nil)

+				t.report("migrated (dry run):", info, nil)

 			} else {

 				t.report("migrated:", info, nil)

 			}

@@ -234,7 +234,7 @@ func (o *CancelBuildOptions) RunCancelBuild() error {

 			}

 			resource, name, _ := cmdutil.ResolveResource(buildapi.Resource("builds"), build.Name, o.Mapper)

-			kcmdutil.PrintSuccess(o.Mapper, false, o.Out, resource.Resource, name, "cancelled")

+			kcmdutil.PrintSuccess(o.Mapper, false, o.Out, resource.Resource, name, false, "cancelled")

 		}(b)

 	}

 	wg.Wait()

@@ -248,7 +248,7 @@ func (o *CancelBuildOptions) RunCancelBuild() error {

 				continue

 			}

 			resource, name, _ := cmdutil.ResolveResource(buildapi.Resource("builds"), build.Name, o.Mapper)

-			kcmdutil.PrintSuccess(o.Mapper, false, o.Out, resource.Resource, name, fmt.Sprintf("restarted build %q", b.Name))

+			kcmdutil.PrintSuccess(o.Mapper, false, o.Out, resource.Resource, name, false, fmt.Sprintf("restarted build %q", b.Name))

 		}

 	}

@@ -165,12 +165,7 @@ func (o *CreateClusterQuotaOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		created := "created"

-		if o.DryRun {

-			created = "created (DRY RUN)"

-		}

-

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "clusterquota", actualObj.Name, created)

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "clusterquota", actualObj.Name, o.DryRun, "created")

 		return nil

 	}

@@ -153,12 +153,7 @@ func (o *CreateDeploymentConfigOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		created := "created"

-		if o.DryRun {

-			created = "created (DRY RUN)"

-		}

-

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "deploymentconfig", actualObj.Name, created)

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "deploymentconfig", actualObj.Name, o.DryRun, "created")

 		return nil

 	}

@@ -142,11 +142,7 @@ func (o *CreateIdentityOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		created := "created"

-		if o.DryRun {

-			created = "created (DRY RUN)"

-		}

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "identity", actualIdentity.Name, created)

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "identity", actualIdentity.Name, o.DryRun, "created")

 		return nil

 	}

@@ -135,11 +135,7 @@ func (o *CreateImageStreamOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		created := "created"

-		if o.DryRun {

-			created = "created (DRY RUN)"

-		}

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "imagestream", actualObj.Name, created)

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "imagestream", actualObj.Name, o.DryRun, "created")

 		return nil

 	}

@@ -122,7 +122,7 @@ func (o *CreatePolicyBindingOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "policybinding", actualBinding.Name, "created")

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "policybinding", actualBinding.Name, false, "created")

 		return nil

 	}

@@ -159,13 +159,8 @@ func CreateEdgeRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Command, ar

 		return err

 	}

-	created := "created"

-	if dryRun {

-		created = "created (DRY RUN)"

-	}

-

 	shortOutput := kcmdutil.GetFlagString(cmd, "output") == "name"

-	kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, created)

+	kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, dryRun, "created")

 	return nil

 }

@@ -258,13 +253,8 @@ func CreatePassthroughRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comm

 		return err

 	}

-	created := "created"

-	if dryRun {

-		created = "created (DRY RUN)"

-	}

-

 	shortOutput := kcmdutil.GetFlagString(cmd, "output") == "name"

-	kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, created)

+	kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, dryRun, "created")

 	return nil

 }

@@ -389,13 +379,8 @@ func CreateReencryptRoute(f *clientcmd.Factory, out io.Writer, cmd *cobra.Comman

 		return err

 	}

-	created := "created"

-	if dryRun {

-		created = "created (DRY RUN)"

-	}

-

 	shortOutput := kcmdutil.GetFlagString(cmd, "output") == "name"

-	kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, created)

+	kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, dryRun, "created")

 	return nil

 }

@@ -133,11 +133,7 @@ func (o *CreateUserOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		created := "created"

-		if o.DryRun {

-			created = "created (DRY RUN)"

-		}

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "user", actualUser.Name, created)

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "user", actualUser.Name, o.DryRun, "created")

 		return nil

 	}

@@ -135,11 +135,7 @@ func (o *CreateUserIdentityMappingOptions) Run() error {

 	}

 	if useShortOutput := o.OutputFormat == "name"; useShortOutput || len(o.OutputFormat) == 0 {

-		created := "created"

-		if o.DryRun {

-			created = "created (DRY RUN)"

-		}

-		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "useridentitymapping", actualMapping.Name, created)

+		cmdutil.PrintSuccess(o.Mapper, useShortOutput, o.Out, "useridentitymapping", actualMapping.Name, o.DryRun, "created")

 		return nil

 	}

@@ -632,7 +632,7 @@ func (o *IdleOptions) RunIdle(f *clientcmd.Factory) error {

 			}

 		}

-		fmt.Fprintf(o.out, "Idled %s %s/%s\n", scaleRef.Kind, info.namespace, scaleRef.Name)

+		fmt.Fprintf(o.out, "Idled %s %s/%s (dry run)\n", scaleRef.Kind, info.namespace, scaleRef.Name)

 	}

 	if hadError {

@@ -252,6 +252,7 @@ func (o *RollbackOptions) Run() error {

 			return err

 		}

 		o.out.Write([]byte(description))

+		fmt.Fprintf(o.out, "%s\n", "(dry run)")

 		return nil

 	}

@@ -36,12 +36,12 @@ var (

 )

 // RolloutLatestOptions holds all the options for the `rollout latest` command.

-// TODO: Support --dry-run

 type RolloutLatestOptions struct {

 	mapper meta.RESTMapper

 	typer  runtime.ObjectTyper

 	infos  []*resource.Info

+	DryRun bool

 	out    io.Writer

 	output string

 	again  bool

@@ -76,7 +76,8 @@ func NewCmdRolloutLatest(fullName string, f *clientcmd.Factory, out io.Writer) *

 		ValidArgs: []string{"deploymentconfig"},

 	}

-	kcmdutil.AddOutputFlagsForMutation(cmd)

+	kcmdutil.AddPrinterFlags(cmd)

+	kcmdutil.AddDryRunFlag(cmd)

 	cmd.Flags().Bool("again", false, "Deploy the current pod template without updating state from triggers")

 	return cmd

@@ -92,6 +93,8 @@ func (o *RolloutLatestOptions) Complete(f *clientcmd.Factory, cmd *cobra.Command

 		return err

 	}

+	o.DryRun = kcmdutil.GetFlagBool(cmd, "dry-run")

+

 	o.oc, o.kc, err = f.Clients()

 	if err != nil {

 		return err

@@ -148,30 +151,35 @@ func (o RolloutLatestOptions) RunRolloutLatest() error {

 		return err

 	}

-	request := &deployapi.DeploymentRequest{

-		Name:   config.Name,

-		Latest: !o.again,

-		Force:  true,

-	}

+	dc := config

+	if !o.DryRun {

+		request := &deployapi.DeploymentRequest{

+			Name:   config.Name,

+			Latest: !o.again,

+			Force:  true,

+		}

-	dc, err := o.oc.DeploymentConfigs(config.Namespace).Instantiate(request)

-	// Pre 1.4 servers don't support the instantiate endpoint. Fallback to incrementing

-	// latestVersion on them.

-	if kerrors.IsNotFound(err) || kerrors.IsForbidden(err) {

-		config.Status.LatestVersion++

-		dc, err = o.oc.DeploymentConfigs(config.Namespace).Update(config)

-	}

-	if err != nil {

-		return err

-	}

+		dc, err = o.oc.DeploymentConfigs(config.Namespace).Instantiate(request)

+

+		// Pre 1.4 servers don't support the instantiate endpoint. Fallback to incrementing

+		// latestVersion on them.

+		if kerrors.IsNotFound(err) || kerrors.IsForbidden(err) {

+			config.Status.LatestVersion++

+			dc, err = o.oc.DeploymentConfigs(config.Namespace).Update(config)

+		}

-	info.Refresh(dc, true)

+		if err != nil {

+			return err

+		}

+

+		info.Refresh(dc, true)

+	}

 	if o.output == "revision" {

 		fmt.Fprintf(o.out, fmt.Sprintf("%d", dc.Status.LatestVersion))

 		return nil

 	}

-	kcmdutil.PrintSuccess(o.mapper, o.output == "name", o.out, info.Mapping.Resource, info.Name, "rolled out")

+	kcmdutil.PrintSuccess(o.mapper, o.output == "name", o.out, info.Mapping.Resource, info.Name, o.DryRun, "rolled out")

 	return nil

 }

@@ -244,7 +244,7 @@ func (o *BuildHookOptions) Run() error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -266,7 +266,7 @@ func (o *BuildSecretOptions) Run() error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if len(errs) > 0 {

 		return errors.NewAggregate(errs)

@@ -289,7 +289,7 @@ func (o *DeploymentHookOptions) Run() error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -538,7 +538,7 @@ updates:

 		}

 		shortOutput := kcmdutil.GetFlagString(cmd, "output") == "name"

-		kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(mapper, shortOutput, out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -346,7 +346,7 @@ func (o *ProbeOptions) Run() error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -245,7 +245,7 @@ func (o *BackendsOptions) Run() error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -317,7 +317,7 @@ func (o *TriggersOptions) Run() error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -484,7 +484,7 @@ func (v *VolumeOptions) RunVolume(args []string) error {

 		}

 		info.Refresh(obj, true)

-		kcmdutil.PrintSuccess(v.Mapper, false, v.Out, info.Mapping.Resource, info.Name, "updated")

+		kcmdutil.PrintSuccess(v.Mapper, false, v.Out, info.Mapping.Resource, info.Name, false, "updated")

 	}

 	if failed {

 		return cmdutil.ErrExit

@@ -314,7 +314,7 @@ func (o *StartBuildOptions) Run() error {

 		}

 	}

-	kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, "build", newBuild.Name, "started")

+	kcmdutil.PrintSuccess(o.Mapper, o.ShortOutput, o.Out, "build", newBuild.Name, false, "started")

 	// Stream the logs from the build

 	if o.Follow {

@@ -85,11 +85,11 @@ func (b *Bulk) Run(list *kapi.List, namespace string) []error {

 	return errs

 }

-func NewPrintNameOrErrorAfterIndent(mapper meta.RESTMapper, short bool, operation string, out, errs io.Writer, indent string) AfterFunc {

+func NewPrintNameOrErrorAfterIndent(mapper meta.RESTMapper, short bool, operation string, out, errs io.Writer, dryRun bool, indent string) AfterFunc {

 	return func(info *resource.Info, err error) bool {

 		if err == nil {

 			fmt.Fprintf(out, indent)

-			cmdutil.PrintSuccess(mapper, short, out, info.Mapping.Resource, info.Name, operation)

+			cmdutil.PrintSuccess(mapper, short, out, info.Mapping.Resource, info.Name, dryRun, operation)

 		} else {

 			fmt.Fprintf(errs, "%serror: %v\n", indent, err)

 		}

@@ -191,10 +191,10 @@ func (b BulkAction) WithMessage(action, individual string) Runner {

 	switch {

 	// TODO: this should be b printer

 	case b.Output == "":

-		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, false, individual, b.Out, b.ErrOut, b.DefaultIndent())

+		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, false, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent())

 	// TODO: needs to be unified with the name printer (incremental vs exact execution), possibly by creating b synthetic printer?

 	case b.Output == "name":

-		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, true, individual, b.Out, b.ErrOut, b.DefaultIndent())

+		b.Bulk.After = NewPrintNameOrErrorAfterIndent(b.Bulk.Mapper, true, individual, b.Out, b.ErrOut, b.DryRun, b.DefaultIndent())

 	default:

 		b.Bulk.After = NewPrintErrorAfter(b.Bulk.Mapper, b.ErrOut)

 		if b.StopOnError {

@@ -214,7 +214,7 @@ func (b *BulkAction) Run(list *kapi.List, namespace string) []error {

 	var modifier string

 	if b.DryRun {

 		run.Op = NoOp

-		modifier = " (DRY RUN)"

+		modifier = " (dry run)"

 	}

 	errs := run.Run(list, namespace)

new file mode 100755

@@ -0,0 +1,18 @@

+#!/bin/bash

+source "$(dirname "${BASH_SOURCE}")/../../hack/lib/init.sh"

+trap os::test::junit::reconcile_output EXIT

+

+# Cleanup cluster resources created by this test

+(

+  set +e

+  oc delete all,templates --all

+  exit 0

+) &>/dev/null

+

+

+os::test::junit::declare_suite_start "cmd/create"

+# validate --dry-run outputs correct success message

+os::cmd::expect_success_and_text 'oc create quota quota --dry-run' 'resourcequota "quota" created \(dry run\)'

+

+echo "oc create: ok"

+os::test::junit::declare_suite_end

\ No newline at end of file

@@ -15,11 +15,11 @@ os::test::junit::declare_suite_start "cmd/migrate"

 os::cmd::expect_success 'oc login -u system:admin'

 os::test::junit::declare_suite_start "cmd/migrate/storage"

-os::cmd::expect_success_and_text     'oadm migrate storage' 'summary \(DRY RUN\)'

-os::cmd::expect_success_and_text     'oadm migrate storage --loglevel=2' 'migrated \(DRY RUN\): serviceaccounts/deployer'

-os::cmd::expect_success_and_not_text 'oadm migrate storage --loglevel=2 --include=pods' 'migrated \(DRY RUN\): serviceaccounts/deployer'

-os::cmd::expect_success_and_text     'oadm migrate storage --loglevel=2 --include=sa --from-key=default/ --to-key=default/\xFF' 'migrated \(DRY RUN\): serviceaccounts/deployer'

-os::cmd::expect_success_and_not_text 'oadm migrate storage --loglevel=2 --include=sa --from-key=default/ --to-key=default/deployer' 'migrated \(DRY RUN\): serviceaccounts/deployer'

+os::cmd::expect_success_and_text     'oadm migrate storage' 'summary \(dry run\)'

+os::cmd::expect_success_and_text     'oadm migrate storage --loglevel=2' 'migrated \(dry run\): serviceaccounts/deployer'

+os::cmd::expect_success_and_not_text 'oadm migrate storage --loglevel=2 --include=pods' 'migrated \(dry run\): serviceaccounts/deployer'

+os::cmd::expect_success_and_text     'oadm migrate storage --loglevel=2 --include=sa --from-key=default/ --to-key=default/\xFF' 'migrated \(dry run\): serviceaccounts/deployer'

+os::cmd::expect_success_and_not_text 'oadm migrate storage --loglevel=2 --include=sa --from-key=default/ --to-key=default/deployer' 'migrated \(dry run\): serviceaccounts/deployer'

 os::cmd::expect_success_and_text     'oadm migrate storage --loglevel=2 --confirm' 'unchanged:'

 os::test::junit::declare_suite_end

@@ -45,7 +45,7 @@ os::cmd::expect_failure_and_text     'oadm migrate image-references a/b=a/b --lo

 os::cmd::expect_failure_and_text     'oadm migrate image-references */*=*/* --loglevel=1' 'at least one change'

 # verify dry run

 os::cmd::expect_success_and_text     'oadm migrate image-references my.docker.io/*=docker.io/* --loglevel=1' 'migrated=0'

-os::cmd::expect_success_and_text     'oadm migrate image-references --include=imagestreams docker.io/*=my.docker.io/* --loglevel=1' 'migrated \(DRY RUN\): imagestreams/test -n '

+os::cmd::expect_success_and_text     'oadm migrate image-references --include=imagestreams docker.io/*=my.docker.io/* --loglevel=1' 'migrated \(dry run\): imagestreams/test -n '

 os::cmd::expect_success_and_text     'oadm migrate image-references --include=imagestreams docker.io/mysql=my.docker.io/* --all-namespaces=false --loglevel=1' 'migrated=1'

 os::cmd::expect_success_and_text     'oadm migrate image-references --include=imagestreams docker.io/mysql=my.docker.io/* --all-namespaces=false --loglevel=1 -o yaml' 'dockerImageReference: my.docker.io/mysql@sha256:'

 os::cmd::expect_success_and_text     'oadm migrate image-references --include=imagestreams docker.io/other=my.docker.io/* --all-namespaces=false --loglevel=1' 'migrated=0'

@@ -67,7 +67,7 @@ os::cmd::expect_failure_and_text 'oadm ipfailover --dry-run' 'you must specify a

 os::cmd::expect_failure_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run' 'error: ipfailover could not be created'

 os::cmd::expect_success 'oadm policy add-scc-to-user privileged -z ipfailover'

 os::cmd::expect_success_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run' 'Creating IP failover'

-os::cmd::expect_success_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run' 'Success \(DRY RUN\)'

+os::cmd::expect_success_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run' 'Success \(dry run\)'

 os::cmd::expect_success_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run -o yaml' 'name: ipfailover'

 os::cmd::expect_success_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run -o name' 'deploymentconfig/ipfailover'

 os::cmd::expect_success_and_text 'oadm ipfailover --virtual-ips="1.2.3.4" --dry-run -o yaml' '1.2.3.4'