Skip to content

Commit

Permalink
Merge pull request #155 from bmozaffa/dc-status-unit-tests
Browse files Browse the repository at this point in the history 
[KIECLOUD-194] Test coverage for PR 148
  • Loading branch information
@openshift-merge-robot
openshift-merge-robot committed Apr 29, 2019
2 parents a130044 + 588c3ac commit 13b2d54
Show file tree
Hide file tree
Showing 2 changed files with 131 additions and 15 deletions.
107 changes: 103 additions & 4 deletions pkg/controller/kieapp/kieapp_controller_test.go
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,22 @@
package kieapp

import (
"context"
"fmt"
"k8s.io/apimachinery/pkg/types"
"reflect"
"sigs.k8s.io/controller-runtime/pkg/reconcile"
"testing"

v1 "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v1"
"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/constants"
"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/defaults"
"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/test"
oappsv1 "github.com/openshift/api/apps/v1"
"github.com/stretchr/testify/assert"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
clientv1 "sigs.k8s.io/controller-runtime/pkg/client"
)

func TestGenerateSecret(t *testing.T) {
Expand Down Expand Up @@ -156,7 +162,8 @@ func TestCreateRhpamImageStreams(t *testing.T) {
Service: mockSvc,
}

reconciler.createLocalImageTag(fmt.Sprintf("rhpam%s-businesscentral-openshift:1.0", cr.Spec.CommonConfig.Version), cr)
err = reconciler.createLocalImageTag(fmt.Sprintf("rhpam%s-businesscentral-openshift:1.0", cr.Spec.CommonConfig.Version), cr)
assert.Nil(t, err)

isTag, err := isTagMock.Get(fmt.Sprintf("test-ns/rhpam%s-businesscentral-openshift:1.0", cr.Spec.CommonConfig.Version), metav1.GetOptions{})
assert.Nil(t, err)
Expand All @@ -182,7 +189,8 @@ func TestCreateRhdmImageStreams(t *testing.T) {
Service: mockSvc,
}

reconciler.createLocalImageTag(fmt.Sprintf("rhdm%s-decisioncentral-openshift:1.0", cr.Spec.CommonConfig.Version), cr)
err = reconciler.createLocalImageTag(fmt.Sprintf("rhdm%s-decisioncentral-openshift:1.0", cr.Spec.CommonConfig.Version), cr)
assert.Nil(t, err)

isTag, err := isTagMock.Get(fmt.Sprintf("test-ns/rhdm%s-decisioncentral-openshift:1.0", cr.Spec.CommonConfig.Version), metav1.GetOptions{})
assert.Nil(t, err)
Expand All @@ -208,7 +216,8 @@ func TestCreateRhdmTechPreviewImageStreams(t *testing.T) {
Service: mockSvc,
}

reconciler.createLocalImageTag(fmt.Sprintf("rhdm%s-decisioncentral-indexing-openshift:1.0", cr.Spec.CommonConfig.Version), cr)
err = reconciler.createLocalImageTag(fmt.Sprintf("rhdm%s-decisioncentral-indexing-openshift:1.0", cr.Spec.CommonConfig.Version), cr)
assert.Nil(t, err)

isTag, err := isTagMock.Get(fmt.Sprintf("test-ns/rhdm%s-decisioncentral-indexing-openshift:1.0", cr.Spec.CommonConfig.Version), metav1.GetOptions{})
assert.Nil(t, err)
Expand All @@ -234,10 +243,100 @@ func TestCreateImageStreamsLatest(t *testing.T) {
Service: mockSvc,
}

reconciler.createLocalImageTag(fmt.Sprintf("rhdm%s-decisioncentral-indexing-openshift", cr.Spec.CommonConfig.Version), cr)
err = reconciler.createLocalImageTag(fmt.Sprintf("rhdm%s-decisioncentral-indexing-openshift", cr.Spec.CommonConfig.Version), cr)
assert.Nil(t, err)

isTag, err := isTagMock.Get(fmt.Sprintf("test-ns/rhdm%s-decisioncentral-indexing-openshift:latest", cr.Spec.CommonConfig.Version), metav1.GetOptions{})
assert.Nil(t, err)
assert.NotNil(t, isTag)
assert.Equal(t, fmt.Sprintf("registry.redhat.io/rhdm-7-tech-preview/rhdm%s-decisioncentral-indexing-openshift:latest", cr.Spec.CommonConfig.Version), isTag.Tag.From.Name)
}

func TestStatusDeploymentsProgression(t *testing.T) {
crNamespacedName := getNamespacedName("namespace", "cr")
cr := getInstance(crNamespacedName)
cr.Spec = v1.KieAppSpec{
Environment: "rhpam-trial",
}
service := test.MockService()
err := service.Create(context.TODO(), cr)
assert.Nil(t, err)
reconciler := Reconciler{Service: service}
result, err := reconciler.Reconcile(reconcile.Request{NamespacedName: crNamespacedName})
assert.Nil(t, err)
assert.Equal(t, reconcile.Result{Requeue: true}, result, "Deployment should be created but requeued for status updates")

cr = reloadCR(t, service, crNamespacedName)
assert.Equal(t, v1.ProvisioningConditionType, cr.Status.Conditions[0].Type)
assert.Len(t, cr.Status.Deployments.Stopped, 2, "Expect 2 stopped deployments")

//Let's now assume console pod is starting
service.ListFunc = func(ctx context.Context, opts *clientv1.ListOptions, list runtime.Object) error {
err := service.Client.List(ctx, opts, list)
if err == nil && reflect.TypeOf(list) == reflect.TypeOf(&oappsv1.DeploymentConfigList{}) {
for index := range list.(*oappsv1.DeploymentConfigList).Items {
dc := &list.(*oappsv1.DeploymentConfigList).Items[index]
if dc.Name == "cr-rhpamcentr" {
dc.Status.Replicas = 1
}
}
}
return err
}

result, err = reconciler.Reconcile(reconcile.Request{NamespacedName: crNamespacedName})
assert.Nil(t, err)
assert.Equal(t, reconcile.Result{Requeue: true}, result, "Deployment should be created but requeued for status updates")

cr = reloadCR(t, service, crNamespacedName)
assert.Equal(t, v1.ProvisioningConditionType, cr.Status.Conditions[0].Type)
assert.Len(t, cr.Status.Deployments.Stopped, 1, "Expect 1 stopped deployments")
assert.Len(t, cr.Status.Deployments.Starting, 1, "Expect 1 deployment starting up")

//Let's now assume both pods have started
service.ListFunc = func(ctx context.Context, opts *clientv1.ListOptions, list runtime.Object) error {
err := service.Client.List(ctx, opts, list)
if err == nil && reflect.TypeOf(list) == reflect.TypeOf(&oappsv1.DeploymentConfigList{}) {
for index := range list.(*oappsv1.DeploymentConfigList).Items {
dc := &list.(*oappsv1.DeploymentConfigList).Items[index]
dc.Status.Replicas = 1
dc.Status.ReadyReplicas = 1
}
}
return err
}

result, err = reconciler.Reconcile(reconcile.Request{NamespacedName: crNamespacedName})
assert.Nil(t, err)
assert.Equal(t, reconcile.Result{Requeue: true}, result, "Deployment should be created but requeued for status updates")

cr = reloadCR(t, service, crNamespacedName)
assert.Equal(t, v1.ProvisioningConditionType, cr.Status.Conditions[0].Type)
assert.Len(t, cr.Status.Deployments.Stopped, 0, "Expect 0 stopped deployments")
assert.Len(t, cr.Status.Deployments.Starting, 0, "Expect 0 deployment starting up")
assert.Len(t, cr.Status.Deployments.Ready, 2, "Expect 2 deployment to be ready")
}

func getNamespacedName(namespace string, name string) types.NamespacedName {
return types.NamespacedName{
Name: name,
Namespace: namespace,
}
}

func reloadCR(t *testing.T, service *test.MockPlatformService, namespacedName types.NamespacedName) *v1.KieApp {
cr := getInstance(namespacedName)
err := service.Get(context.TODO(), namespacedName, cr)
assert.Nil(t, err)
return cr
}

func getInstance(namespacedName types.NamespacedName) *v1.KieApp {
cr := &v1.KieApp{
ObjectMeta: metav1.ObjectMeta{
Name: namespacedName.Name,
Namespace: namespacedName.Namespace,
},
}
return cr
}
39 changes: 28 additions & 11 deletions pkg/controller/kieapp/test/mock_service.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,27 @@ package test

import (
"context"
v1 "github.com/kiegroup/kie-cloud-operator/pkg/apis/app/v1"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

"github.com/kiegroup/kie-cloud-operator/pkg/controller/kieapp/logs"
oappsv1 "github.com/openshift/api/apps/v1"
buildv1 "github.com/openshift/api/build/v1"
oimagev1 "github.com/openshift/api/image/v1"
routev1 "github.com/openshift/api/route/v1"
imagev1 "github.com/openshift/client-go/image/clientset/versioned/typed/image/v1"
appsv1 "k8s.io/api/apps/v1"
corev1 "k8s.io/api/core/v1"
rbacv1 "k8s.io/api/rbac/v1"
"k8s.io/apimachinery/pkg/runtime"
clientv1 "sigs.k8s.io/controller-runtime/pkg/client"
)

var log = logs.GetLogger("kieapp.test")

type MockPlatformService struct {
Client clientv1.Client
scheme *runtime.Scheme
CreateFunc func(ctx context.Context, obj runtime.Object) error
GetFunc func(ctx context.Context, key clientv1.ObjectKey, obj runtime.Object) error
ListFunc func(ctx context.Context, opts *clientv1.ListOptions, list runtime.Object) error
Expand All @@ -23,35 +34,37 @@ type MockPlatformService struct {
}

func MockService() *MockPlatformService {
v1.SchemeBuilder.Register(&v1.KieApp{}, &v1.KieAppList{}, &corev1.PersistentVolumeClaim{}, &corev1.ServiceAccount{}, &corev1.Secret{}, &rbacv1.Role{}, &rbacv1.RoleBinding{}, &oappsv1.DeploymentConfig{}, &corev1.Service{}, &appsv1.StatefulSet{}, &routev1.Route{}, &oimagev1.ImageStream{}, &buildv1.BuildConfig{}, &oappsv1.DeploymentConfigList{}, &buildv1.BuildConfigList{})
scheme, _ := v1.SchemeBuilder.Build()
client := fake.NewFakeClientWithScheme(scheme)
log.Debugf("Fake client created as %v", client)
mockImageStreamTag := &MockImageStreamTag{}
return &MockPlatformService{
Client: client,
scheme: scheme,
CreateFunc: func(ctx context.Context, obj runtime.Object) error {
log.Debugf("Mock service will do no-op in lieu of creating %v", obj)
return nil
return client.Create(ctx, obj)
},
GetFunc: func(ctx context.Context, key clientv1.ObjectKey, obj runtime.Object) error {
log.Debugf("Will return nil to request to get key %v and object %v")
return nil
return client.Get(ctx, key, obj)
},
ListFunc: func(ctx context.Context, opts *clientv1.ListOptions, list runtime.Object) error {
return nil
return client.List(ctx, opts, list)
},
UpdateFunc: func(ctx context.Context, obj runtime.Object) error {
log.Debugf("Mock service will do no-op in lieu of updating %v", obj)
return nil
return client.Update(ctx, obj)
},
UpdateStatusFunc: func(ctx context.Context, obj runtime.Object) error {
log.Debugf("Mock service will do no-op in lieu of updating status %v", obj)
return nil
return client.Status().Update(ctx, obj)
},
GetCachedFunc: func(ctx context.Context, key clientv1.ObjectKey, obj runtime.Object) error {
return nil
return client.Get(ctx, key, obj)
},
ImageStreamTagsFunc: func(namespace string) imagev1.ImageStreamTagInterface {
return mockImageStreamTag
},
GetSchemeFunc: func() *runtime.Scheme {
return nil
return scheme
},
}
}
Expand All @@ -72,6 +85,10 @@ func (service *MockPlatformService) Update(ctx context.Context, obj runtime.Obje
return service.UpdateFunc(ctx, obj)
}

func (service *MockPlatformService) UpdateStatus(ctx context.Context, obj runtime.Object) error {
return service.UpdateStatusFunc(ctx, obj)
}

func (service *MockPlatformService) GetCached(ctx context.Context, key clientv1.ObjectKey, obj runtime.Object) error {
return service.GetCachedFunc(ctx, key, obj)
}
Expand Down

0 comments on commit 13b2d54

Please sign in to comment.