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(bm-nic): added check for 0.0.0.0 reserved ip on nic availability #4122

Merged
merged 2 commits into from
Oct 25, 2022
Merged

fix(bm-nic): added check for 0.0.0.0 reserved ip on nic availability #4122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ffa44cc
fix(bm-nic): added check for 0.0.0.0 reserved ip on nic availability
uibm Oct 21, 2022
69b3359
fixed floating ip details(deprecated reserved_ip attribute) in bare m…
uibm Oct 21, 2022
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
18 changes: 14 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import (
const (
isBareMetalServerNicEnableInfraNAT = "enable_infrastructure_nat"
isBareMetalServerNicFloatingIPs = "floating_ips"
isBareMetalServerNicFloatingIPId = "id"
isBareMetalServerNicIpAddress = "address"
isBareMetalServerNicIpCRN = "crn"
isBareMetalServerNicIpHref = "href"
Expand Down Expand Up @@ -91,8 +92,15 @@ func DataSourceIBMIsBareMetalServerNetworkInterface() *schema.Resource {
isBareMetalServerNicIpID: {
Type: schema.TypeString,
Computed: true,
Deprecated: "This field is deprecated - replaced by id",
Description: "The unique identifier for this floating IP",
},
isBareMetalServerNicFloatingIPId: {
Type: schema.TypeString,
Computed: true,
Description: "The unique identifier for this floating IP",
},

isBareMetalServerNicIpName: {
Type: schema.TypeString,
Computed: true,
Expand Down Expand Up @@ -243,8 +251,9 @@ func dataSourceIBMISBareMetalServerNetworkInterfaceRead(context context.Context,
if nic.FloatingIps != nil {
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down Expand Up @@ -316,8 +325,9 @@ func dataSourceIBMISBareMetalServerNetworkInterfaceRead(context context.Context,
if nic.FloatingIps != nil {
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down
16 changes: 12 additions & 4 deletions ibm/service/vpc/data_source_ibm_is_bare_metal_server_network_interfaces.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,12 @@ func DataSourceIBMIsBareMetalServerNetworkInterfaces() *schema.Resource {
Description: "The URL for this floating IP",
},
isBareMetalServerNicIpID: {
Type: schema.TypeString,
Computed: true,
Deprecated: "This field is deprecated - replaced by id",
Description: "The unique identifier for this floating IP",
},
isBareMetalServerNicFloatingIPId: {
Type: schema.TypeString,
Computed: true,
Description: "The unique identifier for this floating IP",
Expand Down Expand Up @@ -231,8 +237,9 @@ func dataSourceIBMISBareMetalServerNetworkInterfacesRead(context context.Context
floatingIPList := make([]map[string]interface{}, 0)
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down Expand Up @@ -297,8 +304,9 @@ func dataSourceIBMISBareMetalServerNetworkInterfacesRead(context context.Context
floatingIPList := make([]map[string]interface{}, 0)
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down
28 changes: 18 additions & 10 deletions ibm/service/vpc/resource_ibm_is_bare_metal_server_network_interface.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,11 @@ func ResourceIBMIsBareMetalServerNetworkInterface() *schema.Resource {
Computed: true,
Description: "The globally unique IP address",
},
isBareMetalServerNicFloatingIPId: {
Type: schema.TypeString,
Computed: true,
Description: "The globally unique IP identifier",
},
},
},
},
Expand Down Expand Up @@ -403,12 +408,12 @@ func resourceIBMISBareMetalServerNetworkInterfaceCreate(context context.Context,
}

log.Printf("[INFO] Bare Metal Server Network Interface : %s", d.Id())
_, err = isWaitForBareMetalServerNetworkInterfaceAvailable(sess, bareMetalServerId, nicId, d.Timeout(schema.TimeoutCreate), d)
nicAfterWait, err := isWaitForBareMetalServerNetworkInterfaceAvailable(sess, bareMetalServerId, nicId, d.Timeout(schema.TimeoutCreate), d)
if err != nil {
return diag.FromErr(err)
}

err = bareMetalServerNICGet(d, meta, sess, nic, bareMetalServerId)
err = bareMetalServerNICGet(d, meta, sess, nicAfterWait, bareMetalServerId)
if err != nil {
return diag.FromErr(err)
}
Expand Down Expand Up @@ -543,16 +548,16 @@ func createVlanTypeNetworkInterface(context context.Context, d *schema.ResourceD
}
}

err = bareMetalServerNICGet(d, meta, sess, nic, bareMetalServerId)
_, nicId, err := ParseNICTerraformID(d.Id())
if err != nil {
return err
}
_, nicId, err := ParseNICTerraformID(d.Id())
log.Printf("[INFO] Bare Metal Server Network Interface : %s", d.Id())
nicAfterWait, err := isWaitForBareMetalServerNetworkInterfaceAvailable(sess, bareMetalServerId, nicId, d.Timeout(schema.TimeoutCreate), d)
if err != nil {
return err
}
log.Printf("[INFO] Bare Metal Server Network Interface : %s", d.Id())
_, err = isWaitForBareMetalServerNetworkInterfaceAvailable(sess, bareMetalServerId, nicId, d.Timeout(schema.TimeoutCreate), d)
err = bareMetalServerNICGet(d, meta, sess, nicAfterWait, bareMetalServerId)
if err != nil {
return err
}
Expand Down Expand Up @@ -602,8 +607,8 @@ func bareMetalServerNICGet(d *schema.ResourceData, meta interface{}, sess *vpcv1
if nic.FloatingIps != nil {
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down Expand Up @@ -680,8 +685,8 @@ func bareMetalServerNICGet(d *schema.ResourceData, meta interface{}, sess *vpcv1
if nic.FloatingIps != nil {
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down Expand Up @@ -1046,6 +1051,9 @@ func isBareMetalServerNetworkInterfaceRefreshFunc(client *vpcv1.VpcV1, bareMetal
nic := bmsNic.(*vpcv1.BareMetalServerNetworkInterfaceByVlan)
status = *nic.Status
d.Set(isBareMetalServerNicStatus, *nic.Status)
if *nic.PrimaryIP.Address == "0.0.0.0" {
return bmsNic, "pending", nil
}
}
}

Expand Down
17 changes: 11 additions & 6 deletions ibm/service/vpc/resource_ibm_is_bare_metal_server_network_interface_allow_float.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,11 @@ func ResourceIBMIsBareMetalServerNetworkInterfaceAllowFloat() *schema.Resource {
Computed: true,
Description: "The globally unique IP address",
},
isBareMetalServerNicFloatingIPId: {
Type: schema.TypeString,
Computed: true,
Description: "The globally unique IP identifier",
},
},
},
},
Expand Down Expand Up @@ -324,12 +329,12 @@ func createVlanTypeNetworkInterfaceAllowFloat(context context.Context, d *schema
}

log.Printf("[INFO] Bare Metal Server Network Interface : %s", d.Id())
_, err = isWaitForBareMetalServerNetworkInterfaceAvailable(sess, bareMetalServerId, nicId, d.Timeout(schema.TimeoutCreate), d)
nicAfterWait, err := isWaitForBareMetalServerNetworkInterfaceAvailable(sess, bareMetalServerId, nicId, d.Timeout(schema.TimeoutCreate), d)
if err != nil {
return err
}

err = bareMetalServerNICAllowFloatGet(d, meta, sess, nic, bareMetalServerId)
err = bareMetalServerNICAllowFloatGet(d, meta, sess, nicAfterWait, bareMetalServerId)
if err != nil {
return err
}
Expand Down Expand Up @@ -429,8 +434,8 @@ func bareMetalServerNICAllowFloatGet(d *schema.ResourceData, meta interface{}, s
if nic.FloatingIps != nil {
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down Expand Up @@ -502,8 +507,8 @@ func bareMetalServerNICAllowFloatGet(d *schema.ResourceData, meta interface{}, s
if nic.FloatingIps != nil {
for _, ip := range nic.FloatingIps {
currentIP := map[string]interface{}{
isBareMetalServerNicIpID: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
isBareMetalServerNicFloatingIPId: *ip.ID,
isBareMetalServerNicIpAddress: *ip.Address,
}
floatingIPList = append(floatingIPList, currentIP)
}
Expand Down
4 changes: 2 additions & 2 deletions ibm/service/vpc/resource_ibm_is_bare_metal_server_network_interface_allow_float_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
return nil
}),
resource.TestCheckResourceAttrSet(
"ibm_is_bare_metal_server.testacc_bms", "floating_bare_metal_server"),
"ibm_is_bare_metal_server_network_interface_allow_float.bms_nic", "floating_bare_metal_server"),
resource.TestCheckResourceAttrWith("ibm_is_bare_metal_server_network_interface_allow_float.bms_nic", "floating_bare_metal_server", func(v string) error {
if v == "" {
return fmt.Errorf("Attribute 'floating_bare_metal_server' %s is not populated", v)
Expand Down Expand Up @@ -108,7 +108,7 @@ ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCKVmnMOlHKcZK8tpt3MP1lqOLAcqcJzhsvJcjscgVE
return nil
}),
resource.TestCheckResourceAttrSet(
"ibm_is_bare_metal_server.testacc_bms", "floating_bare_metal_server"),
"ibm_is_bare_metal_server_network_interface_allow_float.bms_nic", "floating_bare_metal_server"),
resource.TestCheckResourceAttrWith("ibm_is_bare_metal_server_network_interface_allow_float.bms_nic", "floating_bare_metal_server", func(v string) error {
if v == "" {
return fmt.Errorf("Attribute 'floating_bare_metal_server' %s is not populated", v)
Expand Down