Skip to content

Commit 18e5f3b

Browse files
stephenfinstephenfin
authored
Merge pull request #3160 from kayrus/clusters-lb
[containerinfra]: add "MasterLBEnabled" in Cluster results
2 parents 82a1eb2 + fdb400d commit 18e5f3b

3 files changed

Lines changed: 7 additions & 0 deletions

File tree

‎internal/acceptance/openstack/containerinfra/v1/clusters_test.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ func TestClustersCRUD(t *testing.T) {
6363
newCluster, err := clusters.Get(context.TODO(), client, clusterID).Extract()
6464
th.AssertNoErr(t, err)
6565
th.AssertEquals(t, newCluster.UUID, clusterID)
66+
th.AssertEquals(t, newCluster.MasterLBEnabled, false)
6667

6768
allPagesDetail, err := clusters.ListDetail(client, nil).AllPages(context.TODO())
6869
th.AssertNoErr(t, err)

‎openstack/containerinfra/v1/clusters/results.go‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,7 @@ type Cluster struct {
112112
UpdatedAt time.Time `json:"updated_at"`
113113
UserID string `json:"user_id"`
114114
FloatingIPEnabled bool `json:"floating_ip_enabled"`
115+
MasterLBEnabled bool `json:"master_lb_enabled"`
115116
FixedNetwork string `json:"fixed_network"`
116117
FixedSubnet string `json:"fixed_subnet"`
117118
HealthStatus string `json:"health_status"`

‎openstack/containerinfra/v1/clusters/testing/fixtures_test.go‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ var ExpectedCluster = clusters.Cluster{
5050
UpdatedAt: time.Date(2016, 8, 29, 6, 53, 24, 0, time.UTC),
5151
UUID: clusterUUID,
5252
FloatingIPEnabled: true,
53+
MasterLBEnabled: true,
5354
FixedNetwork: "private_network",
5455
FixedSubnet: "private_subnet",
5556
HealthStatus: "HEALTHY",
@@ -85,6 +86,7 @@ var ExpectedCluster2 = clusters.Cluster{
8586
UpdatedAt: time.Date(2016, 8, 29, 6, 53, 24, 0, time.UTC),
8687
UUID: clusterUUID2,
8788
FloatingIPEnabled: true,
89+
MasterLBEnabled: true,
8890
FixedNetwork: "private_network",
8991
FixedSubnet: "private_subnet",
9092
HealthStatus: "HEALTHY",
@@ -152,6 +154,7 @@ var ClusterGetResponse = fmt.Sprintf(`
152154
"create_timeout":60,
153155
"name":"k8s",
154156
"floating_ip_enabled": true,
157+
"master_lb_enabled": true,
155158
"fixed_network": "private_network",
156159
"fixed_subnet": "private_subnet",
157160
"health_status": "HEALTHY",
@@ -194,6 +197,7 @@ var ClusterListResponse = fmt.Sprintf(`
194197
"updated_at":"2016-08-29T06:53:24+00:00",
195198
"uuid":"%s",
196199
"floating_ip_enabled": true,
200+
"master_lb_enabled": true,
197201
"fixed_network": "private_network",
198202
"fixed_subnet": "private_subnet",
199203
"health_status": "HEALTHY",
@@ -232,6 +236,7 @@ var ClusterListResponse = fmt.Sprintf(`
232236
"updated_at":null,
233237
"uuid":"%s",
234238
"floating_ip_enabled": true,
239+
"master_lb_enabled": true,
235240
"fixed_network": "private_network",
236241
"fixed_subnet": "private_subnet",
237242
"health_status": "HEALTHY",

0 commit comments

Comments
 (0)