Skip to content

Commit

Permalink
Merge pull request #550 from F5Networks/devel
Browse files Browse the repository at this point in the history
Devel sync to master
  • Loading branch information
RavinderReddyF5 authored Sep 16, 2021
2 parents decd297 + e5c372b commit 05709b4
Show file tree
Hide file tree
Showing 12 changed files with 627 additions and 195 deletions.
2 changes: 1 addition & 1 deletion bigip/resource_bigip_cm_device.go
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ func resourceBigipCmDeviceRead(d *schema.ResourceData, meta interface{}) error {
return nil
}

d.Set("name", members.Name)
_ = d.Set("name", members.Name)

if err := d.Set("mirror_ip", members.MirrorIp); err != nil {
return fmt.Errorf("[DEBUG] Error saving mirror_ip to state for Device (%s): %s", d.Id(), err)
Expand Down
35 changes: 17 additions & 18 deletions bigip/resource_bigip_cm_devicegroup.go
Original file line number Diff line number Diff line change
Expand Up @@ -164,19 +164,19 @@ func resourceBigipCmDevicegroupRead(d *schema.ResourceData, meta interface{}) er
d.SetId("")
return nil
}
d.Set("name", p.Name)
d.Set("description", p.Description)
_ = d.Set("name", p.Name)
_ = d.Set("description", p.Description)
if err := d.Set("auto_sync", p.AutoSync); err != nil {
return fmt.Errorf("[DEBUG] Error saving AutoSync to state for Devicegroup (%s): %s", d.Id(), err)
}

if err := d.Set("type", p.Type); err != nil {
return fmt.Errorf("[DEBUG] Error saving Type to state for Devicegroup (%s): %s", d.Id(), err)
}
d.Set("fullLoadOnSync", p.FullLoadOnSync)
d.Set("saveOnAutoSync", p.SaveOnAutoSync)
d.Set("incrementalConfigSyncSizeMax", p.IncrementalConfigSyncSizeMax)
d.Set("networkFailover", p.NetworkFailover)
_ = d.Set("fullLoadOnSync", p.FullLoadOnSync)
_ = d.Set("saveOnAutoSync", p.SaveOnAutoSync)
_ = d.Set("incrementalConfigSyncSizeMax", p.IncrementalConfigSyncSizeMax)
_ = d.Set("networkFailover", p.NetworkFailover)
return nil

}
Expand Down Expand Up @@ -233,21 +233,20 @@ func dataToDevicegroup(name string, d *schema.ResourceData) bigip.Devicegroup {
}

func DevicegroupToData(p *bigip.Devicegroup, d *schema.ResourceData) error {
d.Set("name", p.Name)
d.Set("partition", p.Partition)
d.Set("auto_sync", p.AutoSync)
d.Set("description", p.Description)
d.Set("type", p.Type)
d.Set("full_load_on_sync", p.FullLoadOnSync)
d.Set("save_on_auto_sync", p.SaveOnAutoSync)
d.Set("network_failover", p.NetworkFailover)
d.Set("incremental_config", p.IncrementalConfigSyncSizeMax)
_ = d.Set("name", p.Name)
_ = d.Set("partition", p.Partition)
_ = d.Set("auto_sync", p.AutoSync)
_ = d.Set("description", p.Description)
_ = d.Set("type", p.Type)
_ = d.Set("full_load_on_sync", p.FullLoadOnSync)
_ = d.Set("save_on_auto_sync", p.SaveOnAutoSync)
_ = d.Set("network_failover", p.NetworkFailover)
_ = d.Set("incremental_config", p.IncrementalConfigSyncSizeMax)

for i, r := range p.Deviceb {
device := fmt.Sprintf("device.%d", i)

d.Set(fmt.Sprintf("%s.name", device), r.Name)
d.Set(fmt.Sprintf("%s.set_sync_leader", device), r.SetSyncLeader)
_ = d.Set(fmt.Sprintf("%s.name", device), r.Name)
_ = d.Set(fmt.Sprintf("%s.set_sync_leader", device), r.SetSyncLeader)

}
return nil
Expand Down
Loading

0 comments on commit 05709b4

Please sign in to comment.