resilien
/
terraform
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

provider/openstack: fix test formatting

This commit is contained in:
Joe Topjian 2015-11-06 17:27:18 +00:00
parent 7675246ccc
commit 4c1083c9c5
2 changed files with 47 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
builtin/providers/openstack/resource_openstack_networking_network_v2_test.go
View File

@ -117,54 +117,53 @@ func TestAccNetworkingV2Network_fullstack(t *testing.T) {
var subnet subnets.Subnet var subnet subnets.Subnet
var testAccNetworkingV2Network_fullstack = fmt.Sprintf(` var testAccNetworkingV2Network_fullstack = fmt.Sprintf(`
resource "openstack_networking_network_v2" "foo" { resource "openstack_networking_network_v2" "foo" {
region = "%s" region = "%s"
name = "network_1" name = "network_1"
admin_state_up = "true" admin_state_up = "true"
} }
resource "openstack_networking_subnet_v2" "foo" { resource "openstack_networking_subnet_v2" "foo" {
region = "%s" region = "%s"
name = "subnet_1" name = "subnet_1"
network_id = "${openstack_networking_network_v2.foo.id}" network_id = "${openstack_networking_network_v2.foo.id}"
cidr = "192.168.199.0/24" cidr = "192.168.199.0/24"
ip_version = 4 ip_version = 4
} }
resource "openstack_compute_secgroup_v2" "foo" { resource "openstack_compute_secgroup_v2" "foo" {
region = "%s" region = "%s"
name = "secgroup_1" name = "secgroup_1"
description = "a security group" description = "a security group"
rule { rule {
from_port = 22 from_port = 22
to_port = 22 to_port = 22
ip_protocol = "tcp" ip_protocol = "tcp"
cidr = "0.0.0.0/0" cidr = "0.0.0.0/0"
} }
} }
resource "openstack_networking_port_v2" "foo" {
region = "%s"
name = "port_1"
network_id = "${openstack_networking_network_v2.foo.id}"
admin_state_up = "true"
security_groups = ["${openstack_compute_secgroup_v2.foo.id}"]
resource "openstack_networking_port_v2" "foo" {
region = "%s"
name = "port_1"
network_id = "${openstack_networking_network_v2.foo.id}"
admin_state_up = "true"
security_groups = ["${openstack_compute_secgroup_v2.foo.id}"]
fixed_ips { fixed_ips {
"subnet_id" = "${openstack_networking_subnet_v2.foo.id}" "subnet_id" = "${openstack_networking_subnet_v2.foo.id}"
"ip_address" = "192.168.199.23" "ip_address" = "192.168.199.23"
} }
} }
resource "openstack_compute_instance_v2" "foo" { resource "openstack_compute_instance_v2" "foo" {
region = "%s" region = "%s"
name = "terraform-test" name = "terraform-test"
security_groups = ["${openstack_compute_secgroup_v2.foo.name}"] security_groups = ["${openstack_compute_secgroup_v2.foo.name}"]
network { network {
port = "${openstack_networking_port_v2.foo.id}" port = "${openstack_networking_port_v2.foo.id}"
} }
}`, region, region, region, region, region) }`, region, region, region, region, region)
resource.Test(t, resource.TestCase{ resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) }, PreCheck: func() { testAccPreCheck(t) },

18
builtin/providers/openstack/resource_openstack_networking_port_v2_test.go
View File

@ -27,13 +27,13 @@ func TestAccNetworkingV2Port_basic(t *testing.T) {
admin_state_up = "true" admin_state_up = "true"
} }
resource "openstack_networking_subnet_v2" "foo" { resource "openstack_networking_subnet_v2" "foo" {
region = "%s" region = "%s"
name = "subnet_1" name = "subnet_1"
network_id = "${openstack_networking_network_v2.foo.id}" network_id = "${openstack_networking_network_v2.foo.id}"
cidr = "192.168.199.0/24" cidr = "192.168.199.0/24"
ip_version = 4 ip_version = 4
} }
resource "openstack_networking_port_v2" "foo" { resource "openstack_networking_port_v2" "foo" {
region = "%s" region = "%s"
@ -41,8 +41,8 @@ func TestAccNetworkingV2Port_basic(t *testing.T) {
network_id = "${openstack_networking_network_v2.foo.id}" network_id = "${openstack_networking_network_v2.foo.id}"
admin_state_up = "true" admin_state_up = "true"
fixed_ips { fixed_ips {
subnet_id = "${openstack_networking_subnet_v2.foo.id}" subnet_id = "${openstack_networking_subnet_v2.foo.id}"
ip_address = "192.168.199.23" ip_address = "192.168.199.23"
} }
}`, region, region, region) }`, region, region, region)