#330 improved vs ready unit tests

Author: allmightyspiff

plugin/managers/dedicatedhost_test.go

@@ -1,8 +1,6 @@
 package managers_test
 
 import (
-	"fmt"
-
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	"github.com/softlayer/softlayer-go/session"
@@ -30,7 +28,6 @@ var _ = Describe("DedicatedhostManager", func() {
 			})
 			It("it returns dedicatedhost order template", func() {
 				_, err := dedicatedhostManager.GenerateOrderTemplate("56_CORES_X_242_RAM_X_1_4_TB", "test", "test.com", "ams01", "hourly", 1234567)
-				fmt.Println(err)
 				Expect(err).To(HaveOccurred())
 				Expect(err.Error()).To(ContainSubstring("Ordering package is not found"))
 			})

plugin/managers/storage.go

@@ -470,7 +470,6 @@ func (s storageManager) OrderModifiedVolume(volumeType string, volumeID int, new
 	if strings.Contains(volumeStorageType, "PERFORMANCE") {
 		volumeIsPerformance = true
 		if size == 0 && iops == 0 {
-			fmt.Println(iops)
 			return datatypes.Container_Product_Order_Receipt{}, errors.New(T("A size or IOPS value must be given to modify this performance volume."))
 		}
 		if size == 0 && volume.CapacityGb != nil {

plugin/managers/storage_test.go

@@ -1,7 +1,6 @@
 package managers_test
 
 import (
-	"fmt"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
 	. "github.com/onsi/gomega/gstruct"
@@ -147,7 +146,7 @@ var _ = Describe("StorageManager", func() {
 				apiCalls := fakeHandler.ApiCallLogs
 				Expect(len(apiCalls)).To(Equal(1))
 				// See https://pkg.go.dev/github.com/onsi/gomega/gstruct for this stuff
-				fmt.Printf("APICALL: %+v", apiCalls[0].Options)
+				// fmt.Printf("APICALL: %+v", apiCalls[0].Options)
 				Expect(apiCalls[0]).To(MatchFields(IgnoreExtras, Fields{
 					"Service": Equal("SoftLayer_Account"),
 					"Method":  Equal("getIscsiNetworkStorage"),
@@ -160,7 +159,7 @@ var _ = Describe("StorageManager", func() {
 				apiCalls := fakeHandler.ApiCallLogs
 				Expect(len(apiCalls)).To(Equal(1))
 				// See https://pkg.go.dev/github.com/onsi/gomega/gstruct for this stuff
-				fmt.Printf("APICALL: %+v", apiCalls[0].Options)
+				// fmt.Printf("APICALL: %+v", apiCalls[0].Options)
 				Expect(apiCalls[0]).To(MatchFields(IgnoreExtras, Fields{
 					"Service": Equal("SoftLayer_Account"),
 					"Method":  Equal("getNasNetworkStorage"),

plugin/managers/virtualserver.go

@@ -3,7 +3,7 @@ package managers
 import (
 	"encoding/json"
 	"errors"
-	"fmt"
+
 	"io/ioutil"
 	"math"
 	"os"
@@ -664,7 +664,7 @@ func getPresetCost(preset datatypes.Product_Package_Preset, items []datatypes.Pr
 func printAsJsonFormat(data interface{}) {
 	jsonData, jsonErr := json.MarshalIndent(data, "", "    ")
 	if jsonErr != nil {
-		fmt.Println(jsonErr)
+
 		return
 	}
 	println(string(jsonData))

plugin/managers/virtualserver_test.go

@@ -266,10 +266,34 @@ var _ = Describe("VirtualServerManager", func() {
 			It("It returns it is ready", func() {
 				ready, msg, err := vsManager.InstanceIsReady(123456, time.Now())
 				Expect(err).ToNot(HaveOccurred())
-				Expect(ready).To(Equal(true))
+				Expect(ready).To(BeTrue())
 				Expect(msg).To(Equal(""))
 			})
 		})
+		Context("API Error", func() {
+			It("Error is returned", func() {
+				fakeHandler.AddApiError("SoftLayer_Virtual_Guest", "getObject", 200, `{"error":"Internal Error","code":"SoftLayer_Exception_Public"}`)
+				ready, msg, err := vsManager.InstanceIsReady(123456, time.Now())
+				Expect(err).To(HaveOccurred())
+				Expect(err.Error()).To(ContainSubstring("SoftLayer_Exception_Public"))
+				Expect(ready).To(BeFalse())
+				Expect(msg).To(Equal(""))
+			})
+		})		
+		Context("VS not ready", func() {
+			It("vs is HALTED", func() {
+				ready, msg, err := vsManager.InstanceIsReady(41111, time.Now())
+				Expect(err).ToNot(HaveOccurred())
+				Expect(ready).To(BeFalse())
+				Expect(msg).To(Equal("HALTED"))
+			})
+			It("vs is transactioning", func() {
+				ready, msg, err := vsManager.InstanceIsReady(41112, time.Now())
+				Expect(err).ToNot(HaveOccurred())
+				Expect(ready).To(BeFalse())
+				Expect(msg).To(Equal("TESTTXN"))
+			})
+		})
 	})
 
 	Describe("Set user metadata for instance", func() {

plugin/testfixtures/SoftLayer_Virtual_Guest/getObject-41111.json

@@ -0,0 +1 @@
+{"id":41111,"provisionDate":"2022-08-30T08:50:12-07:00","powerState":{"keyName":"HALTED"}}

plugin/testfixtures/SoftLayer_Virtual_Guest/getObject-41112.json

@@ -0,0 +1,14 @@
+{
+	"id": 41112,
+
+	"powerState": {
+		"keyName": "RUNNING"
+	},
+	"activeTransaction": {
+		"transactionStatus" : {
+			"name": "TESTTXN"
+		},
+		"id": 99999
+	},
+	"lastOperatingSystemReload":{"id":294366820,"modifyDate":"2022-08-30T12:57:05-07:00"}
+}