remove dup pkg and update reference

This commit is contained in:
ymqytw
2017-08-31 21:32:12 -07:00
parent 006f80e35d
commit 93be3f7735
21 changed files with 112 additions and 933 deletions

View File

@@ -18,17 +18,21 @@ package openapi_test
import (
"fmt"
"path/filepath"
. "github.com/onsi/ginkgo"
. "github.com/onsi/gomega"
oapi "k8s.io/kube-openapi/pkg/util/proto"
tst "k8s.io/kube-openapi/pkg/util/proto/testing"
"k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi"
tst "k8s.io/kubernetes/pkg/kubectl/cmd/util/openapi/testing"
)
var fakeSchema = tst.Fake{Path: filepath.Join("..", "..", "..", "..", "..", "api", "openapi-spec", "swagger.json")}
var _ = Describe("Getting the Resources", func() {
var client *tst.FakeClient
var expectedData openapi.Resources
var expectedData oapi.Resources
var instance openapi.Getter
BeforeEach(func() {
@@ -36,7 +40,7 @@ var _ = Describe("Getting the Resources", func() {
d, err := fakeSchema.OpenAPISchema()
Expect(err).To(BeNil())
expectedData, err = openapi.NewOpenAPIData(d)
expectedData, err = oapi.NewOpenAPIData(d, openapi.ParseGroupVersionKind)
Expect(err).To(BeNil())
instance = openapi.NewOpenAPIGetter(client)