Skip to content

Commit 73f7fe0

Browse files
Fixes from code review
1 parent 5a16d11 commit 73f7fe0

6 files changed

+36
-16
lines changed

ibm/service/power/data_source_ibm_pi_virtual_serial_number_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ func TestAccIBMPIVirtualSerialNumber(t *testing.T) {
3131
func testAccCheckIBMPIVirtualSerialNumberConfig() string {
3232
return fmt.Sprintf(`
3333
data "ibm_pi_virtual_serial_number" "testacc_virtual_serial_number" {
34-
pi_cloud_instance_id = "%s"
35-
pi_serial = "%s"
34+
pi_cloud_instance_id = "%s"
35+
pi_serial = "%s"
3636
}`, acc.Pi_cloud_instance_id, acc.Pi_virtual_serial_number)
3737
}

ibm/service/power/data_source_ibm_pi_virtual_serial_numbers_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@ func TestAccIBMPIVirtualSerialNumbers(t *testing.T) {
3232
func testAccCheckIBMPIVirtualSerialNumbersConfig() string {
3333
return fmt.Sprintf(`
3434
data "ibm_pi_virtual_serial_numbers" "testacc_virtual_serial_numbers" {
35-
pi_cloud_instance_id = "%s"
35+
pi_cloud_instance_id = "%s"
3636
}`, acc.Pi_cloud_instance_id)
3737
}

ibm/service/power/resource_ibm_pi_virtual_serial_number_test.go

Lines changed: 26 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestAccIBMPIVirtualSerialNumberBasic(t *testing.T) {
2323
resource.Test(t, resource.TestCase{
2424
PreCheck: func() { acc.TestAccPreCheck(t) },
2525
Providers: acc.TestAccProviders,
26-
CheckDestroy: testAccCheckIBMPISPPPlacementGroupDestroy,
26+
CheckDestroy: testAccCheckIBMPIVirtualSerialNumberDestroy,
2727
Steps: []resource.TestStep{
2828
{
2929
Config: testAccIBMPIVirtualSerialNumberBasicConfig(),
@@ -41,7 +41,7 @@ func TestAccIBMPIVirtualSerialNumberWithInstance(t *testing.T) {
4141
resource.Test(t, resource.TestCase{
4242
PreCheck: func() { acc.TestAccPreCheck(t) },
4343
Providers: acc.TestAccProviders,
44-
CheckDestroy: testAccCheckIBMPISPPPlacementGroupDestroy,
44+
CheckDestroy: testAccCheckIBMPIVirtualSerialNumberDestroy,
4545
Steps: []resource.TestStep{
4646
{
4747
Config: testAccIBMPIVirtualSerialNumberWithInstanceConfig(),
@@ -80,15 +80,35 @@ func testAccCheckIBMPIVirtualSerialNumberExists(n string) resource.TestCheckFunc
8080

8181
client := st.NewIBMPIVSNClient(context.Background(), sess, cloudInstanceId)
8282

83-
vsn, err := client.Get(parts[1])
83+
_, err = client.Get(parts[1])
8484
if err != nil {
8585
return err
8686
}
87-
parts[1] = *vsn.Serial
8887
return nil
8988
}
9089
}
9190

91+
func testAccCheckIBMPIVirtualSerialNumberDestroy(s *terraform.State) error {
92+
sess, err := acc.TestAccProvider.Meta().(conns.ClientSession).IBMPISession()
93+
if err != nil {
94+
return err
95+
}
96+
for _, rs := range s.RootModule().Resources {
97+
if rs.Type != "ibm_pi_virtual_serial_number" {
98+
continue
99+
}
100+
parts, _ := flex.IdParts(rs.Primary.ID)
101+
cloudInstanceId := parts[0]
102+
vsnClient := st.NewIBMPIVSNClient(context.Background(), sess, cloudInstanceId)
103+
_, err = vsnClient.Get(parts[1])
104+
if err == nil {
105+
return fmt.Errorf("PI virtual serial number still exists: %s", rs.Primary.ID)
106+
}
107+
}
108+
109+
return nil
110+
}
111+
92112
func testAccIBMPIVirtualSerialNumberBasicConfig() string {
93113
return fmt.Sprintf(`
94114
resource "ibm_pi_virtual_serial_number" "power_virtual_serial_number" {
@@ -101,11 +121,11 @@ func testAccIBMPIVirtualSerialNumberBasicConfig() string {
101121
func testAccIBMPIVirtualSerialNumberWithInstanceConfig() string {
102122
return fmt.Sprintf(`
103123
resource "ibm_pi_virtual_serial_number" "power_virtual_serial_number" {
104-
pi_cloud_instance_id = "%[1]s"
124+
pi_cloud_instance_id = "%[1]s"
105125
pi_virtual_serial_number {
106126
serial = "auto-assign"
107127
}
108-
pi_instance_id = "%[2]s"
128+
pi_instance_id = "%[2]s"
109129
pi_retain_virtual_serial_number = false
110130
}
111131
`, acc.Pi_cloud_instance_id, acc.Pi_virtual_serial_number, acc.Pi_instance_name)

website/docs/d/pi_virtual_serial_number.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: |-
77
---
88

99
# ibm_virtual_serial_number
10-
Retrieve information about an existing IBM Power Virtual Server Cloud Instance as a read-only data source. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
10+
Retrieve information about an existing virtual serial number as a read-only data source. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
1111

1212
## Example usage
1313
```terraform

website/docs/d/pi_virtual_serial_numbers.html.markdown

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ description: |-
77
---
88

99
# ibm_virtual_serial_number
10-
Retrieve information about an existing IBM Power Virtual Server Cloud Instance as a read-only data source. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
10+
Retrieve information about existing virtual serial numbers as a read-only data source. For more information, about IBM power virtual server cloud, see [getting started with IBM Power Systems Virtual Servers](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-getting-started).
1111

1212
## Example usage
1313
```terraform

website/docs/r/pi_virtual_serial_number.html.markdown

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,13 +11,13 @@ description: |-
1111
Get, update or delete an existing virtual serial number.
1212

1313
## Example usage
14-
The following example enables you to create a shared processor pool placement group with a group policy of affinity:
14+
The following example enables you to create a virtual serial number:
1515

1616
```terraform
1717
resource "ibm_pi_virtual_serial_number" "testacc_virtual_serial_number" {
18-
pi_serial = "<existing virtual serial number>"
19-
pi_cloud_instance_id = "<value of the cloud_instance_id>"
20-
pi_description = "<desired description for virtual serial number>"
18+
pi_serial = "<existing virtual serial number>"
19+
pi_cloud_instance_id = "<value of the cloud_instance_id>"
20+
pi_description = "<desired description for virtual serial number>"
2121
}
2222
```
2323

@@ -37,7 +37,7 @@ resource "ibm_pi_virtual_serial_number" "testacc_virtual_serial_number" {
3737
```
3838

3939
**Note**
40-
* This resource CANNOT create a virtual serial number unless assigning to a power instance using 'auto-assign'. Otherwise, it can only be used to manage an existing virtual serial number.
40+
* This resource is used to create a virtual serial number by assigning to a power instance using 'auto-assign'. Otherwise, it can only be used to manage an existing virtual serial number.
4141

4242
## Timeouts
4343

0 commit comments

Comments
 (0)