Skip to content

Commit abcdd5b

Browse files
mikejihbecodycushing
authored andcommitted
Fix LB policy queries, tidy some documentation. Closes #145
1 parent 8cffebc commit abcdd5b

File tree

4 files changed

+12
-20
lines changed

4 files changed

+12
-20
lines changed

crud/helpers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ func LoadBalancerResourceID(res interface{}, workReq *baremetal.WorkRequest) (id
9494
s := id.String()
9595
return &s, false
9696
}
97-
// backendset, certificate, listener
97+
// backendset, listener
9898
name := v.FieldByName("Name")
9999
if name.IsValid() {
100100
s := name.String()

data_source_obmcs_load_balancer_policies_test.go

Lines changed: 2 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ package main
55
import (
66
"testing"
77

8-
"github.com/MustWin/baremetal-sdk-go"
98
"github.com/hashicorp/terraform/helper/resource"
109
"github.com/hashicorp/terraform/helper/schema"
1110
"github.com/hashicorp/terraform/terraform"
@@ -26,30 +25,15 @@ data "baremetal_load_balancer_policies" "t" {
2625
`
2726
config += testProviderConfig()
2827

29-
compartmentID := "${var.compartment_id}"
30-
list := &baremetal.ListLoadBalancerPolicies{
31-
LoadBalancerPolicies: []baremetal.LoadBalancerPolicy{
32-
{Name: "stub_name1"},
33-
{Name: "stub_name2"},
34-
},
35-
}
36-
client.On(
37-
"ListLoadBalancerPolicies",
38-
compartmentID,
39-
(*baremetal.ListLoadBalancerPolicyOptions)(nil),
40-
).Return(list, nil)
41-
4228
resource.UnitTest(t, resource.TestCase{
4329
PreventPostDestroyRefresh: true,
4430
Providers: providers,
4531
Steps: []resource.TestStep{
4632
{
4733
Config: config,
4834
Check: resource.ComposeAggregateTestCheckFunc(
49-
resource.TestCheckResourceAttr(resourceName, "compartment_id", compartmentID),
50-
resource.TestCheckResourceAttr(resourceName, "policies.#", "2"),
51-
resource.TestCheckResourceAttr(resourceName, "policies.0.name", "stub_name1"),
52-
resource.TestCheckResourceAttr(resourceName, "policies.1.name", "stub_name2"),
35+
resource.TestCheckResourceAttrSet(resourceName, "compartment_id"),
36+
resource.TestCheckResourceAttrSet(resourceName, "policies.#"),
5337
),
5438
},
5539
},

provider_test.go

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,14 @@ data "baremetal_core_images" "t" {
115115
limit = 1
116116
}
117117
118+
data "baremetal_core_policies" "policies" {
119+
compartment_id = "${var.compartment_id}"
120+
}
121+
122+
data "baremetal_core_protocols" "protocols" {
123+
compartment_id = "${var.compartment_id}"
124+
}
125+
118126
data "baremetal_core_shape" "shapes" {
119127
compartment_id = "${var.compartment_id}"
120128
availability_domain = "${data.baremetal_identity_availability_domains.ADs.availability_domains.0.name}"

vendor/github.com/MustWin/baremetal-sdk-go/loadbalancer_policy.go

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)