@@ -25,6 +25,7 @@ type DeploymentConfigInterface interface {

 	Watch(opts kapi.ListOptions) (watch.Interface, error)

 	Generate(name string) (*deployapi.DeploymentConfig, error)

 	Rollback(config *deployapi.DeploymentConfigRollback) (*deployapi.DeploymentConfig, error)

+	RollbackDeprecated(config *deployapi.DeploymentConfigRollback) (*deployapi.DeploymentConfig, error)

 	GetScale(name string) (*extensions.Scale, error)

 	UpdateScale(scale *extensions.Scale) (*extensions.Scale, error)

 	UpdateStatus(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error)

@@ -104,6 +105,20 @@ func (c *deploymentConfigs) Rollback(config *deployapi.DeploymentConfigRollback)

 	result = &deployapi.DeploymentConfig{}

 	err = c.r.Post().

 		Namespace(c.ns).

+		Resource("deploymentConfigs").

+		Name(config.Name).

+		SubResource("rollback").

+		Body(config).

+		Do().

+		Into(result)

+	return

+}

+

+// RollbackDeprecated rolls a deploymentConfig back to a previous configuration

+func (c *deploymentConfigs) RollbackDeprecated(config *deployapi.DeploymentConfigRollback) (result *deployapi.DeploymentConfig, err error) {

+	result = &deployapi.DeploymentConfig{}

+	err = c.r.Post().

+		Namespace(c.ns).

 		Resource("deploymentConfigRollbacks").

 		Body(config).

 		Do().

@@ -71,6 +71,15 @@ func (c *FakeDeploymentConfigs) Generate(name string) (*deployapi.DeploymentConf

 }

 func (c *FakeDeploymentConfigs) Rollback(inObj *deployapi.DeploymentConfigRollback) (result *deployapi.DeploymentConfig, err error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewCreateAction("deploymentconfigs/rollback", c.Namespace, inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*deployapi.DeploymentConfig), err

+}

+

+func (c *FakeDeploymentConfigs) RollbackDeprecated(inObj *deployapi.DeploymentConfigRollback) (result *deployapi.DeploymentConfig, err error) {

 	obj, err := c.Fake.Invokes(ktestclient.NewCreateAction("deploymentconfigrollbacks", c.Namespace, inObj), inObj)

 	if obj == nil {

 		return nil, err

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

 			IncludeReplicationMeta: o.IncludeScalingSettings,

 		},

 	}

-	newConfig, err := o.oc.DeploymentConfigs(o.Namespace).Rollback(rollback)

+	newConfig, err := o.oc.DeploymentConfigs(o.Namespace).RollbackDeprecated(rollback)

 	if err != nil {

 		return err

 	}

@@ -224,7 +224,7 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {

 				authorizationapi.NewRule(read...).Groups(buildGroup).Resources("builds/log").RuleOrDie(),

 				authorizationapi.NewRule("create").Groups(buildGroup).Resources("buildconfigs/instantiate", "buildconfigs/instantiatebinary", "builds/clone").RuleOrDie(),

-				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/rollback", "deploymentconfigs/scale").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs/log", "deploymentconfigs/status").RuleOrDie(),

 				authorizationapi.NewRule(readWrite...).Groups(imageGroup).Resources("imagestreams", "imagestreammappings", "imagestreamtags", "imagestreamimages", "imagestreams/secrets").RuleOrDie(),

@@ -271,7 +271,7 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {

 				authorizationapi.NewRule(read...).Groups(buildGroup).Resources("builds/log").RuleOrDie(),

 				authorizationapi.NewRule("create").Groups(buildGroup).Resources("buildconfigs/instantiate", "buildconfigs/instantiatebinary", "builds/clone").RuleOrDie(),

-				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule(readWrite...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/rollback", "deploymentconfigs/scale").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs/log", "deploymentconfigs/status").RuleOrDie(),

 				authorizationapi.NewRule(readWrite...).Groups(imageGroup).Resources("imagestreams", "imagestreammappings", "imagestreamtags", "imagestreamimages", "imagestreams/secrets").RuleOrDie(),

@@ -313,7 +313,7 @@ func GetBootstrapClusterRoles() []authorizationapi.ClusterRole {

 				authorizationapi.NewRule(read...).Groups(buildGroup).Resources("builds", "buildconfigs", "buildconfigs/webhooks").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(buildGroup).Resources("builds/log").RuleOrDie(),

-				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs", "generatedeploymentconfigs", "deploymentconfigrollbacks", "deploymentconfigs/scale").RuleOrDie(),

+				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs", "deploymentconfigs/scale").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(deployGroup).Resources("deploymentconfigs/log", "deploymentconfigs/status").RuleOrDie(),

 				authorizationapi.NewRule(read...).Groups(imageGroup).Resources("imagestreams", "imagestreammappings", "imagestreamtags", "imagestreamimages").RuleOrDie(),

@@ -518,12 +518,12 @@ func (c *MasterConfig) GetRestStorage() map[string]rest.Storage {

 		},

 	}

 	configClient, kclient := c.DeploymentConfigClients()

-	deployRollback := &deployrollback.RollbackGenerator{}

 	deployRollbackClient := deployrollback.Client{

 		DCFn: deployConfigRegistry.GetDeploymentConfig,

 		RCFn: clientDeploymentInterface{kclient}.GetDeployment,

-		GRFn: deployRollback.GenerateRollback,

+		GRFn: deployrollback.NewRollbackGenerator().GenerateRollback,

 	}

+	deployConfigRollbackStorage := deployrollback.NewREST(configClient, kclient, c.EtcdHelper.Codec())

 	projectStorage := projectproxy.NewREST(kclient.Namespaces(), c.ProjectAuthorizationCache, c.ProjectAuthorizationCache, c.ProjectCache)

@@ -568,12 +568,15 @@ func (c *MasterConfig) GetRestStorage() map[string]rest.Storage {

 		"imageStreamMappings":  imageStreamMappingStorage,

 		"imageStreamTags":      imageStreamTagStorage,

-		"deploymentConfigs":         deployConfigStorage,

-		"deploymentConfigs/scale":   deployConfigScaleStorage,

-		"deploymentConfigs/status":  deployConfigStatusStorage,

+		"deploymentConfigs":          deployConfigStorage,

+		"deploymentConfigs/scale":    deployConfigScaleStorage,

+		"deploymentConfigs/status":   deployConfigStatusStorage,

+		"deploymentConfigs/rollback": deployConfigRollbackStorage,

+		"deploymentConfigs/log":      deploylogregistry.NewREST(configClient, kclient, c.DeploymentLogClient(), kubeletClient),

+

+		// TODO: Deprecate these

 		"generateDeploymentConfigs": deployconfiggenerator.NewREST(deployConfigGenerator, c.EtcdHelper.Codec()),

-		"deploymentConfigRollbacks": deployrollback.NewREST(deployRollbackClient, c.EtcdHelper.Codec()),

-		"deploymentConfigs/log":     deploylogregistry.NewREST(configClient, kclient, c.DeploymentLogClient(), kubeletClient),

+		"deploymentConfigRollbacks": deployrollback.NewDeprecatedREST(deployRollbackClient, c.EtcdHelper.Codec()),

 		"processedTemplates": templateregistry.NewREST(),

 		"templates":          templateStorage,

@@ -409,6 +409,10 @@ type DeploymentConfigList struct {

 // DeploymentConfigRollback provides the input to rollback generation.

 type DeploymentConfigRollback struct {

 	unversioned.TypeMeta

+	// Name of the deployment config that will be rolled back.

+	Name string

+	// UpdatedAnnotations is a set of new annotations that will be added in the deployment config.

+	UpdatedAnnotations map[string]string

 	// Spec defines the options to rollback generation.

 	Spec DeploymentConfigRollbackSpec

 }

@@ -417,6 +421,8 @@ type DeploymentConfigRollback struct {

 type DeploymentConfigRollbackSpec struct {

 	// From points to a ReplicationController which is a deployment.

 	From kapi.ObjectReference

+	// Revision to rollback to. If set to 0, rollback to the last revision.

+	Revision int64

 	// IncludeTriggers specifies whether to include config Triggers.

 	IncludeTriggers bool

 	// IncludeTemplate specifies whether to include the PodTemplateSpec.

@@ -366,6 +366,10 @@ type DeploymentConfigList struct {

 // DeploymentConfigRollback provides the input to rollback generation.

 type DeploymentConfigRollback struct {

 	unversioned.TypeMeta `json:",inline"`

+	// Name of the deployment config that will be rolled back.

+	Name string `json:"name"`

+	// UpdatedAnnotations is a set of new annotations that will be added in the deployment config.

+	UpdatedAnnotations map[string]string `json:"updatedAnnotations,omitempty"`

 	// Spec defines the options to rollback generation.

 	Spec DeploymentConfigRollbackSpec `json:"spec"`

 }

@@ -374,6 +378,8 @@ type DeploymentConfigRollback struct {

 type DeploymentConfigRollbackSpec struct {

 	// From points to a ReplicationController which is a deployment.

 	From kapi.ObjectReference `json:"from"`

+	// Revision to rollback to. If set to 0, rollback to the last revision.

+	Revision int64 `json:"revision,omitempty"`

 	// IncludeTriggers specifies whether to include config Triggers.

 	IncludeTriggers bool `json:"includeTriggers"`

 	// IncludeTemplate specifies whether to include the PodTemplateSpec.

@@ -377,6 +377,10 @@ type DeploymentConfigList struct {

 // DeploymentConfigRollback provides the input to rollback generation.

 type DeploymentConfigRollback struct {

 	unversioned.TypeMeta `json:",inline"`

+	// Name of the deployment config that will be rolled back.

+	Name string `json:"name"`

+	// UpdatedAnnotations is a set of new annotations that will be added in the deployment config.

+	UpdatedAnnotations map[string]string `json:"updatedAnnotations,omitempty"`

 	// Spec defines the options to rollback generation.

 	Spec DeploymentConfigRollbackSpec `json:"spec"`

 }

@@ -385,6 +389,8 @@ type DeploymentConfigRollback struct {

 type DeploymentConfigRollbackSpec struct {

 	// From points to a ReplicationController which is a deployment.

 	From kapi.ObjectReference `json:"from"`

+	// Revision to rollback to. If set to 0, rollback to the last revision.

+	Revision int64 `json:"revision,omitempty"`

 	// IncludeTriggers specifies whether to include config Triggers.

 	IncludeTriggers bool `json:"includeTriggers"`

 	// IncludeTemplate specifies whether to include the PodTemplateSpec.

@@ -148,6 +148,23 @@ func ValidateDeploymentConfigStatusUpdate(newConfig *deployapi.DeploymentConfig,

 func ValidateDeploymentConfigRollback(rollback *deployapi.DeploymentConfigRollback) field.ErrorList {

 	result := field.ErrorList{}

+	if len(rollback.Name) == 0 {

+		result = append(result, field.Required(field.NewPath("name"), "name of the deployment config is missing"))

+	} else if !kvalidation.IsDNS1123Subdomain(rollback.Name) {

+		result = append(result, field.Invalid(field.NewPath("name"), rollback.Name, "name of the deployment config is invalid"))

+	}

+

+	specPath := field.NewPath("spec")

+	if rollback.Spec.Revision < 0 {

+		result = append(result, field.Invalid(specPath.Child("revision"), rollback.Spec.Revision, "must be non-negative"))

+	}

+

+	return result

+}

+

+func ValidateDeploymentConfigRollbackDeprecated(rollback *deployapi.DeploymentConfigRollback) field.ErrorList {

+	result := field.ErrorList{}

+

 	fromPath := field.NewPath("spec", "from")

 	if len(rollback.Spec.From.Name) == 0 {

 		result = append(result, field.Required(fromPath.Child("name"), ""))

@@ -726,6 +726,20 @@ func TestValidateDeploymentConfigUpdate(t *testing.T) {

 func TestValidateDeploymentConfigRollbackOK(t *testing.T) {

 	rollback := &api.DeploymentConfigRollback{

+		Name: "config",

+		Spec: api.DeploymentConfigRollbackSpec{

+			Revision: 2,

+		},

+	}

+

+	errs := ValidateDeploymentConfigRollback(rollback)

+	if len(errs) > 0 {

+		t.Errorf("Unxpected non-empty error list: %v", errs)

+	}

+}

+

+func TestValidateDeploymentConfigRollbackDeprecatedOK(t *testing.T) {

+	rollback := &api.DeploymentConfigRollback{

 		Spec: api.DeploymentConfigRollbackSpec{

 			From: kapi.ObjectReference{

 				Name: "deployment",

@@ -733,7 +747,7 @@ func TestValidateDeploymentConfigRollbackOK(t *testing.T) {

 		},

 	}

-	errs := ValidateDeploymentConfigRollback(rollback)

+	errs := ValidateDeploymentConfigRollbackDeprecated(rollback)

 	if len(errs) > 0 {

 		t.Errorf("Unxpected non-empty error list: %v", errs)

 	}

@@ -749,6 +763,59 @@ func TestValidateDeploymentConfigRollbackInvalidFields(t *testing.T) {

 		T field.ErrorType

 		F string

 	}{

+		"missing name": {

+			api.DeploymentConfigRollback{

+				Spec: api.DeploymentConfigRollbackSpec{

+					Revision: 2,

+				},

+			},

+			field.ErrorTypeRequired,

+			"name",

+		},

+		"invalid name": {

+			api.DeploymentConfigRollback{

+				Name: "*_*myconfig",

+				Spec: api.DeploymentConfigRollbackSpec{

+					Revision: 2,

+				},

+			},

+			field.ErrorTypeInvalid,

+			"name",

+		},

+		"invalid revision": {

+			api.DeploymentConfigRollback{

+				Name: "config",

+				Spec: api.DeploymentConfigRollbackSpec{

+					Revision: -1,

+				},

+			},

+			field.ErrorTypeInvalid,

+			"spec.revision",

+		},

+	}

+

+	for k, v := range errorCases {

+		errs := ValidateDeploymentConfigRollback(&v.D)

+		if len(errs) == 0 {

+			t.Errorf("Expected failure for scenario %q", k)

+		}

+		for i := range errs {

+			if errs[i].Type != v.T {

+				t.Errorf("%s: expected errors to have type %q: %v", k, v.T, errs[i])

+			}

+			if errs[i].Field != v.F {

+				t.Errorf("%s: expected errors to have field %q: %v", k, v.F, errs[i])

+			}

+		}

+	}

+}

+

+func TestValidateDeploymentConfigRollbackDeprecatedInvalidFields(t *testing.T) {

+	errorCases := map[string]struct {

+		D api.DeploymentConfigRollback

+		T field.ErrorType

+		F string

+	}{

 		"missing spec.from.name": {

 			api.DeploymentConfigRollback{

 				Spec: api.DeploymentConfigRollbackSpec{

@@ -773,7 +840,7 @@ func TestValidateDeploymentConfigRollbackInvalidFields(t *testing.T) {

 	}

 	for k, v := range errorCases {

-		errs := ValidateDeploymentConfigRollback(&v.D)

+		errs := ValidateDeploymentConfigRollbackDeprecated(&v.D)

 		if len(errs) == 0 {

 			t.Errorf("Expected failure for scenario %s", k)

 		}

@@ -5,9 +5,11 @@ import (

 	kapi "k8s.io/kubernetes/pkg/api"

 	kerrors "k8s.io/kubernetes/pkg/api/errors"

+	kclient "k8s.io/kubernetes/pkg/client/unversioned"

 	"k8s.io/kubernetes/pkg/runtime"

 	"k8s.io/kubernetes/pkg/util/validation/field"

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

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	"github.com/openshift/origin/pkg/deploy/api/validation"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

@@ -15,95 +17,82 @@ import (

 // REST provides a rollback generation endpoint. Only the Create method is implemented.

 type REST struct {

-	generator GeneratorClient

+	generator RollbackGenerator

+	dn        client.DeploymentConfigsNamespacer

+	rn        kclient.ReplicationControllersNamespacer

 	codec     runtime.Codec

 }

-// GeneratorClient defines a local interface to a rollback generator for testability.

-type GeneratorClient interface {

-	GenerateRollback(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error)

-	GetDeployment(ctx kapi.Context, name string) (*kapi.ReplicationController, error)

-	GetDeploymentConfig(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error)

-}

-

-// Client provides an implementation of Generator client

-type Client struct {

-	GRFn func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error)

-	RCFn func(ctx kapi.Context, name string) (*kapi.ReplicationController, error)

-	DCFn func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error)

-}

-

-// GetDeployment returns the deploymentConfig with the provided context and name

-func (c Client) GetDeploymentConfig(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

-	return c.DCFn(ctx, name)

-}

-

-// GetDeployment returns the deployment with the provided context and name

-func (c Client) GetDeployment(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

-	return c.RCFn(ctx, name)

-}

-

-// GenerateRollback generates a new deploymentConfig by merging a pair of deploymentConfigs

-func (c Client) GenerateRollback(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

-	return c.GRFn(from, to, spec)

-}

-

 // NewREST safely creates a new REST.

-func NewREST(generator GeneratorClient, codec runtime.Codec) *REST {

+func NewREST(oc client.Interface, kc kclient.Interface, codec runtime.Codec) *REST {

 	return &REST{

-		generator: generator,

+		generator: NewRollbackGenerator(),

+		dn:        oc,

+		rn:        kc,

 		codec:     codec,

 	}

 }

 // New creates an empty DeploymentConfigRollback resource

-func (s *REST) New() runtime.Object {

+func (r *REST) New() runtime.Object {

 	return &deployapi.DeploymentConfigRollback{}

 }

 // Create generates a new DeploymentConfig representing a rollback.

-func (s *REST) Create(ctx kapi.Context, obj runtime.Object) (runtime.Object, error) {

+func (r *REST) Create(ctx kapi.Context, obj runtime.Object) (runtime.Object, error) {

+	namespace, ok := kapi.NamespaceFrom(ctx)

+	if !ok {

+		return nil, kerrors.NewBadRequest("namespace parameter required.")

+	}

 	rollback, ok := obj.(*deployapi.DeploymentConfigRollback)

 	if !ok {

 		return nil, kerrors.NewBadRequest(fmt.Sprintf("not a rollback spec: %#v", obj))

 	}

 	if errs := validation.ValidateDeploymentConfigRollback(rollback); len(errs) > 0 {

-		return nil, kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), "", errs)

+		return nil, kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), rollback.Name, errs)

 	}

-	// Roll back "from" the current deployment "to" a target deployment

-

-	// Find the target ("to") deployment and decode the DeploymentConfig

-	targetDeployment, err := s.generator.GetDeployment(ctx, rollback.Spec.From.Name)

+	from, err := r.dn.DeploymentConfigs(namespace).Get(rollback.Name)

 	if err != nil {

-		if kerrors.IsNotFound(err) {

-			return nil, newInvalidDeploymentError(rollback, "Deployment not found")

-		}

-		return nil, newInvalidDeploymentError(rollback, fmt.Sprintf("%v", err))

+		return nil, newInvalidError(rollback, fmt.Sprintf("cannot get deployment config %q: %v", rollback.Name, err))

+	}

+

+	switch from.Status.LatestVersion {

+	case 0:

+		return nil, newInvalidError(rollback, "cannot rollback an undeployed config")

+	case 1:

+		return nil, newInvalidError(rollback, fmt.Sprintf("no previous deployment exists for %q", deployutil.LabelForDeploymentConfig(from)))

 	}

-	to, err := deployutil.DecodeDeploymentConfig(targetDeployment, s.codec)

+	revision := from.Status.LatestVersion - 1

+	if rollback.Spec.Revision > 0 {

+		revision = rollback.Spec.Revision

+	}

+

+	// Find the target deployment and decode its config.

+	name := deployutil.DeploymentNameForConfigVersion(from.Name, revision)

+	targetDeployment, err := r.rn.ReplicationControllers(namespace).Get(name)

 	if err != nil {

-		return nil, newInvalidDeploymentError(rollback,

-			fmt.Sprintf("couldn't decode DeploymentConfig from Deployment: %v", err))

+		return nil, newInvalidError(rollback, err.Error())

 	}

-	// Find the current ("from") version of the target deploymentConfig

-	from, err := s.generator.GetDeploymentConfig(ctx, to.Name)

+	to, err := deployutil.DecodeDeploymentConfig(targetDeployment, r.codec)

 	if err != nil {

-		if kerrors.IsNotFound(err) {

-			return nil, newInvalidDeploymentError(rollback,

-				fmt.Sprintf("couldn't find a current DeploymentConfig %s/%s", targetDeployment.Namespace, to.Name))

-		}

-		return nil, newInvalidDeploymentError(rollback,

-			fmt.Sprintf("error finding current DeploymentConfig %s/%s: %v", targetDeployment.Namespace, to.Name, err))

+		return nil, newInvalidError(rollback, fmt.Sprintf("couldn't decode deployment config from deployment: %v", err))

+	}

+

+	if from.Annotations == nil && len(rollback.UpdatedAnnotations) > 0 {

+		from.Annotations = make(map[string]string)

+	}

+	for key, value := range rollback.UpdatedAnnotations {

+		from.Annotations[key] = value

 	}

-	return s.generator.GenerateRollback(from, to, &rollback.Spec)

+	return r.generator.GenerateRollback(from, to, &rollback.Spec)

 }

-func newInvalidDeploymentError(rollback *deployapi.DeploymentConfigRollback, reason string) error {

-	err := field.Invalid(field.NewPath("spec").Child("from").Child("name"), rollback.Spec.From.Name, reason)

-	return kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), "", field.ErrorList{err})

+func newInvalidError(rollback *deployapi.DeploymentConfigRollback, reason string) error {

+	err := field.Invalid(field.NewPath("name"), rollback.Name, reason)

+	return kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), rollback.Name, field.ErrorList{err})

 }

new file mode 100644

@@ -0,0 +1,109 @@

+package rollback

+

+import (

+	"fmt"

+

+	kapi "k8s.io/kubernetes/pkg/api"

+	kerrors "k8s.io/kubernetes/pkg/api/errors"

+	"k8s.io/kubernetes/pkg/runtime"

+	"k8s.io/kubernetes/pkg/util/validation/field"

+

+	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	"github.com/openshift/origin/pkg/deploy/api/validation"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

+)

+

+// REST provides a rollback generation endpoint. Only the Create method is implemented.

+type DeprecatedREST struct {

+	generator GeneratorClient

+	codec     runtime.Codec

+}

+

+// GeneratorClient defines a local interface to a rollback generator for testability.

+type GeneratorClient interface {

+	GenerateRollback(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error)

+	GetDeployment(ctx kapi.Context, name string) (*kapi.ReplicationController, error)

+	GetDeploymentConfig(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error)

+}

+

+// Client provides an implementation of Generator client

+type Client struct {

+	GRFn func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error)

+	RCFn func(ctx kapi.Context, name string) (*kapi.ReplicationController, error)

+	DCFn func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error)

+}

+

+// GetDeployment returns the deploymentConfig with the provided context and name

+func (c Client) GetDeploymentConfig(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+	return c.DCFn(ctx, name)

+}

+

+// GetDeployment returns the deployment with the provided context and name

+func (c Client) GetDeployment(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

+	return c.RCFn(ctx, name)

+}

+

+// GenerateRollback generates a new deploymentConfig by merging a pair of deploymentConfigs

+func (c Client) GenerateRollback(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+	return c.GRFn(from, to, spec)

+}

+

+// NewDeprecatedREST safely creates a new REST.

+func NewDeprecatedREST(generator GeneratorClient, codec runtime.Codec) *DeprecatedREST {

+	return &DeprecatedREST{

+		generator: generator,

+		codec:     codec,

+	}

+}

+

+// New creates an empty DeploymentConfigRollback resource

+func (s *DeprecatedREST) New() runtime.Object {

+	return &deployapi.DeploymentConfigRollback{}

+}

+

+// Create generates a new DeploymentConfig representing a rollback.

+func (s *DeprecatedREST) Create(ctx kapi.Context, obj runtime.Object) (runtime.Object, error) {

+	rollback, ok := obj.(*deployapi.DeploymentConfigRollback)

+	if !ok {

+		return nil, kerrors.NewBadRequest(fmt.Sprintf("not a rollback spec: %#v", obj))

+	}

+

+	if errs := validation.ValidateDeploymentConfigRollbackDeprecated(rollback); len(errs) > 0 {

+		return nil, kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), "", errs)

+	}

+

+	// Roll back "from" the current deployment "to" a target deployment

+

+	// Find the target ("to") deployment and decode the DeploymentConfig

+	targetDeployment, err := s.generator.GetDeployment(ctx, rollback.Spec.From.Name)

+	if err != nil {

+		if kerrors.IsNotFound(err) {

+			return nil, newInvalidDeploymentError(rollback, "Deployment not found")

+		}

+		return nil, newInvalidDeploymentError(rollback, fmt.Sprintf("%v", err))

+	}

+

+	to, err := deployutil.DecodeDeploymentConfig(targetDeployment, s.codec)

+	if err != nil {

+		return nil, newInvalidDeploymentError(rollback,

+			fmt.Sprintf("couldn't decode DeploymentConfig from Deployment: %v", err))

+	}

+

+	// Find the current ("from") version of the target deploymentConfig

+	from, err := s.generator.GetDeploymentConfig(ctx, to.Name)

+	if err != nil {

+		if kerrors.IsNotFound(err) {

+			return nil, newInvalidDeploymentError(rollback,

+				fmt.Sprintf("couldn't find a current DeploymentConfig %s/%s", targetDeployment.Namespace, to.Name))

+		}

+		return nil, newInvalidDeploymentError(rollback,

+			fmt.Sprintf("error finding current DeploymentConfig %s/%s: %v", targetDeployment.Namespace, to.Name, err))

+	}

+

+	return s.generator.GenerateRollback(from, to, &rollback.Spec)

+}

+

+func newInvalidDeploymentError(rollback *deployapi.DeploymentConfigRollback, reason string) error {

+	err := field.Invalid(field.NewPath("spec").Child("from").Child("name"), rollback.Spec.From.Name, reason)

+	return kerrors.NewInvalid(deployapi.Kind("DeploymentConfigRollback"), "", field.ErrorList{err})

+}

new file mode 100644

@@ -0,0 +1,231 @@

+package rollback

+

+import (

+	"errors"

+	"fmt"

+	"strings"

+	"testing"

+

+	kapi "k8s.io/kubernetes/pkg/api"

+	kerrors "k8s.io/kubernetes/pkg/api/errors"

+

+	deployapi "github.com/openshift/origin/pkg/deploy/api"

+	_ "github.com/openshift/origin/pkg/deploy/api/install"

+	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

+	deployutil "github.com/openshift/origin/pkg/deploy/util"

+)

+

+func TestCreateErrorDepr(t *testing.T) {

+	rest := DeprecatedREST{}

+	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfig{})

+

+	if err == nil {

+		t.Errorf("Expected an error")

+	}

+

+	if obj != nil {

+		t.Errorf("Unexpected non-nil object: %#v", obj)

+	}

+}

+

+func TestCreateInvalidDepr(t *testing.T) {

+	rest := DeprecatedREST{}

+	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{})

+

+	if err == nil {

+		t.Errorf("Expected an error")

+	}

+

+	if obj != nil {

+		t.Errorf("Unexpected non-nil object: %#v", obj)

+	}

+}

+

+func TestCreateOkDepr(t *testing.T) {

+	rest := DeprecatedREST{

+		generator: Client{

+			GRFn: func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+				return &deployapi.DeploymentConfig{}, nil

+			},

+			RCFn: func(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

+				deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+				return deployment, nil

+			},

+			DCFn: func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+				return deploytest.OkDeploymentConfig(1), nil

+			},

+		},

+		codec: kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion),

+	}

+

+	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+		Spec: deployapi.DeploymentConfigRollbackSpec{

+			From: kapi.ObjectReference{

+				Name:      "deployment",

+				Namespace: kapi.NamespaceDefault,

+			},

+		},

+	})

+

+	if err != nil {

+		t.Errorf("Unexpected error: %v", err)

+	}

+

+	if obj == nil {

+		t.Errorf("Expected a result obj")

+	}

+

+	if _, ok := obj.(*deployapi.DeploymentConfig); !ok {

+		t.Errorf("expected a DeploymentConfig, got a %#v", obj)

+	}

+}

+

+func TestCreateGeneratorErrorDepr(t *testing.T) {

+	rest := DeprecatedREST{

+		generator: Client{

+			GRFn: func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+				return nil, kerrors.NewInternalError(fmt.Errorf("something terrible happened"))

+			},

+			RCFn: func(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

+				deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+				return deployment, nil

+			},

+			DCFn: func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+				return deploytest.OkDeploymentConfig(1), nil

+			},

+		},

+		codec: kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion),

+	}

+

+	_, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+		Spec: deployapi.DeploymentConfigRollbackSpec{

+			From: kapi.ObjectReference{

+				Name:      "deployment",

+				Namespace: kapi.NamespaceDefault,

+			},

+		},

+	})

+

+	if err == nil || !strings.Contains(err.Error(), "something terrible happened") {

+		t.Errorf("Unexpected error: %v", err)

+	}

+}

+

+func TestCreateMissingDeploymentDepr(t *testing.T) {

+	rest := DeprecatedREST{

+		generator: Client{

+			GRFn: func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+				t.Fatal("unexpected call to generator")

+				return nil, errors.New("something terrible happened")

+			},

+			RCFn: func(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

+				return nil, kerrors.NewNotFound(kapi.Resource("replicationController"), name)

+			},

+			DCFn: func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+				namespace, _ := kapi.NamespaceFrom(ctx)

+				t.Fatalf("unexpected call to GetDeploymentConfig(%s/%s)", namespace, name)

+				return nil, kerrors.NewNotFound(deployapi.Resource("deploymentConfig"), name)

+			},

+		},

+		codec: kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion),

+	}

+

+	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+		Spec: deployapi.DeploymentConfigRollbackSpec{

+			From: kapi.ObjectReference{

+				Name:      "deployment",

+				Namespace: kapi.NamespaceDefault,

+			},

+		},

+	})

+

+	if err == nil {

+		t.Errorf("Expected an error")

+	}

+

+	if obj != nil {

+		t.Error("Unexpected result obj")

+	}

+}

+

+func TestCreateInvalidDeploymentDepr(t *testing.T) {

+	rest := DeprecatedREST{

+		generator: Client{

+			GRFn: func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+				t.Fatal("unexpected call to generator")

+				return nil, errors.New("something terrible happened")

+			},

+			RCFn: func(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

+				// invalidate the encoded config

+				deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+				deployment.Annotations[deployapi.DeploymentEncodedConfigAnnotation] = ""

+				return deployment, nil

+			},

+			DCFn: func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+				namespace, _ := kapi.NamespaceFrom(ctx)

+				t.Fatalf("unexpected call to GetDeploymentConfig(%s/%s)", namespace, name)

+				return nil, kerrors.NewNotFound(deployapi.Resource("deploymentConfig"), name)

+			},

+		},

+		codec: kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion),

+	}

+

+	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+		Spec: deployapi.DeploymentConfigRollbackSpec{

+			From: kapi.ObjectReference{

+				Name:      "deployment",

+				Namespace: kapi.NamespaceDefault,

+			},

+		},

+	})

+

+	if err == nil {

+		t.Errorf("Expected an error")

+	}

+

+	if obj != nil {

+		t.Error("Unexpected result obj")

+	}

+}

+

+func TestCreateMissingDeploymentConfigDepr(t *testing.T) {

+	rest := DeprecatedREST{

+		generator: Client{

+			GRFn: func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+				t.Fatal("unexpected call to generator")

+				return nil, errors.New("something terrible happened")

+			},

+			RCFn: func(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

+				deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+				return deployment, nil

+			},

+			DCFn: func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

+				return nil, kerrors.NewNotFound(deployapi.Resource("deploymentConfig"), name)

+			},

+		},

+		codec: kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion),

+	}

+

+	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+		Spec: deployapi.DeploymentConfigRollbackSpec{

+			From: kapi.ObjectReference{

+				Name:      "deployment",

+				Namespace: kapi.NamespaceDefault,

+			},

+		},

+	})

+

+	if err == nil {

+		t.Errorf("Expected an error")

+	}

+

+	if obj != nil {

+		t.Error("Unexpected result obj")

+	}

+}

+

+func TestNewDepr(t *testing.T) {

+	// :)

+	rest := NewDeprecatedREST(Client{}, kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

+	rest.New()

+}

@@ -2,19 +2,31 @@ package rollback

 import (

 	"errors"

-	"fmt"

 	"strings"

 	"testing"

 	kapi "k8s.io/kubernetes/pkg/api"

 	kerrors "k8s.io/kubernetes/pkg/api/errors"

+	ktestclient "k8s.io/kubernetes/pkg/client/unversioned/testclient"

+	"k8s.io/kubernetes/pkg/runtime"

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

 	deployapi "github.com/openshift/origin/pkg/deploy/api"

 	_ "github.com/openshift/origin/pkg/deploy/api/install"

 	deploytest "github.com/openshift/origin/pkg/deploy/api/test"

 	deployutil "github.com/openshift/origin/pkg/deploy/util"

 )

+var codec = kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion)

+

+type terribleGenerator struct{}

+

+func (tg *terribleGenerator) GenerateRollback(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

+	return nil, kerrors.NewInternalError(errors.New("something terrible happened"))

+}

+

+var _ RollbackGenerator = &terribleGenerator{}

+

 func TestCreateError(t *testing.T) {

 	rest := REST{}

 	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfig{})

@@ -42,28 +54,20 @@ func TestCreateInvalid(t *testing.T) {

 }

 func TestCreateOk(t *testing.T) {

-	rest := REST{

-		generator: Client{

-			GRFn: func(from, to *deployapi.DeploymentConfig, spec *deployapi.DeploymentConfigRollbackSpec) (*deployapi.DeploymentConfig, error) {

-				return &deployapi.DeploymentConfig{}, nil

-			},

-			RCFn: func(ctx kapi.Context, name string) (*kapi.ReplicationController, error) {

-				deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion))

-				return deployment, nil

-			},

-			DCFn: func(ctx kapi.Context, name string) (*deployapi.DeploymentConfig, error) {

-				return deploytest.OkDeploymentConfig(1), nil

-			},

-		},

-		codec: kapi.Codecs.LegacyCodec(deployapi.SchemeGroupVersion),

-	}

+	oc := &testclient.Fake{}

+	oc.AddReactor("get", "deploymentconfigs", func(action ktestclient.Action) (handled bool, ret runtime.Object, err error) {

+		return true, deploytest.OkDeploymentConfig(2), nil

+	})

+	kc := &ktestclient.Fake{}

+	kc.AddReactor("get", "replicationcontrollers", func(action ktestclient.Action) (handled bool, ret runtime.Object, err error) {

+		deployment, _ := deployutil.MakeDeployment(deploytest.OkDeploymentConfig(1), codec)

+		return true, deployment, nil

+	})

-	obj, err := rest.Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+	obj, err := NewREST(oc, kc, codec).Create(kapi.NewDefaultContext(), &deployapi.DeploymentConfigRollback{

+		Name: "config",

 		Spec: deployapi.DeploymentConfigRollbackSpec{

-			From: kapi.ObjectReference{

-				Name:      "deployment",

-				Namespace: kapi.NamespaceDefault,