Refresh/4305 (#97)

* refreshing the provider for build 4305

* Version update in examples and makefile

Co-authored-by: Vikrant Balyan (vvb) <[email protected]>

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Change Logs
 
+## v1.0.10
+Release Date: 11th June 2021
+* Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 4305)
+* Fix for data sources #95 
+
 ## v1.0.9
 Release Date: 21st May 2021
 * Refreshes the terraform module to be in sync with the latest Cisco Intersight model (build 4289)

GNUmakefile

@@ -1,5 +1,5 @@
 PKG_NAME=intersight
-VERSION=1.0.9
+VERSION=1.0.10
 TEST?=$$(go list ./... |grep -v 'vendor')
 GOFMT_FILES?=$$(find . -name '*.go' |grep -v vendor)
 WEBSITE_REPO=github.com/hashicorp/terraform-website

examples/sample_modules/os_install/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.9"
+      version = "1.0.10"
     }
   }
 }

examples/sample_modules/server_configurations/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.9"
+      version = "1.0.10"
     }
   }
 }

examples/sample_modules/server_deployment/main.tf

@@ -2,7 +2,7 @@ terraform {
   required_providers {
     intersight = {
       source = "CiscoDevNet/intersight"
-      version = "1.0.9"
+      version = "1.0.10"
     }
   }
 }

intersight/data_source_intersight_compute_physical_summary.go

@@ -474,6 +474,44 @@ func dataSourceComputePhysicalSummary() *schema.Resource {
 						Optional:    true,
 						Computed:    true,
 					},
+					"equipment_chassis": {
+						Description: "A reference to a equipmentChassis resource.\nWhen the $expand query parameter is specified, the referenced resource is returned inline.",
+						Type:        schema.TypeList,
+						MaxItems:    1,
+						Optional:    true,
+						Computed:    true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"additional_properties": {
+									Type:             schema.TypeString,
+									Optional:         true,
+									DiffSuppressFunc: SuppressDiffAdditionProps,
+								},
+								"class_id": {
+									Description: "The fully-qualified name of the instantiated, concrete type.\nThis property is used as a discriminator to identify the type of the payload\nwhen marshaling and unmarshaling data.",
+									Type:        schema.TypeString,
+									Optional:    true,
+								},
+								"moid": {
+									Description: "The Moid of the referenced REST resource.",
+									Type:        schema.TypeString,
+									Optional:    true,
+									Computed:    true,
+								},
+								"object_type": {
+									Description: "The fully-qualified name of the remote type referred by this relationship.",
+									Type:        schema.TypeString,
+									Optional:    true,
+									Computed:    true,
+								},
+								"selector": {
+									Description: "An OData $filter expression which describes the REST resource to be referenced. This field may\nbe set instead of 'moid' by clients.\n1. If 'moid' is set this field is ignored.\n1. If 'selector' is set and 'moid' is empty/absent from the request, Intersight determines the Moid of the\nresource matching the filter expression and populates it in the MoRef that is part of the object\ninstance being inserted/updated to fulfill the REST request.\nAn error is returned if the filter matches zero or more than one REST resource.\nAn example filter string is: Serial eq '3AA8B7T11'.",
+									Type:        schema.TypeString,
+									Optional:    true,
+								},
+							},
+						},
+					},
 					"fault_summary": {
 						Description: "The fault summary for the server.",
 						Type:        schema.TypeInt,
@@ -1359,6 +1397,8 @@ func dataSourceComputePhysicalSummaryRead(c context.Context, d *schema.ResourceD
 				temp["device_mo_id"] = (s.GetDeviceMoId())
 				temp["dn"] = (s.GetDn())
 				temp["domain_group_moid"] = (s.GetDomainGroupMoid())
+
+				temp["equipment_chassis"] = flattenMapEquipmentChassisRelationship(s.GetEquipmentChassis(), d)
 				temp["fault_summary"] = (s.GetFaultSummary())
 				temp["firmware"] = (s.GetFirmware())
 

intersight/data_source_intersight_equipment_device_summary.go

@@ -181,6 +181,44 @@ func dataSourceEquipmentDeviceSummary() *schema.Resource {
 							},
 						},
 					},
+					"compute_rack_unit": {
+						Description: "A reference to a computeRackUnit resource.\nWhen the $expand query parameter is specified, the referenced resource is returned inline.",
+						Type:        schema.TypeList,
+						MaxItems:    1,
+						Optional:    true,
+						Computed:    true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"additional_properties": {
+									Type:             schema.TypeString,
+									Optional:         true,
+									DiffSuppressFunc: SuppressDiffAdditionProps,
+								},
+								"class_id": {
+									Description: "The fully-qualified name of the instantiated, concrete type.\nThis property is used as a discriminator to identify the type of the payload\nwhen marshaling and unmarshaling data.",
+									Type:        schema.TypeString,
+									Optional:    true,
+								},
+								"moid": {
+									Description: "The Moid of the referenced REST resource.",
+									Type:        schema.TypeString,
+									Optional:    true,
+									Computed:    true,
+								},
+								"object_type": {
+									Description: "The fully-qualified name of the remote type referred by this relationship.",
+									Type:        schema.TypeString,
+									Optional:    true,
+									Computed:    true,
+								},
+								"selector": {
+									Description: "An OData $filter expression which describes the REST resource to be referenced. This field may\nbe set instead of 'moid' by clients.\n1. If 'moid' is set this field is ignored.\n1. If 'selector' is set and 'moid' is empty/absent from the request, Intersight determines the Moid of the\nresource matching the filter expression and populates it in the MoRef that is part of the object\ninstance being inserted/updated to fulfill the REST request.\nAn error is returned if the filter matches zero or more than one REST resource.\nAn example filter string is: Serial eq '3AA8B7T11'.",
+									Type:        schema.TypeString,
+									Optional:    true,
+								},
+							},
+						},
+					},
 					"create_time": {
 						Description: "The time when this managed object was created.",
 						Type:        schema.TypeString,
@@ -237,6 +275,44 @@ func dataSourceEquipmentDeviceSummary() *schema.Resource {
 							},
 						},
 					},
+					"equipment_fex": {
+						Description: "A reference to a equipmentFex resource.\nWhen the $expand query parameter is specified, the referenced resource is returned inline.",
+						Type:        schema.TypeList,
+						MaxItems:    1,
+						Optional:    true,
+						Computed:    true,
+						Elem: &schema.Resource{
+							Schema: map[string]*schema.Schema{
+								"additional_properties": {
+									Type:             schema.TypeString,
+									Optional:         true,
+									DiffSuppressFunc: SuppressDiffAdditionProps,
+								},
+								"class_id": {
+									Description: "The fully-qualified name of the instantiated, concrete type.\nThis property is used as a discriminator to identify the type of the payload\nwhen marshaling and unmarshaling data.",
+									Type:        schema.TypeString,
+									Optional:    true,
+								},
+								"moid": {
+									Description: "The Moid of the referenced REST resource.",
+									Type:        schema.TypeString,
+									Optional:    true,
+									Computed:    true,
+								},
+								"object_type": {
+									Description: "The fully-qualified name of the remote type referred by this relationship.",
+									Type:        schema.TypeString,
+									Optional:    true,
+									Computed:    true,
+								},
+								"selector": {
+									Description: "An OData $filter expression which describes the REST resource to be referenced. This field may\nbe set instead of 'moid' by clients.\n1. If 'moid' is set this field is ignored.\n1. If 'selector' is set and 'moid' is empty/absent from the request, Intersight determines the Moid of the\nresource matching the filter expression and populates it in the MoRef that is part of the object\ninstance being inserted/updated to fulfill the REST request.\nAn error is returned if the filter matches zero or more than one REST resource.\nAn example filter string is: Serial eq '3AA8B7T11'.",
+									Type:        schema.TypeString,
+									Optional:    true,
+								},
+							},
+						},
+					},
 					"inventory_device_info": {
 						Description: "A reference to a inventoryDeviceInfo resource.\nWhen the $expand query parameter is specified, the referenced resource is returned inline.",
 						Type:        schema.TypeList,
@@ -683,12 +759,16 @@ func dataSourceEquipmentDeviceSummaryRead(c context.Context, d *schema.ResourceD
 
 				temp["compute_blade"] = flattenMapComputeBladeRelationship(s.GetComputeBlade(), d)
 
+				temp["compute_rack_unit"] = flattenMapComputeRackUnitRelationship(s.GetComputeRackUnit(), d)
+
 				temp["create_time"] = (s.GetCreateTime()).String()
 				temp["dn"] = (s.GetDn())
 				temp["domain_group_moid"] = (s.GetDomainGroupMoid())
 
 				temp["equipment_chassis"] = flattenMapEquipmentChassisRelationship(s.GetEquipmentChassis(), d)
 
+				temp["equipment_fex"] = flattenMapEquipmentFexRelationship(s.GetEquipmentFex(), d)
+
 				temp["inventory_device_info"] = flattenMapInventoryDeviceInfoRelationship(s.GetInventoryDeviceInfo(), d)
 
 				temp["mod_time"] = (s.GetModTime()).String()

intersight/data_source_intersight_forecast_instance.go

@@ -23,6 +23,11 @@ func dataSourceForecastInstance() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 			},
+			"action": {
+				Description: "Action to be triggered on forecast instance. Default value is None.\n* `None` - The Enum value None represents that no action is triggered on the forecast Instance managed object.\n* `Evaluate` - The Enum value Evaluate represents that a re-evaluation of the forecast needs to be triggered.",
+				Type:        schema.TypeString,
+				Optional:    true,
+			},
 			"class_id": {
 				Description: "The fully-qualified name of the instantiated, concrete type.\nThis property is used as a discriminator to identify the type of the payload\nwhen marshaling and unmarshaling data.",
 				Type:        schema.TypeString,
@@ -34,6 +39,16 @@ func dataSourceForecastInstance() *schema.Resource {
 				Optional:    true,
 				Computed:    true,
 			},
+			"data_interval": {
+				Description: "The time interval (in days) for the data to be used for computing forecast model.",
+				Type:        schema.TypeInt,
+				Optional:    true,
+			},
+			"data_start_date": {
+				Description: "The start date from when the data should be used for computing forecast model.",
+				Type:        schema.TypeString,
+				Optional:    true,
+			},
 			"device_id": {
 				Description: "The Moid of the Intersight managed device instance for which regression model is derived.",
 				Type:        schema.TypeString,
@@ -108,6 +123,11 @@ func dataSourceForecastInstance() *schema.Resource {
 					Optional:    true,
 					Computed:    true,
 				},
+					"action": {
+						Description: "Action to be triggered on forecast instance. Default value is None.\n* `None` - The Enum value None represents that no action is triggered on the forecast Instance managed object.\n* `Evaluate` - The Enum value Evaluate represents that a re-evaluation of the forecast needs to be triggered.",
+						Type:        schema.TypeString,
+						Optional:    true,
+					},
 					"additional_properties": {
 						Type:             schema.TypeString,
 						Optional:         true,
@@ -166,6 +186,16 @@ func dataSourceForecastInstance() *schema.Resource {
 						Optional:    true,
 						Computed:    true,
 					},
+					"data_interval": {
+						Description: "The time interval (in days) for the data to be used for computing forecast model.",
+						Type:        schema.TypeInt,
+						Optional:    true,
+					},
+					"data_start_date": {
+						Description: "The start date from when the data should be used for computing forecast model.",
+						Type:        schema.TypeString,
+						Optional:    true,
+					},
 					"device_id": {
 						Description: "The Moid of the Intersight managed device instance for which regression model is derived.",
 						Type:        schema.TypeString,
@@ -589,6 +619,10 @@ func dataSourceForecastInstanceRead(c context.Context, d *schema.ResourceData, m
 		x := (v.(string))
 		o.SetAccountMoid(x)
 	}
+	if v, ok := d.GetOk("action"); ok {
+		x := (v.(string))
+		o.SetAction(x)
+	}
 	if v, ok := d.GetOk("class_id"); ok {
 		x := (v.(string))
 		o.SetClassId(x)
@@ -597,6 +631,14 @@ func dataSourceForecastInstanceRead(c context.Context, d *schema.ResourceData, m
 		x, _ := time.Parse(v.(string), time.RFC1123)
 		o.SetCreateTime(x)
 	}
+	if v, ok := d.GetOk("data_interval"); ok {
+		x := int64(v.(int))
+		o.SetDataInterval(x)
+	}
+	if v, ok := d.GetOk("data_start_date"); ok {
+		x, _ := time.Parse(v.(string), time.RFC1123)
+		o.SetDataStartDate(x)
+	}
 	if v, ok := d.GetOk("device_id"); ok {
 		x := (v.(string))
 		o.SetDeviceId(x)
@@ -679,13 +721,17 @@ func dataSourceForecastInstanceRead(c context.Context, d *schema.ResourceData, m
 				var s = results[i]
 				var temp = make(map[string]interface{})
 				temp["account_moid"] = (s.GetAccountMoid())
+				temp["action"] = (s.GetAction())
 				temp["additional_properties"] = flattenAdditionalProperties(s.AdditionalProperties)
 				temp["alt_model"] = (s.GetAltModel())
 
 				temp["ancestors"] = flattenListMoBaseMoRelationship(s.GetAncestors(), d)
 				temp["class_id"] = (s.GetClassId())
 
 				temp["create_time"] = (s.GetCreateTime()).String()
+				temp["data_interval"] = (s.GetDataInterval())
+
+				temp["data_start_date"] = (s.GetDataStartDate()).String()
 				temp["device_id"] = (s.GetDeviceId())
 				temp["domain_group_moid"] = (s.GetDomainGroupMoid())