Skip to content

feat: add proxy port support across all host models #4283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 27, 2025
Merged

feat: add proxy port support across all host models #4283

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 44 additions & 14 deletions api/manager/docs.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4430,6 +4430,9 @@ const docTemplate = `{
"port": {
"type": "integer"
},
"proxy_port": {
"type": "integer"
},
"scheduler_cluster": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_models.SchedulerCluster"
},
Expand Down Expand Up @@ -4494,6 +4497,9 @@ const docTemplate = `{
"d7y_io_dragonfly_v2_manager_models.Scheduler": {
"type": "object",
"properties": {
"config": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_models.JSONMap"
},
"created_at": {
"type": "string"
},
Expand All @@ -4518,6 +4524,9 @@ const docTemplate = `{
"is_del": {
"type": "integer"
},
"last_keep_alive_at": {
"type": "string"
},
"location": {
"type": "string"
},
Expand Down Expand Up @@ -4980,6 +4989,7 @@ const docTemplate = `{
"host_name",
"ip",
"port",
"proxy_port",
"scheduler_cluster_id",
"type"
],
Expand Down Expand Up @@ -5029,6 +5039,9 @@ const docTemplate = `{
"port": {
"type": "integer"
},
"proxy_port": {
"type": "integer"
},
"scheduler_cluster_id": {
"type": "integer"
},
Expand Down Expand Up @@ -5136,6 +5149,9 @@ const docTemplate = `{
"scheduler_cluster_id"
],
"properties": {
"config": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.SchedulerConfig"
},
"features": {
"type": "array",
"items": {
Expand Down Expand Up @@ -5547,14 +5563,6 @@ const docTemplate = `{
"description": "Network contains network information.",
"type": "object",
"properties": {
"download_rate": {
"description": "DownloadRate is download rate.",
"type": "integer"
},
"download_rate_limit": {
"description": "DownloadRateLimit is download rate limit.",
"type": "integer"
},
"idc": {
"description": "IDC is network idc.",
"type": "string"
Expand All @@ -5563,16 +5571,24 @@ const docTemplate = `{
"description": "Location is network location.",
"type": "string"
},
"tcp_connection_count": {
"description": "TCPConnectionCount is tcp connection count.",
"max_rx_bandwidth": {
"description": "MaxRxBandwidth is download rate limit.",
"type": "integer"
},
"max_tx_bandwidth": {
"description": "MaxTxBandwidth is upload rate limit.",
"type": "integer"
},
"rx_bandwidth": {
"description": "RxBandwidth is download rate.",
"type": "integer"
},
"upload_rate": {
"description": "UploadRate is upload rate.",
"tcp_connection_count": {
"description": "TCPConnectionCount is tcp connection count.",
"type": "integer"
},
"upload_rate_limit": {
"description": "UploadRateLimit is upload rate limit.",
"tx_bandwidth": {
"description": "TxBandwidth is upload rate.",
"type": "integer"
},
"upload_tcp_connection_count": {
Expand Down Expand Up @@ -5822,6 +5838,17 @@ const docTemplate = `{
}
}
},
"d7y_io_dragonfly_v2_manager_types.SchedulerConfig": {
"type": "object",
"required": [
"manager_keep_alive_interval"
],
"properties": {
"manager_keep_alive_interval": {
"$ref": "#/definitions/time.Duration"
}
}
},
"d7y_io_dragonfly_v2_manager_types.SeedPeerClusterConfig": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6084,6 +6111,9 @@ const docTemplate = `{
"d7y_io_dragonfly_v2_manager_types.UpdateSchedulerRequest": {
"type": "object",
"properties": {
"config": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.SchedulerConfig"
},
"features": {
"type": "array",
"items": {
Expand Down
58 changes: 44 additions & 14 deletions api/manager/swagger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4424,6 +4424,9 @@
"port": {
"type": "integer"
},
"proxy_port": {
"type": "integer"
},
"scheduler_cluster": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_models.SchedulerCluster"
},
Expand Down Expand Up @@ -4488,6 +4491,9 @@
"d7y_io_dragonfly_v2_manager_models.Scheduler": {
"type": "object",
"properties": {
"config": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_models.JSONMap"
},
"created_at": {
"type": "string"
},
Expand All @@ -4512,6 +4518,9 @@
"is_del": {
"type": "integer"
},
"last_keep_alive_at": {
"type": "string"
},
"location": {
"type": "string"
},
Expand Down Expand Up @@ -4974,6 +4983,7 @@
"host_name",
"ip",
"port",
"proxy_port",
"scheduler_cluster_id",
"type"
],
Expand Down Expand Up @@ -5023,6 +5033,9 @@
"port": {
"type": "integer"
},
"proxy_port": {
"type": "integer"
},
"scheduler_cluster_id": {
"type": "integer"
},
Expand Down Expand Up @@ -5130,6 +5143,9 @@
"scheduler_cluster_id"
],
"properties": {
"config": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.SchedulerConfig"
},
"features": {
"type": "array",
"items": {
Expand Down Expand Up @@ -5541,14 +5557,6 @@
"description": "Network contains network information.",
"type": "object",
"properties": {
"download_rate": {
"description": "DownloadRate is download rate.",
"type": "integer"
},
"download_rate_limit": {
"description": "DownloadRateLimit is download rate limit.",
"type": "integer"
},
"idc": {
"description": "IDC is network idc.",
"type": "string"
Expand All @@ -5557,16 +5565,24 @@
"description": "Location is network location.",
"type": "string"
},
"tcp_connection_count": {
"description": "TCPConnectionCount is tcp connection count.",
"max_rx_bandwidth": {
"description": "MaxRxBandwidth is download rate limit.",
"type": "integer"
},
"max_tx_bandwidth": {
"description": "MaxTxBandwidth is upload rate limit.",
"type": "integer"
},
"rx_bandwidth": {
"description": "RxBandwidth is download rate.",
"type": "integer"
},
"upload_rate": {
"description": "UploadRate is upload rate.",
"tcp_connection_count": {
"description": "TCPConnectionCount is tcp connection count.",
"type": "integer"
},
"upload_rate_limit": {
"description": "UploadRateLimit is upload rate limit.",
"tx_bandwidth": {
"description": "TxBandwidth is upload rate.",
"type": "integer"
},
"upload_tcp_connection_count": {
Expand Down Expand Up @@ -5816,6 +5832,17 @@
}
}
},
"d7y_io_dragonfly_v2_manager_types.SchedulerConfig": {
"type": "object",
"required": [
"manager_keep_alive_interval"
],
"properties": {
"manager_keep_alive_interval": {
"$ref": "#/definitions/time.Duration"
}
}
},
"d7y_io_dragonfly_v2_manager_types.SeedPeerClusterConfig": {
"type": "object",
"properties": {
Expand Down Expand Up @@ -6078,6 +6105,9 @@
"d7y_io_dragonfly_v2_manager_types.UpdateSchedulerRequest": {
"type": "object",
"properties": {
"config": {
"$ref": "#/definitions/d7y_io_dragonfly_v2_manager_types.SchedulerConfig"
},
"features": {
"type": "array",
"items": {
Expand Down
42 changes: 31 additions & 11 deletions api/manager/swagger.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,8 @@ definitions:
type: string
port:
type: integer
proxy_port:
type: integer
scheduler_cluster:
$ref: '#/definitions/d7y_io_dragonfly_v2_manager_models.SchedulerCluster'
scheduler_cluster_id:
Expand Down Expand Up @@ -236,6 +238,8 @@ definitions:
type: object
d7y_io_dragonfly_v2_manager_models.Scheduler:
properties:
config:
$ref: '#/definitions/d7y_io_dragonfly_v2_manager_models.JSONMap'
created_at:
type: string
features:
Expand All @@ -252,6 +256,8 @@ definitions:
type: string
is_del:
type: integer
last_keep_alive_at:
type: string
location:
type: string
port:
Expand Down Expand Up @@ -590,6 +596,8 @@ definitions:
type: string
port:
type: integer
proxy_port:
type: integer
scheduler_cluster_id:
type: integer
state:
Expand All @@ -609,6 +617,7 @@ definitions:
- host_name
- ip
- port
- proxy_port
- scheduler_cluster_id
- type
type: object
Expand Down Expand Up @@ -666,6 +675,8 @@ definitions:
type: object
d7y_io_dragonfly_v2_manager_types.CreateSchedulerRequest:
properties:
config:
$ref: '#/definitions/d7y_io_dragonfly_v2_manager_types.SchedulerConfig'
features:
items:
type: string
Expand Down Expand Up @@ -960,26 +971,26 @@ definitions:
network:
description: Network contains network information.
properties:
download_rate:
description: DownloadRate is download rate.
type: integer
download_rate_limit:
description: DownloadRateLimit is download rate limit.
type: integer
idc:
description: IDC is network idc.
type: string
location:
description: Location is network location.
type: string
max_rx_bandwidth:
description: MaxRxBandwidth is download rate limit.
type: integer
max_tx_bandwidth:
description: MaxTxBandwidth is upload rate limit.
type: integer
rx_bandwidth:
description: RxBandwidth is download rate.
type: integer
tcp_connection_count:
description: TCPConnectionCount is tcp connection count.
type: integer
upload_rate:
description: UploadRate is upload rate.
type: integer
upload_rate_limit:
description: UploadRateLimit is upload rate limit.
tx_bandwidth:
description: TxBandwidth is upload rate.
type: integer
upload_tcp_connection_count:
description: UploadTCPConnectionCount is upload tcp connection count.
Expand Down Expand Up @@ -1152,6 +1163,13 @@ definitions:
location:
type: string
type: object
d7y_io_dragonfly_v2_manager_types.SchedulerConfig:
properties:
manager_keep_alive_interval:
$ref: '#/definitions/time.Duration'
required:
- manager_keep_alive_interval
type: object
d7y_io_dragonfly_v2_manager_types.SeedPeerClusterConfig:
properties:
load_limit:
Expand Down Expand Up @@ -1328,6 +1346,8 @@ definitions:
type: object
d7y_io_dragonfly_v2_manager_types.UpdateSchedulerRequest:
properties:
config:
$ref: '#/definitions/d7y_io_dragonfly_v2_manager_types.SchedulerConfig'
features:
items:
type: string
Expand Down
Loading