You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by nv...@apache.org on 2022/04/19 14:29:41 UTC
[cloudstack] branch main updated (334891a4b9d -> a5014a28a6e)
This is an automated email from the ASF dual-hosted git repository.
nvazquez pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from 334891a4b9d Merge branch '4.16'
add a5014a28a6e New feature: give access permission of networks to other accounts in same domain (#5769)
No new revisions were added by this update.
Summary of changes:
api/src/main/java/com/cloud/network/GuestVlan.java | 19 +-
.../{GuestVlan.java => GuestVlanRange.java} | 2 +-
api/src/main/java/com/cloud/network/Network.java | 10 +
.../main/java/com/cloud/network/NetworkModel.java | 5 +
.../{GuestVlan.java => NetworkPermission.java} | 12 +-
.../java/com/cloud/network/NetworkService.java | 21 +-
.../java/com/cloud/network/vpc/VpcService.java | 4 +-
.../java/com/cloud/offering/NetworkOffering.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 6 +
.../api/BaseResponseWithAssociatedNetwork.java | 40 ++
.../apache/cloudstack/api/ResponseGenerator.java | 10 +-
.../admin/network/DedicateGuestVlanRangeCmd.java | 4 +-
.../network/ListDedicatedGuestVlanRangesCmd.java | 6 +-
.../command/admin/network/ListGuestVlansCmd.java | 113 +++
.../admin/network/ListNetworksCmdByAdmin.java | 16 +-
.../admin/vpc/CreatePrivateGatewayByAdminCmd.java | 74 ++
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 4 +-
.../api/command/user/network/CreateNetworkCmd.java | 35 +-
.../user/network/CreateNetworkPermissionsCmd.java | 130 ++++
.../api/command/user/network/DeleteNetworkCmd.java | 3 +-
.../user/network/ListNetworkPermissionsCmd.java | 94 +++
.../api/command/user/network/ListNetworksCmd.java | 26 +
.../user/network/RemoveNetworkPermissionsCmd.java | 129 ++++
.../user/network/ResetNetworkPermissionsCmd.java | 89 +++
.../command/user/network/RestartNetworkCmd.java | 11 +
.../api/command/user/network/UpdateNetworkCmd.java | 11 +
.../vpc/CreatePrivateGatewayCmd.java | 64 +-
.../api/response/GuestVlanRangeResponse.java | 4 +-
...anRangeResponse.java => GuestVlanResponse.java} | 98 ++-
...sponse.java => NetworkPermissionsResponse.java} | 73 +-
.../cloudstack/api/response/NetworkResponse.java | 20 +-
.../api/response/PrivateGatewayResponse.java | 5 +-
.../service/NetworkOrchestrationService.java | 2 +
.../engine/orchestration/NetworkOrchestrator.java | 44 +-
.../main/java/com/cloud/dc/DataCenterVnetVO.java | 9 +-
.../schema/src/main/java/com/cloud/dc/VlanVO.java | 2 +-
.../cloud/network/dao/AccountGuestVlanMapVO.java | 4 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 4 +-
.../java/com/cloud/vm/dao/DomainRouterDaoImpl.java | 3 +-
.../cloudstack/network/NetworkPermissionVO.java | 61 ++
.../network/dao/NetworkPermissionDao.java | 65 ++
.../network/dao/NetworkPermissionDaoImpl.java | 98 +++
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41610to41700.sql | 9 +
.../src/main/java/com/cloud/acl/DomainChecker.java | 5 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 116 +++-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 11 +-
.../configuration/ConfigurationManagerImpl.java | 142 ++--
.../java/com/cloud/network/NetworkModelImpl.java | 162 ++++-
.../java/com/cloud/network/NetworkServiceImpl.java | 597 +++++++++++++---
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 2 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 7 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 18 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 267 +++++---
.../com/cloud/server/ConfigurationServerImpl.java | 4 +-
.../com/cloud/server/ManagementServerImpl.java | 23 +-
.../java/com/cloud/user/AccountManagerImpl.java | 22 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 11 +-
.../cloud/network/CreatePrivateNetworkTest.java | 14 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 18 +-
.../com/cloud/network/MockNetworkModelImpl.java | 11 +
.../cloud/network/UpdatePhysicalNetworkTest.java | 2 +-
.../cloud/network/lb/AssignLoadBalancerTest.java | 54 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 43 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 11 +
.../networkoffering/CreateNetworkOfferingTest.java | 4 +-
.../cloudstack/privategw/AclOnPrivateGwTest.java | 2 +-
test/integration/smoke/test_network_permissions.py | 760 +++++++++++++++++++++
test/integration/smoke/test_pvlan.py | 17 +-
.../integration/smoke/test_user_private_gateway.py | 425 ++++++++++++
test/integration/smoke/test_user_shared_network.py | 631 +++++++++++++++++
tools/marvin/marvin/lib/base.py | 58 +-
ui/public/locales/en.json | 14 +
ui/src/components/view/InfoCard.vue | 2 +-
ui/src/components/view/ListView.vue | 5 +
ui/src/components/view/SearchView.vue | 29 +-
ui/src/config/section/network.js | 37 +-
ui/src/views/AutogenView.vue | 12 +-
ui/src/views/network/CreateNetwork.vue | 6 +-
ui/src/views/network/CreateNetworkPermission.vue | 247 +++++++
ui/src/views/network/CreateSharedNetworkForm.vue | 354 +++++++---
ui/src/views/network/GuestVlanNetworksTab.vue | 135 ++++
ui/src/views/network/NetworkPermissions.vue | 207 ++++++
ui/src/views/network/VpcTab.vue | 59 +-
ui/src/views/offering/AddNetworkOffering.vue | 18 +-
86 files changed, 5391 insertions(+), 614 deletions(-)
copy api/src/main/java/com/cloud/network/{GuestVlan.java => GuestVlanRange.java} (93%)
copy api/src/main/java/com/cloud/network/{GuestVlan.java => NetworkPermission.java} (77%)
create mode 100755 api/src/main/java/org/apache/cloudstack/api/BaseResponseWithAssociatedNetwork.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestVlansCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkPermissionsCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/ListNetworkPermissionsCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/RemoveNetworkPermissionsCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/network/ResetNetworkPermissionsCmd.java
rename api/src/main/java/org/apache/cloudstack/api/command/{admin => user}/vpc/CreatePrivateGatewayCmd.java (81%)
copy api/src/main/java/org/apache/cloudstack/api/response/{GuestVlanRangeResponse.java => GuestVlanResponse.java} (50%)
copy api/src/main/java/org/apache/cloudstack/api/response/{GuestVlanRangeResponse.java => NetworkPermissionsResponse.java} (57%)
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/NetworkPermissionVO.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/NetworkPermissionDao.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/network/dao/NetworkPermissionDaoImpl.java
create mode 100644 test/integration/smoke/test_network_permissions.py
create mode 100644 test/integration/smoke/test_user_private_gateway.py
create mode 100644 test/integration/smoke/test_user_shared_network.py
create mode 100644 ui/src/views/network/CreateNetworkPermission.vue
create mode 100644 ui/src/views/network/GuestVlanNetworksTab.vue
create mode 100644 ui/src/views/network/NetworkPermissions.vue