Skip to content

Commit 05d6225

Browse files
mimuretmimuret
authored
fix lb_domains.Endpoint.Rdata (#13)
1 parent 004d998 commit 05d6225

File tree

6 files changed

+99
-20
lines changed

6 files changed

+99
-20
lines changed

‎pkg/apis/dpf/v1/lb_domains/ZZ_deepcopy_generated.go‎

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

‎pkg/apis/dpf/v1/lb_domains/config_test.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ var _ = Describe("Config", func() {
6161
Enabled: false,
6262
LiveStatus: lb_domains.StatusUp,
6363
ReadyStatus: lb_domains.StatusDown,
64-
Rdata: []string{"192.168.0.1", "192.168.1.1"},
64+
Rdata: []lb_domains.EndpointRdata{{Value: "192.168.0.1"}, {Value: "192.168.1.1"}},
6565
Monitorings: []lb_domains.MonitoringEndpoint{
6666
{
6767
MonitoringResourceName: "id1",
@@ -117,7 +117,7 @@ var _ = Describe("Config", func() {
117117
Enabled: true,
118118
LiveStatus: lb_domains.StatusDown,
119119
ReadyStatus: lb_domains.StatusDown,
120-
Rdata: []string{"2001:db8::1", "2001:db8::2"},
120+
Rdata: []lb_domains.EndpointRdata{{Value: "2001:db8::1"}, {Value: "2001:db8::2"}},
121121
Monitorings: []lb_domains.MonitoringEndpoint{
122122
{
123123
MonitoringResourceName: "id1",

‎pkg/apis/dpf/v1/lb_domains/endpoint.go‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@ func (m *MonitoringEndpoint) UnmarshalJSON(bs []byte) error {
3939
return nil
4040
}
4141

42+
type EndpointRdata struct {
43+
Value string `read:"value" create:"value" update:"value" apply:"value"`
44+
}
45+
4246
// +k8s:deepcopy-gen:interfaces=github.com/mimuret/golang-iij-dpf/pkg/api.Object
4347
type Endpoint struct {
4448
SiteAttributeMeta
@@ -52,7 +56,7 @@ type Endpoint struct {
5256
Enabled bool `read:"enabled" create:"enabled" update:"enabled" apply:"enabled"`
5357
LiveStatus Status `read:"live_status"`
5458
ReadyStatus Status `read:"ready_status"`
55-
Rdata []string `read:"rdata" create:"rdata" update:"rdata" apply:"rdata"`
59+
Rdata []EndpointRdata `read:"rdata" create:"rdata" update:"rdata" apply:"rdata"`
5660
Monitorings []MonitoringEndpoint `read:"monitorings" create:"monitorings" update:"monitorings" apply:"monitorings"`
5761
}
5862

‎pkg/apis/dpf/v1/lb_domains/endpoint_test.go‎

Lines changed: 51 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var _ = Describe("Endpoint", func() {
4141
Enabled: false,
4242
LiveStatus: lb_domains.StatusUp,
4343
ReadyStatus: lb_domains.StatusDown,
44-
Rdata: []string{"192.168.0.1", "192.168.1.1"},
44+
Rdata: []lb_domains.EndpointRdata{{Value: "192.168.0.1"}, {Value: "192.168.1.1"}},
4545
Monitorings: []lb_domains.MonitoringEndpoint{
4646
{
4747
MonitoringResourceName: "id1",
@@ -85,7 +85,7 @@ var _ = Describe("Endpoint", func() {
8585
Enabled: true,
8686
LiveStatus: lb_domains.StatusDown,
8787
ReadyStatus: lb_domains.StatusDown,
88-
Rdata: []string{"192.168.0.2", "192.168.1.2"},
88+
Rdata: []lb_domains.EndpointRdata{{Value: "192.168.0.2"}, {Value: "192.168.1.2"}},
8989
Monitorings: []lb_domains.MonitoringEndpoint{},
9090
}
9191
slist = lb_domains.EndpointList{
@@ -114,7 +114,14 @@ var _ = Describe("Endpoint", func() {
114114
"enabled": false,
115115
"live_status": "up",
116116
"ready_status": "down",
117-
"rdata": ["192.168.0.1","192.168.1.1"],
117+
"rdata": [
118+
{
119+
"value": "192.168.0.1"
120+
},
121+
{
122+
"value": "192.168.1.1"
123+
}
124+
],
118125
"monitorings": [
119126
{
120127
"resource_name": "id1",
@@ -145,7 +152,14 @@ var _ = Describe("Endpoint", func() {
145152
"enabled": true,
146153
"live_status": "down",
147154
"ready_status": "down",
148-
"rdata": ["192.168.0.2","192.168.1.2"],
155+
"rdata": [
156+
{
157+
"value": "192.168.0.2"
158+
},
159+
{
160+
"value": "192.168.1.2"
161+
}
162+
],
149163
"monitorings": []
150164
}
151165
}`)))
@@ -215,7 +229,14 @@ var _ = Describe("Endpoint", func() {
215229
"manual_failback": false,
216230
"manual_failover": false,
217231
"enabled": false,
218-
"rdata": ["192.168.0.1","192.168.1.1"],
232+
"rdata": [
233+
{
234+
"value": "192.168.0.1"
235+
},
236+
{
237+
"value": "192.168.1.1"
238+
}
239+
],
219240
"monitorings": [
220241
{"resource_name": "id1", "enabled": true}
221242
]
@@ -244,7 +265,14 @@ var _ = Describe("Endpoint", func() {
244265
"manual_failback": false,
245266
"manual_failover": false,
246267
"enabled": false,
247-
"rdata": ["192.168.0.1","192.168.1.1"],
268+
"rdata": [
269+
{
270+
"value": "192.168.0.1"
271+
},
272+
{
273+
"value": "192.168.1.1"
274+
}
275+
],
248276
"monitorings": [
249277
{"resource_name": "id1", "enabled": true}
250278
]
@@ -332,7 +360,15 @@ var _ = Describe("Endpoint", func() {
332360
"enabled": false,
333361
"live_status": "up",
334362
"ready_status": "down",
335-
"rdata": ["192.168.0.1","192.168.1.1"],
363+
"enabled": false,
364+
"rdata": [
365+
{
366+
"value": "192.168.0.1"
367+
},
368+
{
369+
"value": "192.168.1.1"
370+
}
371+
],
336372
"monitorings": [
337373
{
338374
"resource_name": "id1",
@@ -360,7 +396,14 @@ var _ = Describe("Endpoint", func() {
360396
"enabled": true,
361397
"live_status": "down",
362398
"ready_status": "down",
363-
"rdata": ["192.168.0.2","192.168.1.2"],
399+
"rdata": [
400+
{
401+
"value": "192.168.0.2"
402+
},
403+
{
404+
"value": "192.168.1.2"
405+
}
406+
],
364407
"monitorings": []
365408
}
366409
]

‎pkg/apis/dpf/v1/lb_domains/testdata/config_get.json‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,12 @@
2121
"live_status": "up",
2222
"ready_status": "down",
2323
"rdata": [
24-
"192.168.0.1",
25-
"192.168.1.1"
24+
{
25+
"value": "192.168.0.1"
26+
},
27+
{
28+
"value": "192.168.1.1"
29+
}
2630
],
2731
"monitorings": [
2832
{
@@ -61,8 +65,12 @@
6165
"live_status": "down",
6266
"ready_status": "down",
6367
"rdata": [
64-
"2001:db8::1",
65-
"2001:db8::2"
68+
{
69+
"value": "2001:db8::1"
70+
},
71+
{
72+
"value": "2001:db8::2"
73+
}
6674
],
6775
"monitorings": [
6876
{

‎pkg/apis/dpf/v1/lb_domains/testdata/config_put.json‎

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,12 @@
1616
"manual_failover": false,
1717
"enabled": false,
1818
"rdata": [
19-
"192.168.0.1",
20-
"192.168.1.1"
19+
{
20+
"value": "192.168.0.1"
21+
},
22+
{
23+
"value": "192.168.1.1"
24+
}
2125
],
2226
"monitorings": [
2327
{
@@ -44,8 +48,12 @@
4448
"manual_failover": true,
4549
"enabled": true,
4650
"rdata": [
47-
"2001:db8::1",
48-
"2001:db8::2"
51+
{
52+
"value": "2001:db8::1"
53+
},
54+
{
55+
"value": "2001:db8::2"
56+
}
4957
],
5058
"monitorings": [
5159
{

0 commit comments

Comments
 (0)