Virtual Media resource UT fix (#289)

Co-authored-by: Krunal Thakkar <[email protected]>
dell · Feb 17, 2025 · 3781a27 · 3781a27
1 parent c88389d
commit 3781a27
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 37 deletions.
diff --git a/redfish/helper/redfish_virtual_media.go b/redfish/helper/redfish_virtual_media.go
@@ -82,6 +82,8 @@ func InsertMedia(id string, collection []*redfish.VirtualMedia, config redfish.V
 	if err != nil {
 		return nil, fmt.Errorf("virtual media selected doesn't exist: %w", err)
 	}
+	virtualMedia.Entity.SetETag("")
+
 	if !virtualMedia.Inserted {
 		err = virtualMedia.InsertMediaConfig(config)
 		if err != nil {
@@ -115,6 +117,7 @@ func GetNejectVirtualMedia(service *gofish.Service, uri string) (*redfish.Virtua
 	if err != nil {
 		return nil, fmt.Errorf("virtual Media doesn't exist:  %w", err) // This error won't be triggered ever
 	}
+	virtualMedia.Entity.SetETag("")
 
 	// Eject virtual media
 	err = virtualMedia.EjectMedia()

diff --git a/redfish/provider/provider_test.go b/redfish/provider/provider_test.go
@@ -24,21 +24,23 @@ import (
 	"strings"
 	"testing"
 
+	"github.com/bytedance/mockey"
 	"github.com/hashicorp/terraform-plugin-framework/providerserver"
 	"github.com/hashicorp/terraform-plugin-go/tfprotov6"
 	"github.com/hashicorp/terraform-plugin-testing/terraform"
-	"github.com/bytedance/mockey"
 )
 
 var (
-	testAccProtoV6ProviderFactories map[string]func() (tfprotov6.ProviderServer, error)
-	creds                           TestingServerCredentials
-	image64Boot                     string
-	image64BootInvalid              string
-	image64Dvd1                     string
-	imageEfiBoot                    string
-	drive                           string
-	firmwareUpdateIP                string
+	testAccProtoV6ProviderFactories         map[string]func() (tfprotov6.ProviderServer, error)
+	creds                                   TestingServerCredentials
+	image64Boot                             string
+	image64BootInvalid                      string
+	image64Dvd1                             string
+	imageEfiBoot                            string
+	virtualMediaTransferProtocolTypeValid   string
+	virtualMediaTransferProtocolTypeInvalid string
+	drive                                   string
+	firmwareUpdateIP                        string
 )
 
 // FunctionMocker is used to mock functions in the provider
@@ -93,6 +95,8 @@ func init() {
 	image64BootInvalid = os.Getenv("TF_TESTING_VIRTUAL_MEDIA_IMAGE_PATH_64BOOT_INVALID")
 	image64Dvd1 = os.Getenv("TF_TESTING_VIRTUAL_MEDIA_IMAGE_PATH_64DVD1")
 	imageEfiBoot = os.Getenv("TF_TESTING_VIRTUAL_MEDIA_IMAGE_PATH_EFI_BOOT")
+	virtualMediaTransferProtocolTypeValid = os.Getenv("TF_TESTING_VIRTUAL_MEDIA_TRANSFER_PROTOCOL_TYPE_VALID")
+	virtualMediaTransferProtocolTypeInvalid = os.Getenv("TF_TESTING_VIRTUAL_MEDIA_TRANSFER_PROTOCOL_TYPE_INVALID")
 	// storage volume environment varibale
 	drive = os.Getenv("TF_TESTING_STORAGE_VOLUME_DRIVE")
 	firmwareUpdateIP = os.Getenv("TF_TESTING_FIRMWARE_UPDATE_IP")

diff --git a/redfish/provider/resource_redfish_virtual_media_test.go b/redfish/provider/resource_redfish_virtual_media_test.go
@@ -54,7 +54,7 @@ func TestAccRedfishVirtualMedia_basic(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(testAccVMedResName, "image", image64Boot),
@@ -95,7 +95,7 @@ func TestAccRedfishVirtualMediaServer2_ReadMockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 			},
 			{
@@ -107,7 +107,7 @@ func TestAccRedfishVirtualMediaServer2_ReadMockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 				ExpectError: regexp.MustCompile(`.*mock error*.`),
@@ -121,7 +121,7 @@ func TestAccRedfishVirtualMediaServer2_ReadMockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 			},
@@ -144,7 +144,7 @@ func TestAccRedfishVirtualMedia_InvalidImage_Negative(t *testing.T) {
 					"virtual_media",
 					image64BootInvalid,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},
@@ -164,7 +164,7 @@ func TestAccRedfishVirtualMedia_InvalidTransferMethod_Negative(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Upload"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},
@@ -184,7 +184,7 @@ func TestAccRedfishVirtualMedia_InvalidTransferProtocol_Negative(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTPS",
+					virtualMediaTransferProtocolTypeInvalid,
 					"Stream"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},
@@ -204,22 +204,22 @@ func TestAccRedfishVirtualMediaNoMediaNegative_basic(t *testing.T) {
 					"virtual_media1",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream") +
 					testAccRedfishResourceVirtualMediaConfigDependency(
 						creds,
 						"virtual_media2",
 						image64Dvd1,
 						true,
-						"HTTP",
+						virtualMediaTransferProtocolTypeValid,
 						"Stream",
 						"redfish_virtual_media.virtual_media1") +
 					testAccRedfishResourceVirtualMediaConfigDependency(
 						creds,
 						"virtual_media3",
 						image64Dvd1,
 						true,
-						"HTTP",
+						virtualMediaTransferProtocolTypeValid,
 						"Stream",
 						"redfish_virtual_media.virtual_media2"),
 				ExpectError: regexp.MustCompile("There are no Virtual Medias to mount"),
@@ -240,7 +240,7 @@ func TestAccRedfishVirtualMediaServer2_basic(t *testing.T) {
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(testAccVMedResName, "image", imageEfiBoot),
@@ -277,7 +277,7 @@ func TestAccRedfishVirtualMediaServer2_CreateMockErr(t *testing.T) {
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 				ExpectError: regexp.MustCompile(`.*mock error*.`),
@@ -295,7 +295,7 @@ func TestAccRedfishVirtualMediaServer2_CreateMockErr(t *testing.T) {
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 				ExpectError: regexp.MustCompile(`.*mock error*.`),
@@ -318,7 +318,7 @@ func TestAccRedfishVirtualMediaServer2_CreateMockErr(t *testing.T) {
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 				ExpectError: regexp.MustCompile(`.*mock error*.`),
@@ -351,7 +351,7 @@ func TestAccRedfishVirtualMediaServer2_InvalidTransferProtocol_Negative(t *testi
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTPS",
+					virtualMediaTransferProtocolTypeInvalid,
 					"Stream"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},
@@ -371,7 +371,7 @@ func TestAccRedfishVirtualMediaServer2Update_InvalidTransferProtocol_Negative(t
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(testAccVMedResName, "image", imageEfiBoot),
@@ -384,7 +384,7 @@ func TestAccRedfishVirtualMediaServer2Update_InvalidTransferProtocol_Negative(t
 					"virtual_media",
 					imageEfiBoot,
 					true,
-					"HTTPS",
+					virtualMediaTransferProtocolTypeInvalid,
 					"Stream"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},
@@ -404,7 +404,7 @@ func TestAccRedfishVirtualMediaUpdate_basic(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(testAccVMedResName, "image", image64Boot),
@@ -427,7 +427,7 @@ func TestAccRedfishVirtualMediaUpdate_basic(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					false,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				ExpectError: regexp.MustCompile("Provider produced inconsistent result after apply"),
 			},
@@ -457,7 +457,7 @@ func TestAccRedfishVirtualMediaUpdate_MockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 			},
 			{
@@ -469,7 +469,7 @@ func TestAccRedfishVirtualMediaUpdate_MockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					false,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 				ExpectError: regexp.MustCompile(`.*mock error*.`),
@@ -483,7 +483,7 @@ func TestAccRedfishVirtualMediaUpdate_MockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 			},
@@ -496,7 +496,7 @@ func TestAccRedfishVirtualMediaUpdate_MockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					false,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 				ExpectError: regexp.MustCompile(`.*mock error*.`),
@@ -510,7 +510,7 @@ func TestAccRedfishVirtualMediaUpdate_MockErr(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream",
 				),
 			},
@@ -534,7 +534,7 @@ func TestAccRedfishVirtualMediaUpdate_InvalidImage_Negative(t *testing.T) {
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(testAccVMedResName, "image", image64Boot),
@@ -547,7 +547,7 @@ func TestAccRedfishVirtualMediaUpdate_InvalidImage_Negative(t *testing.T) {
 					"virtual_media",
 					image64BootInvalid,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},
@@ -567,7 +567,7 @@ func TestAccRedfishVirtualMediaUpdate_InvalidTransferMethod_Negative(t *testing.
 					"virtual_media",
 					image64Boot,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Stream"),
 				Check: resource.ComposeAggregateTestCheckFunc(
 					resource.TestCheckResourceAttr(testAccVMedResName, "image", image64Boot),
@@ -580,7 +580,7 @@ func TestAccRedfishVirtualMediaUpdate_InvalidTransferMethod_Negative(t *testing.
 					"virtual_media",
 					image64Dvd1,
 					true,
-					"HTTP",
+					virtualMediaTransferProtocolTypeValid,
 					"Upload"),
 				ExpectError: regexp.MustCompile("[C|c]ouldn't mount Virtual Media"),
 			},