Fix tests using internal types for serialization

pkg/api/validation/schema_test.go

@@ -27,8 +27,9 @@ import (
 	"k8s.io/kubernetes/pkg/api"
 	"k8s.io/kubernetes/pkg/api/testapi"
 	apitesting "k8s.io/kubernetes/pkg/api/testing"
+	"k8s.io/kubernetes/pkg/api/v1"
 	"k8s.io/kubernetes/pkg/apimachinery/registered"
-	"k8s.io/kubernetes/pkg/apis/extensions"
+	"k8s.io/kubernetes/pkg/apis/extensions/v1beta1"
 	"k8s.io/kubernetes/pkg/runtime"
 	k8syaml "k8s.io/kubernetes/pkg/util/yaml"
 
@@ -171,18 +172,18 @@ func TestValidateDifferentApiVersions(t *testing.T) {
 		t.Fatalf("Failed to load: %v", err)
 	}
 
-	pod := &api.Pod{}
+	pod := &v1.Pod{}
 	pod.APIVersion = "v1"
 	pod.Kind = "Pod"
 
-	deployment := &extensions.Deployment{}
+	deployment := &v1beta1.Deployment{}
 	deployment.APIVersion = "extensions/v1beta1"
 	deployment.Kind = "Deployment"
 
-	list := &api.List{}
+	list := &v1.List{}
 	list.APIVersion = "v1"
 	list.Kind = "List"
-	list.Items = []runtime.Object{pod, deployment}
+	list.Items = []runtime.RawExtension{{Object: pod}, {Object: deployment}}
 	bytes, err := json.Marshal(list)
 	if err != nil {
 		t.Error(err)
@@ -295,7 +296,7 @@ func TestTypeAny(t *testing.T) {
 			t.Errorf("could not read file: %s, err: %v", test, err)
 		}
 		// Verify that pod has at least one label (labels are type "any")
-		var pod api.Pod
+		var pod v1.Pod
 		err = yaml.Unmarshal(podBytes, &pod)
 		if err != nil {
 			t.Errorf("error in unmarshalling pod: %v", err)