test: upgrade integration test from 1.7 to master

The upgrade integration test was from rook v1.6 to the latest master.
This was necessary until we are ready for the v1.8 release, from which
time we want to focus the upgrade testing from v1.7 to the latest
master.

The duplication in the test CRs and other resources is now reduced
by the upgrade calling a thin wrapper to forward a call to the
master version of the resource. When a new feature is added that
needs to be differentiated from the previous version, the method
then can be implemented instead of wrapping the master implementation.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>

tests/framework/installer/ceph_manifests.go

@@ -61,8 +61,8 @@ func NewCephManifests(settings *TestCephSettings) CephManifests {
 	switch settings.RookVersion {
 	case LocalBuildTag:
 		return &CephManifestsMaster{settings}
-	case Version1_6:
-		return &CephManifestsV1_6{settings}
+	case Version1_7:
+		return &CephManifestsPreviousVersion{settings, &CephManifestsMaster{settings}}
 	}
 	panic(fmt.Errorf("unrecognized ceph manifest version: %s", settings.RookVersion))
 }
@@ -105,7 +105,7 @@ func (m *CephManifestsMaster) GetToolbox() string {
 //**********************************************************************************
 //**********************************************************************************
 // After a release, copy the methods below this separator into the versioned file
-// such as ceph_manifests_v1.6.go. Methods above this separator do not need to be
+// such as ceph_manifests_previous.go. Methods above this separator do not need to be
 // copied since the versioned implementation will load them directly from github.
 //**********************************************************************************
 //**********************************************************************************

tests/framework/installer/ceph_manifests_previous.go

@@ -0,0 +1,162 @@
+/*
+Copyright 2016 The Rook 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 installer
+
+import (
+	"strings"
+
+	"github.com/rook/rook/tests/framework/utils"
+)
+
+const (
+	// The version from which the upgrade test will start
+	Version1_7 = "v1.7.8"
+)
+
+// CephManifestsPreviousVersion wraps rook yaml definitions
+type CephManifestsPreviousVersion struct {
+	settings *TestCephSettings
+	latest   *CephManifestsMaster
+}
+
+func (m *CephManifestsPreviousVersion) Settings() *TestCephSettings {
+	return m.settings
+}
+
+func (m *CephManifestsPreviousVersion) GetCRDs(k8shelper *utils.K8sHelper) string {
+	return m.settings.readManifestFromGithub("crds.yaml")
+}
+
+// GetRookOperator returns rook Operator manifest
+func (m *CephManifestsPreviousVersion) GetOperator() string {
+	var manifest string
+	if utils.IsPlatformOpenShift() {
+		manifest = m.settings.readManifestFromGithub("operator-openshift.yaml")
+	} else {
+		manifest = m.settings.readManifestFromGithub("operator.yaml")
+	}
+	return m.settings.replaceOperatorSettings(manifest)
+}
+
+// GetCommon returns rook-cluster manifest
+func (m *CephManifestsPreviousVersion) GetCommon() string {
+	return m.settings.readManifestFromGithub("common.yaml")
+}
+
+// GetRookToolBox returns rook-toolbox manifest
+func (m *CephManifestsPreviousVersion) GetToolbox() string {
+	if m.settings.DirectMountToolbox {
+		manifest := strings.ReplaceAll(m.settings.readManifestFromGithub("direct-mount.yaml"), "name: rook-direct-mount", "name: rook-ceph-tools")
+		return strings.ReplaceAll(manifest, "app: rook-direct-mount", "app: rook-ceph-tools")
+	}
+	return m.settings.readManifestFromGithub("toolbox.yaml")
+}
+
+func (m *CephManifestsPreviousVersion) GetCommonExternal() string {
+	return m.settings.readManifestFromGithub("common-external.yaml")
+}
+
+//**********************************************************************************
+//**********************************************************************************
+// Methods in this section may need to be customized depending on new
+// features that are being added in newer releases and may not be possible
+// to configure in the previous release. By default, all these methods will
+// provide a thin wrapper around the resources created by the master
+// implementation.
+//**********************************************************************************
+//**********************************************************************************
+
+// GetRookCluster returns rook-cluster manifest
+func (m *CephManifestsPreviousVersion) GetCephCluster() string {
+	return m.latest.GetCephCluster()
+}
+
+func (m *CephManifestsPreviousVersion) GetBlockSnapshotClass(snapshotClassName, reclaimPolicy string) string {
+	return m.latest.GetBlockSnapshotClass(snapshotClassName, reclaimPolicy)
+}
+
+func (m *CephManifestsPreviousVersion) GetFileStorageSnapshotClass(snapshotClassName, reclaimPolicy string) string {
+	return m.latest.GetFileStorageSnapshotClass(snapshotClassName, reclaimPolicy)
+}
+
+func (m *CephManifestsPreviousVersion) GetBlockPool(poolName, replicaSize string) string {
+	return m.latest.GetBlockPool(poolName, replicaSize)
+}
+
+func (m *CephManifestsPreviousVersion) GetBlockStorageClass(poolName, storageClassName, reclaimPolicy string) string {
+	return m.latest.GetBlockStorageClass(poolName, storageClassName, reclaimPolicy)
+}
+
+func (m *CephManifestsPreviousVersion) GetFileStorageClass(fsName, storageClassName string) string {
+	return m.latest.GetFileStorageClass(fsName, storageClassName)
+}
+
+// GetFilesystem returns the manifest to create a Rook filesystem resource with the given config.
+func (m *CephManifestsPreviousVersion) GetFilesystem(name string, activeCount int) string {
+	return m.latest.GetFilesystem(name, activeCount)
+}
+
+// GetFilesystem returns the manifest to create a Rook Ceph NFS resource with the given config.
+func (m *CephManifestsPreviousVersion) GetNFS(name, pool string, count int) string {
+	return m.latest.GetNFS(name, pool, count)
+}
+
+func (m *CephManifestsPreviousVersion) GetObjectStore(name string, replicaCount, port int, tlsEnable bool) string {
+	return m.latest.GetObjectStore(name, replicaCount, port, tlsEnable)
+}
+
+func (m *CephManifestsPreviousVersion) GetObjectStoreUser(name, displayName, store, usercaps, maxsize string, maxbuckets, maxobjects int) string {
+	return m.latest.GetObjectStoreUser(name, displayName, store, usercaps, maxsize, maxbuckets, maxobjects)
+}
+
+//GetBucketStorageClass returns the manifest to create object bucket
+func (m *CephManifestsPreviousVersion) GetBucketStorageClass(storeName, storageClassName, reclaimPolicy, region string) string {
+	return m.latest.GetBucketStorageClass(storeName, storageClassName, reclaimPolicy, region)
+}
+
+//GetOBC returns the manifest to create object bucket claim
+func (m *CephManifestsPreviousVersion) GetOBC(claimName, storageClassName, objectBucketName, maxObject string, varBucketName bool) string {
+	return m.latest.GetOBC(claimName, storageClassName, objectBucketName, maxObject, varBucketName)
+}
+
+//GetOBCNotification returns the manifest to create object bucket claim
+func (m *CephManifestsPreviousVersion) GetOBCNotification(claimName, storageClassName, objectBucketName, notificationName string, varBucketName bool) string {
+	return m.latest.GetOBCNotification(claimName, storageClassName, objectBucketName, notificationName, varBucketName)
+}
+
+//GetBucketNotification returns the manifest to create ceph bucket notification
+func (m *CephManifestsPreviousVersion) GetBucketNotification(notificationName, topicName string) string {
+	return m.latest.GetBucketNotification(notificationName, topicName)
+}
+
+//GetBucketTopic returns the manifest to create ceph bucket topic
+func (m *CephManifestsPreviousVersion) GetBucketTopic(topicName, storeName, httpEndpointService string) string {
+	return m.latest.GetBucketTopic(topicName, storeName, httpEndpointService)
+}
+
+func (m *CephManifestsPreviousVersion) GetClient(claimName string, caps map[string]string) string {
+	return m.latest.GetClient(claimName, caps)
+}
+
+func (m *CephManifestsPreviousVersion) GetExternalCephCluster() string {
+	return m.latest.GetExternalCephCluster()
+}
+
+// GetRBDMirror returns the manifest to create a Rook Ceph RBD Mirror resource with the given config.
+func (m *CephManifestsPreviousVersion) GetRBDMirror(name string, count int) string {
+	return m.latest.GetRBDMirror(name, count)
+}