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

Remove region properties on acceptance tests

This commit is contained in:
Eric Bellemon 2015-02-09 23:55:21 +01:00 committed by Jon Perritt
parent e9abf04e4b
commit 9b30ef4eb2
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
builtin/providers/openstack/resource_openstack_networking_router_interface_v2_test.go
View File

@ -78,27 +78,23 @@ func testAccCheckNetworkingV2RouterInterfaceExists(t *testing.T, n string) resou
}
var testAccNetworkingV2RouterInterface_basic = fmt.Sprintf(`
resource "openstack_networking_router_v2" "router_1" {
name = "router_1"
region = "%s"
admin_state_up = "true"
}
resource "openstack_networking_router_v2" "router_1" {
name = "router_1"
admin_state_up = "true"
}
resource "openstack_networking_router_interface_v2" "int_1" {
subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
router_id = "${openstack_networking_router_v2.router_1.id}"
region = "%s"
}
resource "openstack_networking_router_interface_v2" "int_1" {
subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}"
router_id = "${openstack_networking_router_v2.router_1.id}"
}
resource "openstack_networking_network_v2" "network_1" {
region = "%s"
name = "network_1"
admin_state_up = "true"
}
resource "openstack_networking_network_v2" "network_1" {
name = "network_1"
admin_state_up = "true"
}
resource "openstack_networking_subnet_v2" "subnet_1" {
region = "%s"
network_id = "${openstack_networking_network_v2.network_1.id}"
cidr = "192.168.199.0/24"
ip_version = 4
}`, OS_REGION_NAME, OS_REGION_NAME, OS_REGION_NAME, OS_REGION_NAME)
resource "openstack_networking_subnet_v2" "subnet_1" {
network_id = "${openstack_networking_network_v2.network_1.id}"
cidr = "192.168.199.0/24"
ip_version = 4
}`)

20
builtin/providers/openstack/resource_openstack_networking_router_v2_test.go
View File

@ -88,17 +88,13 @@ func testAccCheckNetworkingV2RouterExists(t *testing.T, n string, router *router
}
var testAccNetworkingV2Router_basic = fmt.Sprintf(`
resource "openstack_networking_router_v2" "foo" {
name = "router"
region = "%s"
admin_state_up = "true"
}`,
OS_REGION_NAME)
resource "openstack_networking_router_v2" "foo" {
name = "router"
admin_state_up = "true"
}`)
var testAccNetworkingV2Router_update = fmt.Sprintf(`
resource "openstack_networking_router_v2" "foo" {
region = "%s"
name = "router_2"
admin_state_up = "true"
}`,
OS_REGION_NAME)
resource "openstack_networking_router_v2" "foo" {
name = "router_2"
admin_state_up = "true"
}`)