feat(cci): add resource CCI v2 network

Author: luoping-12345

docs/resources/cciv2_network.md

@@ -0,0 +1,76 @@
+---
+subcategory: "Cloud Container Instance (CCI)"
+layout: "huaweicloud"
+page_title: "HuaweiCloud: huaweicloud_cciv2_network"
+description: |-
+  Manages a CCI Network resource within HuaweiCloud.
+---
+
+# huaweicloud_cciv2_network
+
+Manages a CCI Network resource within HuaweiCloud.
+
+## Example Usage
+
+```hcl
+
+```
+
+## Argument Reference
+
+The following arguments are supported:
+
+* `region` - (Optional, String, ForceNew) Specifies the region in which to create the resource.
+  If omitted, the provider-level region will be used.
+  Changing this creates a new resource.
+
+* `name` - (Required, String) Specifies the name of the CCI network.
+
+* `namespace` - (Required, String) Specifies the namespace.
+
+* `annotations` - (Optional, Map) Specifies the annotations of the CCI network.
+
+* `ip_families` - (Optional, List) Specifies the IP families of the CCI network.
+
+* `security_group_ids` - (Optional, List) Specifies the security group IDs of the CCI network.
+
+* `subnets` - (Optional, List) Specifies the subnets of the CCI network.
+  The [subnets](#block--subnets) structure is documented below.
+
+<a name="block--subnets"></a>
+The `subnets` block supports:
+
+* `subnet_id` - (Optional, String) Specifies the subnet ID of the CCI network.
+
+## Attribute Reference
+
+In addition to all arguments above, the following attributes are exported:
+
+* `id` - The resource ID.
+
+* `api_version` - The API version of the CCI network.
+
+* `kind` - The kind of the CCI network.
+
+* `resource_version` - The resource version of the namespace.
+
+* `self_link` - The self link of the namespace.
+
+* `status` - The status of the namespace.
+
+* `uid` - The uid of the namespace.
+
+## Timeouts
+
+This resource provides the following timeouts configuration options:
+
+* `create` - Default is 10 minutes.
+* `delete` - Default is 10 minutes.
+
+## Import
+
+The xxx can be imported using `id`, e.g.
+
+```bash
+$ terraform import huaweicloud_cciv2_network.test <id>
+```

huaweicloud/provider.go

@@ -1561,6 +1561,7 @@ func Provider() *schema.Provider {
 			"huaweicloud_cci_namespace":    cci.ResourceCciNamespace(),
 			"huaweicloud_cci_network":      cci.ResourceCciNetworkV1(),
 			"huaweicloud_cci_pvc":          cci.ResourcePersistentVolumeClaimV1(),
+			"huaweicloud_cciv2_network":    cci.ResourceV2Network(),
 
 			"huaweicloud_ccm_certificate":                ccm.ResourceCCMCertificate(),
 			"huaweicloud_ccm_certificate_apply":          ccm.ResourceCertificateApply(),

huaweicloud/services/acceptance/cci/resource_huaweicloud_cciv2_network_test.go

@@ -0,0 +1,108 @@
+package cci
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/hashicorp/terraform-plugin-sdk/v2/helper/resource"
+	"github.com/hashicorp/terraform-plugin-sdk/v2/terraform"
+
+	"github.com/chnsz/golangsdk/openstack/cci/v1/networks"
+
+	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/config"
+	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/services/acceptance"
+	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/services/acceptance/common"
+	"github.com/huaweicloud/terraform-provider-huaweicloud/huaweicloud/services/cci"
+)
+
+func getV2NetworkResourceFunc(conf *config.Config, state *terraform.ResourceState) (interface{}, error) {
+	client, err := conf.CciV1BetaClient(acceptance.HW_REGION_NAME)
+	if err != nil {
+		return nil, fmt.Errorf("error creating CCI network v2 client: %s", err)
+	}
+	return cci.GetNetwork(client, state.Primary.Attributes["namespace"], state.Primary.ID)
+}
+
+func TestAccV2Network_basic(t *testing.T) {
+	var network networks.Network
+	rName := acceptance.RandomAccResourceNameWithDash()
+	resourceName := "huaweicloud_cciv2_network.test"
+
+	rc := acceptance.InitResourceCheck(
+		resourceName,
+		&network,
+		getV2NetworkResourceFunc,
+	)
+
+	resource.ParallelTest(t, resource.TestCase{
+		PreCheck:          func() { acceptance.TestAccPreCheck(t) },
+		ProviderFactories: acceptance.TestAccProviderFactories,
+		CheckDestroy:      rc.CheckResourceDestroy(),
+		Steps: []resource.TestStep{
+			{
+				Config: testAccV2Network_basic(rName),
+				Check: resource.ComposeTestCheckFunc(
+					rc.CheckResourceExists(),
+					resource.TestCheckResourceAttr(resourceName, "name", rName),
+					resource.TestCheckResourceAttr(resourceName, "status", "Active"),
+					resource.TestCheckResourceAttrSet(resourceName, "status"),
+					resource.TestCheckResourceAttrSet(resourceName, "cidr"),
+					resource.TestCheckResourceAttrPair(resourceName, "namespace",
+						"huaweicloud_cciv2_namespace.test", "name"),
+					resource.TestCheckResourceAttrPair(resourceName, "network_id",
+						"huaweicloud_vpc_subnet.test", "id"),
+					resource.TestCheckResourceAttrPair(resourceName, "subnet_id",
+						"huaweicloud_vpc_subnet.test", "subnet_id"),
+					resource.TestCheckResourceAttrPair(resourceName, "security_group_id",
+						"huaweicloud_networking_secgroup.test", "id"),
+					resource.TestCheckResourceAttrPair(resourceName, "vpc_id",
+						"huaweicloud_vpc.test", "id"),
+				),
+			},
+			{
+				ResourceName:      resourceName,
+				ImportState:       true,
+				ImportStateVerify: true,
+				ImportStateIdFunc: testAccV2NetworkImportStateFunc(resourceName),
+			},
+		},
+	})
+}
+
+func testAccV2NetworkImportStateFunc(name string) resource.ImportStateIdFunc {
+	return func(s *terraform.State) (string, error) {
+		rs, ok := s.RootModule().Resources[name]
+		if !ok {
+			return "", fmt.Errorf("Resource (%s) not found: %s", name, rs)
+		}
+		if rs.Primary.ID == "" || rs.Primary.Attributes["namespace"] == "" {
+			return "", fmt.Errorf("the namespace name (%s) or network ID (%s) is nil",
+				rs.Primary.Attributes["namespace"], rs.Primary.ID)
+		}
+		return fmt.Sprintf("%s/%s", rs.Primary.Attributes["namespace"], rs.Primary.ID), nil
+	}
+}
+
+func testAccV2Network_base(rName string) string {
+	return fmt.Sprintf(`
+%s
+
+resource "huaweicloud_cci_namespace" "test" {
+  name = "%s"
+  type = "general-computing"
+}
+`, common.TestBaseNetwork(rName), rName)
+}
+
+func testAccV2Network_basic(rName string) string {
+	return fmt.Sprintf(`
+%s
+
+resource "huaweicloud_cci_network" "test" {
+  name              = "%s"
+  namespace         = huaweicloud_cci_namespace.test.name
+  network_id        = huaweicloud_vpc_subnet.test.id
+  security_group_id = huaweicloud_networking_secgroup.test.id
+}
+`, testAccV2Network_base(rName), rName)
+}