fix(resource): delete disk offering allocator_strategy and add virtual_router_offering public network uuid

Author: ZStack-Robot

docs/resources/disk_offer.md

@@ -35,7 +35,6 @@ output "zstack_disk_offer" {
 
 ### Optional
 
-- `allocator_strategy` (String) The type of the allocator_strategy.
 - `description` (String) A description of the disk offering, providing additional context or details about the configuration.
 
 ### Read-Only

docs/resources/image.md

@@ -55,7 +55,6 @@ output "zstack_image" {
 - `boot_mode` (String) The boot mode supported by the image, such as 'Legacy' or 'UEFI'.
 - `description` (String) A description of the image, providing additional context or details.
 - `guest_os_type` (String) The guest operating system type that the image is optimized for.
-- `marketplace` (Boolean) Specifies whether the image is from a marketplace.
 - `media_type` (String) The type of media for the image. Examples include 'ISO' or 'Template' or DataVolumeTemplate.
 - `platform` (String) The platform that the image is intended for, such as 'Linux', 'Windows', or others.
 - `virtio` (Boolean) Indicates if the VirtIO drivers are required for the image.

docs/resources/virtual_router_offer.md

@@ -21,6 +21,7 @@ resource "zstack_virtual_router_offer" "test" {
   memory_size             = 1024 # in megabytes, MB
   zone_uuid               = "d29f4847a99f4dea83bc446c8fe6e64c"
   management_network_uuid = "50e8c0d69681447fbe347c8dae2b1bef"
+  public_network_uuid     = "50e8c0d69681447fbe347c8dae2b1bef"
   image_uuid              = "93005c8a2a314a489635eca8c30794d4"
 }
 
@@ -39,6 +40,7 @@ output "zstack_vroffer" {
 - `management_network_uuid` (String) The UUID of the management network associated with the virtual router offering. This is a mandatory field.
 - `memory_size` (Number) The amount of memory  allocated to the virtual router offering. This is a mandatory field, in megabytes (MB)
 - `name` (String) The name of the virtual router offering. This is a mandatory field and must be unique.
+- `public_network_uuid` (String) The UUID of the public network associated with the virtual router offering. If not specified, it will share the same network UUID as the management network or vice versa, depending on the configuration.
 - `zone_uuid` (String) The UUID of the zone where the virtual router offering is deployed. This is a mandatory field.
 
 ### Optional

docs/resources/vpc.md

@@ -38,13 +38,13 @@ output "zstack_vpc" {
 
 ### Required
 
-- `description` (String) A description for the VPC network.
 - `l2_network_uuid` (String) The UUID of the L2 network associated with this VPC network.
 - `name` (String) The name of the VPC network.
 - `subnet_cidr` (Attributes) Details of the subnet CIDR to be configured in the VPC network. (see [below for nested schema](#nestedatt--subnet_cidr))
 
 ### Optional
 
+- `description` (String) A description for the VPC network.
 - `dns` (String) Attach Dns Server for this VPC network.
 - `enable_ipam` (Boolean) Enable IP Address Management (IPAM) for this VPC network.
 - `virtual_router_uuid` (String) Attach virtual router  for this VPC network.

examples/resources/virtual_router_offer/resource.tf

@@ -7,6 +7,7 @@ resource "zstack_virtual_router_offer" "test" {
   memory_size             = 1024 # in megabytes, MB
   zone_uuid               = "d29f4847a99f4dea83bc446c8fe6e64c"
   management_network_uuid = "50e8c0d69681447fbe347c8dae2b1bef"
+  public_network_uuid     = "50e8c0d69681447fbe347c8dae2b1bef"
   image_uuid              = "93005c8a2a314a489635eca8c30794d4"
 }
 

zstack/provider/resource_zstack_disk_offering.go

@@ -25,11 +25,11 @@ type diskOfferingResource struct {
 }
 
 type diskOfferingResourceModel struct {
-	Name              types.String `tfsdk:"name"`
-	Uuid              types.String `tfsdk:"uuid"`
-	Description       types.String `tfsdk:"description"`
-	DiskSize          types.Int64  `tfsdk:"disk_size"`
-	AllocatorStrategy types.String `tfsdk:"allocator_strategy"` // Allocation strategy
+	Name        types.String `tfsdk:"name"`
+	Uuid        types.String `tfsdk:"uuid"`
+	Description types.String `tfsdk:"description"`
+	DiskSize    types.Int64  `tfsdk:"disk_size"`
+	//AllocatorStrategy types.String `tfsdk:"allocator_strategy"` // Allocation strategy
 }
 
 // Configure implements resource.ResourceWithConfigure.
@@ -67,10 +67,10 @@ func (r *diskOfferingResource) Create(ctx context.Context, req resource.CreateRe
 	offerParam := param.CreateDiskOfferingParam{
 		BaseParam: param.BaseParam{},
 		Params: param.CreateDiskOfferingDetailParam{
-			Name:              plan.Name.ValueString(),
-			Description:       plan.Description.ValueStringPointer(),
-			DiskSize:          diskSizeBytes,
-			AllocatorStrategy: plan.AllocatorStrategy.ValueStringPointer(),
+			Name:        plan.Name.ValueString(),
+			Description: plan.Description.ValueStringPointer(),
+			DiskSize:    diskSizeBytes,
+			//AllocatorStrategy: plan.AllocatorStrategy.ValueStringPointer(),
 		},
 	}
 
@@ -87,7 +87,7 @@ func (r *diskOfferingResource) Create(ctx context.Context, req resource.CreateRe
 	plan.Name = types.StringValue(disk_offer.Name)
 	plan.Description = types.StringValue(disk_offer.Description)
 	plan.DiskSize = types.Int64Value(utils.BytesToGB(int64(disk_offer.DiskSize)))
-	plan.AllocatorStrategy = types.StringValue(disk_offer.AllocatorStrategy)
+	//	plan.AllocatorStrategy = types.StringValue(disk_offer.AllocatorStrategy)
 
 	diags = resp.State.Set(ctx, plan)
 	resp.Diagnostics.Append(diags...)
@@ -143,7 +143,7 @@ func (r *diskOfferingResource) Read(ctx context.Context, req resource.ReadReques
 	state.Description = types.StringValue(disk_offer.Description)
 	state.Name = types.StringValue(disk_offer.Name)
 	state.DiskSize = types.Int64Value(utils.BytesToGB(int64(disk_offer.DiskSize)))
-	state.AllocatorStrategy = types.StringValue(disk_offer.AllocatorStrategy)
+	//state.AllocatorStrategy = types.StringValue(disk_offer.AllocatorStrategy)
 
 	diags = resp.State.Set(ctx, &state)
 	resp.Diagnostics.Append(diags...)
@@ -176,11 +176,13 @@ func (r *diskOfferingResource) Schema(_ context.Context, req resource.SchemaRequ
 				Required:    true,
 				Description: "The amount of disk size allocated to the disk offering. This is a mandatory field, in gigabytes (GB).",
 			},
-			"allocator_strategy": schema.StringAttribute{
-				Optional:    true,
-				Computed:    true,
-				Description: "The type of the allocator_strategy. ",
-			},
+			/*
+				"allocator_strategy": schema.StringAttribute{
+					Optional:    true,
+					Computed:    true,
+					Description: "The type of the allocator_strategy. ",
+				},
+			*/
 		},
 	}
 }

zstack/provider/resource_zstack_virtual_router_offering.go

@@ -31,6 +31,7 @@ type virtualRouterOfferingResourceModel struct {
 	CpuNum                types.Int64  `tfsdk:"cpu_num"`
 	MemorySize            types.Int64  `tfsdk:"memory_size"`
 	ManagementNetworkUuid types.String `tfsdk:"management_network_uuid"`
+	PublicNetworkUuid     types.String `tfsdk:"public_network_uuid"`
 	ZoneUuid              types.String `tfsdk:"zone_uuid"`
 	ImageUuid             types.String `tfsdk:"image_uuid"`
 	IsDefault             types.Bool   `tfsdk:"is_default"`
@@ -77,6 +78,7 @@ func (r *virtualRouterOfferingResource) Create(ctx context.Context, req resource
 			CpuNum:                int(plan.CpuNum.ValueInt64()),
 			MemorySize:            utils.MBToBytes(plan.MemorySize.ValueInt64()), //plan.MemorySize.ValueInt64(),
 			ManagementNetworkUuid: plan.ManagementNetworkUuid.ValueString(),
+			PublicNetworkUuid:     plan.PublicNetworkUuid.ValueString(),
 			ZoneUuid:              plan.ZoneUuid.ValueString(),
 			ImageUuid:             plan.ImageUuid.ValueString(),
 			IsDefault:             bool(plan.IsDefault.ValueBool()),
@@ -205,6 +207,10 @@ func (r *virtualRouterOfferingResource) Schema(_ context.Context, req resource.S
 				Required:    true,
 				Description: "The UUID of the management network associated with the virtual router offering. This is a mandatory field.",
 			},
+			"public_network_uuid": schema.StringAttribute{
+				Required:    true,
+				Description: "The UUID of the public network associated with the virtual router offering. If not specified, it will share the same network UUID as the management network or vice versa, depending on the configuration.",
+			},
 			"zone_uuid": schema.StringAttribute{
 				Required:    true,
 				Description: "The UUID of the zone where the virtual router offering is deployed. This is a mandatory field.",