@@ -83,8 +83,5 @@ func init() {

 	// For Origin we use MultiRESTMapper that handles both Origin and Kubernetes

 	// objects

-	RESTMapper = meta.MultiRESTMapper{

-		originMapper,

-		kubeMapper,

-	}

+	RESTMapper = meta.MultiRESTMapper{originMapper, kubeMapper}

 }

@@ -1,9 +1,26 @@

 package meta

-import "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"

+import kmeta "github.com/GoogleCloudPlatform/kubernetes/pkg/api/meta"

 // MultiRESTMapper is a wrapper for multiple RESTMappers.

-type MultiRESTMapper []meta.RESTMapper

+type MultiRESTMapper []kmeta.RESTMapper

+

+const (

+	OriginAPI     = "origin"

+	KubernetesAPI = "kubernetes"

+)

+

+// TODO: This list have to be maintained manually if a new API resource is added

+// into the Origin API.

+var OriginTypes = []string{

+	"Build", "BuildConfig",

+	"Deployment", "DeploymentConfig",

+	"Image", "ImageRepository", "ImageRepositoryMapping",

+	"Route",

+	"Project",

+	"User",

+	"OAuth",

+}

 // VersionAndKindForResource provides the Version and Kind  mappings for the

 // REST resources. This implementation supports multiple REST schemas and return

@@ -21,7 +38,7 @@ func (m MultiRESTMapper) VersionAndKindForResource(resource string) (defaultVers

 // RESTMapping provides the REST mapping for the resource based on the resource

 // kind and version. This implementation supports multiple REST schemas and

 // return the first match.

-func (m MultiRESTMapper) RESTMapping(version, kind string) (mapping *meta.RESTMapping, err error) {

+func (m MultiRESTMapper) RESTMapping(version, kind string) (mapping *kmeta.RESTMapping, err error) {

 	for _, t := range m {

 		mapping, err = t.RESTMapping(version, kind)

 		if err == nil {

@@ -30,3 +47,14 @@ func (m MultiRESTMapper) RESTMapping(version, kind string) (mapping *meta.RESTMa

 	}

 	return

 }

+

+// APINameForResource provides information about the API name that manages the

+// given resource and version.

+func (m MultiRESTMapper) APINameForResource(version, kind string) string {

+	for _, t := range OriginTypes {

+		if t == kind {

+			return OriginAPI

+		}

+	}

+	return KubernetesAPI

+}

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

 	"testing"

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

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

 )

 func TestMultiRESTMapperVersionAndKindForResource(t *testing.T) {

@@ -46,3 +47,21 @@ func TestMultiRESTMapperRESTMapping(t *testing.T) {

 		t.Errorf("Expected error for 'unknown' Kind")

 	}

 }

+

+func TestObjectOwner(t *testing.T) {

+	mapper := latest.RESTMapper.(meta.MultiRESTMapper)

+

+	if o := mapper.APINameForResource("v1beta2", "Pod"); o != meta.KubernetesAPI {

+		t.Errorf("The owner of Pod resource should be kubernetes, is %s", o)

+	}

+

+	for _, s := range meta.OriginTypes {

+		if o := mapper.APINameForResource("v1beta1", s); o != meta.OriginAPI {

+			t.Errorf("The owner of %s resource should be origin, is %s", s, o)

+		}

+	}

+

+	if o := mapper.APINameForResource("v1beta1", "Unknown"); o != meta.KubernetesAPI {

+		t.Errorf("The owner of Unknown resource should be kubernetes, is %s", o)

+	}

+}

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

 type RESTClient interface {

 	Verb(verb string) *client.Request

+	Put() *client.Request

+	Post() *client.Request

+	Delete() *client.Request

+	Get() *client.Request

 }

 type ClientMappings map[string]struct {