-
Notifications
You must be signed in to change notification settings - Fork 38.7k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a basic e2e test for 3rd party objects. #25542
Merged
k8s-github-robot
merged 2 commits into
kubernetes:master
from
brendandburns:3rdpartye2e
May 23, 2016
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,178 @@ | ||
/* | ||
Copyright 2016 The Kubernetes Authors All rights reserved. | ||
|
||
Licensed under the Apache License, Version 2.0 (the "License"); | ||
you may not use this file except in compliance with the License. | ||
You may obtain a copy of the License at | ||
|
||
http://www.apache.org/licenses/LICENSE-2.0 | ||
|
||
Unless required by applicable law or agreed to in writing, software | ||
distributed under the License is distributed on an "AS IS" BASIS, | ||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
See the License for the specific language governing permissions and | ||
limitations under the License. | ||
*/ | ||
|
||
package e2e | ||
|
||
import ( | ||
"encoding/json" | ||
"fmt" | ||
"net/http" | ||
"time" | ||
|
||
"k8s.io/kubernetes/pkg/api" | ||
"k8s.io/kubernetes/pkg/api/unversioned" | ||
"k8s.io/kubernetes/pkg/apimachinery/registered" | ||
"k8s.io/kubernetes/pkg/apis/extensions" | ||
"k8s.io/kubernetes/pkg/runtime" | ||
"k8s.io/kubernetes/pkg/util/wait" | ||
"k8s.io/kubernetes/test/e2e/framework" | ||
|
||
. "github.com/onsi/ginkgo" | ||
) | ||
|
||
var data = `{ | ||
"kind": "Foo", | ||
"apiVersion": "company.com/v1", | ||
"metadata": { | ||
"name": "bazz" | ||
}, | ||
"someField": "hello world", | ||
"otherField": 1 | ||
}` | ||
|
||
type Foo struct { | ||
unversioned.TypeMeta `json:",inline"` | ||
api.ObjectMeta `json:"metadata,omitempty" description:"standard object metadata"` | ||
|
||
SomeField string `json:"someField"` | ||
OtherField int `json:"otherField"` | ||
} | ||
|
||
type FooList struct { | ||
unversioned.TypeMeta `json:",inline"` | ||
unversioned.ListMeta `json:"metadata,omitempty" description:"standard list metadata; see http://releases.k8s.io/HEAD/docs/devel/api-conventions.md#metadata"` | ||
|
||
Items []Foo `json:"items"` | ||
} | ||
|
||
var _ = Describe("ThirdParty resources", func() { | ||
|
||
f := framework.NewDefaultFramework("thirdparty") | ||
|
||
rsrc := &extensions.ThirdPartyResource{ | ||
ObjectMeta: api.ObjectMeta{ | ||
Name: "foo.company.com", | ||
}, | ||
Versions: []extensions.APIVersion{ | ||
{Name: "v1"}, | ||
}, | ||
} | ||
|
||
Context("Simple Third Party", func() { | ||
It("creating/deleting thirdparty objects works [Conformance]", func() { | ||
defer func() { | ||
if err := f.Client.ThirdPartyResources().Delete(rsrc.Name); err != nil { | ||
framework.Failf("failed to delete third party resource: %v", err) | ||
} | ||
}() | ||
if _, err := f.Client.ThirdPartyResources().Create(rsrc); err != nil { | ||
framework.Failf("failed to create third party resource: %v", err) | ||
} | ||
|
||
wait.Poll(time.Second*30, time.Minute*5, func() (bool, error) { | ||
data, err := f.Client.RESTClient.Get().AbsPath("/apis/company.com/v1/foos").DoRaw() | ||
if err != nil { | ||
return false, err | ||
} | ||
meta := unversioned.TypeMeta{} | ||
if err := json.Unmarshal(data, &meta); err != nil { | ||
return false, err | ||
} | ||
if meta.Kind == "FooList" { | ||
return true, nil | ||
} | ||
status := unversioned.Status{} | ||
if err := runtime.DecodeInto(api.Codecs.LegacyCodec(registered.EnabledVersions()...), data, &status); err != nil { | ||
return false, err | ||
} | ||
if status.Code != http.StatusNotFound { | ||
return false, fmt.Errorf("Unexpected status: %v", status) | ||
} | ||
return false, nil | ||
}) | ||
|
||
data, err := f.Client.RESTClient.Get().AbsPath("/apis/company.com/v1/foos").DoRaw() | ||
if err != nil { | ||
framework.Failf("failed to list with no objects: %v", err) | ||
} | ||
list := FooList{} | ||
if err := json.Unmarshal(data, &list); err != nil { | ||
framework.Failf("failed to decode: %#v", err) | ||
} | ||
if len(list.Items) != 0 { | ||
framework.Failf("unexpected object before create: %v", list) | ||
} | ||
foo := &Foo{ | ||
TypeMeta: unversioned.TypeMeta{ | ||
Kind: "Foo", | ||
}, | ||
ObjectMeta: api.ObjectMeta{ | ||
Name: "foo", | ||
}, | ||
SomeField: "bar", | ||
OtherField: 10, | ||
} | ||
bodyData, err := json.Marshal(foo) | ||
if err != nil { | ||
framework.Failf("failed to marshal: %v", err) | ||
} | ||
if _, err := f.Client.RESTClient.Post().AbsPath("/apis/company.com/v1/namespaces/default/foos").Body(bodyData).DoRaw(); err != nil { | ||
framework.Failf("failed to create: %v", err) | ||
} | ||
|
||
data, err = f.Client.RESTClient.Get().AbsPath("/apis/company.com/v1/namespaces/default/foos/foo").DoRaw() | ||
if err != nil { | ||
framework.Failf("failed to get object: %v", err) | ||
} | ||
out := Foo{} | ||
if err := json.Unmarshal(data, &out); err != nil { | ||
framework.Failf("failed to decode: %#v", err) | ||
} | ||
if out.Name != foo.Name || out.SomeField != foo.SomeField || out.OtherField != foo.OtherField { | ||
framework.Failf("expected:\n%#v\nsaw:\n%#v\n%s\n", foo, &out, string(data)) | ||
} | ||
|
||
data, err = f.Client.RESTClient.Get().AbsPath("/apis/company.com/v1/foos").DoRaw() | ||
if err != nil { | ||
framework.Failf("failed to list with no objects: %v", err) | ||
} | ||
if err := json.Unmarshal(data, &list); err != nil { | ||
framework.Failf("failed to decode: %#v", err) | ||
} | ||
if len(list.Items) != 1 { | ||
framework.Failf("unexpected object too few or too many: %v", list) | ||
} | ||
if list.Items[0].Name != foo.Name || list.Items[0].SomeField != foo.SomeField || list.Items[0].OtherField != foo.OtherField { | ||
framework.Failf("expected: %#v, saw in list: %#v", foo, list.Items[0]) | ||
} | ||
|
||
if _, err := f.Client.RESTClient.Delete().AbsPath("/apis/company.com/v1/namespaces/default/foos/foo").DoRaw(); err != nil { | ||
framework.Failf("failed to delete: %v", err) | ||
} | ||
|
||
data, err = f.Client.RESTClient.Get().AbsPath("/apis/company.com/v1/foos").DoRaw() | ||
if err != nil { | ||
framework.Failf("failed to list with no objects: %v", err) | ||
} | ||
if err := json.Unmarshal(data, &list); err != nil { | ||
framework.Failf("failed to decode: %#v", err) | ||
} | ||
if len(list.Items) != 0 { | ||
framework.Failf("unexpected object after delete: %v", list) | ||
} | ||
}) | ||
}) | ||
}) |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Is the conformance tag correct?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I believe so. We want thirdparty to be a part of all working clusters, seems worth making it part of the conformance suite.