added utilization and options field in network datasource (#489)

* added utilization and options field in network datasource

* added options field in return fields

Author: Chaithra001

docs/data-sources/infoblox_ipv4_network.md

@@ -6,7 +6,17 @@ The data source for the network object allows you to get the following parameter
 * `cidr`: the network block which corresponds to the network, in CIDR notation. Example: `192.0.17.0/24`
 * `comment`: a description of the network. This is a regular comment. Example: `Untrusted network`.
 * `ext_attrs`: The set of extensible attributes, if any. The content is formatted as string of JSON map. Example: `"{\"Owner\":\"State Library\",\"Administrator\":\"unknown\"}"`.
-
+* `options`: An array of DHCP option structs that lists the DHCP options associated with the object.
+```terraform
+options {
+  name         = "dhcp-lease-time"
+  value        = "43200"
+  vendor_class = "DHCP"
+  num          = 51
+  use_option   = true
+}
+```
+* `utilization`: The network utilization in percentage. Example: `0`
 
 For usage of filters, add the fields as keys and appropriate values to be passed to the keys like `name`, `view` corresponding to object.
 From the below list of supported arguments for filters,  use only the searchable fields for retriving the matching records.

infoblox/datasource_infoblox_network.go

@@ -49,6 +49,50 @@ func dataSourceNetwork() *schema.Resource {
 							Computed:    true,
 							Description: "The Extensible attributes for network datasource, as a map in JSON format",
 						},
+						"utilization": {
+							Type:        schema.TypeInt,
+							Computed:    true,
+							Description: "The utilization of the network",
+						},
+						"options": {
+							Type:     schema.TypeList,
+							Computed: true,
+							Description: "An array of DHCP option structs that lists the DHCP options associated with the object. An option sets the" +
+								"value of a DHCP option that has been defined in an option space. DHCP options describe network configuration settings" +
+								"and various services available on the network. These options occur as variable-length fields at the end of DHCP messages." +
+								"When defining a DHCP option, at least a ‘name’ or a ‘num’ is required.",
+							Elem: &schema.Resource{
+								Schema: map[string]*schema.Schema{
+									"name": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Name of the DHCP option.",
+									},
+									"num": {
+										Type:        schema.TypeInt,
+										Computed:    true,
+										Description: "The code of the DHCP option.",
+									},
+									"use_option": {
+										Type:     schema.TypeBool,
+										Computed: true,
+										Description: "Only applies to special options that are displayed separately from other options and have a use flag. " +
+											"These options are: `routers`, `router-templates`, `domain-name-servers`, `domain-name`, `broadcast-address`, " +
+											"`broadcast-address-offset`, `dhcp-lease-time`, `dhcp6.name-servers`",
+									},
+									"value": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "Value of the DHCP option.",
+									},
+									"vendor_class": {
+										Type:        schema.TypeString,
+										Computed:    true,
+										Description: "The name of the space this DHCP option is associated to.",
+									},
+								},
+							},
+						},
 					},
 				},
 			},
@@ -62,7 +106,7 @@ func dataSourceIPv4NetworkRead(ctx context.Context, d *schema.ResourceData, m in
 	var diags diag.Diagnostics
 
 	n := &ibclient.Ipv4Network{}
-	n.SetReturnFields(append(n.ReturnFields(), "extattrs"))
+	n.SetReturnFields(append(n.ReturnFields(), "extattrs", "options", "utilization"))
 
 	filters := filterFromMap(d.Get("filters").(map[string]interface{}))
 	qp := ibclient.NewQueryParams(false, filters)
@@ -115,6 +159,7 @@ func flattenIpv4Network(network ibclient.Ipv4Network) (map[string]interface{}, e
 		"id":           network.Ref,
 		"network_view": network.NetworkView,
 		"ext_attrs":    string(ea),
+		"utilization":  network.Utilization,
 	}
 
 	if network.Network != nil {
@@ -125,6 +170,9 @@ func flattenIpv4Network(network ibclient.Ipv4Network) (map[string]interface{}, e
 		res["comment"] = *network.Comment
 	}
 
+	if network.Options != nil {
+		res["options"] = convertDhcpOptionsToInterface(network.Options)
+	}
 	return res, nil
 }
 
@@ -154,6 +202,9 @@ func flattenIpv6Network(network ibclient.Ipv6Network) (map[string]interface{}, e
 		res["comment"] = *network.Comment
 	}
 
+	if network.Options != nil {
+		res["options"] = convertDhcpOptionsToInterface(network.Options)
+	}
 	return res, nil
 }
 
@@ -163,7 +214,7 @@ func dataSourceIPv6NetworkRead(ctx context.Context, d *schema.ResourceData, m in
 	var diags diag.Diagnostics
 
 	n := &ibclient.Ipv6Network{}
-	n.SetReturnFields(append(n.ReturnFields(), "extattrs"))
+	n.SetReturnFields(append(n.ReturnFields(), "extattrs", "options"))
 
 	filters := filterFromMap(d.Get("filters").(map[string]interface{}))
 	qp := ibclient.NewQueryParams(false, filters)