Skip to content

Commit ab7f1f2

Browse files
committed
resource/alicloud_vpn_gateway_vco_route: add new attribute overlay_mode.
1 parent c43df9a commit ab7f1f2

File tree

3 files changed

+39
-17
lines changed

3 files changed

+39
-17
lines changed

alicloud/resource_alicloud_vpn_gateway_vco_route.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,11 @@ func resourceAlicloudVpnGatewayVcoRoute() *schema.Resource {
5151
Required: true,
5252
ForceNew: true,
5353
},
54+
"overlay_mode": {
55+
Type: schema.TypeString,
56+
Optional: true,
57+
ForceNew: true,
58+
},
5459
},
5560
}
5661
}
@@ -69,6 +74,9 @@ func resourceAlicloudVpnGatewayVcoRouteCreate(d *schema.ResourceData, meta inter
6974
request["NextHop"] = d.Get("next_hop")
7075
request["RouteDest"] = d.Get("route_dest")
7176
request["VpnConnectionId"] = d.Get("vpn_connection_id")
77+
if v, ok := d.GetOk("overlay_mode"); ok {
78+
request["OverlayMode"] = v
79+
}
7280
request["ClientToken"] = buildClientToken("CreateVcoRouteEntry")
7381
runtime := util.RuntimeOptions{}
7482
runtime.SetAutoretry(true)

alicloud/resource_alicloud_vpn_gateway_vco_route_test.go

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@ func TestAccAlicloudVPNGatewayVcoRoute_basic0(t *testing.T) {
4646
"next_hop": "${alicloud_cen_transit_router_vpn_attachment.default.vpn_id}",
4747
"vpn_connection_id": "${alicloud_cen_transit_router_vpn_attachment.default.vpn_id}",
4848
"weight": "100",
49+
"overlay_mode": "Ipsec",
4950
}),
5051
Check: resource.ComposeTestCheckFunc(
5152
testAccCheck(map[string]string{
@@ -57,9 +58,10 @@ func TestAccAlicloudVPNGatewayVcoRoute_basic0(t *testing.T) {
5758
),
5859
},
5960
{
60-
ResourceName: resourceId,
61-
ImportState: true,
62-
ImportStateVerify: true,
61+
ResourceName: resourceId,
62+
ImportState: true,
63+
ImportStateVerify: true,
64+
ImportStateVerifyIgnore: []string{"overlay_mode"},
6365
},
6466
},
6567
})
@@ -82,6 +84,14 @@ resource "alicloud_cen_transit_router" "default" {
8284
transit_router_description = "desd"
8385
transit_router_name = var.name
8486
}
87+
resource "alicloud_cen_transit_router_cidr" "default" {
88+
transit_router_id = alicloud_cen_transit_router.default.transit_router_id
89+
cidr = "192.168.0.0/16"
90+
transit_router_cidr_name = var.name
91+
description = var.name
92+
publish_cidr_route = true
93+
}
94+
8595
data "alicloud_cen_transit_router_available_resources" "default" {}
8696
resource "alicloud_vpn_customer_gateway" "default" {
8797
name = "${var.name}"
@@ -135,7 +145,7 @@ resource "alicloud_cen_transit_router_vpn_attachment" "default" {
135145
transit_router_attachment_description = var.name
136146
transit_router_attachment_name = var.name
137147
cen_id = alicloud_cen_transit_router.default.cen_id
138-
transit_router_id = alicloud_cen_transit_router.default.transit_router_id
148+
transit_router_id = alicloud_cen_transit_router_cidr.default.transit_router_id
139149
vpn_id = alicloud_vpn_gateway_vpn_attachment.default.id
140150
zone {
141151
zone_id = data.alicloud_cen_transit_router_available_resources.default.resources.0.master_zones.0

website/docs/r/vpn_gateway_vco_route.html.markdown

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,21 @@ variable "name" {
3333
resource "alicloud_cen_instance" "default" {
3434
cen_instance_name = var.name
3535
}
36+
3637
resource "alicloud_cen_transit_router" "default" {
3738
cen_id = alicloud_cen_instance.default.id
38-
transit_router_description = "desd"
39+
transit_router_description = var.name
3940
transit_router_name = var.name
4041
}
42+
43+
resource "alicloud_cen_transit_router_cidr" "default" {
44+
transit_router_id = alicloud_cen_transit_router.default.transit_router_id
45+
cidr = "192.168.0.0/16"
46+
transit_router_cidr_name = var.name
47+
description = var.name
48+
publish_cidr_route = true
49+
}
50+
4151
data "alicloud_cen_transit_router_available_resources" "default" {}
4252
4353
resource "alicloud_vpn_customer_gateway" "default" {
@@ -46,6 +56,7 @@ resource "alicloud_vpn_customer_gateway" "default" {
4656
asn = "45014"
4757
description = var.name
4858
}
59+
4960
resource "alicloud_vpn_gateway_vpn_attachment" "default" {
5061
customer_gateway_id = alicloud_vpn_customer_gateway.default.id
5162
network_type = "public"
@@ -58,7 +69,7 @@ resource "alicloud_vpn_gateway_vpn_attachment" "default" {
5869
ike_version = "ikev2"
5970
ike_mode = "main"
6071
ike_lifetime = 86400
61-
psk = "tf-testvpn2"
72+
psk = "tf-examplevpn2"
6273
ike_pfs = "group1"
6374
remote_id = "testbob2"
6475
local_id = "testalice2"
@@ -87,15 +98,6 @@ resource "alicloud_vpn_gateway_vpn_attachment" "default" {
8798
enable_nat_traversal = true
8899
vpn_attachment_name = var.name
89100
}
90-
91-
resource "alicloud_cen_transit_router_cidr" "default" {
92-
transit_router_id = alicloud_cen_transit_router.default.transit_router_id
93-
cidr = "192.168.0.0/16"
94-
transit_router_cidr_name = var.name
95-
description = var.name
96-
publish_cidr_route = true
97-
}
98-
99101
resource "alicloud_cen_transit_router_vpn_attachment" "default" {
100102
auto_publish_route_enabled = false
101103
transit_router_attachment_description = var.name
@@ -108,11 +110,12 @@ resource "alicloud_cen_transit_router_vpn_attachment" "default" {
108110
}
109111
}
110112
113+
111114
resource "alicloud_vpn_gateway_vco_route" "default" {
112-
route_dest = "192.168.12.0/24"
113115
next_hop = alicloud_cen_transit_router_vpn_attachment.default.vpn_id
114116
vpn_connection_id = alicloud_cen_transit_router_vpn_attachment.default.vpn_id
115-
weight = 100
117+
weight = "100"
118+
route_dest = "192.168.10.0/24"
116119
}
117120
```
118121

@@ -124,6 +127,7 @@ The following arguments are supported:
124127
* `next_hop` - (Required, ForceNew) The next hop of the destination route.
125128
* `vpn_connection_id` - (Required, ForceNew) The id of the vpn attachment.
126129
* `route_dest` - (Required, ForceNew) The destination network segment of the destination route.
130+
* `overlay_mode` - (Optional, ForceNew, Available since v1.235.0) The tunneling protocol. Set the value to Ipsec, which specifies the IPsec tunneling protocol.
127131

128132
## Attributes Reference
129133

0 commit comments

Comments
 (0)