@@ -96,9 +96,9 @@ func fakeUser() user.Info {

 func fakeClient(expectedResource string, reviewResponse *authorizationapi.SubjectAccessReviewResponse) client.Interface {

 	emptyResponse := &authorizationapi.SubjectAccessReviewResponse{}

 	return &testclient.Fake{

-		ReactFn: func(action ktestclient.FakeAction) (runtime.Object, error) {

-			if action.Action == "create-subjectAccessReview" {

-				review, ok := action.Value.(*authorizationapi.SubjectAccessReview)

+		ReactFn: func(action ktestclient.Action) (runtime.Object, error) {

+			if action.Matches("create", "subjectaccessreviews") {

+				review, ok := action.(ktestclient.CreateAction).GetObject().(*authorizationapi.SubjectAccessReview)

 				if !ok {

 					return emptyResponse, fmt.Errorf("unexpected object received: %#v", review)

 				}

@@ -6,26 +6,24 @@ import (

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

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

 	"k8s.io/kubernetes/pkg/runtime"

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

 	"github.com/openshift/origin/pkg/api/latest"

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

 )

-// FakeAction is a wrapper around the Kubernetes FakeAction.

-// Used for faking various actions on resources.

-type FakeAction ktestclient.FakeAction

-

 // Fake implements Interface. Meant to be embedded into a struct to get a default

 // implementation. This makes faking out just the method you want to test easier.

 type Fake struct {

-	// Fake by default keeps a simple list of the methods that have been called.

-	Actions []FakeAction

-	Err     error

+	actions []ktestclient.Action // these may be castable to other types, but "Action" is the minimum

+	err     error

+

+	Watch watch.Interface

 	// ReactFn is an optional function that will be invoked with the provided action

 	// and return a response.

 	ReactFn ktestclient.ReactionFunc

-	Lock sync.Mutex

+	Lock sync.RWMutex

 }

 // NewSimpleFake returns a client that will respond with the provided objects

@@ -41,15 +39,49 @@ func NewSimpleFake(objects ...runtime.Object) *Fake {

 // Invokes registers the passed fake action and reacts on it if a ReactFn

 // has been defined

-func (c *Fake) Invokes(action FakeAction, obj runtime.Object) (runtime.Object, error) {

+func (c *Fake) Invokes(action ktestclient.Action, defaultReturnObj runtime.Object) (runtime.Object, error) {

 	c.Lock.Lock()

 	defer c.Lock.Unlock()

-	c.Actions = append(c.Actions, action)

+	c.actions = append(c.actions, action)

 	if c.ReactFn != nil {

-		return c.ReactFn(ktestclient.FakeAction(action))

+		return c.ReactFn(action)

 	}

-	return obj, c.Err

+	return defaultReturnObj, c.err

+}

+

+// ClearActions clears the history of actions called on the fake client

+func (c *Fake) ClearActions() {

+	c.Lock.Lock()

+	c.Lock.Unlock()

+

+	c.actions = make([]ktestclient.Action, 0)

+}

+

+// Actions returns a chronologically ordered slice fake actions called on the fake client

+func (c *Fake) Actions() []ktestclient.Action {

+	c.Lock.RLock()

+	defer c.Lock.RUnlock()

+

+	fa := make([]ktestclient.Action, len(c.actions))

+	copy(fa, c.actions)

+	return fa

+}

+

+// SetErr sets the error to return for client calls

+func (c *Fake) SetErr(err error) {

+	c.Lock.Lock()

+	defer c.Lock.Unlock()

+

+	c.err = err

+}

+

+// Err returns any a client error or nil

+func (c *Fake) Err() error {

+	c.Lock.RLock()

+	c.Lock.RUnlock()

+

+	return c.err

 }

 var _ client.Interface = &Fake{}

@@ -121,12 +153,12 @@ func (c *Fake) ClusterNetwork() client.ClusterNetworkInterface {

 // Templates provides a fake REST client for Templates

 func (c *Fake) Templates(namespace string) client.TemplateInterface {

-	return &FakeTemplates{Fake: c}

+	return &FakeTemplates{Fake: c, Namespace: namespace}

 }

 // TemplateConfigs provides a fake REST client for TemplateConfigs

 func (c *Fake) TemplateConfigs(namespace string) client.TemplateConfigInterface {

-	return &FakeTemplateConfigs{Fake: c}

+	return &FakeTemplateConfigs{Fake: c, Namespace: namespace}

 }

 // Identities provides a fake REST client for Identities

@@ -161,27 +193,27 @@ func (c *Fake) ProjectRequests() client.ProjectRequestInterface {

 // Policies provides a fake REST client for Policies

 func (c *Fake) Policies(namespace string) client.PolicyInterface {

-	return &FakePolicies{Fake: c}

+	return &FakePolicies{Fake: c, Namespace: namespace}

 }

 // Roles provides a fake REST client for Roles

 func (c *Fake) Roles(namespace string) client.RoleInterface {

-	return &FakeRoles{Fake: c}

+	return &FakeRoles{Fake: c, Namespace: namespace}

 }

 // RoleBindings provides a fake REST client for RoleBindings

 func (c *Fake) RoleBindings(namespace string) client.RoleBindingInterface {

-	return &FakeRoleBindings{Fake: c}

+	return &FakeRoleBindings{Fake: c, Namespace: namespace}

 }

 // PolicyBindings provides a fake REST client for PolicyBindings

 func (c *Fake) PolicyBindings(namespace string) client.PolicyBindingInterface {

-	return &FakePolicyBindings{Fake: c}

+	return &FakePolicyBindings{Fake: c, Namespace: namespace}

 }

 // ResourceAccessReviews provides a fake REST client for ResourceAccessReviews

 func (c *Fake) ResourceAccessReviews(namespace string) client.ResourceAccessReviewInterface {

-	return &FakeResourceAccessReviews{Fake: c}

+	return &FakeResourceAccessReviews{Fake: c, Namespace: namespace}

 }

 // ClusterResourceAccessReviews provides a fake REST client for ClusterResourceAccessReviews

@@ -191,12 +223,12 @@ func (c *Fake) ClusterResourceAccessReviews() client.ResourceAccessReviewInterfa

 // SubjectAccessReviews provides a fake REST client for SubjectAccessReviews

 func (c *Fake) SubjectAccessReviews(namespace string) client.SubjectAccessReviewInterface {

-	return &FakeSubjectAccessReviews{Fake: c}

+	return &FakeSubjectAccessReviews{Fake: c, Namespace: namespace}

 }

 // ImpersonateSubjectAccessReviews provides a fake REST client for SubjectAccessReviews

 func (c *Fake) ImpersonateSubjectAccessReviews(token, namespace string) client.SubjectAccessReviewInterface {

-	return &FakeSubjectAccessReviews{Fake: c}

+	return &FakeSubjectAccessReviews{Fake: c, Namespace: namespace}

 }

 // OAuthAccessTokens provides a fake REST client for OAuthAccessTokens

@@ -4,6 +4,7 @@ import (

 	"fmt"

 	"net/url"

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/watch"

@@ -19,51 +20,70 @@ type FakeBuildConfigs struct {

 	Namespace string

 }

-func (c *FakeBuildConfigs) List(label labels.Selector, field fields.Selector) (*buildapi.BuildConfigList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-buildconfig"}, &buildapi.BuildConfigList{})

-	return obj.(*buildapi.BuildConfigList), err

-}

-

 func (c *FakeBuildConfigs) Get(name string) (*buildapi.BuildConfig, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-buildconfig", Value: name}, &buildapi.BuildConfig{})

+	obj, err := c.Fake.Invokes(ktestclient.NewGetAction("buildconfigs", c.Namespace, name), &buildapi.BuildConfig{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*buildapi.BuildConfig), err

 }

-func (c *FakeBuildConfigs) WebHookURL(name string, trigger *buildapi.BuildTriggerPolicy) (*url.URL, error) {

-	switch {

-	case trigger.GenericWebHook != nil:

-		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/generic", name, trigger.GenericWebHook.Secret))

-	case trigger.GitHubWebHook != nil:

-		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/github", name, trigger.GitHubWebHook.Secret))

-	default:

-		return nil, client.ErrTriggerIsNotAWebHook

+func (c *FakeBuildConfigs) List(label labels.Selector, field fields.Selector) (*buildapi.BuildConfigList, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewListAction("buildconfigs", c.Namespace, label, field), &buildapi.BuildConfigList{})

+	if obj == nil {

+		return nil, err

 	}

+

+	return obj.(*buildapi.BuildConfigList), err

 }

-func (c *FakeBuildConfigs) Create(config *buildapi.BuildConfig) (*buildapi.BuildConfig, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-buildconfig"}, &buildapi.BuildConfig{})

+func (c *FakeBuildConfigs) Create(inObj *buildapi.BuildConfig) (*buildapi.BuildConfig, error) {

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

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*buildapi.BuildConfig), err

 }

-func (c *FakeBuildConfigs) Update(config *buildapi.BuildConfig) (*buildapi.BuildConfig, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-buildconfig"}, &buildapi.BuildConfig{})

+func (c *FakeBuildConfigs) Update(inObj *buildapi.BuildConfig) (*buildapi.BuildConfig, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewUpdateAction("buildconfigs", c.Namespace, inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*buildapi.BuildConfig), err

 }

 func (c *FakeBuildConfigs) Delete(name string) error {

-	_, err := c.Fake.Invokes(FakeAction{Action: "delete-buildconfig", Value: name}, &buildapi.BuildConfig{})

+	_, err := c.Fake.Invokes(ktestclient.NewDeleteAction("buildconfigs", c.Namespace, name), &buildapi.BuildConfig{})

 	return err

 }

 func (c *FakeBuildConfigs) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+	c.Fake.Invokes(ktestclient.NewWatchAction("buildconfigs", c.Namespace, label, field, resourceVersion), nil)

+	return c.Fake.Watch, nil

+}

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-buildconfigs"})

-	return nil, nil

+func (c *FakeBuildConfigs) WebHookURL(name string, trigger *buildapi.BuildTriggerPolicy) (*url.URL, error) {

+	switch {

+	case trigger.GenericWebHook != nil:

+		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/generic", name, trigger.GenericWebHook.Secret))

+	case trigger.GitHubWebHook != nil:

+		return url.Parse(fmt.Sprintf("http://localhost/buildConfigHooks/%s/%s/github", name, trigger.GitHubWebHook.Secret))

+	default:

+		return nil, client.ErrTriggerIsNotAWebHook

+	}

 }

 func (c *FakeBuildConfigs) Instantiate(request *buildapi.BuildRequest) (result *buildapi.Build, err error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "instantiate-buildconfig", Value: request}, &buildapi.Build{})

+	action := ktestclient.NewCreateAction("buildconfigs", c.Namespace, request)

+	action.Subresource = "instantiate"

+	obj, err := c.Fake.Invokes(action, &buildapi.Build{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*buildapi.Build), err

 }

@@ -3,7 +3,9 @@ package testclient

 import (

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

-	"github.com/openshift/origin/pkg/build/api"

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

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

 )

 // FakeBuildLogs implements BuildLogsInterface. Meant to be embedded into a struct to get a default

@@ -13,11 +15,14 @@ type FakeBuildLogs struct {

 	Namespace string

 }

-// Get builds and returns a buildLog request

-func (c *FakeBuildLogs) Get(name string, opt api.BuildLogOptions) *kclient.Request {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+func (c *FakeBuildLogs) Get(name string, opt buildapi.BuildLogOptions) *kclient.Request {

+	action := ktestclient.GenericActionImpl{}

+	action.Verb = "get"

+	action.Namespace = c.Namespace

+	action.Resource = "builds"

+	action.Subresource = "logs"

+	action.Value = opt

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "proxy"})

+	_, _ = c.Fake.Invokes(action, &buildapi.BuildConfig{})

 	return &kclient.Request{}

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/watch"

@@ -15,46 +16,59 @@ type FakeBuilds struct {

 	Namespace string

 }

+func (c *FakeBuilds) Get(name string) (*buildapi.Build, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewGetAction("builds", c.Namespace, name), &buildapi.Build{})

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*buildapi.Build), err

+}

+

 func (c *FakeBuilds) List(label labels.Selector, field fields.Selector) (*buildapi.BuildList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-builds"}, &buildapi.BuildList{})

+	obj, err := c.Fake.Invokes(ktestclient.NewListAction("builds", c.Namespace, label, field), &buildapi.BuildList{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*buildapi.BuildList), err

 }

-func (c *FakeBuilds) Get(name string) (*buildapi.Build, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-build"}, &buildapi.Build{})

-	return obj.(*buildapi.Build), err

-}

+func (c *FakeBuilds) Create(inObj *buildapi.Build) (*buildapi.Build, error) {

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

+	if obj == nil {

+		return nil, err

+	}

-func (c *FakeBuilds) Create(build *buildapi.Build) (*buildapi.Build, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-build", Value: build}, &buildapi.Build{})

 	return obj.(*buildapi.Build), err

 }

-func (c *FakeBuilds) Update(build *buildapi.Build) (*buildapi.Build, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-build"}, &buildapi.Build{})

+func (c *FakeBuilds) Update(inObj *buildapi.Build) (*buildapi.Build, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewUpdateAction("builds", c.Namespace, inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*buildapi.Build), err

 }

 func (c *FakeBuilds) Delete(name string) error {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-build", Value: name})

-	return nil

+	_, err := c.Fake.Invokes(ktestclient.NewDeleteAction("builds", c.Namespace, name), &buildapi.Build{})

+	return err

 }

 func (c *FakeBuilds) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-builds"})

-	return nil, nil

+	c.Fake.Invokes(ktestclient.NewWatchAction("builds", c.Namespace, label, field, resourceVersion), nil)

+	return c.Fake.Watch, nil

 }

 func (c *FakeBuilds) Clone(request *buildapi.BuildRequest) (result *buildapi.Build, err error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+	action := ktestclient.NewCreateAction("buildconfigs", c.Namespace, request)

+	action.Subresource = "clone"

+	obj, err := c.Fake.Invokes(action, &buildapi.Build{})

+	if obj == nil {

+		return nil, err

+	}

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "clone-build"})

-	return nil, nil

+	return obj.(*buildapi.Build), err

 }

@@ -1,6 +1,8 @@

 package testclient

 import (

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

+

 	sdnapi "github.com/openshift/origin/pkg/sdn/api"

 )

@@ -11,11 +13,19 @@ type FakeClusterNetwork struct {

 }

 func (c *FakeClusterNetwork) Get(name string) (*sdnapi.ClusterNetwork, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-network"}, &sdnapi.ClusterNetwork{})

+	obj, err := c.Fake.Invokes(ktestclient.NewRootGetAction("clusternetworks", name), &sdnapi.ClusterNetwork{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*sdnapi.ClusterNetwork), err

 }

-func (c *FakeClusterNetwork) Create(sdn *sdnapi.ClusterNetwork) (*sdnapi.ClusterNetwork, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-network"}, &sdnapi.ClusterNetwork{})

+func (c *FakeClusterNetwork) Create(inObj *sdnapi.ClusterNetwork) (*sdnapi.ClusterNetwork, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootCreateAction("clusternetworks", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*sdnapi.ClusterNetwork), err

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/watch"

@@ -14,28 +15,30 @@ type FakeClusterPolicies struct {

 	Fake *Fake

 }

-func (c *FakeClusterPolicies) List(label labels.Selector, field fields.Selector) (*authorizationapi.ClusterPolicyList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-clusterPolicies"}, &authorizationapi.ClusterPolicyList{})

-	return obj.(*authorizationapi.ClusterPolicyList), err

-}

-

 func (c *FakeClusterPolicies) Get(name string) (*authorizationapi.ClusterPolicy, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-clusterPolicy"}, &authorizationapi.ClusterPolicy{})

+	obj, err := c.Fake.Invokes(ktestclient.NewRootGetAction("clusterpolicies", name), &authorizationapi.ClusterPolicy{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*authorizationapi.ClusterPolicy), err

 }

-func (c *FakeClusterPolicies) Delete(name string) error {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+func (c *FakeClusterPolicies) List(label labels.Selector, field fields.Selector) (*authorizationapi.ClusterPolicyList, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootListAction("clusterpolicies", label, field), &authorizationapi.ClusterPolicyList{})

+	if obj == nil {

+		return nil, err

+	}

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-clusterPolicy", Value: name})

-	return nil

+	return obj.(*authorizationapi.ClusterPolicyList), err

 }

-func (c *FakeClusterPolicies) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+func (c *FakeClusterPolicies) Delete(name string) error {

+	_, err := c.Fake.Invokes(ktestclient.NewRootDeleteAction("clusterpolicies", name), &authorizationapi.ClusterPolicy{})

+	return err

+}

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-clusterPolicy"})

-	return nil, nil

+func (c *FakeClusterPolicies) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

+	c.Fake.Invokes(ktestclient.NewRootWatchAction("clusterpolicies", label, field, resourceVersion), nil)

+	return c.Fake.Watch, c.Fake.Err()

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/watch"

@@ -14,33 +15,39 @@ type FakeClusterPolicyBindings struct {

 	Fake *Fake

 }

+func (c *FakeClusterPolicyBindings) Get(name string) (*authorizationapi.ClusterPolicyBinding, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootGetAction("clusterpolicybindings", name), &authorizationapi.ClusterPolicyBinding{})

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*authorizationapi.ClusterPolicyBinding), err

+}

+

 func (c *FakeClusterPolicyBindings) List(label labels.Selector, field fields.Selector) (*authorizationapi.ClusterPolicyBindingList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-clusterPolicyBindings"}, &authorizationapi.ClusterPolicyBindingList{})

+	obj, err := c.Fake.Invokes(ktestclient.NewRootListAction("clusterpolicybindings", label, field), &authorizationapi.ClusterPolicyBindingList{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*authorizationapi.ClusterPolicyBindingList), err

 }

-func (c *FakeClusterPolicyBindings) Get(name string) (*authorizationapi.ClusterPolicyBinding, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-clusterPolicyBinding"}, &authorizationapi.ClusterPolicyBinding{})

-	return obj.(*authorizationapi.ClusterPolicyBinding), err

-}

+func (c *FakeClusterPolicyBindings) Create(inObj *authorizationapi.ClusterPolicyBinding) (*authorizationapi.ClusterPolicyBinding, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootCreateAction("clusterpolicybindings", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

-func (c *FakeClusterPolicyBindings) Create(policyBinding *authorizationapi.ClusterPolicyBinding) (*authorizationapi.ClusterPolicyBinding, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-clusterPolicyBinding", Value: policyBinding}, &authorizationapi.ClusterPolicyBinding{})

 	return obj.(*authorizationapi.ClusterPolicyBinding), err

 }

 func (c *FakeClusterPolicyBindings) Delete(name string) error {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-clusterPolicyBinding", Value: name})

-	return nil

+	_, err := c.Fake.Invokes(ktestclient.NewRootDeleteAction("clusterpolicybindings", name), &authorizationapi.ClusterPolicyBinding{})

+	return err

 }

 func (c *FakeClusterPolicyBindings) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-clusterPolicyBinding"})

-	return nil, nil

+	c.Fake.Invokes(ktestclient.NewRootWatchAction("clusterpolicybindings", label, field, resourceVersion), nil)

+	return c.Fake.Watch, c.Fake.Err()

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

@@ -13,30 +14,43 @@ type FakeClusterRoleBindings struct {

 	Fake *Fake

 }

+func (c *FakeClusterRoleBindings) Get(name string) (*authorizationapi.ClusterRoleBinding, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootGetAction("clusterrolebindings", name), &authorizationapi.ClusterRoleBinding{})

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*authorizationapi.ClusterRoleBinding), err

+}

+

 func (c *FakeClusterRoleBindings) List(label labels.Selector, field fields.Selector) (*authorizationapi.ClusterRoleBindingList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-clusterRoleBindings"}, &authorizationapi.ClusterRoleBindingList{})

+	obj, err := c.Fake.Invokes(ktestclient.NewRootListAction("clusterrolebindings", label, field), &authorizationapi.ClusterRoleBindingList{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*authorizationapi.ClusterRoleBindingList), err

 }

-func (c *FakeClusterRoleBindings) Get(name string) (*authorizationapi.ClusterRoleBinding, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-clusterRoleBinding"}, &authorizationapi.ClusterRoleBinding{})

-	return obj.(*authorizationapi.ClusterRoleBinding), err

-}

+func (c *FakeClusterRoleBindings) Create(inObj *authorizationapi.ClusterRoleBinding) (*authorizationapi.ClusterRoleBinding, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootCreateAction("clusterrolebindings", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

-func (c *FakeClusterRoleBindings) Create(roleBinding *authorizationapi.ClusterRoleBinding) (*authorizationapi.ClusterRoleBinding, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-clusterRoleBinding", Value: roleBinding}, &authorizationapi.ClusterRoleBinding{})

 	return obj.(*authorizationapi.ClusterRoleBinding), err

 }

-func (c *FakeClusterRoleBindings) Update(roleBinding *authorizationapi.ClusterRoleBinding) (*authorizationapi.ClusterRoleBinding, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-clusterRoleBinding"}, &authorizationapi.ClusterRoleBinding{})

+func (c *FakeClusterRoleBindings) Update(inObj *authorizationapi.ClusterRoleBinding) (*authorizationapi.ClusterRoleBinding, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootUpdateAction("clusterrolebindings", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*authorizationapi.ClusterRoleBinding), err

 }

 func (c *FakeClusterRoleBindings) Delete(name string) error {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-clusterRoleBinding", Value: name})

-	return nil

+	_, err := c.Fake.Invokes(ktestclient.NewRootDeleteAction("clusterrolebindings", name), &authorizationapi.ClusterRoleBinding{})

+	return err

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

@@ -13,30 +14,43 @@ type FakeClusterRoles struct {

 	Fake *Fake

 }

+func (c *FakeClusterRoles) Get(name string) (*authorizationapi.ClusterRole, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootGetAction("clusterroles", name), &authorizationapi.ClusterRole{})

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*authorizationapi.ClusterRole), err

+}

+

 func (c *FakeClusterRoles) List(label labels.Selector, field fields.Selector) (*authorizationapi.ClusterRoleList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-clusterRoles"}, &authorizationapi.ClusterRoleList{})

+	obj, err := c.Fake.Invokes(ktestclient.NewRootListAction("clusterroles", label, field), &authorizationapi.ClusterRoleList{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*authorizationapi.ClusterRoleList), err

 }

-func (c *FakeClusterRoles) Get(name string) (*authorizationapi.ClusterRole, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-clusterRole"}, &authorizationapi.ClusterRole{})

-	return obj.(*authorizationapi.ClusterRole), err

-}

+func (c *FakeClusterRoles) Create(inObj *authorizationapi.ClusterRole) (*authorizationapi.ClusterRole, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootCreateAction("clusterroles", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

-func (c *FakeClusterRoles) Create(role *authorizationapi.ClusterRole) (*authorizationapi.ClusterRole, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-clusterRole", Value: role}, &authorizationapi.ClusterRole{})

 	return obj.(*authorizationapi.ClusterRole), err

 }

-func (c *FakeClusterRoles) Update(role *authorizationapi.ClusterRole) (*authorizationapi.ClusterRole, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-clusterRole"}, &authorizationapi.ClusterRole{})

+func (c *FakeClusterRoles) Update(inObj *authorizationapi.ClusterRole) (*authorizationapi.ClusterRole, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootUpdateAction("clusterroles", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*authorizationapi.ClusterRole), err

 }

 func (c *FakeClusterRoles) Delete(name string) error {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-clusterRole", Value: name})

-	return nil

+	_, err := c.Fake.Invokes(ktestclient.NewRootDeleteAction("clusterroles", name), &authorizationapi.ClusterRole{})

+	return err

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

 	"k8s.io/kubernetes/pkg/watch"

@@ -15,51 +16,67 @@ type FakeDeploymentConfigs struct {

 	Namespace string

 }

+func (c *FakeDeploymentConfigs) Get(name string) (*deployapi.DeploymentConfig, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewGetAction("deploymentconfigs", c.Namespace, name), &deployapi.DeploymentConfig{})

+	if obj == nil {

+		return nil, err

+	}

+

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

+}

+

 func (c *FakeDeploymentConfigs) List(label labels.Selector, field fields.Selector) (*deployapi.DeploymentConfigList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-deploymentconfig"}, &deployapi.DeploymentConfigList{})

+	obj, err := c.Fake.Invokes(ktestclient.NewListAction("deploymentconfigs", c.Namespace, label, field), &deployapi.DeploymentConfigList{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*deployapi.DeploymentConfigList), err

 }

-func (c *FakeDeploymentConfigs) Get(name string) (*deployapi.DeploymentConfig, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-deploymentconfig"}, &deployapi.DeploymentConfig{})

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

-}

+func (c *FakeDeploymentConfigs) Create(inObj *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

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

+	if obj == nil {

+		return nil, err

+	}

-func (c *FakeDeploymentConfigs) Create(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-deploymentconfig"}, &deployapi.DeploymentConfig{})

 	return obj.(*deployapi.DeploymentConfig), err

 }

-func (c *FakeDeploymentConfigs) Update(config *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-deploymentconfig"}, &deployapi.DeploymentConfig{})

+func (c *FakeDeploymentConfigs) Update(inObj *deployapi.DeploymentConfig) (*deployapi.DeploymentConfig, error) {

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

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*deployapi.DeploymentConfig), err

 }

 func (c *FakeDeploymentConfigs) Delete(name string) error {

-	_, err := c.Fake.Invokes(FakeAction{Action: "delete-deploymentconfig"}, nil)

+	_, err := c.Fake.Invokes(ktestclient.NewDeleteAction("deploymentconfigs", c.Namespace, name), &deployapi.DeploymentConfig{})

 	return err

 }

 func (c *FakeDeploymentConfigs) Watch(label labels.Selector, field fields.Selector, resourceVersion string) (watch.Interface, error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "watch-deploymentconfig"})

-	return nil, nil

+	c.Fake.Invokes(ktestclient.NewWatchAction("deploymentconfigs", c.Namespace, label, field, resourceVersion), nil)

+	return c.Fake.Watch, nil

 }

 func (c *FakeDeploymentConfigs) Generate(name string) (*deployapi.DeploymentConfig, error) {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+	obj, err := c.Fake.Invokes(ktestclient.NewGetAction("generatedeploymentconfigs", c.Namespace, name), &deployapi.DeploymentConfig{})

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "generate-deploymentconfig"})

-	return nil, nil

+	if obj == nil {

+		return nil, err

+	}

+

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

 }

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

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

+func (c *FakeDeploymentConfigs) Rollback(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

+	}

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "rollback"})

-	return nil, nil

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

 }

@@ -1,9 +1,11 @@

 package testclient

 import (

-	userapi "github.com/openshift/origin/pkg/user/api"

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

 	"k8s.io/kubernetes/pkg/fields"

 	"k8s.io/kubernetes/pkg/labels"

+

+	userapi "github.com/openshift/origin/pkg/user/api"

 )

 // FakeGroups implements GroupsInterface. Meant to be embedded into a struct to get a default

@@ -12,30 +14,43 @@ type FakeGroups struct {

 	Fake *Fake

 }

+func (c *FakeGroups) Get(name string) (*userapi.Group, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootGetAction("groups", name), &userapi.Group{})

+	if obj == nil {

+		return nil, err

+	}

+

+	return obj.(*userapi.Group), err

+}

+

 func (c *FakeGroups) List(label labels.Selector, field fields.Selector) (*userapi.GroupList, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "list-groups"}, &userapi.GroupList{})

+	obj, err := c.Fake.Invokes(ktestclient.NewRootListAction("groups", label, field), &userapi.GroupList{})

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*userapi.GroupList), err

 }

-func (c *FakeGroups) Get(name string) (*userapi.Group, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "get-group", Value: name}, &userapi.Group{})

-	return obj.(*userapi.Group), err

-}

+func (c *FakeGroups) Create(inObj *userapi.Group) (*userapi.Group, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootCreateAction("groups", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

-func (c *FakeGroups) Create(group *userapi.Group) (*userapi.Group, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "create-group", Value: group}, &userapi.Group{})

 	return obj.(*userapi.Group), err

 }

-func (c *FakeGroups) Update(group *userapi.Group) (*userapi.Group, error) {

-	obj, err := c.Fake.Invokes(FakeAction{Action: "update-group", Value: group}, &userapi.Group{})

+func (c *FakeGroups) Update(inObj *userapi.Group) (*userapi.Group, error) {

+	obj, err := c.Fake.Invokes(ktestclient.NewRootUpdateAction("groups", inObj), inObj)

+	if obj == nil {

+		return nil, err

+	}

+

 	return obj.(*userapi.Group), err

 }

 func (c *FakeGroups) Delete(name string) error {

-	c.Fake.Lock.Lock()

-	defer c.Fake.Lock.Unlock()

-

-	c.Fake.Actions = append(c.Fake.Actions, FakeAction{Action: "delete-group"})

-	return nil

+	_, err := c.Fake.Invokes(ktestclient.NewRootDeleteAction("groups", name), &userapi.Group{})

+	return err

 }

@@ -1,6 +1,7 @@

 package testclient

 import (

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

 	"k8s.io/kubernetes/pkg/watch"

 	sdnapi "github.com/openshift/origin/pkg/sdn/api"

@@ -12,33 +13,39 @@ type FakeHostSubnet struct {

 	Fake *Fake

 }

+func (c *FakeHostSubnet) Get(name string) (*sdnapi.HostSubnet, error) {