Fix network port attach tests and fix warnings on network port data s…

…ource
powervs-ibm · Nov 19, 2024 · 7c864ee · 7c864ee
1 parent df2a26b
commit 7c864ee
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/ibm/service/power/resource_ibm_pi_network_port_attach_test.go b/ibm/service/power/resource_ibm_pi_network_port_attach_test.go
@@ -40,7 +40,6 @@ func TestAccIBMPINetworkPortAttachbasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("ibm_pi_network_port_attach.power_network_port_attach", "network_port_id"),
 					resource.TestCheckResourceAttrSet("ibm_pi_network_port_attach.power_network_port_attach", "public_ip"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})
@@ -66,7 +65,6 @@ func TestAccIBMPINetworkPortAttachVlanbasic(t *testing.T) {
 					resource.TestCheckResourceAttrSet("ibm_pi_network_port_attach.power_network_port_attach", "id"),
 					resource.TestCheckResourceAttrSet("ibm_pi_network_port_attach.power_network_port_attach", "network_port_id"),
 				),
-				ExpectNonEmptyPlan: true,
 			},
 		},
 	})
@@ -141,13 +139,12 @@ func testAccCheckIBMPINetworkPortAttachConfig(name, networkName, networkName2, h
 		resource "ibm_pi_network" "power_networks" {
 			pi_cloud_instance_id = "%[1]s"
 			pi_cidr              = "192.168.15.0/24"
-			pi_network_name      = "%[6]s"
+			pi_network_name      = "%[5]s"
 			pi_network_type      = "vlan"
 		}
 		resource "ibm_pi_network" "power_networks2" {
 			pi_cloud_instance_id = "%[1]s"
-			pi_cidr              = "192.97.57.0/24"
-			pi_network_name      = "%[7]s"
+			pi_network_name      = "%[6]s"
 			pi_network_type      = "pub-vlan"
 		}
 		resource "ibm_pi_instance" "power_instance" {
@@ -158,8 +155,8 @@ func testAccCheckIBMPINetworkPortAttachConfig(name, networkName, networkName2, h
 			pi_proc_type          = "shared"
 			pi_processors         = "0.25"
 			pi_storage_pool       = data.ibm_pi_image.power_image.storage_pool
-			pi_storage_type       = "%[5]s"
-			pi_health_status      = "%[8]s"
+			pi_storage_type       = "%[4]s"
+			pi_health_status      = "%[7]s"
 			pi_sys_type           = "s922"
 			pi_network {
 				network_id = resource.ibm_pi_network.power_networks.network_id
@@ -171,7 +168,7 @@ func testAccCheckIBMPINetworkPortAttachConfig(name, networkName, networkName2, h
 			pi_network_name             = resource.ibm_pi_network.power_networks2.pi_network_name 
 			pi_network_port_description = "IP Reserved for Test UAT"
 		}
-	`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.Pi_network_name, acc.PiStorageType, networkName, networkName2, health)
+	`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.PiStorageType, networkName, networkName2, health)
 }
 
 func testAccCheckIBMPINetworkPortAttachVlanConfig(name, networkName, networkName2, health string) string {
@@ -183,13 +180,13 @@ func testAccCheckIBMPINetworkPortAttachVlanConfig(name, networkName, networkName
 		resource "ibm_pi_network" "power_networks" {
 			pi_cloud_instance_id = "%[1]s"
 			pi_cidr              = "192.168.15.0/24"
-			pi_network_name      = "%[6]s"
+			pi_network_name      = "%[5]s"
 			pi_network_type      = "vlan"
 		}
 		resource "ibm_pi_network" "power_networks2" {
 			pi_cloud_instance_id = "%[1]s"
 			pi_cidr              = "192.97.57.0/24"
-			pi_network_name      = "%[7]s"
+			pi_network_name      = "%[6]s"
 			pi_network_type      = "vlan"
 		}
 		resource "ibm_pi_instance" "power_instance" {
@@ -200,8 +197,8 @@ func testAccCheckIBMPINetworkPortAttachVlanConfig(name, networkName, networkName
 			pi_proc_type          = "shared"
 			pi_processors         = "0.25"
 			pi_storage_pool       = data.ibm_pi_image.power_image.storage_pool
-			pi_storage_type       = "%[5]s"
-			pi_health_status      = "%[8]s"
+			pi_storage_type       = "%[4]s"
+			pi_health_status      = "%[7]s"
 			pi_sys_type           = "s922"
 			pi_network {
 				network_id = resource.ibm_pi_network.power_networks.network_id
@@ -213,5 +210,5 @@ func testAccCheckIBMPINetworkPortAttachVlanConfig(name, networkName, networkName
 			pi_network_name             = ibm_pi_network.power_networks2.pi_network_name
 			pi_network_port_description = "IP Reserved for Test UAT"
 		}
-	`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.Pi_network_name, acc.PiStorageType, networkName, networkName2, health)
+	`, acc.Pi_cloud_instance_id, name, acc.Pi_image, acc.PiStorageType, networkName, networkName2, health)
 }
diff --git a/website/docs/d/pi_network_port.html.markdown b/website/docs/d/pi_network_port.html.markdown
@@ -7,23 +7,27 @@ description: |-
 ---
 
 # ibm_pi_network_port
+
 Retrieve information about a network port in the Power Virtual Server Cloud. For more information, about networks in IBM power virtual server, see [adding or removing a public network](https://cloud.ibm.com/docs/power-iaas?topic=power-iaas-modifying-server#adding-removing-network).
 
 ## Example usage
+
 ```terraform
 data "ibm_pi_network_port" "test-network-port" {
     pi_network_name             = "Zone1-CFN"
     pi_cloud_instance_id        = "51e1879c-bcbe-4ee1-a008-49cdba0eaf60"
 }
 ```
 
-**Notes**
+### Notes
+
 - Please find [supported Regions](https://cloud.ibm.com/apidocs/power-cloud#endpoint) for endpoints.
 - If a Power cloud instance is provisioned at `lon04`, The provider level attributes should be as follows:
   - `region` - `lon`
   - `zone` - `lon04`
 
 Example usage:
+
   ```terraform
     provider "ibm" {
       region    =   "lon"
@@ -32,12 +36,14 @@ Example usage:
   ```
 
 ## Argument reference
+
 Review the argument references that you can specify for your data source.
 
 - `pi_cloud_instance_id` - (Required, String) The GUID of the service instance associated with an account.
 - `pi_network_name` - (Required, String) The unique identifier or name of a network.
 
 ## Attribute reference
+
 In addition to all argument reference list, you can access the following attribute reference after your data source is created.
 
 - `network_ports` - (List) List of all in use network ports for a network.