This commit contains entire DNS changes #25

saiprasannasastry · 2019-02-20T16:51:55Z

This commit contains support for A,CNAME,PTR and Host records

UT Results
PASS
ok github.com/infobloxopen/terraform-provider-infoblox/infoblox 203.885s

Acceptance UT Results
=== RUN TestProvider
--- PASS: TestProvider (0.00s)
=== RUN TestProvider_impl
--- PASS: TestProvider_impl (0.00s)
=== RUN TestValidationStringInSlice
--- PASS: TestValidationStringInSlice (0.00s)
=== RUN TestAccResourceARecord
--- PASS: TestAccResourceARecord (29.22s)
=== RUN TestAccResourceCNAMERecord
--- PASS: TestAccResourceCNAMERecord (29.74s)
=== RUN TestAccResourceIPAllocation
--- PASS: TestAccResourceIPAllocation (31.28s)
=== RUN TestAccresourceIPAssociation
--- PASS: TestAccresourceIPAssociation (27.37s)
=== RUN TestAccresourceNetworkView
--- PASS: TestAccresourceNetworkView (16.46s)
=== RUN TestAccresourceNetwork
--- PASS: TestAccresourceNetwork (40.75s)
=== RUN TestAccResourcePTRRecord
--- PASS: TestAccResourcePTRRecord (29.06s)

This commit contains support for A,CNAME,PTR and Host records UT Results PASS ok github.com/infobloxopen/terraform-provider-infoblox/infoblox 203.885s Acceptance UT Results === RUN TestProvider --- PASS: TestProvider (0.00s) === RUN TestProvider_impl --- PASS: TestProvider_impl (0.00s) === RUN TestValidationStringInSlice --- PASS: TestValidationStringInSlice (0.00s) === RUN TestAccResourceARecord --- PASS: TestAccResourceARecord (29.22s) === RUN TestAccResourceCNAMERecord --- PASS: TestAccResourceCNAMERecord (29.74s) === RUN TestAccResourceIPAllocation --- PASS: TestAccResourceIPAllocation (31.28s) === RUN TestAccresourceIPAssociation --- PASS: TestAccresourceIPAssociation (27.37s) === RUN TestAccresourceNetworkView --- PASS: TestAccresourceNetworkView (16.46s) === RUN TestAccresourceNetwork --- PASS: TestAccresourceNetwork (40.75s) === RUN TestAccResourcePTRRecord --- PASS: TestAccResourcePTRRecord (29.06s)

Gopkg.toml

sganesh-infoblox · 2019-03-15T06:49:15Z

From Cloud perspective changes are fine.

sganesh-infoblox

Changes looks fine from Cloud perspective.

sganesh-infoblox · 2019-03-15T06:51:46Z

@saiprasannasastry Please add @AjeyHiremath & @jkraj as reviewers.

jkraj · 2019-03-15T11:47:07Z

examples/VMware/README.md

+
+#Using the templates for different combinations.
+
+- For cretion of fixedAddress or if you just using the provider without dns,


typo - creation

Make keyword bold and check the case

Give explict names

jkraj · 2019-03-15T11:50:10Z

infoblox/provider.go

@@ -34,11 +34,11 @@ func Provider() terraform.ResourceProvider {
 			"wapi_version": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
-				DefaultFunc: schema.EnvDefaultFunc("WAPI_VERSION", "2.8"),
-				Description: "WAPI Version of Infoblox server defaults to v2.8.",
+				DefaultFunc: schema.EnvDefaultFunc("WAPI_VERSION", "2.10"),


Keep some stable lower version

jkraj · 2019-03-15T11:51:08Z

infoblox/resourceARecord.go

+				Type:        schema.TypeString,
+				Required:    true,
+				DefaultFunc: schema.EnvDefaultFunc("net_address", nil),
+				Description: "Give the address in cidr format.",


remove 'Give the'

jkraj · 2019-03-15T11:51:28Z

infoblox/resourceARecord.go

+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("dns_view", nil),
+				Description: "Dns View under which the zone has been created .",


space before dot

jkraj · 2019-03-15T11:56:42Z

infoblox/resourceARecord.go

+	connector := m.(*ibclient.Connector)
+
+	objMgr := ibclient.NewObjectManager(connector, "terraform", tenantID)
+	name := Name + "." + zone


change name => fqdn

jkraj · 2019-03-15T11:57:43Z

infoblox/resourceARecord.go

+
+	networkViewName := d.Get("network_view_name").(string)
+	//This is for record Name
+	Name := d.Get("vm_name").(string)


name => recordName

jkraj · 2019-03-15T12:03:36Z

infoblox/resourceCNAMERecord.go

+			},
+			"dns_view": &schema.Schema{
+				Type:        schema.TypeString,
+				Optional:    true,


Required = true, check in all A, PTR as well

jkraj · 2019-03-15T12:03:57Z

infoblox/resourceCNAMERecord.go

+				Type:        schema.TypeString,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("zone", nil),
+				Description: "Zone under which record has to be created .",


space after dot, check in other places as well

jkraj · 2019-03-15T12:04:43Z

infoblox/resourceCNAMERecord.go

+		Schema: map[string]*schema.Schema{
+			"zone": &schema.Schema{
+				Type:        schema.TypeString,
+				Optional:    true,


Required == true

jkraj · 2019-03-15T12:06:08Z

infoblox/resourceIPAllocation.go

+				Type:        schema.TypeBool,
+				Optional:    true,
+				DefaultFunc: schema.EnvDefaultFunc("enable_dns", nil),
+				Description: "flag that defines if the host reocrd is used for DNS or IPAM Puurposes .",


typo: puurposes

jkraj · 2019-03-15T12:09:41Z

infoblox/resourceIPAllocation.go

 			"ip_addr": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("ipaddr", nil),
-				Description: "IP address of your instance in cloud.",
+				Description: "IP address you want to allocate yourinstance in cloud.If field is not specified , it akes next avaliable ip address",


punctuation,
IP address of your instance in cloud. For static set ip_addr for dynamic leave this empty.

jkraj · 2019-03-15T12:10:10Z

infoblox/resourceIPAllocation.go

 func resourceIPAllocationRequest(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[DEBUG] %s: Beginning to request a next free IP from a required network block", resourceIPAllocationIDString(d))

 	networkViewName := d.Get("network_view_name").(string)
-	recordName := d.Get("host_name").(string)
+	//This is for record Name
+	Name := d.Get("vm_name").(string)


change this to meaninful variable names

jkraj · 2019-03-15T12:12:59Z

infoblox/resourceIPAssociation.go

-//a host record which doesnt have the details of the mac address
-//at the beginigand we are using this update call to update the mac address
+//a reservation which doesnt have the details of the mac address
+//at the beginig and we are using this update call to update the mac address


typo begining

beginig ==> beginning

jkraj · 2019-03-15T12:13:51Z

infoblox/resourceIPAssociation.go

-	if err != nil {
-		return fmt.Errorf("Error Releasing IP from network block having reference (%s): %s", d.Id(), err)
+	if (zone != "" || len(zone) != 0) && (dnsView != "" || len(dnsView) != 0) {
+		_, err := objMgr.UpdateHostRecord(d.Id(), ipAddr, "00:00:00:00:00:00", vmID, vmName)


use variable for zero mac

jkraj

See my comments

…raform-provider-infoblox into dnschanges

saiprasannasastry · 2019-03-18T10:17:03Z

@jkraj please review

jkraj · 2019-03-18T10:23:09Z

infoblox/resourceARecord.go

@@ -73,7 +73,7 @@ func resourceARecordCreate(d *schema.ResourceData, m interface{}) error {

 	networkViewName := d.Get("network_view_name").(string)
 	//This is for record Name
-	Name := d.Get("vm_name").(string)
+	record_Name := d.Get("vm_name").(string)


In go u don't have to use '_' so record_Name ==> recordName

jkraj · 2019-03-21T12:24:55Z

infoblox/resourceCNAMERecord.go

+func resourceCNAMERecordCreate(d *schema.ResourceData, m interface{}) error {
+	log.Printf("[DEBUG] %s: Beginning to create CNAME record ", resourceCNAMERecordIDString(d))
+
+	Zone := d.Get("zone").(string)


jkraj · 2019-03-21T12:25:41Z

infoblox/resourceCNAMERecord.go

+
+	Zone := d.Get("zone").(string)
+	dnsView := d.Get("dns_view").(string)
+	Canonical := d.Get("canonical").(string) + "." + Zone


jkraj · 2019-03-21T12:27:34Z

infoblox/resourceIPAllocation.go

 			},
 			"ip_addr": &schema.Schema{
 				Type:        schema.TypeString,
 				Optional:    true,
 				DefaultFunc: schema.EnvDefaultFunc("ipaddr", nil),
-				Description: "IP address of your instance in cloud.",
+				Description: "IP address your instance in cloud.For static allocation ,set the field. For dynamic allocation, leave this field empty.",


set the field => set this field with valid IP.

jkraj · 2019-03-21T12:30:34Z

infoblox/resourceIPAllocation.go

-	hostrecordObj, err := objMgr.CreateHostRecordWithoutDNS(recordName, networkViewName, cidr, ipAddr, macAddr, vmID)
-	if err != nil {
-		return fmt.Errorf("Error allocating IP from network block(%s): %s", cidr, err)
+	if (zone != "" || len(zone) != 0) && (dnsView != "" || len(dnsView) != 0) {


Both check are same right. why we need this 2 check.

zone != "" == len(zone) != 0

zone != "" == len(zone) != 0 cant be done because
invalid operation: dnsView != "" == len(dnsView) (mismatched types bool and int)
i've see the core NIOS code have these kind of check that is why i added them

jkraj · 2019-03-21T12:31:38Z

infoblox/resourceIPAssociation.go

@@ -95,21 +107,32 @@ func resourceIPAssociationRead(d *schema.ResourceData, m interface{}) error {
 //will be a conflict of resources
 func resourceIPAssociationDelete(d *schema.ResourceData, m interface{}) error {
 	log.Printf("[DEBUG] %s: Beginning Reassociation of IP address in specified network block", resourceIPAssociationIDString(d))
-
+	match_client := "MAC_ADDRESS"


matchClient

jkraj · 2019-03-21T12:32:15Z

infoblox/resourceIPAssociation.go


 	connector := m.(*ibclient.Connector)

+	ZERO_MACADDR := "00:00:00:00:00:00"


ZERO_MACADDR ==> zeroMacAddr

jkraj · 2019-03-21T12:32:26Z

infoblox/resourceIPAssociation.go

-	_, err := objMgr.UpdateHostRecordWithoutDNS(d.Id(), ipAddr, "00:00:00:00:00:00", "")
-	if err != nil {
-		return fmt.Errorf("Error Releasing IP from network block having reference (%s): %s", d.Id(), err)
+	if (zone != "" || len(zone) != 0) && (dnsView != "" || len(dnsView) != 0) {


same us above.

jkraj · 2019-03-21T12:32:54Z

infoblox/resourceIPAssociation.go

 	networkViewName := d.Get("network_view_name").(string)
-	recordName := d.Get("host_name").(string)
+	Name := d.Get("vm_name").(string)


not just 'Name' => vmName

jkraj · 2019-03-21T12:33:15Z

infoblox/resourceIPAssociation.go

-	_, err = objMgr.UpdateHostRecordWithoutDNS(hostRecordObj.Ref, ipAddr, macAddr, vmID)
-	if err != nil {
-		return fmt.Errorf("UpdateHostAddress error from network block(%s):%s", cidr, err)
+	if (zone != "" || len(zone) != 0) && (dnsView != "" || len(dnsView) != 0) {


same as above

jkraj

see my comments,

mainly on variable name
one if check case.

saiprasannasastry requested review from sganesh-infoblox and rahulinfoblox February 20, 2019 16:51

saiprasannasastry added 6 commits March 9, 2019 10:30

Update infoblox.tf

0189b48

Update vm.tf

910b06b

Update infoblox.tf

0caa8cd

Update vm.tf

4724675

Update infoblox.tf

2e4845b

Update infoblox.tf

53f3603

AjeyHiremath reviewed Mar 13, 2019

View reviewed changes

Gopkg.toml Show resolved Hide resolved

sganesh-infoblox approved these changes Mar 15, 2019

View reviewed changes

Update README.md

c8b6233

jkraj reviewed Mar 15, 2019

View reviewed changes

jkraj requested changes Mar 15, 2019

View reviewed changes

Review comments

12e1b2f

saiprasannasastry and others added 3 commits March 18, 2019 15:30

Update resourceCNAMERecord.go

7d7dc13

Review changes

c8f32f4

Merge branch 'dnschanges' of https://github.com/saiprasannasastry/ter…

4bdacef

…raform-provider-infoblox into dnschanges

saiprasannasastry requested a review from jkraj March 18, 2019 10:17

jkraj reviewed Mar 18, 2019

View reviewed changes

jkraj reviewed Mar 21, 2019

View reviewed changes

jkraj requested changes Mar 21, 2019

View reviewed changes

Review changes

a07f8f5

jkraj approved these changes Mar 22, 2019

View reviewed changes

jkraj merged commit 71f6216 into infobloxopen:master Mar 22, 2019

saiprasannasastry deleted the dnschanges branch September 3, 2019 06:42

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

This commit contains entire DNS changes #25

This commit contains entire DNS changes #25

saiprasannasastry commented Feb 20, 2019

sganesh-infoblox commented Mar 15, 2019

sganesh-infoblox left a comment

sganesh-infoblox commented Mar 15, 2019

jkraj Mar 15, 2019 •

edited

Loading

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019 •

edited

Loading

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 15, 2019

jkraj Mar 21, 2019

jkraj Mar 15, 2019

jkraj left a comment

saiprasannasastry commented Mar 18, 2019

jkraj Mar 18, 2019

jkraj Mar 21, 2019

jkraj Mar 21, 2019

jkraj Mar 21, 2019

jkraj Mar 21, 2019

saiprasannasastry Mar 22, 2019

jkraj Mar 21, 2019

jkraj Mar 21, 2019

jkraj Mar 21, 2019

jkraj Mar 21, 2019 •

edited

Loading

jkraj Mar 21, 2019

jkraj left a comment


		#Using the templates for different combinations.

		- For cretion of fixedAddress or if you just using the provider without dns,


		connector := m.(*ibclient.Connector)

		ZERO_MACADDR := "00:00:00:00:00:00"

This commit contains entire DNS changes #25

This commit contains entire DNS changes #25

Conversation

saiprasannasastry commented Feb 20, 2019

sganesh-infoblox commented Mar 15, 2019

sganesh-infoblox left a comment

Choose a reason for hiding this comment

sganesh-infoblox commented Mar 15, 2019

jkraj Mar 15, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkraj Mar 15, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkraj left a comment

Choose a reason for hiding this comment

saiprasannasastry commented Mar 18, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkraj Mar 21, 2019 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkraj left a comment

Choose a reason for hiding this comment

jkraj Mar 15, 2019 •

edited

Loading

jkraj Mar 15, 2019 •

edited

Loading

jkraj Mar 21, 2019 •

edited

Loading