Commit 7a4e287
committed
Support throttling a VPC's public gateway network rate
Adds an operator-configurable data transfer rate for a VPC's public/internet-facing
network, independent of the intra-VPC tier rates that network offerings already
control. Precedence: vpc_offerings.public_nw_rate (per-offering override) falls back
to the new zone-scoped config vpc.public.network.throttling.rate (default 0/unlimited,
preserving today's unthrottled behavior on upgrade).
- createVPCOffering/updateVPCOffering/cloneVPCOffering accept publicnetworkrate
- listVPCOfferings/listVPCs expose it, normalized to -1 for unlimited
- vpc_details "publicnetworkrate" cache is (re)computed only where a VPC's offering
can actually change: at creation and in restartVpc's make-redundant path
- backfills existing VPCs to -1 on upgrade, since the new column/config can't yet
hold a value
- UI support for setting/viewing the rate on VPC offerings and VPCs1 parent 4c8b4ef commit 7a4e287
28 files changed
Lines changed: 289 additions & 23 deletions
File tree
- api/src/main/java
- com/cloud/network/vpc
- org/apache/cloudstack/api
- command/admin/vpc
- response
- engine
- api/src/main/java/org/apache/cloudstack/engine/orchestration/service
- components-api/src/main/java/com/cloud/configuration
- orchestration/src/main/java/org/apache/cloudstack/engine/orchestration
- schema/src/main
- java/com/cloud
- network/vpc
- upgrade
- resources/META-INF/db
- views
- plugins/network-elements/juniper-contrail/src/main/java/org/apache/cloudstack/network/contrail/management
- server/src
- main/java/com/cloud
- api
- query
- dao
- vo
- configuration
- network
- vpc
- test/java/com/cloud
- network
- vpc
- vpc
- ui
- public/locales
- src
- config/section
- views/offering
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
86 | 86 | | |
87 | 87 | | |
88 | 88 | | |
| 89 | + | |
| 90 | + | |
89 | 91 | | |
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
42 | 42 | | |
43 | 43 | | |
44 | 44 | | |
45 | | - | |
| 45 | + | |
46 | 46 | | |
47 | 47 | | |
48 | 48 | | |
| |||
Lines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
729 | 729 | | |
730 | 730 | | |
731 | 731 | | |
| 732 | + | |
732 | 733 | | |
733 | 734 | | |
734 | 735 | | |
| |||
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
165 | 165 | | |
166 | 166 | | |
167 | 167 | | |
| 168 | + | |
| 169 | + | |
| 170 | + | |
| 171 | + | |
| 172 | + | |
168 | 173 | | |
169 | 174 | | |
170 | 175 | | |
| |||
318 | 323 | | |
319 | 324 | | |
320 | 325 | | |
| 326 | + | |
| 327 | + | |
| 328 | + | |
| 329 | + | |
321 | 330 | | |
322 | 331 | | |
323 | 332 | | |
| |||
Lines changed: 9 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
68 | 68 | | |
69 | 69 | | |
70 | 70 | | |
| 71 | + | |
| 72 | + | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
71 | 76 | | |
72 | 77 | | |
73 | 78 | | |
| |||
100 | 105 | | |
101 | 106 | | |
102 | 107 | | |
| 108 | + | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
103 | 112 | | |
104 | 113 | | |
105 | 114 | | |
| |||
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
106 | 106 | | |
107 | 107 | | |
108 | 108 | | |
| 109 | + | |
| 110 | + | |
| 111 | + | |
| 112 | + | |
109 | 113 | | |
110 | 114 | | |
111 | 115 | | |
| |||
213 | 217 | | |
214 | 218 | | |
215 | 219 | | |
| 220 | + | |
| 221 | + | |
| 222 | + | |
| 223 | + | |
216 | 224 | | |
Lines changed: 8 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
77 | 77 | | |
78 | 78 | | |
79 | 79 | | |
| 80 | + | |
| 81 | + | |
| 82 | + | |
| 83 | + | |
80 | 84 | | |
81 | 85 | | |
82 | 86 | | |
| |||
209 | 213 | | |
210 | 214 | | |
211 | 215 | | |
| 216 | + | |
| 217 | + | |
| 218 | + | |
| 219 | + | |
212 | 220 | | |
213 | 221 | | |
214 | 222 | | |
| |||
Lines changed: 3 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
138 | 138 | | |
139 | 139 | | |
140 | 140 | | |
| 141 | + | |
| 142 | + | |
| 143 | + | |
141 | 144 | | |
142 | 145 | | |
143 | 146 | | |
| |||
Lines changed: 2 additions & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
82 | 82 | | |
83 | 83 | | |
84 | 84 | | |
| 85 | + | |
| 86 | + | |
85 | 87 | | |
86 | 88 | | |
87 | 89 | | |
| |||
Lines changed: 1 addition & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
5075 | 5075 | | |
5076 | 5076 | | |
5077 | 5077 | | |
5078 | | - | |
| 5078 | + | |
5079 | 5079 | | |
5080 | 5080 | | |
5081 | 5081 | | |
| |||
0 commit comments