forked from openshift/origin
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add e2e for walkthrough (openshift#832)
- Loading branch information
Showing
3 changed files
with
292 additions
and
56 deletions.
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
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,74 @@ | ||
| /* | ||
| Copyright 2017 The Kubernetes Authors. | ||
| 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 ( | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/apimachinery/pkg/util/intstr" | ||
| "k8s.io/client-go/pkg/api/v1" | ||
| ) | ||
|
|
||
| func NewUPSBrokerPod(name string) *v1.Pod { | ||
| return &v1.Pod{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: name, | ||
| Labels: map[string]string{ | ||
| "app": name, | ||
| }, | ||
| }, | ||
| Spec: v1.PodSpec{ | ||
| Containers: []v1.Container{ | ||
| { | ||
| Name: name, | ||
| Image: "quay.io/kubernetes-service-catalog/user-broker:latest", | ||
| Args: []string{ | ||
| "--port", | ||
| "8080", | ||
| }, | ||
| Ports: []v1.ContainerPort{ | ||
| { | ||
| ContainerPort: 8080, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } | ||
|
|
||
| func NewUPSBrokerService(name string) *v1.Service { | ||
| return &v1.Service{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: name, | ||
| Labels: map[string]string { | ||
| "app": name, | ||
| }, | ||
| }, | ||
| Spec: v1.ServiceSpec{ | ||
| Selector: map[string]string{ | ||
| "app": name, | ||
| }, | ||
| Ports: []v1.ServicePort{ | ||
| { | ||
| Protocol: v1.ProtocolTCP, | ||
| Port: 80, | ||
| TargetPort: intstr.FromInt(8080), | ||
| }, | ||
| }, | ||
| }, | ||
| } | ||
| } |
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,209 @@ | ||
| /* | ||
| Copyright 2017 The Kubernetes Authors. | ||
| 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 ( | ||
| v1alpha1 "github.com/kubernetes-incubator/service-catalog/pkg/apis/servicecatalog/v1alpha1" | ||
| "github.com/kubernetes-incubator/service-catalog/test/e2e/framework" | ||
| "github.com/kubernetes-incubator/service-catalog/test/util" | ||
| metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" | ||
| "k8s.io/client-go/pkg/api/v1" | ||
|
|
||
| . "github.com/onsi/ginkgo" | ||
| . "github.com/onsi/gomega" | ||
| ) | ||
|
|
||
| var _ = framework.ServiceCatalogDescribe("walkthrough", func() { | ||
| f := framework.NewDefaultFramework("walkthrough-example") | ||
|
|
||
| upsbrokername := "ups-broker" | ||
|
|
||
| BeforeEach(func() { | ||
| //Deploying user provider service broker | ||
| By("Creating a user broker pod") | ||
| pod, err := f.KubeClientSet.CoreV1().Pods(f.Namespace.Name).Create(NewUPSBrokerPod(upsbrokername)) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create upsbroker pod") | ||
|
|
||
| By("Waiting for pod to be running") | ||
| err = framework.WaitForPodRunningInNamespace(f.KubeClientSet, pod) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| By("Createing a user provider broker service") | ||
| _, err = f.KubeClientSet.CoreV1().Services(f.Namespace.Name).Create(NewUPSBrokerService(upsbrokername)) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create upsbroker service") | ||
| }) | ||
|
|
||
| AfterEach(func() { | ||
| //Deleting user provider service broker | ||
| By("Deleting the user provider broker pod") | ||
| err := f.KubeClientSet.CoreV1().Pods(f.Namespace.Name).Delete(upsbrokername, nil) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| By("Deleting the upsbroker service") | ||
| err = f.KubeClientSet.CoreV1().Services(f.Namespace.Name).Delete(upsbrokername, nil) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
|
|
||
| It("Run walkthrough-example ", func() { | ||
| var ( | ||
| brokerName = upsbrokername | ||
| serviceclassName = "user-provided-service" | ||
| testns = "test-ns" | ||
| instanceName = "ups-instance" | ||
| bindingName = "ups-binding" | ||
| ) | ||
|
|
||
| //Broker and ServiceClass should become ready | ||
| By("Make sure the named Broker not exist before create") | ||
| if _, err := f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Brokers().Get(brokerName, metav1.GetOptions{}); err == nil { | ||
| err = f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Brokers().Delete(brokerName, nil) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to delete the broker") | ||
|
|
||
| By("Waiting for Broker to not exist") | ||
| err = util.WaitForBrokerToNotExist(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), brokerName) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| } | ||
|
|
||
| By("Creating a Broker") | ||
| url := "http://" + upsbrokername + "." +f.Namespace.Name + ".svc.cluster.local" | ||
| broker := &v1alpha1.Broker{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: brokerName, | ||
| }, | ||
| Spec: v1alpha1.BrokerSpec{ | ||
| URL: url, | ||
| }, | ||
| } | ||
| broker, err := f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Brokers().Create(broker) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create Broker") | ||
|
|
||
| By("Waiting for Broker to be ready") | ||
| err = util.WaitForBrokerCondition(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), | ||
| broker.Name, | ||
| v1alpha1.BrokerCondition{ | ||
| Type: v1alpha1.BrokerConditionReady, | ||
| Status: v1alpha1.ConditionTrue, | ||
| }, | ||
| ) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to wait Broker to be ready") | ||
|
|
||
| By("Waiting for ServiceClass to be ready") | ||
| err = util.WaitForServiceClassToExist(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), serviceclassName) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to wait serviceclass to be ready") | ||
|
|
||
| //Provisioning a Instance and binding to it | ||
| By("Creating a namespace") | ||
| testnamespace, err := framework.CreateKubeNamespace(testns, f.KubeClientSet) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create kube namespace") | ||
|
|
||
| By("Creating a Instance") | ||
| instance := &v1alpha1.Instance{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: instanceName, | ||
| Namespace: testnamespace.Name, | ||
| }, | ||
| Spec: v1alpha1.InstanceSpec{ | ||
| ServiceClassName: serviceclassName, | ||
| PlanName: "default", | ||
| }, | ||
| } | ||
| instance, err = f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Instances(testnamespace.Name).Create(instance) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create instance") | ||
|
|
||
| By("Waiting for Instance to be ready") | ||
| err = util.WaitForInstanceCondition(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), | ||
| testnamespace.Name, | ||
| instanceName, | ||
| v1alpha1.InstanceCondition{ | ||
| Type: v1alpha1.InstanceConditionReady, | ||
| Status: v1alpha1.ConditionTrue, | ||
| }, | ||
| ) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to wait instance to be ready") | ||
|
|
||
| //Binding to the Instance | ||
| By("Creating a Binding") | ||
| binding := &v1alpha1.Binding{ | ||
| ObjectMeta: metav1.ObjectMeta{ | ||
| Name: bindingName, | ||
| Namespace: testnamespace.Name, | ||
| }, | ||
| Spec: v1alpha1.BindingSpec{ | ||
| InstanceRef: v1.LocalObjectReference{ | ||
| Name: instanceName, | ||
| }, | ||
| SecretName: "my-secret", | ||
| }, | ||
| } | ||
| binding, err = f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Bindings(testnamespace.Name).Create(binding) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create binding") | ||
|
|
||
| By("Waiting for Binding to be ready") | ||
| err = util.WaitForBindingCondition(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), | ||
| testnamespace.Name, | ||
| bindingName, | ||
| v1alpha1.BindingCondition{ | ||
| Type: v1alpha1.BindingConditionReady, | ||
| Status: v1alpha1.ConditionTrue, | ||
| }, | ||
| ) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to wait binding to be ready") | ||
|
|
||
| By("Secret should have been created after binding") | ||
| _, err = f.KubeClientSet.CoreV1().Secrets(testnamespace.Name).Get("my-secret", metav1.GetOptions{}) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to create secret after binding") | ||
|
|
||
| //Unbinding from the Instance | ||
| By("Deleting the Binding") | ||
| err = f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Bindings(testnamespace.Name).Delete(bindingName, nil) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to delete the binding") | ||
|
|
||
| By("Waiting for Binding to not exist") | ||
| err = util.WaitForBindingToNotExist(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), testnamespace.Name, bindingName) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| By("Secret should been deleted after delete the binding") | ||
| _, err = f.KubeClientSet.CoreV1().Secrets(testnamespace.Name).Get("my-secret", metav1.GetOptions{}) | ||
| Expect(err).To(HaveOccurred()) | ||
|
|
||
| //Deprovisioning the Instance | ||
| By("Deleting the Instance") | ||
| err = f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Instances(testnamespace.Name).Delete(instanceName, nil) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to delete the instance") | ||
|
|
||
| By("Waiting for Instance to not exist") | ||
| err = util.WaitForInstanceToNotExist(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), testnamespace.Name, instanceName) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| By("Deleting the test namespace") | ||
| err = framework.DeleteKubeNamespace(f.KubeClientSet, testnamespace.Name) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| //Deleting Broker and ServiceClass | ||
| By("Deleting the Broker") | ||
| err = f.ServiceCatalogClientSet.ServicecatalogV1alpha1().Brokers().Delete(brokerName, nil) | ||
| Expect(err).NotTo(HaveOccurred(), "failed to delete the broker") | ||
|
|
||
| By("Waiting for Broker to not exist") | ||
| err = util.WaitForBrokerToNotExist(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), brokerName) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
|
|
||
| By("Waiting for ServiceClass to not exist") | ||
| err = util.WaitForServiceClassToNotExist(f.ServiceCatalogClientSet.ServicecatalogV1alpha1(), serviceclassName) | ||
| Expect(err).NotTo(HaveOccurred()) | ||
| }) | ||
| }) |