Merge pull request #571 from HewlettPackard/hostNameIssue

Added support for hostNVMeQualifiedNameType  and removing MirrorList attribute for firmware driver resource

Author: akshith-gunasheelan

examples/server_profiles/main.tf

@@ -100,6 +100,28 @@ resource "oneview_server_profile" "SPWithLocalStorage" {
 #   scopes_uri           = data.oneview_scope.scope.uri
 # }
 
+#Create a Server Profile using a Server profile template and user defined host nvme qualified name
+
+# data "oneview_server_hardware" "sh" {
+#   name = "Test_server_hardware"
+# }
+
+# data "oneview_server_profile_template" "spt" {
+#   name = "spt"
+# }
+
+
+# resource "oneview_server_profile" "sp_from_spt" {
+#   name                          = "sp_from_spt"
+#   hardware_name                 = data.oneview_server_hardware.sh.name
+#   server_hardware_type          = data.oneview_server_profile_template.spt.server_hardware_type
+#   template                      = data.oneview_server_profile_template.spt.name
+#   host_nvme_qualified_name_type = "UserDefined"
+#   host_nvme_qualified_name      = "nqn.2021-11.com.hpe:oneview-vcgouvd010"
+#   scopes_uri                    = data.oneview_scope.scope.uri
+# }
+
+
 /*
 # Create Server Profile with OS deployment settings
 resource "oneview_server_profile" "SPWithOSDS" {

examples/server_profiles/update_resource.tf

@@ -114,6 +114,28 @@ resource "oneview_server_profile" "SP" {
 }
 */
 
+# Edit a Server Profile using a Server profile template and user defined host nvme qualified name
+
+# data "oneview_server_hardware" "sh" {
+#   name = "Test_server_hardware"
+# }
+
+# data "oneview_server_profile_template" "spt" {
+#   name = "spt"
+# }
+
+
+# resource "oneview_server_profile" "sp_from_spt" {
+#   name                          = "sp_from_spt"
+#   hardware_name                 = data.oneview_server_hardware.sh.name
+#   server_hardware_type          = data.oneview_server_profile_template.spt.server_hardware_type
+#   template                      = data.oneview_server_profile_template.spt.name
+#   host_nvme_qualified_name_type = "UserDefined"
+#   host_nvme_qualified_name      = "nqn.2021-11.com.hpe:oneview-vcgouvd010"
+#   scopes_uri                    = data.oneview_scope.scope.uri
+# }
+
+
 
 
 

go.mod

@@ -3,7 +3,7 @@ module github.com/HewlettPackard/terraform-provider-oneview
 go 1.15
 
 require (
-	github.com/HewlettPackard/oneview-golang v9.4.0+incompatible
+	github.com/HewlettPackard/oneview-golang v9.4.1-0.20250527100241-13999d41ac67+incompatible
 	github.com/docker/machine v0.16.2 // indirect
 	github.com/hashicorp/errwrap v1.1.0 // indirect
 	github.com/hashicorp/go-getter v1.6.2 // indirect

go.sum

@@ -34,8 +34,8 @@ cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
-github.com/HewlettPackard/oneview-golang v9.4.0+incompatible h1:klFKiAm6W6r3GgfKELgVECVSqfvNsRVP5u3lt8grwEY=
-github.com/HewlettPackard/oneview-golang v9.4.0+incompatible/go.mod h1:GJcjWgNHrKtt2lUl4xcaV3NRiuBlG138DNrFygXj4JE=
+github.com/HewlettPackard/oneview-golang v9.4.1-0.20250527100241-13999d41ac67+incompatible h1:Vst+7DJoMGa7ahZFdkqjG4EO5aCzQyoxQysSB5qHyOA=
+github.com/HewlettPackard/oneview-golang v9.4.1-0.20250527100241-13999d41ac67+incompatible/go.mod h1:GJcjWgNHrKtt2lUl4xcaV3NRiuBlG138DNrFygXj4JE=
 github.com/agext/levenshtein v1.2.1/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=
 github.com/agext/levenshtein v1.2.2 h1:0S/Yg6LYmFJ5stwQeRp6EeOcCbj7xiqQSdNelsXvaqE=
 github.com/agext/levenshtein v1.2.2/go.mod h1:JEDfjyjHDjOF/1e4FlBE/PkbqA9OfWu2ki2W0IB5558=

oneview/data_source_firmware_drivers.go

@@ -141,13 +141,6 @@ func dataSourceFirmwareDrivers() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"mirror_list": {
-				Computed: true,
-				Type:     schema.TypeMap,
-				Elem: &schema.Schema{
-					Type: schema.TypeList,
-				},
-			},
 			"locations": {
 				Computed: true,
 				Type:     schema.TypeMap,
@@ -306,7 +299,6 @@ func dataSourceFirmwareDriversRead(d *schema.ResourceData, meta interface{}) err
 	d.Set("parent_bundle", parentBundle)
 
 	d.Set("locations", firmware.Locations)
-	d.Set("mirror_list", firmware.Mirrorlist)
 
 	d.SetId(id)
 	return nil

oneview/data_source_server_profile.go

@@ -32,6 +32,14 @@ func dataSourceServerProfile() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
+			"host_nvme_qualified_name_type": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
+			"host_nvme_qualified_name": {
+				Type:     schema.TypeString,
+				Computed: true,
+			},
 			"bios_option": {
 				Type:     schema.TypeSet,
 				Optional: true,

oneview/resource_firmware_drivers.go

@@ -149,13 +149,6 @@ func resourceFirmwareDrivers() *schema.Resource {
 				Type:     schema.TypeString,
 				Computed: true,
 			},
-			"mirror_list": {
-				Computed: true,
-				Type:     schema.TypeMap,
-				Elem: &schema.Schema{
-					Type: schema.TypeList,
-				},
-			},
 			"locations": {
 				Computed: true,
 				Type:     schema.TypeMap,
@@ -373,7 +366,6 @@ func resourceFirmwareDriversRead(d *schema.ResourceData, meta interface{}) error
 			d.Set("parent_bundle", parentBundle)
 
 			d.Set("locations", firmware.Locations)
-			d.Set("mirror_list", firmware.Mirrorlist)
 			id := strings.Split(firmware.Uri.String(), "/")[3]
 
 			d.SetId(id)

oneview/resource_server_profile.go

@@ -1014,6 +1014,16 @@ func resourceServerProfile() *schema.Resource {
 				Optional: true,
 				Computed: true,
 			},
+			"host_nvme_qualified_name_type": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
+			"host_nvme_qualified_name": {
+				Type:     schema.TypeString,
+				Optional: true,
+				Computed: true,
+			},
 			"management_processor": {
 				Type:     schema.TypeList,
 				Optional: true,
@@ -1366,6 +1376,8 @@ func resourceServerProfileCreate(d *schema.ResourceData, meta interface{}) error
 
 	serverProfile.Type = d.Get("type").(string)
 	serverProfile.Name = d.Get("name").(string)
+	serverProfile.HostNVMeQualifiedNameType = d.Get("host_nvme_qualified_name_type").(string)
+	serverProfile.HostNVMeQualifiedName = d.Get("host_nvme_qualified_name").(string)
 
 	var serverHardware ov.ServerHardware
 	if val, ok := d.GetOk("hardware_name"); ok {
@@ -2080,6 +2092,8 @@ func resourceServerProfileRead(d *schema.ResourceData, meta interface{}) error {
 
 	d.Set("server_hardware_type", serverHardwareType.Name)
 	d.Set("affinity", serverProfile.Affinity)
+	d.Set("host_nvme_qualified_name_type", serverProfile.HostNVMeQualifiedNameType)
+	d.Set("host_nvme_qualified_name", serverProfile.HostNVMeQualifiedName)
 	d.Set("serial_number_type", serverProfile.SerialNumberType)
 	d.Set("wwn_type", serverProfile.WWNType)
 	d.Set("mac_type", serverProfile.MACType)
@@ -2874,6 +2888,16 @@ func resourceServerProfileUpdate(d *schema.ResourceData, meta interface{}) error
 			serverProfile.SerialNumberType = val.(string)
 		}
 
+		if d.HasChange("host_nvme_qualified_name_type") {
+			val := d.Get("host_nvme_qualified_name_type").(string)
+			serverProfile.HostNVMeQualifiedNameType = val
+		}
+
+		if d.HasChange("host_nvme_qualified_name") {
+			val := d.Get("host_nvme_qualified_name")
+			serverProfile.HostNVMeQualifiedName = val.(string)
+		}
+
 		if d.HasChange("wwn_type") {
 			val := d.Get("wwn_type")
 			serverProfile.WWNType = val.(string)