You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2022/09/22 06:11:31 UTC
[cloudstack] branch UserDataAsFirstClassResource updated (bda175e364e -> 0b4c9d9ecba)
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch UserDataAsFirstClassResource
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
omit bda175e364e Moved schema changes to 4171 to 4180 schema upgrade file
omit 50687d7c281 added success message for userdata registration
omit 694990a0024 Removed labels added during merge
omit d3c54472595 Added unit tests
omit cb43623e938 Added a check while deleting the userdata, to see if no VMs are using the userdata
omit 77723761ade Fix document link in UI
omit 4c7b977e66d added comments to marvin test cases
omit dc107840f0a Fix marvin test case
omit 73d2e95e83b Fix custom userdata params for config drive by adding userdata file name and value metadata json
omit 6818fcb0479 remove delete cascade on user_vm and vm_template tables for userdata id foreign key reference.
omit 3d99abbcbe7 Added length to userdata param
omit 4fb9676e53c Removed required param for iso id in linkuserdatatotemplate cmd
omit 9b0aeea886a Added validation to userdata params so that it wont contain any VR metadafile names
omit ab9e47eb4b3 Added ISO id to the linkuserdatatotemplate API
omit 68f083d11e1 Added blank values for userdata in edit template form
omit 056ec447bcf Added resetVMUserdata in UI for stopped VM
omit 5627d3712b7 Added new UnitTests for resetVMUserData
omit 31020407eab Added new API to reset UserData of a VM along with UpdateVM API
omit 0618005c111 Add comments section to userdata
omit 435ef2713c8 Added userdata selection in deploy VM form for ISOs
omit aafe795a7d2 Added userdata details to register and upload iso forms
omit 44b33af71f5 Few more code fixes
omit 840e578beda Few code fixes
omit 70b88a00544 Added few more marvin tests for userdata
omit d49ddab3aab Fixed marvin tests for registerd userdata
omit d934829d6f3 Adding marvin tests for userdata
omit 96bf42fc4c3 Few improvements in the code
omit b75ee14ea2a Fix Userdata delete flow
omit c3cf63eb775 Fix unused imports
omit a0dfba15f4e Move test file to proper files
omit c1032ba4aee Remove unused imports
omit 8f12510ea05 Added unit tests for linking userdata to template
omit 1f13caba8ce Added unit tests for userdata
omit 21ede0e5428 fixes in deploy VM form to support deny userdata policy
omit 13e7c571a3b Few UI fixes in deploy VM and edit template form
omit 70f7c2e9bb7 update userdata linking to template
omit a0173e811a8 Allow override append of userdata in deploy VM flow
omit 9a38fa3e511 added userdata policy list to register template form
omit 7eafbbf47f5 Added ToolTips and fixes deploy VM, register userdata form
omit 876131d60d6 Added userdata denyoverride flag and userdata params section
omit d2b586bcaf1 Userdata Navigation in template view
omit 60d724c6470 Fixed unit tests and imports
omit 47247d76930 Small fixes and added userdata to updateVM flow
omit 01d363f7d2a Added userdata params to registeruserdata UI form
omit 9badf84e0b4 Added userdata list to deploy VM form
omit 824b6331651 UI: added userdata id to deloyvm wizard
omit 6c6bbb13b44 Updated template response and views
omit f99567934c5 Write userdata details into metadata VR
omit 2ece8d7558e Added userdata details to the deployVM cmd flow
omit 9d1faa6b758 UI: added a new section for userdata
omit 40150ddb11b Fixed userdata append scenario between template userdata and user provided userdata
omit e635437b84e Added userdata id in deploy VM flow
omit d909e46e568 Few fixes
omit 957d731cfca UserData as first clas resource
add d3ec27dc790 Fixed Veeam listing restore points (#6555)
add 68425830340 vpc,network: fix createLoadBalancer access on user network (#6591)
add 76f52af8f39 removed the use of SharedMountPoint storage type for the StorPool plugin (#6552)
add 840c3f6a7ad Merge remote-tracking branch 'origin/4.17'
add 9717ed9af24 Improve log messages on VolumeOrchestrator class (#6408)
add 696b93f421a kvm: update host memory stats (#6622)
add 9410a70454e schema: increase size of column 'value' at table 'account_details' (#6080)
add d9b770eb486 Merge remote-tracking branch 'apache/4.17' into main
add 152a2748457 README: add codecov badge
add 75da982d730 Updated resource counter to include correct size after volume creation/resize and other improvements (#6587)
add a5716d964a8 ui: reset disksize param on offering change in scale vm (#6636)
add 770df60bbef vmware,cks: fix attachiso failure with vmware drs (#6625)
add ef2997c4a88 ui: fix the warning in detail tab (#6645)
add 7ae6fdf053b Merge remote-tracking branch 'apache/4.17' into main
add 780bb2474cd ui: fix gputype in add compute offering (#6646)
add 547041646ab server: fix delete resource tag permission (#6634)
add 8e428c7b0c9 Merge remote-tracking branch 'origin/4.17'
add 052a34c1fb9 ui: fix resource tags visibility in infocard (#6650)
add 010b47f82eb server: fix ipv6 network deployment with separate guest nw (#6588)
add 83008e55cf3 Merge remote-tracking branch 'origin/4.17'
add f23a4db6d26 kvm: Add usermode interface option to Libvirt Domain XML builder (#6640)
add 1fd1f0626a0 Fix SQL query for uuid wrong format (#6654)
add 44e600e2fc8 server: remove resource tags for disassociated public ip (#6642)
add 98479183601 api, vmware: allow VM setting/detail for disk controller (root/data) to override template details (#6276)
add 814dbbaf860 cks: fix k8s cluster deployment with host tagged offering (#6658)
add bd6bcffccc2 Merge remote-tracking branch 'apache/4.17' into main
add ad0ae839746 ui: Revise Chinese language pack (#6653)
add cd37b135a0a vpc: prevent sourcenat ip disassociation for an active vpc (#6664)
add f76b6c686d6 Merge remote-tracking branch 'apache/4.17' into main
add c8494354ca8 UI: Fixes suffix icon on project selector not work (#6671)
add 7ddebd3b2c1 server: fix error when dedicating guest vlan range for physical nw without vlan range (#6655)
add 7115e359657 ui: fix update network update in sequence param (#6675)
add c5262443595 Merge remote-tracking branch 'apache/4.17' into main
add 9f7e0cc2d57 VM stats history visualization (#6401)
add 3170338d14a ui: remove incorrect API calls when initializing the deploy VM page (#6687)
add 201f06697df Merge remote-tracking branch 'origin/4.17'
add d4b8e2cbe87 Validate host tags on VM live scale (#6409)
add a21efe75dfb vmware: fix vm snapshot with datastore cluster, drs (#6643)
add e720b72e158 Merge remote-tracking branch 'apache/4.17' into main
add c58118148e1 Remove unsupported params from API calls on the UI (#6686)
add c290cbcb71e server: fix scale vm with compute offering having same disk offering (#6688)
add 65c70704227 Merge remote-tracking branch 'apache/4.17' into main
add e76df16d9f4 Ignore opensaml dependencies (#6693)
add 1d20fcfc6e1 ui: fix set reservation toggle in add public ip range (#6707)
add f18eebf2e95 server: fix check for ipv6 range overlap (#6705)
add b831f23f5fe kvm: add libvirt host capabilities method for cpu speed retrieval (#6696)
add 687a21c116c Merge remote-tracking branch 'apache/4.17' into main
add fe16be04088 UI: fix bulk delete project with cleanup (#6708)
add f342cf300ee ui: Fix netowrkid not passed in deployvm (#6711)
add d3bfdacffd1 systemvm,vr: disable radvd for non-applicable VRs (#6706)
add cf18549dbb0 Merge remote-tracking branch 'apache/4.17' into main
add 78b68fd7e6e api,server: custom dns for guest network (#6425)
add 20950e0e1d5 jacoco: fix no coverage result in server and some other modules (#6730)
add 68c09f92d17 Merge remote-tracking branch 'origin/4.17'
add a45a4a5218d upgrade a backported patch (#6728)
add e8b249f11d5 server: fix netowork upgrade for IPv6 (#6729)
add 77df050160d Reset unusable db connections (#6725)
add fa34d687668 Merge remote-tracking branch 'apache/4.16' into 4.17
add 9c2a462d1a7 Merge remote-tracking branch 'apache/4.17' into main
add 7be7ef66fb3 Improve error message on storage tags update (#6269)
add b2fbe7bb121 console: Console access enhancements (#6577)
add ba35437da7d UI: Build Dockerfile with Node v14 (#6712)
add 14656733d81 Fix min balance for API quotaCredits to be optional (#6691)
add c3d6f42dd9d UI fix Theme text color not bind navTextColorPick and reset button (#6721)
add bf4e9059dd6 Merge remote-tracking branch 'apache/4.17' into main
add e39b7ac0d94 ui: fixes errors in the Console.vue (#6741)
add bbc12605767 Resource reservation framework (#6694)
add 350ef38e1cb Updating pom.xml version numbers for release 4.17.1.0
add d724a9d15cf Updating pom.xml version numbers for release 4.17.2.0-SNAPSHOT
add 5669888c161 mvn: fix build and use the 4.17.2.0-SNAPSHOT in version
add 434f15a9b29 Merge remote-tracking branch 'origin/4.17'
add 9873e2fc4be UserData as first clas resource
add 7c4eff53ca5 Few fixes
add ebd430a3c82 Added userdata id in deploy VM flow
add 458bd11b736 Fixed userdata append scenario between template userdata and user provided userdata
add 259eabee968 UI: added a new section for userdata
add fe1850faa78 Added userdata details to the deployVM cmd flow
add aa872fe634c Write userdata details into metadata VR
add c2077425168 Updated template response and views
add 280ed55dc5a UI: added userdata id to deloyvm wizard
add 9bbe6ad6e8a Added userdata list to deploy VM form
add 56d7bf18930 Added userdata params to registeruserdata UI form
add c9aeb2c81c9 Small fixes and added userdata to updateVM flow
add 668c071181d Fixed unit tests and imports
add fd0a3e923d9 Userdata Navigation in template view
add 7e5d6f72fc7 Added userdata denyoverride flag and userdata params section
add 02673470842 Added ToolTips and fixes deploy VM, register userdata form
add ceb1bc6954c added userdata policy list to register template form
add 16619327b84 Allow override append of userdata in deploy VM flow
add 6852bb4c3bd update userdata linking to template
add 57bd1498ff4 Few UI fixes in deploy VM and edit template form
add 4f7d26d580b fixes in deploy VM form to support deny userdata policy
add a8e08161373 Added unit tests for userdata
add d4f86eb9e76 Added unit tests for linking userdata to template
add 6df85247a25 Remove unused imports
add f65980233ae Move test file to proper files
add 885d7d79eb8 Fix unused imports
add 817bee130ae Fix Userdata delete flow
add 8db087ef8f1 Few improvements in the code
add d6c7f767a01 Adding marvin tests for userdata
add 9d5b358059d Fixed marvin tests for registerd userdata
add d644c3f5cec Added few more marvin tests for userdata
add 33e7ad9b5d4 Few code fixes
add b35ab00eb19 Few more code fixes
add 163565841a4 Added userdata details to register and upload iso forms
add 953087376d5 Added userdata selection in deploy VM form for ISOs
add e24a7459e0e Add comments section to userdata
add 76f484b1ff8 Added new API to reset UserData of a VM along with UpdateVM API
add 62da8d82ed2 Added new UnitTests for resetVMUserData
add 30b354a27c5 Added resetVMUserdata in UI for stopped VM
add 7ab1b431bf9 Added blank values for userdata in edit template form
add f073af6f45b Added ISO id to the linkuserdatatotemplate API
add 264a7fa418f Added validation to userdata params so that it wont contain any VR metadafile names
add 864aa50c9fb Removed required param for iso id in linkuserdatatotemplate cmd
add 06d6ba1dacd Added length to userdata param
add 9268534486e remove delete cascade on user_vm and vm_template tables for userdata id foreign key reference.
add 54b7d47abdd Fix custom userdata params for config drive by adding userdata file name and value metadata json
add 0c508276fae Fix marvin test case
add d5a1d808b1e added comments to marvin test cases
add 7f0307fd3dc Fix document link in UI
add f19b9255032 Added a check while deleting the userdata, to see if no VMs are using the userdata
add bbb49cf4eb8 Added unit tests
add fbf81686128 Removed labels added during merge
add cb3c9c70515 added success message for userdata registration
add cdc9a477643 Moved schema changes to 4171 to 4180 schema upgrade file
add 0b4c9d9ecba Fixed issues are rebasing with main
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (bda175e364e)
\
N -- N -- N refs/heads/UserDataAsFirstClassResource (0b4c9d9ecba)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
README.md | 2 +-
.../consoleproxy/ConsoleProxyResource.java | 24 +-
.../java/com/cloud/agent/api/to/NetworkTO.java | 10 +
.../java/com/cloud/configuration/Resource.java | 5 +-
api/src/main/java/com/cloud/network/Network.java | 8 +
.../main/java/com/cloud/network/NetworkModel.java | 16 +-
.../java/com/cloud/network/NetworkProfile.java | 22 +
api/src/main/java/com/cloud/network/vpc/Vpc.java | 12 +-
.../java/com/cloud/network/vpc/VpcService.java | 5 +-
api/src/main/java/com/cloud/storage/Storage.java | 3 +-
.../java/com/cloud/user/ResourceLimitService.java | 17 +-
.../api/command/admin/config/UpdateCfgCmd.java | 2 +-
.../command/user/consoleproxy/ConsoleEndpoint.java | 103 +
.../consoleproxy/CreateConsoleEndpointCmd.java | 120 +
.../api/command/user/network/CreateNetworkCmd.java | 28 +
.../api/command/user/network/UpdateNetworkCmd.java | 29 +
.../api/command/user/vpc/CreateVPCCmd.java | 30 +-
.../response/ConsoleEndpointWebsocketResponse.java | 88 +
.../response/CreateConsoleEndpointResponse.java | 76 +
.../cloudstack/api/response/NetworkResponse.java | 20 +-
.../cloudstack/api/response/VpcResponse.java | 32 +
.../consoleproxy/ConsoleAccessManager.java | 35 +
.../cloudstack/user/ResourceReservation.java | 22 +-
.../api/ConsoleAccessAuthenticationCommand.java | 13 +-
.../agent/api/proxy/AllowConsoleAccessCommand.java | 34 +-
.../com/cloud/info/ConsoleProxyConnectionInfo.java | 9 +
.../main/java/com/cloud/info/ConsoleProxyInfo.java | 9 +
.../java/com/cloud/info/ConsoleProxyStatus.java | 5 +
.../cloudstack/storage/to/PrimaryDataStoreTO.java | 7 +
.../template/LocalTemplateDownloaderTest.java | 6 +-
.../service/NetworkOrchestrationService.java | 3 +-
.../subsystem/api/storage/PrimaryDataStore.java | 4 +
.../engine/subsystem/api/storage/SnapshotInfo.java | 2 +
.../engine/subsystem/api/storage/VolumeInfo.java | 2 +
.../java/com/cloud/capacity/CapacityManager.java | 17 +-
.../java/com/cloud/network/vpc/VpcManager.java | 3 +-
.../engine/orchestration/NetworkOrchestrator.java | 64 +-
.../engine/orchestration/VolumeOrchestrator.java | 448 +-
.../orchestration/NetworkOrchestratorTest.java | 156 +-
.../src/main/java/com/cloud/dc/DataCenterVO.java | 10 +-
.../src/main/java/com/cloud/dc/dao/VlanDao.java | 2 +-
.../main/java/com/cloud/dc/dao/VlanDaoImpl.java | 20 +-
.../src/main/java/com/cloud/host/HostVO.java | 3 +-
.../main/java/com/cloud/network/dao/NetworkVO.java | 45 +-
.../src/main/java/com/cloud/network/vpc/VpcVO.java | 41 +-
.../network/vpc/dao/VpcOfferingServiceMapDao.java | 2 +-
.../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 4 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 3 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 8 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 13 +
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 9 +-
.../com/cloud/upgrade/dao/Upgrade41700to41710.java | 42 +-
.../main/java/com/cloud/user/AccountDetailVO.java | 2 +-
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 3 +-
.../cloudstack/reservation/ReservationVO.java} | 71 +-
.../cloudstack/reservation/dao/ReservationDao.java | 18 +-
.../reservation/dao/ReservationDaoImpl.java | 75 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 8 +-
.../spring-engine-schema-core-daos-context.xml | 1 +
.../resources/META-INF/db/schema-41610to41700.sql | 5 +-
.../resources/META-INF/db/schema-41700to41710.sql | 3 +
.../resources/META-INF/db/schema-41710to41800.sql | 24 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 32 +-
.../vmsnapshot/DefaultVMSnapshotStrategyTest.java | 106 +
.../storage/vmsnapshot/VMSnapshotStrategyTest.java | 8 +
.../storage/datastore/PrimaryDataStoreImpl.java | 21 +-
.../cloudstack/storage/volume/VolumeObject.java | 21 +
.../cloudstack/framework/config/ConfigKey.java | 3 +
.../com/cloud/utils/db/ConnectionConcierge.java | 8 +-
plugins/api/discovery/pom.xml | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
.../cloudstack/backup/VeeamBackupProvider.java | 78 +-
.../cloudstack/api/command/QuotaCreditsCmd.java | 3 -
.../networkservice/BaremetaNetworkGuru.java | 14 +-
.../kvm/resource/LibvirtComputingResource.java | 7 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 26 +-
.../apache/cloudstack/utils/linux/KVMHostInfo.java | 68 +-
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 29 +-
.../cloudstack/utils/linux/KVMHostInfoTest.java | 27 +-
.../vmware/manager/VmwareHostService.java | 3 +
.../vmware/manager/VmwareStorageManagerImpl.java | 111 +-
.../hypervisor/vmware/resource/VmwareResource.java | 7 +-
.../VmwareSecondaryStorageResourceHandler.java | 15 +-
.../storage/resource/VmwareStorageProcessor.java | 124 +-
.../cluster/KubernetesClusterManagerImpl.java | 122 +-
plugins/metrics/pom.xml | 2 +-
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../kvm/storage/StorPoolStorageAdaptor.java | 2 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 3 +-
.../StorPoolPrimaryDataStoreLifeCycle.java | 2 +-
pom.xml | 14 +
server/pom.xml | 2 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 6 +
server/src/main/java/com/cloud/api/ApiServlet.java | 12 +
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 49 +-
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 49 +-
.../configuration/ConfigurationManagerImpl.java | 14 +-
.../AgentBasedConsoleProxyManager.java | 16 +-
.../java/com/cloud/consoleproxy/AgentHookBase.java | 19 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 42 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 34 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 2 +
.../com/cloud/network/IpAddressManagerImpl.java | 13 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 6 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 9 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 5 +-
.../java/com/cloud/network/NetworkModelImpl.java | 66 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 124 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 40 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 11 +-
.../network/guru/ExternalGuestNetworkGuru.java | 6 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 36 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 26 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 26 +-
.../cloud/network/router/CommandSetupHelper.java | 22 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 4 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 10 +
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 47 +-
.../com/cloud/resource/ResourceManagerImpl.java | 3 +
.../cloud/resourcelimit/CheckedReservation.java | 134 +
.../resourcelimit/ResourceLimitManagerImpl.java | 94 +-
.../java/com/cloud/server/ManagementServer.java | 4 +
.../com/cloud/server/ManagementServerImpl.java | 46 +
.../com/cloud/servlet/ConsoleProxyClientParam.java | 37 +
.../com/cloud/servlet/ConsoleProxyServlet.java | 220 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 3 +
.../com/cloud/tags/TaggedResourceManagerImpl.java | 28 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 636 ++-
.../consoleproxy/ConsoleAccessManagerImpl.java | 494 ++
.../lb/ApplicationLoadBalancerManagerImpl.java | 2 +-
.../core/spring-server-core-managers-context.xml | 2 +
.../test/java/com/cloud/api/ApiServletTest.java | 2 +-
.../configuration/ConfigurationManagerTest.java | 60 +
.../cloud/network/CreatePrivateNetworkTest.java | 2 +-
.../cloud/network/DedicateGuestVlanRangesTest.java | 20 +-
.../com/cloud/network/Ipv6AddressManagerTest.java | 8 +-
.../com/cloud/network/Ipv6ServiceImplTest.java | 21 +-
.../com/cloud/network/MockNetworkModelImpl.java | 17 +
.../com/cloud/network/NetworkModelImplTest.java | 144 +
.../java/com/cloud/network/NetworkModelTest.java | 169 +-
.../com/cloud/network/NetworkServiceImplTest.java | 300 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 84 +-
.../network/guru/ExternalGuestNetworkGuruTest.java | 123 +
.../com/cloud/network/vpc/VpcManagerImplTest.java | 101 +-
.../resourcelimit/CheckedReservationTest.java | 102 +
.../cloud/tags/TaggedResourceManagerImplTest.java | 45 +-
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 17 +
.../cloud/vpc/MockResourceLimitManagerImpl.java | 7 +
.../test/java/com/cloud/vpc/VpcApiUnitTest.java | 2 +-
.../java/com/cloud/vpc/dao/MockVpcDaoImpl.java | 4 +-
.../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 2 +-
.../consoleproxy/ConsoleAccessManagerImplTest.java | 109 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 43 +-
.../com/cloud/consoleproxy/ConsoleProxyClient.java | 2 +
.../cloud/consoleproxy/ConsoleProxyClientBase.java | 6 +
.../consoleproxy/ConsoleProxyClientParam.java | 37 +
.../ConsoleProxyClientStatsCollector.java | 17 +
.../cloud/consoleproxy/ConsoleProxyGCThread.java | 10 +-
.../ConsoleProxyHttpHandlerHelper.java | 12 +-
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 9 +-
.../consoleproxy/ConsoleProxyNoVNCServer.java | 24 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 7 +
.../ConsoleProxyHttpHandlerHelperTest.java | 51 +
systemvm/agent/noVNC/app/ui.js | 11 +-
systemvm/agent/noVNC/vnc.html | 4 +
systemvm/debian/opt/cloud/bin/setup/common.sh | 3 +
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 5 +
systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh | 4 +
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 12 +
systemvm/patch-sysvms.sh | 8 +-
.../component/test_network_vpc_custom_dns.py | 732 +++
test/integration/smoke/test_console_endpoint.py | 123 +
.../smoke/test_deploy_vms_in_parallel.py | 172 +
tools/apidoc/gen_toc.py | 3 +-
tools/marvin/marvin/lib/base.py | 8 +
ui/Dockerfile | 2 +-
ui/package.json | 5 +
ui/public/locales/en.json | 38 +
ui/public/locales/pt_BR.json | 38 +
ui/public/locales/zh_CN.json | 5494 ++++++++++++++------
ui/src/components/header/ProjectMenu.vue | 2 +-
ui/src/components/header/SamlDomainSwitcher.vue | 4 +-
ui/src/components/view/DetailsTab.vue | 12 +
ui/src/components/view/InfoCard.vue | 24 +-
ui/src/components/view/SearchView.vue | 6 +-
ui/src/components/view/Setting.vue | 3 +-
ui/src/components/view/SettingsTab.vue | 5 +-
ui/src/components/view/StatsTab.vue | 714 +++
.../view/chart/LineChart.vue} | 59 +-
ui/src/components/view/stats/FilterStats.vue | 165 +
ui/src/components/view/stats/ResourceStatsInfo.vue | 90 +
ui/src/components/widgets/Console.vue | 43 +-
ui/src/config/section/network.js | 4 +-
ui/src/config/section/offering.js | 2 -
ui/src/config/section/project.js | 2 +-
ui/src/store/modules/user.js | 2 +-
ui/src/style/ant-overwrite/ant-form.less | 8 +
.../style/{component => components}/dashboard.less | 0
.../view/StatsTab.scss} | 16 +-
ui/src/utils/plugins.js | 12 +
ui/src/views/AutogenView.vue | 11 +-
ui/src/views/compute/DeployVM.vue | 7 +-
ui/src/views/compute/EditVM.vue | 2 +-
ui/src/views/compute/InstanceTab.vue | 5 +
ui/src/views/compute/ScaleVM.vue | 1 +
ui/src/views/iam/SSLCertificateTab.vue | 1 -
.../views/image/AddKubernetesSupportedVersion.vue | 1 -
ui/src/views/image/IsoZones.vue | 2 +-
ui/src/views/image/RegisterOrUploadIso.vue | 6 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 7 +-
ui/src/views/image/TemplateZones.vue | 2 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 7 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 2 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 101 +-
ui/src/views/network/CreateL2NetworkForm.vue | 1 -
ui/src/views/network/CreateNetwork.vue | 1 -
ui/src/views/network/CreateSharedNetworkForm.vue | 297 +-
ui/src/views/network/CreateVpc.vue | 75 +-
ui/src/views/network/GuestIpRanges.vue | 1 -
ui/src/views/network/LoadBalancing.vue | 1 -
ui/src/views/network/UpdateNetwork.vue | 68 +-
ui/src/views/offering/AddComputeOffering.vue | 19 +-
ui/src/views/offering/AddDiskOffering.vue | 2 -
ui/src/views/offering/AddNetworkOffering.vue | 5 +-
ui/src/views/offering/AddVpcOffering.vue | 1 -
ui/src/views/offering/UpdateOfferingAccess.vue | 1 -
ui/src/views/tools/ManageInstances.vue | 2 +-
.../utils/consoleproxy/ConsoleAccessUtils.java | 9 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 11 +
232 files changed, 12062 insertions(+), 3151 deletions(-)
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/ConsoleEndpoint.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ConsoleEndpointWebsocketResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/CreateConsoleEndpointResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManager.java
copy core/src/main/java/com/cloud/info/ConsoleProxyStatus.java => api/src/main/java/org/apache/cloudstack/user/ResourceReservation.java (67%)
rename api/src/main/java/org/apache/cloudstack/acl/APILimitChecker.java => core/src/main/java/com/cloud/agent/api/proxy/AllowConsoleAccessCommand.java (59%)
copy engine/schema/src/main/java/{com/cloud/user/AccountDetailVO.java => org/apache/cloudstack/reservation/ReservationVO.java} (52%)
copy core/src/main/java/com/cloud/info/ConsoleProxyConnectionInfo.java => engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDao.java (65%)
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
create mode 100644 engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/DefaultVMSnapshotStrategyTest.java
create mode 100644 server/src/main/java/com/cloud/resourcelimit/CheckedReservation.java
create mode 100644 server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
create mode 100644 server/src/test/java/com/cloud/network/NetworkModelImplTest.java
create mode 100644 server/src/test/java/com/cloud/network/guru/ExternalGuestNetworkGuruTest.java
create mode 100644 server/src/test/java/com/cloud/resourcelimit/CheckedReservationTest.java
create mode 100644 server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
create mode 100644 services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelperTest.java
create mode 100644 test/integration/component/test_network_vpc_custom_dns.py
create mode 100644 test/integration/smoke/test_console_endpoint.py
create mode 100644 test/integration/smoke/test_deploy_vms_in_parallel.py
create mode 100644 ui/src/components/view/StatsTab.vue
copy ui/src/{style/component/dashboard.less => components/view/chart/LineChart.vue} (51%)
create mode 100644 ui/src/components/view/stats/FilterStats.vue
create mode 100644 ui/src/components/view/stats/ResourceStatsInfo.vue
rename ui/src/style/{component => components}/dashboard.less (100%)
copy ui/src/style/{ant-overwrite/ant-form.less => components/view/StatsTab.scss} (80%)
copy ui/src/style/ant-overwrite/ant-form.less => utils/src/main/java/org/apache/cloudstack/utils/consoleproxy/ConsoleAccessUtils.java (79%)