Skip to content

Commit 88ae947

Browse files
mjuragaGopher Bot
authored andcommitted
MEDIUM: runtime: add weight for servers and make address editable
1 parent 0dd4973 commit 88ae947

File tree

7 files changed

+25
-35
lines changed

7 files changed

+25
-35
lines changed

models/runtime_server.go

Lines changed: 3 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/runtime_server_compare_test.go

Lines changed: 4 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/runtimeserver_diff_generated.go

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

models/runtimeserver_equal_generated.go

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

runtime/servers.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -192,6 +192,12 @@ func parseRuntimeServer(line string) *models.RuntimeServer {
192192
port = &p
193193
}
194194

195+
w, err := strconv.ParseInt(fields[7], 10, 64)
196+
var weight *int64
197+
if err == nil {
198+
weight = &w
199+
}
200+
195201
admState, _ := misc.GetServerAdminState(fields[6])
196202

197203
var opState string
@@ -211,5 +217,6 @@ func parseRuntimeServer(line string) *models.RuntimeServer {
211217
ID: fields[2],
212218
AdminState: admState,
213219
OperationalState: opState,
220+
Weight: weight,
214221
}
215222
}

specification/build/haproxy_spec.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9807,7 +9807,6 @@ definitions:
98079807
properties:
98089808
address:
98099809
pattern: ^[^\s]+$
9810-
readOnly: true
98119810
type: string
98129811
x-nullable: false
98139812
admin_state:
@@ -9831,7 +9830,9 @@ definitions:
98319830
port:
98329831
maximum: 65535
98339832
minimum: 1
9834-
readOnly: true
9833+
type: integer
9834+
x-nullable: true
9835+
weight:
98359836
type: integer
98369837
x-nullable: true
98379838
title: Runtime Server

specification/models/runtime/server.yaml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,19 +14,20 @@ server:
1414
type: string
1515
pattern: '^[^\s]+$'
1616
x-nullable: false
17-
readOnly: true
1817
port:
1918
type: integer
2019
x-nullable: true
2120
minimum: 1
2221
maximum: 65535
23-
readOnly: true
2422
operational_state:
2523
type: string
2624
enum: [up, down, stopping]
2725
admin_state:
2826
type: string
2927
enum: [ready, maint, drain]
28+
weight:
29+
type: integer
30+
x-nullable: true
3031
example:
3132
server_id: 1
3233
server_name: web_server

0 commit comments

Comments
 (0)