Fix for NPA-420 , added ms_server field in datasource (#488)

* Fix for NPA-420 , added ms_server field in datasource

* added empty string checks in convertDhcpMemberToMap function

* test case changes and Allocate IP function changes in network and fixed address object

* rebased and resolved conflict

* documentation changes for options field

* changed the name of the resource for fixed address and range

* vendor directory changes with latest commit id from go-client

Author: Chaithra001

docs/data-sources/infoblox_alias_record.md

@@ -14,6 +14,7 @@ Use the `infoblox_alias_record` data resource for the Alias record to retrieve t
 * `comment`: the text describing the record. This is a regular comment. Example: `Temporary Alias-record`.
 * `creator`: the creator of the record. Valid value is `STATIC`.
 * `ext_attrs`: the set of extensible attributes of the record, if any. The content is formatted as string of JSON map. Example: `"{\"Site\":\"Greece\"}"`
+* `cloud_info`: Structure containing all cloud API related information for this object. Example: `"{\"authority_type\":\"GM\",\"delegated_scope\":\"NONE\",\"owned_by_adaptor\":false}"`
 
 For usage of filters, add the fields as keys and appropriate values to be passed to the keys like `name`, `view`, `zone`, `comment`, `target_name`, and `target_type`  corresponding to object.
 From the below list of supported arguments for filters,  use only the searchable fields for retrieving the matching records.

docs/data-sources/infoblox_ipv4_fixed_address.md

@@ -8,24 +8,31 @@ The `infoblox_ipv4_fixed_address` data source to retrieve the following informat
 * `comment`: Comment for the fixed address; maximum 256 characters. Example: `fixed address`
 * `dhcp_client_identifier`: The DHCP client ID for the fixed address. The field is required only when match_client is set to CLIENT_ID. Example: `20`
 * `disable`: Determines whether a fixed address is disabled or not. When this is set to False, the fixed address is enabled. Example: `false`
-* `extattrs`: Extensible attributes associated with the object. Example: `"{\"*Site\":\"Antarctica\"}"`
+* `ext_attrs`: Extensible attributes associated with the object. Example: `"{\"*Site\":\"Antarctica\"}"`
 * `ipv4addr`: The IPv4 Address of the fixed address. If the `ipv4addr` field is not provided and the `network` field is set, the next available IP address in the network will be allocated. Example: `10.0.0.34`
 * `mac`: The MAC address value for this fixed address. The field is required only when match_client is set to its default value - MAC_ADDRESS. Example: `00-1A-2B-3C-4D-5E`
 * `match_client`: The match client for the fixed address.Valid values are CIRCUIT_ID, CLIENT_ID , MAC_ADDRESS, REMOTE_ID and RESERVED. Default value is MAC_ADDRESS. Example: `CLIENT_ID`
 * `name`: This field contains the name of this fixed address. Example: `fixedAddressName`
 * `network`: The network to which this fixed address belongs, in IPv4 Address/CIDR format. Example: `10.0.0.0/24`
 * `network_view`: The name of the network view in which this fixed address resides. The default value is The default network view. Example: `default`
-* `options`: An array of DHCP option structs that lists the DHCP options associated with the object.
-* `cloud_info`: Structure containing all cloud API related information for this object. Example: `"{\"authority_type\":\"GM\",\"delegated_scope\":\"NONE\",\"owned_by_adaptor\":false}"`
+* `options`: An array of DHCP option structs that lists the DHCP options associated with the object. The description of the fields of `options` is as follows:
+    * `name`: The Name of the DHCP option. Example: `domain-name-servers`.
+    * `num`: The code of the DHCP option. Example: `6`.
+    * `value`: The value of the option. Example: `11.22.33.44`.
+    * `vendor_class`: The name of the space this DHCP option is associated to. Default value is `DHCP`.
+    * `use_option`:Only applies to special options that are displayed separately from other options and have a use flag. These options are `router`,
+      `router-templates`, `domain-name-servers`, `domain-name`, `broadcast-address`, `broadcast-address-offset`, `dhcp-lease-time`, and `dhcp6.name-servers`.
+
 ```terraform
 options {
-    name         = "dhcp-lease-time"
-    value        = "43200"
-    vendor_class = "DHCP"
-    num          = 51
-    use_option   = true
-  }
+name         = "dhcp-lease-time"
+value        = "43200"
+vendor_class = "DHCP"
+num          = 51
+use_option   = false
+}
 ```
+* `cloud_info`: Structure containing all cloud API related information for this object. Example: `"{\"authority_type\":\"GM\",\"delegated_scope\":\"NONE\",\"owned_by_adaptor\":false}"`
 * `use_options`: Use option is a flag that indicates whether the options field are used or not. The default value is false. Example: `false`
 
 For usage of filters, add the fields as keys and appropriate values to be passed to the keys like `comment`, `ipv4addr` corresponding to object.
@@ -38,7 +45,7 @@ From the below list of supported arguments for filters,  use only the searchable
 |--------------|--------------|--------|------------|
 | network_view | network_view | string | yes        |
 | network      | network      | string | yes        |
-| match_cleint | match_client | string | yes        |
+| match_client | match_client | string | yes        |
 | mac          | mac          | string | yes        |
 | comment      | comment      | string | yes        |
 | ipv4addr     | ipv4addr     | string | yes        |
@@ -66,7 +73,7 @@ You can reference this resource and retrieve information about it.
 resource "infoblox_ipv4_network" "net2" {
   cidr = "18.0.0.0/24"
 }
-resource "infoblox_ipv4_fixed_address" "fix4"{
+resource "infoblox_ipv4_fixed_address" "fix_addr"{
   client_identifier_prepend_zero=true
   comment= "fixed address"
   dhcp_client_identifier="23"
@@ -99,7 +106,7 @@ data "infoblox_ipv4_fixed_address" "testFixedAddress_read1" {
   filters = {
     "*Site" = "Blr"
   }
-  depends_on = [infoblox_ipv4_fixed_address.fix4]
+  depends_on = [infoblox_ipv4_fixed_address.fix_addr]
 }
 output "fa_rec_temp1" {
   value = data.infoblox_ipv4_fixed_address.testFixedAddress_read1

docs/data-sources/infoblox_ipv4_range.md

@@ -9,10 +9,16 @@ Use the `infoblox_ipv4_range` data source to retrieve the following information
 * `start_addr`: The IPv4 Address starting address of the range. Example: `21.20.2.20`.
 * `end_addr`: The IPv4 Address end address of the range. Example: `21.20.2.40`
 * `disable`: Determines whether a range is disabled or not. When this is set to False, the range is enabled. Default value: `false`.
-* `extattrs`: Extensible attributes associated with the object. Example: `"{\"*Site\":\"Antarctica\"}"`
-* `failover_association`: The name of the failover association: the server in this failover association will serve the IPv4 range in case the main server is out of service. `server_association_type` must be set to `FAILOVER` or `FAILOVER_MS` if you want the failover association specified here to serve the range.
+* `ext_attrs`: Extensible attributes associated with the object. Example: `"{\"*Site\":\"Antarctica\"}"`
+* `failover_association`: The name of the failover association: the server in this failover association will serve the IPv4 range in case the main server is out of service. Example: `dhcp_failover`.
 * `server_association_type`: The type of server that is going to serve the range. Valid values are `FAILOVER`,`MEMBER`,`MS_FAILOVER`,`MS_SERVER`,`NONE`. Default value: `NONE`.
-* `options`: An array of DHCP option structs that lists the DHCP options associated with the object.
+* `options`: An array of DHCP option structs that lists the DHCP options associated with the object. The description of the fields of `options` is as follows:
+  * `name`: The Name of the DHCP option. Example: `domain-name-servers`.
+  * `num`: The code of the DHCP option. Example: `6`.
+  * `value`: The value of the option. Example: `11.22.33.44`.
+  * `vendor_class`: The name of the space this DHCP option is associated to. Default value is `DHCP`.
+  * `use_option`:Only applies to special options that are displayed separately from other options and have a use flag. These options are `router`,
+    `router-templates`, `domain-name-servers`, `domain-name`, `broadcast-address`, `broadcast-address-offset`, `dhcp-lease-time`, and `dhcp6.name-servers`.
 ```terraform
 options {
     name         = "dhcp-lease-time"
@@ -23,6 +29,7 @@ options {
   }
 ```
 * `use_options`: Use option is a flag that indicates whether the options field are used or not. The default value is false. Example: `false`
+* `ms_server`: The Microsoft server that will provide service for this range. server_association_type needs to be set to MS_SERVER if you want the server specified here to serve the range. Example: `10.23.23.2`
 * `member`: The member that will provide service for this range. `server_association_type` needs to be set to `MEMBER` if you want the server specified here to serve the range. `member` has the following three fields `name`, `ipv4addr` and `ipv6addr`.The description of the fields of `member` is as follows:
   * `name`: The name of the Grid member. Example: `infoblox.localdomain`.
   * `ipv4addr`: The IPv4 Address of the Grid Member. Example: `11.10.1.0`.
@@ -54,6 +61,8 @@ member = {
 
 !> Please consider using only fields as the keys in terraform datasource filters, kindly don't use alias names as keys from the above table.
 
+!> The search functionality using the filters argument is not supported for member and ms_server fields.
+
 ### Example for using the filters:
  ```hcl
  data "infoblox_ipv4_range" "range_rec_temp" {
@@ -83,6 +92,7 @@ resource "infoblox_ipv4_range" "range" {
   disable              = false
   member = {
     name = "infoblox.localdomain"
+    ipv4addr = "10.197.2.19"
   }
   server_association_type= "MEMBER"
   ext_attrs = jsonencode({

docs/data-sources/infoblox_ipv4_range_template.md

@@ -7,11 +7,18 @@ Use the `infoblox_ipv4_range_template` data resource for the IPV4 Range Template
 * `offset`: The start address offset for the range. Example: `30`.
 * `use_options`: Use flag for options. Example: `true`.
 * `cloud_api_compatible`: The flag controls whether this template can be used to create network objects in a cloud-computing deployment. Example: `true`.
-* `options`: An array of DHCP option structs that lists the DHCP options associated with the object. Example:
+* `options`: An array of DHCP option structs that lists the DHCP options associated with the object. The description of the fields of `options` is as follows:
+  * `name`: The Name of the DHCP option. Example: `domain-name-servers`.
+  * `num`: The code of the DHCP option. Example: `6`.
+  * `value`: The value of the option. Example: `11.22.33.44`.
+  * `vendor_class`: The name of the space this DHCP option is associated to. Default value is `DHCP`.
+  * `use_option`:Only applies to special options that are displayed separately from other options and have a use flag. These options are `router`,
+    `router-templates`, `domain-name-servers`, `domain-name`, `broadcast-address`, `broadcast-address-offset`, `dhcp-lease-time`, and `dhcp6.name-servers`.
 ```terraform
-option { 
+options { 
     name = "domain-name-servers"
     value = "11.22.33.44"
+    num = 6
     use_option = true
   }
 ```
@@ -51,6 +58,8 @@ From the below list of supported arguments for filters,  use only the searchable
 
 !> Please consider using only fields as the keys in terraform datasource filters, kindly don't use alias names as keys from the above table.
 
+!>The search functionality using the filters argument is not supported for member and ms_server fields.
+
 ### Example for using the filters:
  ```hcl
 data "infoblox_ipv4_range_template" "range_template_read" {

docs/data-sources/infoblox_ipv4_shared_network.md

@@ -7,11 +7,18 @@ Use the `infoblox_ipv4_shared_network` data source to retrieve the following inf
 * `network_view`: The name of the network view in which this shared network resides. Example: `default`
 * `disable`: The disable flag for the IPv4 shared network object. Example: `true`
 * `use_options`: Use flag for options. Example: `true`.
-* `options`: An array of DHCP option structs that lists the DHCP options associated with the object. Example:
+* `options`: An array of DHCP option structs that lists the DHCP options associated with the object. The description of the fields of `options` is as follows:
+    * `name`: The Name of the DHCP option. Example: `domain-name-servers`.
+    * `num`: The code of the DHCP option. Example: `6`.
+    * `value`: The value of the option. Example: `11.22.33.44`.
+    * `vendor_class`: The name of the space this DHCP option is associated to. Default value is `DHCP`.
+    * `use_option`:Only applies to special options that are displayed separately from other options and have a use flag. These options are `router`,
+      `router-templates`, `domain-name-servers`, `domain-name`, `broadcast-address`, `broadcast-address-offset`, `dhcp-lease-time`, and `dhcp6.name-servers`.
 ```terraform
-option { 
+options { 
     name = "domain-name-servers"
     value = "11.22.33.44"
+    num = 6
     use_option = true
   }
 ```
@@ -26,9 +33,9 @@ From the below list of supported arguments for filters,  use only the searchable
 -----
 | Field        | Alias        | Type   | Searchable |
 |--------------|--------------|--------|------------|
-| name         | fqdn         | string | yes        |
+| name         | name         | string | yes        |
 | network_view | network_view | string | yes        |
-| comment      | zone         | string | yes        |
+| comment      | comment      | string | yes        |
 
 !> Any of the combination from searchable fields in supported arguments list for fields are allowed.
 

docs/resources/infoblox_alias_record.md

@@ -10,7 +10,7 @@ The following list describes the parameters you can define in the `infoblox_alia
 * `target_type`: required, specifies the type of the target object. Valid values are: `A`, `AAAA`, `MX`, `NAPTR`, `PTR`, `SPF`, `SRV` and `TXT`.
 * `ttl`: optional, specifies the "time to live" value for the alias-record. There is no default value for this parameter. If a value is not specified, then in NIOS, the value is inherited from the parent zone of the DNS record for this resource. A TTL value of 0 (zero) means caching should be disabled for this record. Example: `3600`.
 * `disable`: optional, specifies whether the alias record is disabled or not. Default value is `false`.
-* `dns_view`: required, specifies the DNS view in which the zone exists. If a value is not specified, the name `default` is set as the DNS view. Example: `dns_view_1`.
+* `dns_view`: optional, specifies the DNS view in which the zone exists. If a value is not specified, the name `default` is set as the DNS view. Example: `dns_view_1`.
 * `comment`: optional, describes the alias-record. Example: `an example alias-record`.
 * `ext_attrs`: optional, specifies the set of NIOS extensible attributes that are attached to the alias-record. Example: `jsonencode({"Site":"Singapore"})`.
 

docs/resources/infoblox_ipv4_fixed_address.md

@@ -10,21 +10,27 @@ The `infoblox_ipv4_fixed_address` resource, enables you to allocate, update, or
 * `comment`: optional, Comment for the fixed address; maximum 256 characters. Example: `fixed address`
 * `dhcp_client_identifier`: optional, The DHCP client ID for the fixed address. The field is required only when match_client is set to CLIENT_ID. Example: `20`
 * `disable`: optional, Determines whether a fixed address is disabled or not. When this is set to False, the fixed address is enabled. Example: `false`
-* `extattrs`: optional, Extensible attributes associated with the object. Example: `"{\"*Site\":\"Antarctica\"}"`
+* `ext_attrs`: optional, Extensible attributes associated with the object. Example: `"{\"*Site\":\"Antarctica\"}"`
 * `ipv4addr`: optional, The IPv4 Address of the fixed address. If the `ipv4addr` field is not provided and the `network` field is set, the next available IP address in the network will be allocated. Example: `10.0.0.34`
 * `mac`: optional, The MAC address value for this fixed address. The field is required only when match_client is set to its default value - MAC_ADDRESS. Example: `00-1A-2B-3C-4D-5E`
 * `match_client`: optional, The match client for the fixed address.Valid values are CIRCUIT_ID, CLIENT_ID , MAC_ADDRESS, REMOTE_ID and RESERVED. Default value is MAC_ADDRESS. Example: `CLIENT_ID`
 * `name`: optional, This field contains the name of this fixed address. Example: `fixedAddressName`
 * `network`: optional, The network to which this fixed address belongs, in IPv4 Address/CIDR format. Example: `10.0.0.0/24`
 * `network_view`: optional, The name of the network view in which this fixed address resides. The default value is The default network view. Example: `default`
-* `options`: optional, An array of DHCP option structs that lists the DHCP options associated with the object. 
+* `options`: optional, specifies an array of DHCP option structs that lists the DHCP options associated with the object. The description of the fields of `options` is as follows:
+    * `name`: required, specifies the Name of the DHCP option. Example: `domain-name-servers`.
+    * `num`: required, specifies the code of the DHCP option. Example: `6`.
+    * `value`: required, specifies the value of the option. Example: `11.22.33.44`.
+    * `vendor_class`: optional, specifies the name of the space this DHCP option is associated to. Default value is `DHCP`.
+    * `use_option`: optional, only applies to special options that are displayed separately from other options and have a use flag. These options are `router`,
+      `router-templates`, `domain-name-servers`, `domain-name`, `broadcast-address`, `broadcast-address-offset`, `dhcp-lease-time`, and `dhcp6.name-servers`.
 ```terraform
 options {
     name         = "dhcp-lease-time"
     value        = "43200"
     vendor_class = "DHCP"
     num          = 51
-    use_option   = true
+    use_option   = false
   }
 ```
 * `use_options`: optional, Use option is a flag that indicates whether the options field are used or not. The default value is false. Example: `false`
@@ -34,7 +40,7 @@ options {
 ```hcl
 //example for fixed address with maximal parameters and using next available ip function 
 //ipv4addr not specified and network is given so next available ip in the network will be allocated
-resource "infoblox_ipv4_fixed_address" "fix4"{
+resource "infoblox_ipv4_fixed_address" "fix_address"{
   client_identifier_prepend_zero=true
   comment= "fixed address"
   dhcp_client_identifier="23"
@@ -51,7 +57,7 @@ resource "infoblox_ipv4_fixed_address" "fix4"{
     value        = "43200"
     vendor_class = "DHCP"
     num          = 51
-    use_option   = true
+    use_option   = false  
   }
   options {
     name = "routers"
@@ -67,15 +73,15 @@ resource "infoblox_ipv4_network" "net2" {
   cidr = "18.0.0.0/24"
 }
 //creates a fixed address by explicitly providing the `ipv4addr` value instead of using the next available IP function.
-resource "infoblox_ipv4_fixed_address" "fix3"{
+resource "infoblox_ipv4_fixed_address" "fix_address_1"{
   ipv4addr        = "17.0.0.9"
   mac = "00:0C:24:2E:8F:2A"
   options {
     name         = "dhcp-lease-time"
     value        = "43200"
     vendor_class = "DHCP"
     num          = 51
-    use_option   = true
+    use_option   = false  
   }
   depends_on=[infoblox_ipv4_network.net3]
 }