From e2a850a300d54f6aa710dce718ae30be7fbf7080 Mon Sep 17 00:00:00 2001 From: dkalleg Date: Mon, 6 Jun 2016 15:11:08 -0700 Subject: [PATCH] Openstack LBaaS V2 Support - Refactoring resource naming convention --- builtin/providers/openstack/provider.go | 10 ++--- ...source_openstack_lbaas_listener_v2_test.go | 20 +++++----- ...ce_openstack_lbaas_loadbalancer_v2_test.go | 10 ++--- ...resource_openstack_lbaas_member_v2_test.go | 34 ++++++++--------- ...esource_openstack_lbaas_monitor_v2_test.go | 38 +++++++++---------- .../resource_openstack_lbaas_pool_v2_test.go | 26 ++++++------- vendor/vendor.json | 1 - 7 files changed, 69 insertions(+), 70 deletions(-) diff --git a/builtin/providers/openstack/provider.go b/builtin/providers/openstack/provider.go index 1891bbd4a973..9116ec994515 100644 --- a/builtin/providers/openstack/provider.go +++ b/builtin/providers/openstack/provider.go @@ -105,11 +105,11 @@ func Provider() terraform.ResourceProvider { "openstack_lb_monitor_v1": resourceLBMonitorV1(), "openstack_lb_pool_v1": resourceLBPoolV1(), "openstack_lb_vip_v1": resourceLBVipV1(), - "openstack_lbaas_loadbalancer_v2": resourceLoadBalancerV2(), - "openstack_lbaas_listener_v2": resourceListenerV2(), - "openstack_lbaas_pool_v2": resourcePoolV2(), - "openstack_lbaas_member_v2": resourceMemberV2(), - "openstack_lbaas_monitor_v2": resourceMonitorV2(), + "openstack_lb_loadbalancer_v2": resourceLoadBalancerV2(), + "openstack_lb_listener_v2": resourceListenerV2(), + "openstack_lb_pool_v2": resourcePoolV2(), + "openstack_lb_member_v2": resourceMemberV2(), + "openstack_lb_monitor_v2": resourceMonitorV2(), "openstack_networking_network_v2": resourceNetworkingNetworkV2(), "openstack_networking_subnet_v2": resourceNetworkingSubnetV2(), "openstack_networking_floatingip_v2": resourceNetworkingFloatingIPV2(), diff --git a/builtin/providers/openstack/resource_openstack_lbaas_listener_v2_test.go b/builtin/providers/openstack/resource_openstack_lbaas_listener_v2_test.go index ca0e0ae2674c..d1d88d20661b 100644 --- a/builtin/providers/openstack/resource_openstack_lbaas_listener_v2_test.go +++ b/builtin/providers/openstack/resource_openstack_lbaas_listener_v2_test.go @@ -21,14 +21,14 @@ func TestAccLBV2Listener_basic(t *testing.T) { resource.TestStep{ Config: TestAccLBV2ListenerConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckLBV2ListenerExists(t, "openstack_lbaas_listener_v2.listener_1", &listener), + testAccCheckLBV2ListenerExists(t, "openstack_lb_listener_v2.listener_1", &listener), ), }, resource.TestStep{ Config: TestAccLBV2ListenerConfig_update, Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("openstack_lbaas_listener_v2.listener_1", "name", "tf_test_listener_updated"), - resource.TestCheckResourceAttr("openstack_lbaas_listener_v2.listener_1", "connection_limit", "100"), + resource.TestCheckResourceAttr("openstack_lb_listener_v2.listener_1", "name", "tf_test_listener_updated"), + resource.TestCheckResourceAttr("openstack_lb_listener_v2.listener_1", "connection_limit", "100"), ), }, }, @@ -45,7 +45,7 @@ func testAccCheckLBV2ListenerDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("[FINDME] rs TYPE is: %T", rs) - if rs.Type != "openstack_lbaas_listener_v2" { + if rs.Type != "openstack_lb_listener_v2" { continue } @@ -103,15 +103,15 @@ var TestAccLBV2ListenerConfig_basic = fmt.Sprintf(` name = "tf_test_subnet" } - resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { + resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } - resource "openstack_lbaas_listener_v2" "listener_1" { + resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } `) @@ -129,15 +129,15 @@ var TestAccLBV2ListenerConfig_update = fmt.Sprintf(` name = "tf_test_subnet" } - resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { + resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } - resource "openstack_lbaas_listener_v2" "listener_1" { + resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener_updated" connection_limit = 100 admin_state_up = "true" diff --git a/builtin/providers/openstack/resource_openstack_lbaas_loadbalancer_v2_test.go b/builtin/providers/openstack/resource_openstack_lbaas_loadbalancer_v2_test.go index 32f40f772cad..7762df82a4a1 100644 --- a/builtin/providers/openstack/resource_openstack_lbaas_loadbalancer_v2_test.go +++ b/builtin/providers/openstack/resource_openstack_lbaas_loadbalancer_v2_test.go @@ -21,13 +21,13 @@ func TestAccLBV2LoadBalancer_basic(t *testing.T) { resource.TestStep{ Config: TestAccLBV2LoadBalancerConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckLBV2LoadBalancerExists(t, "openstack_lbaas_loadbalancer_v2.loadbalancer_1", &lb), + testAccCheckLBV2LoadBalancerExists(t, "openstack_lb_loadbalancer_v2.loadbalancer_1", &lb), ), }, resource.TestStep{ Config: TestAccLBV2LoadBalancerConfig_update, Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("openstack_lbaas_loadbalancer_v2.loadbalancer_1", "name", "tf_test_loadbalancer_v2_updated"), + resource.TestCheckResourceAttr("openstack_lb_loadbalancer_v2.loadbalancer_1", "name", "tf_test_loadbalancer_v2_updated"), ), }, }, @@ -44,7 +44,7 @@ func testAccCheckLBV2LoadBalancerDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("[FINDME] rs TYPE is: %#v", rs.Type) - if rs.Type != "openstack_lbaas_loadbalancer_v2" { + if rs.Type != "openstack_lb_loadbalancer_v2" { continue } @@ -102,7 +102,7 @@ var TestAccLBV2LoadBalancerConfig_basic = fmt.Sprintf(` name = "tf_test_subnet" } - resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { + resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" }`) @@ -120,7 +120,7 @@ var TestAccLBV2LoadBalancerConfig_update = fmt.Sprintf(` name = "tf_test_subnet" } - resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { + resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2_updated" admin_state_up = "true" diff --git a/builtin/providers/openstack/resource_openstack_lbaas_member_v2_test.go b/builtin/providers/openstack/resource_openstack_lbaas_member_v2_test.go index 232db24dcd2b..4db4774a9e76 100644 --- a/builtin/providers/openstack/resource_openstack_lbaas_member_v2_test.go +++ b/builtin/providers/openstack/resource_openstack_lbaas_member_v2_test.go @@ -21,13 +21,13 @@ func TestAccLBV2Member_basic(t *testing.T) { resource.TestStep{ Config: TestAccLBV2MemberConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckLBV2MemberExists(t, "openstack_lbaas_member_v2.member_1", &member), + testAccCheckLBV2MemberExists(t, "openstack_lb_member_v2.member_1", &member), ), }, resource.TestStep{ Config: TestAccLBV2MemberConfig_update, Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("openstack_lbaas_member_v2.member_1", "weight", "10"), + resource.TestCheckResourceAttr("openstack_lb_member_v2.member_1", "weight", "10"), ), }, }, @@ -44,7 +44,7 @@ func testAccCheckLBV2MemberDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("[FINDME] rs TYPE is: %T", rs) - if rs.Type != "openstack_lbaas_member_v2" { + if rs.Type != "openstack_lb_member_v2" { continue } @@ -103,28 +103,28 @@ resource "openstack_networking_subnet_v2" "subnet_1" { name = "tf_test_subnet" } -resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { +resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } -resource "openstack_lbaas_listener_v2" "listener_1" { +resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } -resource "openstack_lbaas_pool_v2" "pool_1" { +resource "openstack_lb_pool_v2" "pool_1" { protocol = "HTTP" lb_method = "ROUND_ROBIN" - listener_id = "${openstack_lbaas_listener_v2.listener_1.id}" + listener_id = "${openstack_lb_listener_v2.listener_1.id}" name = "tf_test_pool" } -resource "openstack_lbaas_member_v2" "member_1" { +resource "openstack_lb_member_v2" "member_1" { address = "192.168.199.10" - pool_id = "${openstack_lbaas_pool_v2.pool_1.id}" + pool_id = "${openstack_lb_pool_v2.pool_1.id}" protocol_port = 8080 subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" }`) @@ -142,28 +142,28 @@ resource "openstack_networking_subnet_v2" "subnet_1" { name = "tf_test_subnet" } -resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { +resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } -resource "openstack_lbaas_listener_v2" "listener_1" { +resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } -resource "openstack_lbaas_pool_v2" "pool_1" { +resource "openstack_lb_pool_v2" "pool_1" { protocol = "HTTP" lb_method = "ROUND_ROBIN" - listener_id = "${openstack_lbaas_listener_v2.listener_1.id}" + listener_id = "${openstack_lb_listener_v2.listener_1.id}" name = "tf_test_pool" } -resource "openstack_lbaas_member_v2" "member_1" { +resource "openstack_lb_member_v2" "member_1" { address = "192.168.199.10" - pool_id = "${openstack_lbaas_pool_v2.pool_1.id}" + pool_id = "${openstack_lb_pool_v2.pool_1.id}" protocol_port = 8080 subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" weight = 10 diff --git a/builtin/providers/openstack/resource_openstack_lbaas_monitor_v2_test.go b/builtin/providers/openstack/resource_openstack_lbaas_monitor_v2_test.go index 81076f8da10a..a6d1d18bd72a 100644 --- a/builtin/providers/openstack/resource_openstack_lbaas_monitor_v2_test.go +++ b/builtin/providers/openstack/resource_openstack_lbaas_monitor_v2_test.go @@ -21,15 +21,15 @@ func TestAccLBV2Monitor_basic(t *testing.T) { resource.TestStep{ Config: TestAccLBV2MonitorConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckLBV2MonitorExists(t, "openstack_lbaas_monitor_v2.monitor_1", &monitor), + testAccCheckLBV2MonitorExists(t, "openstack_lb_monitor_v2.monitor_1", &monitor), ), }, resource.TestStep{ Config: TestAccLBV2MonitorConfig_update, Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("openstack_lbaas_monitor_v2.monitor_1", "name", "tf_test_monitor_updated"), - resource.TestCheckResourceAttr("openstack_lbaas_monitor_v2.monitor_1", "delay", "30"), - resource.TestCheckResourceAttr("openstack_lbaas_monitor_v2.monitor_1", "timeout", "15"), + resource.TestCheckResourceAttr("openstack_lb_monitor_v2.monitor_1", "name", "tf_test_monitor_updated"), + resource.TestCheckResourceAttr("openstack_lb_monitor_v2.monitor_1", "delay", "30"), + resource.TestCheckResourceAttr("openstack_lb_monitor_v2.monitor_1", "timeout", "15"), ), }, }, @@ -46,7 +46,7 @@ func testAccCheckLBV2MonitorDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("[FINDME] rs TYPE is: %T", rs) - if rs.Type != "openstack_lbaas_monitor_v2" { + if rs.Type != "openstack_lb_monitor_v2" { continue } @@ -105,27 +105,27 @@ resource "openstack_networking_subnet_v2" "subnet_1" { name = "tf_test_subnet" } -resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { +resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } -resource "openstack_lbaas_listener_v2" "listener_1" { +resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } -resource "openstack_lbaas_pool_v2" "pool_1" { +resource "openstack_lb_pool_v2" "pool_1" { protocol = "HTTP" lb_method = "ROUND_ROBIN" - listener_id = "${openstack_lbaas_listener_v2.listener_1.id}" + listener_id = "${openstack_lb_listener_v2.listener_1.id}" name = "tf_test_pool" } -resource "openstack_lbaas_monitor_v2" "monitor_1" { - pool_id = "${openstack_lbaas_pool_v2.pool_1.id}" +resource "openstack_lb_monitor_v2" "monitor_1" { + pool_id = "${openstack_lb_pool_v2.pool_1.id}" type = "PING" delay = 20 timeout = 10 @@ -146,27 +146,27 @@ resource "openstack_networking_subnet_v2" "subnet_1" { name = "tf_test_subnet" } -resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { +resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } -resource "openstack_lbaas_listener_v2" "listener_1" { +resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } -resource "openstack_lbaas_pool_v2" "pool_1" { +resource "openstack_lb_pool_v2" "pool_1" { protocol = "HTTP" lb_method = "ROUND_ROBIN" - listener_id = "${openstack_lbaas_listener_v2.listener_1.id}" + listener_id = "${openstack_lb_listener_v2.listener_1.id}" name = "tf_test_pool" } -resource "openstack_lbaas_monitor_v2" "monitor_1" { - pool_id = "${openstack_lbaas_pool_v2.pool_1.id}" +resource "openstack_lb_monitor_v2" "monitor_1" { + pool_id = "${openstack_lb_pool_v2.pool_1.id}" type = "PING" delay = 30 timeout = 15 diff --git a/builtin/providers/openstack/resource_openstack_lbaas_pool_v2_test.go b/builtin/providers/openstack/resource_openstack_lbaas_pool_v2_test.go index 6edf2063bb34..777600c1dbfb 100644 --- a/builtin/providers/openstack/resource_openstack_lbaas_pool_v2_test.go +++ b/builtin/providers/openstack/resource_openstack_lbaas_pool_v2_test.go @@ -21,13 +21,13 @@ func TestAccLBV2Pool_basic(t *testing.T) { resource.TestStep{ Config: TestAccLBV2PoolConfig_basic, Check: resource.ComposeTestCheckFunc( - testAccCheckLBV2PoolExists(t, "openstack_lbaas_pool_v2.pool_1", &pool), + testAccCheckLBV2PoolExists(t, "openstack_lb_pool_v2.pool_1", &pool), ), }, resource.TestStep{ Config: TestAccLBV2PoolConfig_update, Check: resource.ComposeTestCheckFunc( - resource.TestCheckResourceAttr("openstack_lbaas_pool_v2.pool_1", "name", "tf_test_pool_update"), + resource.TestCheckResourceAttr("openstack_lb_pool_v2.pool_1", "name", "tf_test_pool_update"), ), }, }, @@ -44,7 +44,7 @@ func testAccCheckLBV2PoolDestroy(s *terraform.State) error { for _, rs := range s.RootModule().Resources { log.Printf("[FINDME] rs TYPE is: %T", rs) - if rs.Type != "openstack_lbaas_pool_v2" { + if rs.Type != "openstack_lb_pool_v2" { continue } @@ -102,22 +102,22 @@ resource "openstack_networking_network_v2" "network_1" { name = "tf_test_subnet" } - resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { + resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } - resource "openstack_lbaas_listener_v2" "listener_1" { + resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } - resource "openstack_lbaas_pool_v2" "pool_1" { + resource "openstack_lb_pool_v2" "pool_1" { protocol = "HTTP" lb_method = "ROUND_ROBIN" - listener_id = "${openstack_lbaas_listener_v2.listener_1.id}" + listener_id = "${openstack_lb_listener_v2.listener_1.id}" name = "tf_test_pool" }`) @@ -134,22 +134,22 @@ var TestAccLBV2PoolConfig_update = fmt.Sprintf(` name = "tf_test_subnet" } - resource "openstack_lbaas_loadbalancer_v2" "loadbalancer_1" { + resource "openstack_lb_loadbalancer_v2" "loadbalancer_1" { vip_subnet_id = "${openstack_networking_subnet_v2.subnet_1.id}" name = "tf_test_loadbalancer_v2" } - resource "openstack_lbaas_listener_v2" "listener_1" { + resource "openstack_lb_listener_v2" "listener_1" { protocol = "HTTP" protocol_port = 8080 - loadbalancer_id = "${openstack_lbaas_loadbalancer_v2.loadbalancer_1.id}" + loadbalancer_id = "${openstack_lb_loadbalancer_v2.loadbalancer_1.id}" name = "tf_test_listener" } - resource "openstack_lbaas_pool_v2" "pool_1" { + resource "openstack_lb_pool_v2" "pool_1" { protocol = "HTTP" lb_method = "LEAST_CONNECTIONS" - listener_id = "${openstack_lbaas_listener_v2.listener_1.id}" + listener_id = "${openstack_lb_listener_v2.listener_1.id}" name = "tf_test_pool_update" admin_state_up = "true" }`) diff --git a/vendor/vendor.json b/vendor/vendor.json index 9fab981a951e..7b823590793b 100644 --- a/vendor/vendor.json +++ b/vendor/vendor.json @@ -1,6 +1,5 @@ { "comment": "", -<<<<<<< 8c3ff933951a5ab0111c0ef6b3553e42e4ce14af "ignore": "appengine test", "package": [ {