Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix to not put fixed_ip in request if not defined #4617

Merged
merged 1 commit into from
Jan 11, 2016
Merged

Fix to not put fixed_ip in request if not defined #4617

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions builtin/providers/openstack/resource_openstack_networking_port_v2.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -245,8 +245,13 @@ func resourcePortSecurityGroupsV2(d *schema.ResourceData) []string {
return groups
}

func resourcePortFixedIpsV2(d *schema.ResourceData) []ports.IP {
func resourcePortFixedIpsV2(d *schema.ResourceData) interface{} {
rawIP := d.Get("fixed_ip").([]interface{})

if len(rawIP) == 0 {
return nil
}

ip := make([]ports.IP, len(rawIP))
for i, raw := range rawIP {
rawMap := raw.(map[string]interface{})
Expand All @@ -255,8 +260,8 @@ func resourcePortFixedIpsV2(d *schema.ResourceData) []ports.IP {
IPAddress: rawMap["ip_address"].(string),
}
}

return ip

}

func resourcePortAdminStateUpV2(d *schema.ResourceData) *bool {
Expand Down