Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

provider/openstack Compute Network Refactor #1347

Merged
merged 14 commits into from
Apr 2, 2015
Merged

provider/openstack Compute Network Refactor #1347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
141b401
os-floating-ips support
jtopjian Apr 1, 2015
d768a01
Removes check for a "public" network
jtopjian Mar 21, 2015
b90a615
Renamed fixed_ip to fixed_ip_v4 and added fixed_ip_v6
jtopjian Mar 21, 2015
b160654
Allow networks to be specified by name
jtopjian Mar 21, 2015
ccba698
Network Read changes
jtopjian Mar 21, 2015
0d77232
Fixing computed parameters
jtopjian Mar 24, 2015
30b0fc7
Only attempt to get the MAC address if it exists.
jtopjian Mar 25, 2015
bb81228
typo with netname when no networks are specified
jtopjian Apr 1, 2015
67e33a7
Updated compute_instance acceptance tests for floating IPs
jtopjian Apr 1, 2015
4244d09
Making the network resource computable
jtopjian Apr 1, 2015
ef4e03a
Workaround for missing tenant-network
jtopjian Apr 1, 2015
99ac8b4
Compute Floating IP Test Update
jtopjian Apr 1, 2015
7ca97f4
Updating Floating IP acceptance tests
jtopjian Apr 1, 2015
1693767
Compute Instance basic acceptance test
jtopjian Apr 2, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions builtin/providers/openstack/provider_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,4 +63,9 @@ func testAccPreCheck(t *testing.T) {
if v1 == "" && v2 == "" {
t.Fatal("OS_FLAVOR_ID or OS_FLAVOR_NAME must be set for acceptance tests")
}

v = os.Getenv("OS_NETWORK_ID")
if v == "" {
t.Fatal("OS_NETWORK_ID must be set for acceptance tests")
}
}
41 changes: 36 additions & 5 deletions builtin/providers/openstack/resource_openstack_compute_floatingip_v2_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,14 @@ package openstack

import (
"fmt"
"os"
"testing"

"github.com/hashicorp/terraform/helper/resource"
"github.com/hashicorp/terraform/terraform"

"github.com/rackspace/gophercloud/openstack/compute/v2/extensions/floatingip"
"github.com/rackspace/gophercloud/openstack/compute/v2/servers"
)

func TestAccComputeV2FloatingIP_basic(t *testing.T) {
Expand All @@ -28,6 +30,40 @@ func TestAccComputeV2FloatingIP_basic(t *testing.T) {
})
}

func TestAccComputeV2FloatingIP_attach(t *testing.T) {
var instance servers.Server
var fip floatingip.FloatingIP
var testAccComputeV2FloatingIP_attach = fmt.Sprintf(`
resource "openstack_compute_floatingip_v2" "myip" {
}

resource "openstack_compute_instance_v2" "foo" {
name = "terraform-test"
floating_ip = "${openstack_compute_floatingip_v2.myip.address}"

network {
uuid = "%s"
}
}`,
os.Getenv("OS_NETWORK_ID"))

resource.Test(t, resource.TestCase{
PreCheck: func() { testAccPreCheck(t) },
Providers: testAccProviders,
CheckDestroy: testAccCheckComputeV2FloatingIPDestroy,
Steps: []resource.TestStep{
resource.TestStep{
Config: testAccComputeV2FloatingIP_attach,
Check: resource.ComposeTestCheckFunc(
testAccCheckComputeV2FloatingIPExists(t, "openstack_compute_floatingip_v2.myip", &fip),
testAccCheckComputeV2InstanceExists(t, "openstack_compute_instance_v2.foo", &instance),
testAccCheckComputeV2InstanceFloatingIPAttach(&instance, &fip),
),
},
},
})
}

func testAccCheckComputeV2FloatingIPDestroy(s *terraform.State) error {
config := testAccProvider.Meta().(*Config)
computeClient, err := config.computeV2Client(OS_REGION_NAME)
Expand Down Expand Up @@ -83,9 +119,4 @@ func testAccCheckComputeV2FloatingIPExists(t *testing.T, n string, kp *floatingi

var testAccComputeV2FloatingIP_basic = `
resource "openstack_compute_floatingip_v2" "foo" {
}

resource "openstack_compute_instance_v2" "bar" {
name = "terraform-acc-floating-ip-test"
floating_ip = "${openstack_compute_floatingip_v2.foo.address}"
}`
Loading