Repository navigation
Commit dfff32e
Netris: Improvements and fixes to the Netris plugin (apache#13591)
* Netris CloudStack Integration Enhancements
* Netris - Support NAT, PF for Secondary IP
* Allow PF rules to be correctly created on secondary IP of a VM on netris
* unique static nat names on netris by adding public IP - handle backward compatibility
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Support for L2 networks
* Add support for L2 networks in Netris
* remove the need to add connectivity to identify netris provider, remove changes to ui and create net offering
* create vpc network and use it for l2 networks
* dont fail if deletion on netris doesnt succeed
* remove connectivity capability
* update vpc name when l2 name is updated
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - CKS support
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Enable Global Routing Flag for NATTED Dual-Stack VPCs
* Set globalRouting = true, when network offering is NATTED, dual-stack
* update global routing based on routing mode and ip protocol type
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* Netris - Fix allocate vnets with the correct account ID so that release succeeds on network deletion
* Fix allocate vnets with the correct account ID so that release succeeds on network deletion
* add fix for vpc tiers as well
* move entire vnet cleanup logic to trash from shutdown, so that it works for all network types for netris
* cleanup vnets when reservation id is null
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Add support to include VPN service for NATTED Netris offerings
* Add support to include VPN service for NATTED Netris offerings
* missing changes of global routing
* Remove extra space
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* Netris - Support Redundant Virtual Routers for Netris VPC networks
* Add support for redundant routers for Netris VPC networks
* address comment
* default null network mode to natted for netris
* preventing vpc and ipam creation if already exists
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Enable autoscaling groups for Netris network offerings
* Enable autoscaling groups for Netris network offerings
* Fix UI loading for services when network mode changes for external providers and show vm autoscaling always set to true / non-editable for netris when LB is selected i.e, natted mode
* Revert removed comment
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* merge conflict
* systemvm: fix VPC VPN issue when network id is bigger than 1000 on Netris
* show networks for vnf nic mappings
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
Co-authored-by: Wei Zhou <weizhou@apache.org>
* Add a check to prevent re-adding existing ACLs
* Netris - Support NAT, PF for Secondary IP
* Allow PF rules to be correctly created on secondary IP of a VM on netris
* unique static nat names on netris by adding public IP - handle backward compatibility
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Support for L2 networks
* Add support for L2 networks in Netris
* remove the need to add connectivity to identify netris provider, remove changes to ui and create net offering
* create vpc network and use it for l2 networks
* dont fail if deletion on netris doesnt succeed
* remove connectivity capability
* update vpc name when l2 name is updated
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - CKS support
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Enable Global Routing Flag for NATTED Dual-Stack VPCs
* Set globalRouting = true, when network offering is NATTED, dual-stack
* update global routing based on routing mode and ip protocol type
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* Netris - Fix allocate vnets with the correct account ID so that release succeeds on network deletion
* Fix allocate vnets with the correct account ID so that release succeeds on network deletion
* add fix for vpc tiers as well
* move entire vnet cleanup logic to trash from shutdown, so that it works for all network types for netris
* cleanup vnets when reservation id is null
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Add support to include VPN service for NATTED Netris offerings
* Add support to include VPN service for NATTED Netris offerings
* missing changes of global routing
* Remove extra space
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* Netris - Support Redundant Virtual Routers for Netris VPC networks
* Add support for redundant routers for Netris VPC networks
* address comment
* default null network mode to natted for netris
* preventing vpc and ipam creation if already exists
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Enable autoscaling groups for Netris network offerings
* Enable autoscaling groups for Netris network offerings
* Fix UI loading for services when network mode changes for external providers and show vm autoscaling always set to true / non-editable for netris when LB is selected i.e, natted mode
* Revert removed comment
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* merge conflict
* systemvm: fix VPC VPN issue when network id is bigger than 1000 on Netris
* show networks for vnf nic mappings
* Add a check to prevent re-adding existing ACLs
* Add a check to prevent re-adding existing ACLs
* change message compare statement
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
Co-authored-by: Wei Zhou <weizhou@apache.org>
* Add check for vnet name length and cleanup vpc and vnet resources on failure of creation of allocation
* Netris - Support NAT, PF for Secondary IP
* Allow PF rules to be correctly created on secondary IP of a VM on netris
* unique static nat names on netris by adding public IP - handle backward compatibility
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Support for L2 networks
* Add support for L2 networks in Netris
* remove the need to add connectivity to identify netris provider, remove changes to ui and create net offering
* create vpc network and use it for l2 networks
* dont fail if deletion on netris doesnt succeed
* remove connectivity capability
* update vpc name when l2 name is updated
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - CKS support
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Enable Global Routing Flag for NATTED Dual-Stack VPCs
* Set globalRouting = true, when network offering is NATTED, dual-stack
* update global routing based on routing mode and ip protocol type
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* Netris - Fix allocate vnets with the correct account ID so that release succeeds on network deletion
* Fix allocate vnets with the correct account ID so that release succeeds on network deletion
* add fix for vpc tiers as well
* move entire vnet cleanup logic to trash from shutdown, so that it works for all network types for netris
* cleanup vnets when reservation id is null
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Add support to include VPN service for NATTED Netris offerings
* Add support to include VPN service for NATTED Netris offerings
* missing changes of global routing
* Remove extra space
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* Netris - Support Redundant Virtual Routers for Netris VPC networks
* Add support for redundant routers for Netris VPC networks
* address comment
* default null network mode to natted for netris
* preventing vpc and ipam creation if already exists
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris - Enable autoscaling groups for Netris network offerings
* Enable autoscaling groups for Netris network offerings
* Fix UI loading for services when network mode changes for external providers and show vm autoscaling always set to true / non-editable for netris when LB is selected i.e, natted mode
* Revert removed comment
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
* merge conflict
* systemvm: fix VPC VPN issue when network id is bigger than 1000 on Netris
* show networks for vnf nic mappings
* Add a check to prevent re-adding existing ACLs
* Add a check to prevent re-adding existing ACLs
* change message compare statement
* Add check for vnet name length and cleanup vpc and vnet resources on failure of creation of allocation
* add name length validation to update path
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
Co-authored-by: Wei Zhou <weizhou@apache.org>
* Add support to the VPC response to display if redundant routers are supported
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Hide VPN sections and prevent enabling it when service isn't enabled in the vpc offering
* Hide VPN sections and prevent enabling it when service isn't enabled in the vpc offering
* update
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Fix issue with adding external node to a CKS cluster with Netris offering
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Update upgrade path to reclaim vnets of deleted netris networks, improve log and hide add upstream route for Netris routed networks
* Update upgrade path to reclaim vnets of deleted netris networks, improve log and hide add upstream route for Netris routed networks
* Apply suggestions from code review
* hide upstream route banner for netris networks altogether
* fix migration of netris VRs and fix reclaim vnet query
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: Nicolas Vazquez <nicovazquez90@gmail.com>
* Allocate IP from Netris (Provider) range when IP is not specified during associate
* Allocate IP from Netris (Provider) range when IP is not specified during associate
* update javadoc and method name
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Fix VRRP gateway IP conflict on redundant VPC routers with external network providers (Netris/NSX)
Co-authored-by: Pearl Dsilva <pearl1594@gmail.com>
* VPN: Reconfigure static nat and static route on fail over to backup VR - for redundant VPC VRs
* VPN: Reconfigure static nat and static route on fail over to backup VR - for redundant VPC VRs
* address comment
* add stacktrace to the log
---------
* Fix issue with deletion of vpn connection for DualStack redundant VPCs
* fix precommit ci issue
* Add Netris to the range limit check (apache#129)
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
* Netris: address review comments on static NAT, L2 and offering form
- Match the legacy static NAT rule only when it was created for the
requested public IP, on both create and delete
- Roll back the dedicated L2 VPC if vNet creation fails
- Hide the L2 guest type for Netris in the add offering form
- Add VPN to the external provider service map for Netris only
- Fix the L2 offering services javadoc
* Update Netris SDK version to 1.0.1
* Move to the correct schema file
* systemvm: bind dnsmasq and password server to router IP when external provider owns the gateway
---------
Co-authored-by: Pearl Dsilva <pearl1954@gmail.com>
Co-authored-by: nvazquez <nicovazquez90@gmail.com>
Co-authored-by: Wei Zhou <weizhou@apache.org>1 parent 0883185 commit dfff32e
50 files changed
Lines changed: 1236 additions & 349 deletions
File tree
- api/src/main/java
- com/cloud/network/netris
- org/apache/cloudstack/api
- command
- admin
- network
- vpc
- utils
- response
- engine
- orchestration/src/main/java/org/apache/cloudstack/engine/orchestration
- schema/src/main
- java/com/cloud/vm/dao
- resources/META-INF/db
- plugins
- integrations/kubernetes-service/src/main/java/com/cloud/kubernetes/cluster
- actionworkers
- network-elements/netris
- src
- main/java/org/apache/cloudstack
- agent/api
- resource
- service
- test/java/org/apache/cloudstack
- agent/api
- resource
- service
- server/src
- main/java/com/cloud
- api/query/dao
- network
- guru
- router
- vpc
- vpn
- test/java/org/apache/cloudstack/service
- systemvm/debian/opt/cloud/bin
- cs
- ui/src
- components/view
- config/section
- views
- infra/zone
- network
- offering
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
21 | 21 | | |
22 | 22 | | |
23 | 23 | | |
| 24 | + | |
| 25 | + | |
24 | 26 | | |
25 | 27 | | |
26 | 28 | | |
| |||
81 | 83 | | |
82 | 84 | | |
83 | 85 | | |
84 | | - | |
85 | | - | |
86 | | - | |
87 | | - | |
88 | | - | |
89 | | - | |
90 | | - | |
91 | | - | |
92 | | - | |
| 86 | + | |
| 87 | + | |
| 88 | + | |
| 89 | + | |
| 90 | + | |
| 91 | + | |
| 92 | + | |
| 93 | + | |
| 94 | + | |
| 95 | + | |
| 96 | + | |
93 | 97 | | |
94 | 98 | | |
95 | | - | |
| 99 | + | |
96 | 100 | | |
97 | 101 | | |
98 | 102 | | |
| |||
105 | 109 | | |
106 | 110 | | |
107 | 111 | | |
| 112 | + | |
108 | 113 | | |
109 | 114 | | |
110 | | - | |
| 115 | + | |
111 | 116 | | |
112 | 117 | | |
113 | 118 | | |
| |||
120 | 125 | | |
121 | 126 | | |
122 | 127 | | |
| 128 | + | |
123 | 129 | | |
124 | 130 | | |
125 | | - | |
| 131 | + | |
126 | 132 | | |
127 | 133 | | |
128 | 134 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1289 | 1289 | | |
1290 | 1290 | | |
1291 | 1291 | | |
| 1292 | + | |
1292 | 1293 | | |
1293 | 1294 | | |
1294 | 1295 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
| 63 | + | |
63 | 64 | | |
64 | 65 | | |
65 | 66 | | |
| |||
309 | 310 | | |
310 | 311 | | |
311 | 312 | | |
| 313 | + | |
| 314 | + | |
| 315 | + | |
| 316 | + | |
312 | 317 | | |
313 | 318 | | |
314 | 319 | | |
| |||
418 | 423 | | |
419 | 424 | | |
420 | 425 | | |
| 426 | + | |
| 427 | + | |
| 428 | + | |
421 | 429 | | |
422 | 430 | | |
423 | 431 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
24 | 24 | | |
25 | 25 | | |
26 | 26 | | |
| 27 | + | |
27 | 28 | | |
28 | 29 | | |
29 | 30 | | |
| |||
61 | 62 | | |
62 | 63 | | |
63 | 64 | | |
| 65 | + | |
64 | 66 | | |
| 67 | + | |
65 | 68 | | |
66 | 69 | | |
67 | 70 | | |
| |||
189 | 192 | | |
190 | 193 | | |
191 | 194 | | |
192 | | - | |
| 195 | + | |
193 | 196 | | |
194 | 197 | | |
195 | 198 | | |
| |||
198 | 201 | | |
199 | 202 | | |
200 | 203 | | |
| 204 | + | |
201 | 205 | | |
202 | 206 | | |
203 | 207 | | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
204 | 211 | | |
205 | 212 | | |
206 | 213 | | |
| |||
210 | 217 | | |
211 | 218 | | |
212 | 219 | | |
213 | | - | |
| 220 | + | |
214 | 221 | | |
215 | 222 | | |
216 | 223 | | |
| |||
248 | 255 | | |
249 | 256 | | |
250 | 257 | | |
251 | | - | |
| 258 | + | |
252 | 259 | | |
253 | 260 | | |
254 | 261 | | |
| |||
258 | 265 | | |
259 | 266 | | |
260 | 267 | | |
261 | | - | |
| 268 | + | |
262 | 269 | | |
263 | 270 | | |
264 | 271 | | |
| |||
268 | 275 | | |
269 | 276 | | |
270 | 277 | | |
| 278 | + | |
271 | 279 | | |
| 280 | + | |
| 281 | + | |
| 282 | + | |
| 283 | + | |
| 284 | + | |
| 285 | + | |
| 286 | + | |
| 287 | + | |
| 288 | + | |
| 289 | + | |
| 290 | + | |
| 291 | + | |
272 | 292 | | |
273 | 293 | | |
274 | 294 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
26 | 30 | | |
27 | | - | |
| 31 | + | |
28 | 32 | | |
29 | 33 | | |
30 | 34 | | |
| |||
33 | 37 | | |
34 | 38 | | |
35 | 39 | | |
36 | | - | |
| 40 | + | |
37 | 41 | | |
38 | 42 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
62 | 62 | | |
63 | 63 | | |
64 | 64 | | |
| 65 | + | |
| 66 | + | |
| 67 | + | |
| 68 | + | |
65 | 69 | | |
66 | 70 | | |
67 | 71 | | |
| |||
201 | 205 | | |
202 | 206 | | |
203 | 207 | | |
| 208 | + | |
| 209 | + | |
| 210 | + | |
| 211 | + | |
204 | 212 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
2302 | 2302 | | |
2303 | 2303 | | |
2304 | 2304 | | |
| 2305 | + | |
| 2306 | + | |
| 2307 | + | |
| 2308 | + | |
| 2309 | + | |
2305 | 2310 | | |
2306 | 2311 | | |
2307 | 2312 | | |
| |||
2350 | 2355 | | |
2351 | 2356 | | |
2352 | 2357 | | |
| 2358 | + | |
| 2359 | + | |
| 2360 | + | |
| 2361 | + | |
2353 | 2362 | | |
2354 | 2363 | | |
2355 | 2364 | | |
| |||
3175 | 3184 | | |
3176 | 3185 | | |
3177 | 3186 | | |
3178 | | - | |
| 3187 | + | |
3179 | 3188 | | |
3180 | 3189 | | |
3181 | 3190 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
105 | 105 | | |
106 | 106 | | |
107 | 107 | | |
108 | | - | |
| 108 | + | |
109 | 109 | | |
110 | 110 | | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
456 | 456 | | |
457 | 457 | | |
458 | 458 | | |
459 | | - | |
| 459 | + | |
460 | 460 | | |
461 | 461 | | |
462 | 462 | | |
| 463 | + | |
463 | 464 | | |
464 | 465 | | |
465 | 466 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
23 | 23 | | |
24 | 24 | | |
25 | 25 | | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
0 commit comments