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

provider/openstack: More Import and Region Fixes (#10662) 

This has a few more import and region fixes from #10509
This commit is contained in:
Joe Topjian 2016-12-12 02:14:38 -07:00 committed by Paul Stack
parent ae002d99c4
commit fd40eb3421
2 changed files with 3 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,6 @@ package openstack
import (
"fmt"
"os"
"testing"
"github.com/hashicorp/terraform/helper/resource"
@ -41,21 +40,17 @@ func TestAccNetworkingV2Network_basic(t *testing.T) {
}
func TestAccNetworkingV2Network_netstack(t *testing.T) {
region := os.Getenv(OS_REGION_NAME)
var network networks.Network
var subnet subnets.Subnet
var router routers.Router
var testAccNetworkingV2Network_netstack = fmt.Sprintf(`
resource "openstack_networking_network_v2" "foo" {
region = "%s"
name = "network_1"
admin_state_up = "true"
}
resource "openstack_networking_subnet_v2" "foo" {
region = "%s"
name = "subnet_1"
network_id = "${openstack_networking_network_v2.foo.id}"
cidr = "192.168.10.0/24"
@ -63,15 +58,13 @@ func TestAccNetworkingV2Network_netstack(t *testing.T) {
}
resource "openstack_networking_router_v2" "foo" {
region = "%s"
name = "router_1"
}
resource "openstack_networking_router_interface_v2" "foo" {
region = "%s"
router_id = "${openstack_networking_router_v2.foo.id}"
subnet_id = "${openstack_networking_subnet_v2.foo.id}"
}`, region, region, region, region)
}`)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
@ -92,8 +85,6 @@ func TestAccNetworkingV2Network_netstack(t *testing.T) {
}
func TestAccNetworkingV2Network_fullstack(t *testing.T) {
region := os.Getenv(OS_REGION_NAME)
var instance servers.Server
var network networks.Network
var port ports.Port
@ -102,13 +93,11 @@ func TestAccNetworkingV2Network_fullstack(t *testing.T) {
var testAccNetworkingV2Network_fullstack = fmt.Sprintf(`
resource "openstack_networking_network_v2" "foo" {
region = "%s"
name = "network_1"
admin_state_up = "true"
}
resource "openstack_networking_subnet_v2" "foo" {
region = "%s"
name = "subnet_1"
network_id = "${openstack_networking_network_v2.foo.id}"
cidr = "192.168.199.0/24"
@ -116,7 +105,6 @@ func TestAccNetworkingV2Network_fullstack(t *testing.T) {
}
resource "openstack_compute_secgroup_v2" "foo" {
region = "%s"
name = "secgroup_1"
description = "a security group"
rule {
@ -128,7 +116,6 @@ func TestAccNetworkingV2Network_fullstack(t *testing.T) {
}
resource "openstack_networking_port_v2" "foo" {
region = "%s"
name = "port_1"
network_id = "${openstack_networking_network_v2.foo.id}"
admin_state_up = "true"
@ -140,14 +127,13 @@ func TestAccNetworkingV2Network_fullstack(t *testing.T) {
}
resource "openstack_compute_instance_v2" "foo" {
region = "%s"
name = "terraform-test"
security_groups = ["${openstack_compute_secgroup_v2.foo.name}"]
network {
port = "${openstack_networking_port_v2.foo.id}"
}
}`, region, region, region, region, region)
}`)
resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },

1
builtin/providers/openstack/resource_openstack_networking_subnet_v2.go
View File

@ -54,6 +54,7 @@ func resourceNetworkingSubnetV2() *schema.Resource {
Type: schema.TypeList,
Optional: true,
ForceNew: true,
Computed: true,
Elem: &schema.Resource{
Schema: map[string]*schema.Schema{
"start": &schema.Schema{