Fixing up some tests after a couple of thorough test rounds
This commit is contained in:
parent
1411d4010f
commit
44541c5465
|
@ -63,16 +63,18 @@ func testAccPreCheck(t *testing.T) {
|
||||||
}
|
}
|
||||||
|
|
||||||
// SET THESE VALUES IN ORDER TO RUN THE ACC TESTS!!
|
// SET THESE VALUES IN ORDER TO RUN THE ACC TESTS!!
|
||||||
|
var CLOUDSTACK_2ND_NIC_IPADDRESS = ""
|
||||||
|
var CLOUDSTACK_2ND_NIC_NETWORK = ""
|
||||||
var CLOUDSTACK_DISK_OFFERING_1 = ""
|
var CLOUDSTACK_DISK_OFFERING_1 = ""
|
||||||
var CLOUDSTACK_DISK_OFFERING_2 = ""
|
var CLOUDSTACK_DISK_OFFERING_2 = ""
|
||||||
var CLOUDSTACK_HYPERVISOR = ""
|
var CLOUDSTACK_HYPERVISOR = ""
|
||||||
var CLOUDSTACK_SERVICE_OFFERING_1 = ""
|
var CLOUDSTACK_SERVICE_OFFERING_1 = ""
|
||||||
var CLOUDSTACK_SERVICE_OFFERING_2 = ""
|
var CLOUDSTACK_SERVICE_OFFERING_2 = ""
|
||||||
var CLOUDSTACK_NETWORK_1 = ""
|
var CLOUDSTACK_NETWORK_1 = ""
|
||||||
var CLOUDSTACK_NETWORK_1_CIDR = ""
|
|
||||||
var CLOUDSTACK_NETWORK_1_OFFERING = ""
|
|
||||||
var CLOUDSTACK_NETWORK_1_IPADDRESS = ""
|
var CLOUDSTACK_NETWORK_1_IPADDRESS = ""
|
||||||
var CLOUDSTACK_NETWORK_2 = ""
|
var CLOUDSTACK_NETWORK_2 = ""
|
||||||
|
var CLOUDSTACK_NETWORK_2_CIDR = ""
|
||||||
|
var CLOUDSTACK_NETWORK_2_OFFERING = ""
|
||||||
var CLOUDSTACK_NETWORK_2_IPADDRESS = ""
|
var CLOUDSTACK_NETWORK_2_IPADDRESS = ""
|
||||||
var CLOUDSTACK_VPC_CIDR_1 = ""
|
var CLOUDSTACK_VPC_CIDR_1 = ""
|
||||||
var CLOUDSTACK_VPC_CIDR_2 = ""
|
var CLOUDSTACK_VPC_CIDR_2 = ""
|
||||||
|
|
|
@ -227,7 +227,7 @@ resource "cloudstack_vpc" "foobar" {
|
||||||
resource "cloudstack_network_acl" "foo" {
|
resource "cloudstack_network_acl" "foo" {
|
||||||
name = "terraform-acl"
|
name = "terraform-acl"
|
||||||
description = "terraform-acl-text"
|
description = "terraform-acl-text"
|
||||||
vpc = "${cloudstack_vpc.foobar.name}"
|
vpc = "${cloudstack_vpc.foobar.id}"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_network_acl_rule" "foo" {
|
resource "cloudstack_network_acl_rule" "foo" {
|
||||||
|
|
|
@ -29,7 +29,7 @@ func TestAccCloudStackNetwork_basic(t *testing.T) {
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
func TestAccCloudStackNetwork_vpcACL(t *testing.T) {
|
func TestAccCloudStackNetwork_vpc(t *testing.T) {
|
||||||
var network cloudstack.Network
|
var network cloudstack.Network
|
||||||
|
|
||||||
resource.Test(t, resource.TestCase{
|
resource.Test(t, resource.TestCase{
|
||||||
|
@ -38,11 +38,11 @@ func TestAccCloudStackNetwork_vpcACL(t *testing.T) {
|
||||||
CheckDestroy: testAccCheckCloudStackNetworkDestroy,
|
CheckDestroy: testAccCheckCloudStackNetworkDestroy,
|
||||||
Steps: []resource.TestStep{
|
Steps: []resource.TestStep{
|
||||||
resource.TestStep{
|
resource.TestStep{
|
||||||
Config: testAccCloudStackNetwork_vpcACL,
|
Config: testAccCloudStackNetwork_vpc,
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckCloudStackNetworkExists(
|
testAccCheckCloudStackNetworkExists(
|
||||||
"cloudstack_network.foo", &network),
|
"cloudstack_network.foo", &network),
|
||||||
testAccCheckCloudStackNetworkVPCACLAttributes(&network),
|
testAccCheckCloudStackNetworkVPCAttributes(&network),
|
||||||
resource.TestCheckResourceAttr(
|
resource.TestCheckResourceAttr(
|
||||||
"cloudstack_network.foo", "vpc", "terraform-vpc"),
|
"cloudstack_network.foo", "vpc", "terraform-vpc"),
|
||||||
),
|
),
|
||||||
|
@ -92,11 +92,11 @@ func testAccCheckCloudStackNetworkBasicAttributes(
|
||||||
return fmt.Errorf("Bad display name: %s", network.Displaytext)
|
return fmt.Errorf("Bad display name: %s", network.Displaytext)
|
||||||
}
|
}
|
||||||
|
|
||||||
if network.Cidr != CLOUDSTACK_NETWORK_1_CIDR {
|
if network.Cidr != CLOUDSTACK_NETWORK_2_CIDR {
|
||||||
return fmt.Errorf("Bad service offering: %s", network.Cidr)
|
return fmt.Errorf("Bad service offering: %s", network.Cidr)
|
||||||
}
|
}
|
||||||
|
|
||||||
if network.Networkofferingname != CLOUDSTACK_NETWORK_1_OFFERING {
|
if network.Networkofferingname != CLOUDSTACK_NETWORK_2_OFFERING {
|
||||||
return fmt.Errorf("Bad template: %s", network.Networkofferingname)
|
return fmt.Errorf("Bad template: %s", network.Networkofferingname)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -104,7 +104,7 @@ func testAccCheckCloudStackNetworkBasicAttributes(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func testAccCheckCloudStackNetworkVPCACLAttributes(
|
func testAccCheckCloudStackNetworkVPCAttributes(
|
||||||
network *cloudstack.Network) resource.TestCheckFunc {
|
network *cloudstack.Network) resource.TestCheckFunc {
|
||||||
return func(s *terraform.State) error {
|
return func(s *terraform.State) error {
|
||||||
|
|
||||||
|
@ -117,11 +117,11 @@ func testAccCheckCloudStackNetworkVPCACLAttributes(
|
||||||
}
|
}
|
||||||
|
|
||||||
if network.Cidr != CLOUDSTACK_VPC_NETWORK_CIDR {
|
if network.Cidr != CLOUDSTACK_VPC_NETWORK_CIDR {
|
||||||
return fmt.Errorf("Bad service offering: %s", network.Cidr)
|
return fmt.Errorf("Bad CIDR: %s", network.Cidr)
|
||||||
}
|
}
|
||||||
|
|
||||||
if network.Networkofferingname != CLOUDSTACK_VPC_NETWORK_OFFERING {
|
if network.Networkofferingname != CLOUDSTACK_VPC_NETWORK_OFFERING {
|
||||||
return fmt.Errorf("Bad template: %s", network.Networkofferingname)
|
return fmt.Errorf("Bad network offering: %s", network.Networkofferingname)
|
||||||
}
|
}
|
||||||
|
|
||||||
return nil
|
return nil
|
||||||
|
@ -160,11 +160,11 @@ resource "cloudstack_network" "foo" {
|
||||||
network_offering = "%s"
|
network_offering = "%s"
|
||||||
zone = "%s"
|
zone = "%s"
|
||||||
}`,
|
}`,
|
||||||
CLOUDSTACK_NETWORK_1_CIDR,
|
CLOUDSTACK_NETWORK_2_CIDR,
|
||||||
CLOUDSTACK_NETWORK_1_OFFERING,
|
CLOUDSTACK_NETWORK_2_OFFERING,
|
||||||
CLOUDSTACK_ZONE)
|
CLOUDSTACK_ZONE)
|
||||||
|
|
||||||
var testAccCloudStackNetwork_vpcACL = fmt.Sprintf(`
|
var testAccCloudStackNetwork_vpc = fmt.Sprintf(`
|
||||||
resource "cloudstack_vpc" "foobar" {
|
resource "cloudstack_vpc" "foobar" {
|
||||||
name = "terraform-vpc"
|
name = "terraform-vpc"
|
||||||
cidr = "%s"
|
cidr = "%s"
|
||||||
|
@ -172,18 +172,11 @@ resource "cloudstack_vpc" "foobar" {
|
||||||
zone = "%s"
|
zone = "%s"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_network_acl" "foo" {
|
|
||||||
name = "terraform-acl"
|
|
||||||
description = "terraform-acl-text"
|
|
||||||
vpc = "${cloudstack_vpc.foobar.name}"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "cloudstack_network" "foo" {
|
resource "cloudstack_network" "foo" {
|
||||||
name = "terraform-network"
|
name = "terraform-network"
|
||||||
cidr = "%s"
|
cidr = "%s"
|
||||||
network_offering = "%s"
|
network_offering = "%s"
|
||||||
vpc = "${cloudstack_vpc.foobar.name}"
|
vpc = "${cloudstack_vpc.foobar.name}"
|
||||||
aclid = "${cloudstack_network_acl.foo.id}"
|
|
||||||
zone = "${cloudstack_vpc.foobar.zone}"
|
zone = "${cloudstack_vpc.foobar.zone}"
|
||||||
}`,
|
}`,
|
||||||
CLOUDSTACK_VPC_CIDR_1,
|
CLOUDSTACK_VPC_CIDR_1,
|
||||||
|
|
|
@ -53,7 +53,7 @@ func TestAccCloudStackNIC_update(t *testing.T) {
|
||||||
"cloudstack_instance.foobar", "cloudstack_nic.foo", &nic),
|
"cloudstack_instance.foobar", "cloudstack_nic.foo", &nic),
|
||||||
testAccCheckCloudStackNICIPAddress(&nic),
|
testAccCheckCloudStackNICIPAddress(&nic),
|
||||||
resource.TestCheckResourceAttr(
|
resource.TestCheckResourceAttr(
|
||||||
"cloudstack_nic.foo", "ipaddress", CLOUDSTACK_NETWORK_2_IPADDRESS),
|
"cloudstack_nic.foo", "ipaddress", CLOUDSTACK_2ND_NIC_IPADDRESS),
|
||||||
),
|
),
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
@ -103,7 +103,7 @@ func testAccCheckCloudStackNICAttributes(
|
||||||
nic *cloudstack.Nic) resource.TestCheckFunc {
|
nic *cloudstack.Nic) resource.TestCheckFunc {
|
||||||
return func(s *terraform.State) error {
|
return func(s *terraform.State) error {
|
||||||
|
|
||||||
if nic.Networkname != CLOUDSTACK_NETWORK_2 {
|
if nic.Networkname != CLOUDSTACK_2ND_NIC_NETWORK {
|
||||||
return fmt.Errorf("Bad network: %s", nic.Networkname)
|
return fmt.Errorf("Bad network: %s", nic.Networkname)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -115,11 +115,11 @@ func testAccCheckCloudStackNICIPAddress(
|
||||||
nic *cloudstack.Nic) resource.TestCheckFunc {
|
nic *cloudstack.Nic) resource.TestCheckFunc {
|
||||||
return func(s *terraform.State) error {
|
return func(s *terraform.State) error {
|
||||||
|
|
||||||
if nic.Networkname != CLOUDSTACK_NETWORK_2 {
|
if nic.Networkname != CLOUDSTACK_2ND_NIC_NETWORK {
|
||||||
return fmt.Errorf("Bad network: %s", nic.Networkname)
|
return fmt.Errorf("Bad network: %s", nic.Networkname)
|
||||||
}
|
}
|
||||||
|
|
||||||
if nic.Ipaddress != CLOUDSTACK_NETWORK_2_IPADDRESS {
|
if nic.Ipaddress != CLOUDSTACK_2ND_NIC_IPADDRESS {
|
||||||
return fmt.Errorf("Bad IP address: %s", nic.Ipaddress)
|
return fmt.Errorf("Bad IP address: %s", nic.Ipaddress)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -172,7 +172,7 @@ resource "cloudstack_nic" "foo" {
|
||||||
CLOUDSTACK_NETWORK_1,
|
CLOUDSTACK_NETWORK_1,
|
||||||
CLOUDSTACK_TEMPLATE,
|
CLOUDSTACK_TEMPLATE,
|
||||||
CLOUDSTACK_ZONE,
|
CLOUDSTACK_ZONE,
|
||||||
CLOUDSTACK_NETWORK_2)
|
CLOUDSTACK_2ND_NIC_NETWORK)
|
||||||
|
|
||||||
var testAccCloudStackNIC_ipaddress = fmt.Sprintf(`
|
var testAccCloudStackNIC_ipaddress = fmt.Sprintf(`
|
||||||
resource "cloudstack_instance" "foobar" {
|
resource "cloudstack_instance" "foobar" {
|
||||||
|
@ -194,5 +194,5 @@ resource "cloudstack_nic" "foo" {
|
||||||
CLOUDSTACK_NETWORK_1,
|
CLOUDSTACK_NETWORK_1,
|
||||||
CLOUDSTACK_TEMPLATE,
|
CLOUDSTACK_TEMPLATE,
|
||||||
CLOUDSTACK_ZONE,
|
CLOUDSTACK_ZONE,
|
||||||
CLOUDSTACK_NETWORK_2,
|
CLOUDSTACK_2ND_NIC_NETWORK,
|
||||||
CLOUDSTACK_NETWORK_2_IPADDRESS)
|
CLOUDSTACK_2ND_NIC_IPADDRESS)
|
||||||
|
|
|
@ -204,7 +204,6 @@ resource "cloudstack_port_forward" "foo" {
|
||||||
public_port = 8080
|
public_port = 8080
|
||||||
virtual_machine = "${cloudstack_instance.foobar.name}"
|
virtual_machine = "${cloudstack_instance.foobar.name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
}`,
|
}`,
|
||||||
CLOUDSTACK_SERVICE_OFFERING_1,
|
CLOUDSTACK_SERVICE_OFFERING_1,
|
||||||
CLOUDSTACK_NETWORK_1,
|
CLOUDSTACK_NETWORK_1,
|
||||||
|
|
|
@ -106,6 +106,10 @@ func resourceCloudStackTemplate() *schema.Resource {
|
||||||
func resourceCloudStackTemplateCreate(d *schema.ResourceData, meta interface{}) error {
|
func resourceCloudStackTemplateCreate(d *schema.ResourceData, meta interface{}) error {
|
||||||
cs := meta.(*cloudstack.CloudStackClient)
|
cs := meta.(*cloudstack.CloudStackClient)
|
||||||
|
|
||||||
|
if err := verifyTemplateParams(d); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
|
||||||
name := d.Get("name").(string)
|
name := d.Get("name").(string)
|
||||||
|
|
||||||
// Compute/set the display text
|
// Compute/set the display text
|
||||||
|
@ -169,6 +173,10 @@ func resourceCloudStackTemplateCreate(d *schema.ResourceData, meta interface{})
|
||||||
currentTime := time.Now().Unix()
|
currentTime := time.Now().Unix()
|
||||||
timeout := int64(d.Get("is_ready_timeout").(int))
|
timeout := int64(d.Get("is_ready_timeout").(int))
|
||||||
for {
|
for {
|
||||||
|
// Start with the sleep so the register action has a few seconds
|
||||||
|
// to process the registration correctly. Without this wait
|
||||||
|
time.Sleep(10 * time.Second)
|
||||||
|
|
||||||
err := resourceCloudStackTemplateRead(d, meta)
|
err := resourceCloudStackTemplateRead(d, meta)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
|
@ -181,7 +189,6 @@ func resourceCloudStackTemplateCreate(d *schema.ResourceData, meta interface{})
|
||||||
if time.Now().Unix()-currentTime > timeout {
|
if time.Now().Unix()-currentTime > timeout {
|
||||||
return fmt.Errorf("Timeout while waiting for template to become ready")
|
return fmt.Errorf("Timeout while waiting for template to become ready")
|
||||||
}
|
}
|
||||||
time.Sleep(5 * time.Second)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -282,3 +289,13 @@ func resourceCloudStackTemplateDelete(d *schema.ResourceData, meta interface{})
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func verifyTemplateParams(d *schema.ResourceData) error {
|
||||||
|
format := d.Get("format").(string)
|
||||||
|
if format != "QCOW2" && format != "RAW" && format != "VHD" && format != "VMDK" {
|
||||||
|
return fmt.Errorf(
|
||||||
|
"%s is not a valid format. Valid options are 'QCOW2', 'RAW', 'VHD' and 'VMDK'", format)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
|
|
@ -100,39 +100,39 @@ resource "cloudstack_vpc" "bar" {
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_gateway" "foo" {
|
resource "cloudstack_vpn_gateway" "foo" {
|
||||||
vpc = "${cloudstack_vpc.foo.name}"
|
vpc = "${cloudstack_vpc.foo.name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_gateway" "bar" {
|
resource "cloudstack_vpn_gateway" "bar" {
|
||||||
vpc = "${cloudstack_vpc.bar.name}"
|
vpc = "${cloudstack_vpc.bar.name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_customer_gateway" "foo" {
|
resource "cloudstack_vpn_customer_gateway" "foo" {
|
||||||
name = "terraform-foo"
|
name = "terraform-foo"
|
||||||
cidr = "${cloudstack_vpc.foo.cidr}"
|
cidr = "${cloudstack_vpc.foo.cidr}"
|
||||||
esp_policy = "aes256-sha1"
|
esp_policy = "aes256-sha1"
|
||||||
gateway = "${cloudstack_vpn_gateway.foo.public_ip}"
|
gateway = "${cloudstack_vpn_gateway.foo.public_ip}"
|
||||||
ike_policy = "aes256-sha1"
|
ike_policy = "aes256-sha1"
|
||||||
ipsec_psk = "terraform"
|
ipsec_psk = "terraform"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_customer_gateway" "bar" {
|
resource "cloudstack_vpn_customer_gateway" "bar" {
|
||||||
name = "terraform-bar"
|
name = "terraform-bar"
|
||||||
cidr = "${cloudstack_vpc.bar.cidr}"
|
cidr = "${cloudstack_vpc.bar.cidr}"
|
||||||
esp_policy = "aes256-sha1"
|
esp_policy = "aes256-sha1"
|
||||||
gateway = "${cloudstack_vpn_gateway.bar.public_ip}"
|
gateway = "${cloudstack_vpn_gateway.bar.public_ip}"
|
||||||
ike_policy = "aes256-sha1"
|
ike_policy = "aes256-sha1"
|
||||||
ipsec_psk = "terraform"
|
ipsec_psk = "terraform"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_connection" "foo-bar" {
|
resource "cloudstack_vpn_connection" "foo-bar" {
|
||||||
customergatewayid = "${cloudstack_vpn_customer_gateway.foo.id}"
|
customergatewayid = "${cloudstack_vpn_customer_gateway.foo.id}"
|
||||||
vpngatewayid = "${cloudstack_vpn_gateway.bar.id}"
|
vpngatewayid = "${cloudstack_vpn_gateway.bar.id}"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_connection" "bar-foo" {
|
resource "cloudstack_vpn_connection" "bar-foo" {
|
||||||
customergatewayid = "${cloudstack_vpn_customer_gateway.bar.id}"
|
customergatewayid = "${cloudstack_vpn_customer_gateway.bar.id}"
|
||||||
vpngatewayid = "${cloudstack_vpn_gateway.foo.id}"
|
vpngatewayid = "${cloudstack_vpn_gateway.foo.id}"
|
||||||
}`,
|
}`,
|
||||||
CLOUDSTACK_VPC_CIDR_1,
|
CLOUDSTACK_VPC_CIDR_1,
|
||||||
CLOUDSTACK_VPC_OFFERING,
|
CLOUDSTACK_VPC_OFFERING,
|
||||||
|
|
|
@ -67,7 +67,7 @@ func TestAccCloudStackVPNCustomerGateway_update(t *testing.T) {
|
||||||
Check: resource.ComposeTestCheckFunc(
|
Check: resource.ComposeTestCheckFunc(
|
||||||
testAccCheckCloudStackVPNCustomerGatewayExists(
|
testAccCheckCloudStackVPNCustomerGatewayExists(
|
||||||
"cloudstack_vpn_customer_gateway.foo", &vpnCustomerGateway),
|
"cloudstack_vpn_customer_gateway.foo", &vpnCustomerGateway),
|
||||||
testAccCheckCloudStackVPNCustomerGatewayAttributes(&vpnCustomerGateway),
|
testAccCheckCloudStackVPNCustomerGatewayUpdatedAttributes(&vpnCustomerGateway),
|
||||||
resource.TestCheckResourceAttr(
|
resource.TestCheckResourceAttr(
|
||||||
"cloudstack_vpn_customer_gateway.foo", "name", "terraform-foo-bar"),
|
"cloudstack_vpn_customer_gateway.foo", "name", "terraform-foo-bar"),
|
||||||
resource.TestCheckResourceAttr(
|
resource.TestCheckResourceAttr(
|
||||||
|
@ -131,6 +131,26 @@ func testAccCheckCloudStackVPNCustomerGatewayAttributes(
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func testAccCheckCloudStackVPNCustomerGatewayUpdatedAttributes(
|
||||||
|
vpnCustomerGateway *cloudstack.VpnCustomerGateway) resource.TestCheckFunc {
|
||||||
|
return func(s *terraform.State) error {
|
||||||
|
|
||||||
|
if vpnCustomerGateway.Esppolicy != "3des-md5" {
|
||||||
|
return fmt.Errorf("Bad ESP policy: %s", vpnCustomerGateway.Esppolicy)
|
||||||
|
}
|
||||||
|
|
||||||
|
if vpnCustomerGateway.Ikepolicy != "3des-md5" {
|
||||||
|
return fmt.Errorf("Bad IKE policy: %s", vpnCustomerGateway.Ikepolicy)
|
||||||
|
}
|
||||||
|
|
||||||
|
if vpnCustomerGateway.Ipsecpsk != "terraform" {
|
||||||
|
return fmt.Errorf("Bad IPSEC pre-shared key: %s", vpnCustomerGateway.Ipsecpsk)
|
||||||
|
}
|
||||||
|
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func testAccCheckCloudStackVPNCustomerGatewayDestroy(s *terraform.State) error {
|
func testAccCheckCloudStackVPNCustomerGatewayDestroy(s *terraform.State) error {
|
||||||
cs := testAccProvider.Meta().(*cloudstack.CloudStackClient)
|
cs := testAccProvider.Meta().(*cloudstack.CloudStackClient)
|
||||||
|
|
||||||
|
@ -157,6 +177,53 @@ func testAccCheckCloudStackVPNCustomerGatewayDestroy(s *terraform.State) error {
|
||||||
}
|
}
|
||||||
|
|
||||||
var testAccCloudStackVPNCustomerGateway_basic = fmt.Sprintf(`
|
var testAccCloudStackVPNCustomerGateway_basic = fmt.Sprintf(`
|
||||||
|
resource "cloudstack_vpc" "foo" {
|
||||||
|
name = "terraform-vpc-foo"
|
||||||
|
cidr = "%s"
|
||||||
|
vpc_offering = "%s"
|
||||||
|
zone = "%s"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "cloudstack_vpc" "bar" {
|
||||||
|
name = "terraform-vpc-bar"
|
||||||
|
cidr = "%s"
|
||||||
|
vpc_offering = "%s"
|
||||||
|
zone = "%s"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "cloudstack_vpn_gateway" "foo" {
|
||||||
|
vpc = "${cloudstack_vpc.foo.name}"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "cloudstack_vpn_gateway" "bar" {
|
||||||
|
vpc = "${cloudstack_vpc.bar.name}"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "cloudstack_vpn_customer_gateway" "foo" {
|
||||||
|
name = "terraform-foo"
|
||||||
|
cidr = "${cloudstack_vpc.foo.cidr}"
|
||||||
|
esp_policy = "aes256-sha1"
|
||||||
|
gateway = "${cloudstack_vpn_gateway.foo.public_ip}"
|
||||||
|
ike_policy = "aes256-sha1"
|
||||||
|
ipsec_psk = "terraform"
|
||||||
|
}
|
||||||
|
|
||||||
|
resource "cloudstack_vpn_customer_gateway" "bar" {
|
||||||
|
name = "terraform-bar"
|
||||||
|
cidr = "${cloudstack_vpc.bar.cidr}"
|
||||||
|
esp_policy = "aes256-sha1"
|
||||||
|
gateway = "${cloudstack_vpn_gateway.bar.public_ip}"
|
||||||
|
ike_policy = "aes256-sha1"
|
||||||
|
ipsec_psk = "terraform"
|
||||||
|
}`,
|
||||||
|
CLOUDSTACK_VPC_CIDR_1,
|
||||||
|
CLOUDSTACK_VPC_OFFERING,
|
||||||
|
CLOUDSTACK_ZONE,
|
||||||
|
CLOUDSTACK_VPC_CIDR_2,
|
||||||
|
CLOUDSTACK_VPC_OFFERING,
|
||||||
|
CLOUDSTACK_ZONE)
|
||||||
|
|
||||||
|
var testAccCloudStackVPNCustomerGateway_update = fmt.Sprintf(`
|
||||||
resource "cloudstack_vpc" "foo" {
|
resource "cloudstack_vpc" "foo" {
|
||||||
name = "terraform-vpc-foo"
|
name = "terraform-vpc-foo"
|
||||||
cidr = "%s"
|
cidr = "%s"
|
||||||
|
@ -172,29 +239,29 @@ resource "cloudstack_vpc" "bar" {
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_gateway" "foo" {
|
resource "cloudstack_vpn_gateway" "foo" {
|
||||||
vpc = "${cloudstack_vpc.foo.name}"
|
vpc = "${cloudstack_vpc.foo.name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_gateway" "bar" {
|
resource "cloudstack_vpn_gateway" "bar" {
|
||||||
vpc = "${cloudstack_vpc.bar.name}"
|
vpc = "${cloudstack_vpc.bar.name}"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_customer_gateway" "foo" {
|
resource "cloudstack_vpn_customer_gateway" "foo" {
|
||||||
name = "terraform-foo"
|
name = "terraform-foo-bar"
|
||||||
cidr = "${cloudstack_vpc.foo.cidr}"
|
cidr = "${cloudstack_vpc.foo.cidr}"
|
||||||
esp_policy = "aes256-sha1"
|
esp_policy = "3des-md5"
|
||||||
gateway = "${cloudstack_vpn_gateway.foo.public_ip}"
|
gateway = "${cloudstack_vpn_gateway.foo.public_ip}"
|
||||||
ike_policy = "aes256-sha1"
|
ike_policy = "3des-md5"
|
||||||
ipsec_psk = "terraform"
|
ipsec_psk = "terraform"
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_customer_gateway" "bar" {
|
resource "cloudstack_vpn_customer_gateway" "bar" {
|
||||||
name = "terraform-bar"
|
name = "terraform-bar-foo"
|
||||||
cidr = "${cloudstack_vpc.bar.cidr}"
|
cidr = "${cloudstack_vpc.bar.cidr}"
|
||||||
esp_policy = "aes256-sha1"
|
esp_policy = "3des-md5"
|
||||||
gateway = "${cloudstack_vpn_gateway.bar.public_ip}"
|
gateway = "${cloudstack_vpn_gateway.bar.public_ip}"
|
||||||
ike_policy = "aes256-sha1"
|
ike_policy = "3des-md5"
|
||||||
ipsec_psk = "terraform"
|
ipsec_psk = "terraform"
|
||||||
}`,
|
}`,
|
||||||
CLOUDSTACK_VPC_CIDR_1,
|
CLOUDSTACK_VPC_CIDR_1,
|
||||||
CLOUDSTACK_VPC_OFFERING,
|
CLOUDSTACK_VPC_OFFERING,
|
||||||
|
@ -202,22 +269,3 @@ resource "cloudstack_vpn_customer_gateway" "bar" {
|
||||||
CLOUDSTACK_VPC_CIDR_2,
|
CLOUDSTACK_VPC_CIDR_2,
|
||||||
CLOUDSTACK_VPC_OFFERING,
|
CLOUDSTACK_VPC_OFFERING,
|
||||||
CLOUDSTACK_ZONE)
|
CLOUDSTACK_ZONE)
|
||||||
|
|
||||||
var testAccCloudStackVPNCustomerGateway_update = fmt.Sprintf(`
|
|
||||||
resource "cloudstack_vpn_customer_gateway" "foo" {
|
|
||||||
name = "terraform-foo-bar"
|
|
||||||
cidr = "${cloudstack_vpc.foo.cidr}"
|
|
||||||
esp_policy = "3des-md5"
|
|
||||||
gateway = "${cloudstack_vpn_gateway.foo.public_ip}"
|
|
||||||
ike_policy = "3des-md5"
|
|
||||||
ipsec_psk = "terraform"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "cloudstack_vpn_customer_gateway" "bar" {
|
|
||||||
name = "terraform-bar-foo"
|
|
||||||
cidr = "${cloudstack_vpc.bar.cidr}"
|
|
||||||
esp_policy = "3des-md5"
|
|
||||||
gateway = "${cloudstack_vpn_gateway.bar.public_ip}"
|
|
||||||
ike_policy = "3des-md5"
|
|
||||||
ipsec_psk = "terraform"
|
|
||||||
}`)
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ resource "cloudstack_vpc" "foo" {
|
||||||
}
|
}
|
||||||
|
|
||||||
resource "cloudstack_vpn_gateway" "foo" {
|
resource "cloudstack_vpn_gateway" "foo" {
|
||||||
vpc = "${cloudstack_vpc.foo.name}"
|
vpc = "${cloudstack_vpc.foo.name}"
|
||||||
}`,
|
}`,
|
||||||
CLOUDSTACK_VPC_CIDR_1,
|
CLOUDSTACK_VPC_CIDR_1,
|
||||||
CLOUDSTACK_VPC_OFFERING,
|
CLOUDSTACK_VPC_OFFERING,
|
||||||
|
|
Loading…
Reference in New Issue