OVA test: add minor code changes

Signed-off-by: Bella Khizgiyaev <[email protected]>
kubev2v · Dec 4, 2023 · 3d880fa · 3d880fa
1 parent 6182202
commit 3d880fa
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 6 deletions.
diff --git a/tests/suit/framework/ova.go b/tests/suit/framework/ova.go
@@ -2,6 +2,7 @@ package framework
 
 import (
 	"context"
+	"errors"
 	"os"
 
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
@@ -10,7 +11,6 @@ import (
 
 // LoadSourceDetails - Load Source VM details from ova
 func (r *OvaClient) LoadSourceDetails() (vm *OvaVM, err error) {
-	r.storageClass = DefaultStorageClass
 	if sc := os.Getenv("STORAGE_CLASS"); sc != "" {
 		r.storageClass = sc
 	} else {
@@ -29,16 +29,21 @@ func (r *OvaClient) GetNfsServerForOva(k8sClient *kubernetes.Clientset) (string,
 		return "", err
 	}
 	var nfsShare string
+	var server, share string
 	for parm, val := range storageClass.Parameters {
 		if parm == "server" {
-			nfsShare = val
+			server = val
 		}
 		if parm == "share" {
-			nfsShare = nfsShare + ":" + val
+			share = val
 		}
 	}
+	nfsShare = server + ":" + share
+
 	if nfsShare != "" {
 		r.nfsPath = nfsShare
+	} else {
+		return "", errors.New("failed to fatch NFS settings")
 	}
 	return r.nfsPath, nil
 }

diff --git a/tests/suit/ova_test.go b/tests/suit/ova_test.go
@@ -1,13 +1,20 @@
 package suit_test
 
 import (
+	"bytes"
+	"context"
+	"fmt"
+	"io"
+	"strings"
 	"time"
 
 	forkliftv1 "github.com/konveyor/forklift-controller/pkg/apis/forklift/v1beta1"
 	"github.com/konveyor/forklift-controller/tests/suit/framework"
 	"github.com/konveyor/forklift-controller/tests/suit/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
+	core "k8s.io/api/core/v1"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 )
 
 const (
@@ -78,6 +85,33 @@ var _ = Describe("[level:component]Migration tests for OVA provider", func() {
 		err = utils.CreateMigrationFromDefinition(f.CrClient, migrationDef)
 		Expect(err).ToNot(HaveOccurred())
 		err = utils.WaitForMigrationSucceededWithTimeout(f.CrClient, provider.Namespace, test_migration_name, 900*time.Second)
+		if err != nil {
+			podname := ""
+			pods, err1 := f.K8sClient.CoreV1().Pods(targetNS.Name).List(context.Background(), metav1.ListOptions{})
+			if err1 != nil {
+				fmt.Println("this is error, ", err1)
+			}
+			for _, pod := range pods.Items {
+				if strings.HasPrefix(pod.Name, "plan-test") {
+					podname = pod.Name
+				}
+			}
+			podLogOpts := core.PodLogOptions{}
+			request := f.K8sClient.CoreV1().Pods(targetNS.Name).GetLogs(podname, &podLogOpts)
+			podLogs, err1 := request.Stream(context.Background())
+			if err1 != nil {
+				panic(err1.Error())
+			}
+			defer podLogs.Close()
+			buf := new(bytes.Buffer)
+			_, err1 = io.Copy(buf, podLogs)
+			if err1 != nil {
+				panic(err1.Error())
+			}
+			str := buf.String()
+			fmt.Println("Logs for pod", podname)
+			fmt.Println(str)
+		}
 		Expect(err).ToNot(HaveOccurred())
 
 	})

diff --git a/tests/suit/utils/storagemap.go b/tests/suit/utils/storagemap.go
@@ -37,10 +37,11 @@ func NewStorageMap(namespace string, providerIdentifier forkliftv1.Provider, sto
 			},
 		}
 
-		if providerIdentifier.Type() != api.Ova {
-			pair.Source = ref.Ref{ID: sd}
-		} else {
+		switch providerIdentifier.Type() {
+		case api.Ova:
 			pair.Source = ref.Ref{Name: sd}
+		default:
+			pair.Source = ref.Ref{ID: sd}
 		}
 
 		sdPairs = append(sdPairs, pair)