test update

Author: uibm

ibm/service/vpc/data_source_ibm_is_virtual_network_interface_floating_ips_test.go

@@ -25,11 +25,11 @@ func TestAccIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceBasic(t *testing.T)
 			resource.TestStep{
 				Config: testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPsDataSourceConfigBasic(vpcname, subnetname, vniname, floatingipname),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "address"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "crn"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "href"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "id"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips.floating_ips.0", "name"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips", "floating_ips.0.address"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips", "floating_ips.0.crn"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips", "floating_ips.0.href"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips", "floating_ips.0.id"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_floating_ips.is_floating_ips", "floating_ips.0.name"),
 				),
 			},
 		},

ibm/service/vpc/data_source_ibm_is_virtual_network_interface_ips_test.go

@@ -25,13 +25,13 @@ func TestAccIBMIsVirtualNetworkInterfaceIpsDataSourceBasic(t *testing.T) {
 			resource.TestStep{
 				Config: testAccCheckIBMIsVirtualNetworkInterfaceIpsDataSourceConfigBasic(vpcname, subnetname, vniname, reservedipname),
 				Check: resource.ComposeTestCheckFunc(
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "id"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "name"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "href"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "address"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "resource_type"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "reserved_ip"),
-					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips.reserved_ips.0", "virtual_network_interface"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.id"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.name"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.href"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.address"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.resource_type"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.reserved_ip"),
+					resource.TestCheckResourceAttrSet("data.ibm_is_virtual_network_interface_ips.is_reserved_ips", "reserved_ips.0.virtual_network_interface"),
 				),
 			},
 		},

ibm/service/vpc/resource_ibm_is_virtual_network_interface_floating_ip_test.go

@@ -111,7 +111,7 @@ func testAccCheckIBMIsVirtualNetworkInterfaceFloatingIPDestroy(s *terraform.Stat
 		return err
 	}
 	for _, rs := range s.RootModule().Resources {
-		if rs.Type != "ibm_is_floating_ip" {
+		if rs.Type != "ibm_is_virtual_network_interface_floating_ip" {
 			continue
 		}
 		vniid, fipid, err := vpc.ParseVNIFloatingIpTerraformID(rs.Primary.ID)

ibm/service/vpc/resource_ibm_is_virtual_network_interface_ip_test.go

@@ -94,15 +94,13 @@ func testAccCheckIBMIsVirtualNetworkInterfaceIPExists(n string, obj vpcv1.Reserv
 		if err != nil {
 			return err
 		}
-
 		getSubnetVirtualNetworkInterfaceIPOptions.SetVirtualNetworkInterfaceID(parts[0])
 		getSubnetVirtualNetworkInterfaceIPOptions.SetID(parts[1])
 
 		reservedIP, _, err := vpcClient.GetVirtualNetworkInterfaceIP(getSubnetVirtualNetworkInterfaceIPOptions)
 		if err != nil {
 			return err
 		}
-
 		obj = *reservedIP
 		return nil
 	}
@@ -117,14 +115,11 @@ func testAccCheckIBMIsVirtualNetworkInterfaceIPDestroy(s *terraform.State) error
 		if rs.Type != "ibm_is_virtual_network_interface_ip" {
 			continue
 		}
-
 		getSubnetVirtualNetworkInterfaceIPOptions := &vpcv1.GetVirtualNetworkInterfaceIPOptions{}
-
 		parts, err := flex.SepIdParts(rs.Primary.ID, "/")
 		if err != nil {
 			return err
 		}
-
 		getSubnetVirtualNetworkInterfaceIPOptions.SetVirtualNetworkInterfaceID(parts[0])
 		getSubnetVirtualNetworkInterfaceIPOptions.SetID(parts[1])
 
@@ -137,6 +132,5 @@ func testAccCheckIBMIsVirtualNetworkInterfaceIPDestroy(s *terraform.State) error
 			return fmt.Errorf("Error checking for VirtualNetworkInterfaceIP (%s) has been destroyed: %s", rs.Primary.ID, err)
 		}
 	}
-
 	return nil
 }