This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch decoupleServiceOfferingDiskOffering
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit 187efe7 Added search field for changeofferingforvolume UI form
omit 8e868a1 Fix false response on updateDiskOffering API
omit e9462dc Added custom Iops to resize volume form and removed the
current disk offering during change offering for volume UI form
omit e02841f Fixed UI in migrate and changeofferingfor volume to handle
empty disk offering list Removed the volume's current disk offering from
listDiskOffering response list
omit 664f426 Fix listdiskoffering after rebasing with main
omit a25e93c UI fix in deploy vm wizard
omit 76563b8 UI changes to disable override root disk size when override
root disk offering is enabled
omit 4dce530 Fixed resize volume UI form for data disk
omit b2d8380 Address review comments and fix UI form of deploy VM in case
of ISO.
omit e3ac26d Added tool tip for migrate volume UI form
omit 345f157 Fix smoke test failures
omit b29a1c4 Rename global configuration parameter from
storage.pool.tags.disk.offering.strictness to
match.storage.pool.tags.with.disk.offering
omit a59b230 Added storage id for the list disk offering API and
corresponding UI changes in migrateVolume and changeOfferingForVolume flow
omit d231f94 Fix unit test in VolumeApiServiceImpl
omit 39e7e5b Fixed recent unit test cases with new serviceofferingvo
constructor
omit c3628bd Fix a unit test case
omit 9ce1cb4f Changes for override root disk offering in deployvm wizard in
case of custom offering
omit 14f3179 Fix list volumes, after changing system_use column from disk
offering to service offering in volume_view
omit 216ac79 Fix global setting implementation
omit b4bb70f Fix changeOfferingForVolume API for custom disk offering
omit 92fb162 update volume_view to update system_use column from service
offering and not disk offering
omit 8bf02e7 Remove system_use column from disk offering join
omit 7da967c remove system_use column from disk_offering view
omit 150e131 Upgrade handled with new schema changes
omit b4ea31c review comments addressed
omit 39ec65f Added marvin test cases for checking disk offering strictness
omit a62e07f Addressed review comments and fixed update service offering
flow with storage tags
omit b97f34a Removed unused import
omit f5d55f9 Fix domain_router_view to get proper service offering id
omit b6134d4 Fix service offering constructor to address custom offering
omit 753c9c5 Fix service offering edit flow
omit 35814ad Fixed service_offering_view
omit 12e483d Addressed review comments
omit cfbe3ed fix user_vm_view
omit 19deb0e Fix unit test failures
omit 0d8f9cd Fix service offering usage as disk offering
omit dc5a678 Fix UI conflicts
omit a16a93d Add UI form for changeOfferingForVolume API
omit 413900d Added new API changeofferingforVolume API and corresponding
changes
omit daaef28 Added disk offering change checks during resize volume
operation
omit 7459fdc Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
omit 8b321ac Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
omit d61dd85 UI: move compute only toggle button outside the box in add
compute offering wizard
omit db7bdb9 Fixed diskoffering automatic selection on add compute
offering wizard
omit ac47803 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
omit c8eae0a Move uselocalstorage column access from service offering to
disk offering
omit 9aaad97 Fix VM deployment from custom service offering
omit cfd4492 Fix delete compute offering
omit b906e04 Added UI changes in deployvm wizard to accept override disk
offering id
omit e098999 Added diskoffering details to the service offering response
omit e43842b Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
omit 310d5c3 Remove comments
omit 6d35c08 Added disk offering strictness to the service offering
response
omit ec4a740 Added disk size strictness in disk offering response
omit 468eefd Fix User vm response to show proper service offering and disk
offerings
omit fb48b4c Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
omit ae36a85 Add diskofferingstrictness to serviceoffering vo under quota
omit d4536b8 Added new API params to compute offering creation
omit f5da084 Fix deployVM flow
omit f0db712 diskoffering getsize() is only for strict disk offerings
omit 3ee106d Decouple service offering and disk offering states
omit 7c790a9 Remove diskofferingid from vminstance VO
omit 4865228 Decoupled service offering and disk offering
omit dd059b6 Few more changes
omit b9bc0ff Schema changes and disk offering column change from "type" to
"compute_only"
add ca870df UI: Fixes issue during logout as user / domain admin (#5476)
add 20d5bf5 server: Add support to encrypt https.keystore.password in
server.properties (#5459)
add 22a0c0a change logging during upgrade (#5474)
add 93150f4 api: Fix list templates when no secondary stores present
(#5468)
add 121a72c UI - Fixes search error in selectbox (#5472)
add 34bd922 New API endpoint to update pod management network IP range
(#5458)
add daa183d Universal sshkey and password manager script (#4890)
add 3eafbf7 ui: edit tariff quota and allow user driven backups parameter
in Import Backup Offering (#5454)
add d9154e8 ui: Fix editVM in projectview (#5485)
add 67be3da ui: fix create account/user with saml (#5481)
add 5d63379 ui: Add support to filter Roles permissions (#5488)
add fb7086a Update README.md (#5492)
add 7444bc6 travis: fix test/integration/component/test_public_ip.py
(#5486)
add 847078b Merge remote-tracking branch 'origin/4.15' into main
add 3208929 move out broken tests (#5495)
add 9f7a350 Merge remote-tracking branch 'origin/4.15' into main
add 910d024 ui: recommend adv zone to new users and show basic zone as
bottom option (#5496)
add 56ef349 Display capability info in listNetwork response (#3804)
add 2601ee3 Fix VM state column (#5490)
add 7d5393d Refactor GroupByExtension to improve test logic (#5480)
add 50a0e80 CPVM: use X509ExtendedTrustManager (#5419)
add 6ba656b marvin: Fix intermittent failure observed in
test_02_list_snapshots_with_removed_data_store (#5483)
add 74bb806 resource limit: Fix resource limit check on VM start (#5428)
add d1f375f3 marvin: Refactor - cleanup of resource after test run (#5505)
add 06f602c tools/docker: Upgrade to ubuntu 20.04 , MySQL 8 and python3
(#5507)
add c3a1c78 backup: Improve Veeam Plugin logs (#5455)
add 6aa75cf test_vpc_redundant.py: reduce sleep time from 1 hour to 21
mins (#5503)
add 9de5ef9 Merge branch '4.15' into main
add a9c42fd Provide option to force delete the project (#4617)
add 25d522f server: add vm boot details for start vm api (#5469)
add b955b38 Merge remote-tracking branch 'origin/4.15' into main
add e573d0d Allow users (User accout Role) to delete / archive events
(#5520)
add 75c15fd Allow storage plugins to get storage/volume stats without
sending commands to hosts (#4826)
add 37d2264 simulator: Add support to scale a VM (#5515)
add 9ef7355 ui: show datastore cluster option in vmware zone deployment
(#5522)
add dcc02e0 Enable account settings to be visible under domain settings
(#4215)
add ea643a6 server: cannot deploy/start vm if service offering has
multiple tags (#5521)
add d08e2bc UI - Fixes modal width by device screen (#5526)
add 75922bb remove duplicate endipv6 item in shared network (#5537)
add 32051fb Fix permission issue during Diagnostic service garbage
collection (#5504)
add df0c004 Fix export snapshot and template to secondary storage to
export only required disk (#5510)
add 965a47f Create UpdateBackupOffering API (#5511)
add 4a42e7e vmware, ui: update portgroup on network update (#5470)
add 09fce75 OVS/GRE: bug fixes (#5446)
add e92ce91 network: Remove logic that creates gap for multiple 'source
NAT' in VR (#5532)
add 669ab73 server: check service offering (storage) tags when reallocate
a ROOT disk (#5501)
add 72a1c0e [KVM] Add MV Settings for virtual GPU hardware type and
memory (#5513)
add 9f5ac89 VR: fix data-server if shared network has multiple ip ranges
(#5530)
add 93c0b60 [UI] Edit backup offering (#5546)
add 3574d8d parallel nic adding (#5541)
add ad4def5 an inject annotation short (#5547)
add 6e216dd vmware, network: add maclearning option (#5471)
add cd4e7e0 Fix resize volume and migrate volume to update volume path if
DRS is applied on volume in datastore cluster (#5539)
add 52a9dbd kvm available memory calculation optimization (#5540)
add e198edf Report the PowerFlex/ScaleIO disk copy failure during volume
migration and fail the migration (#5542)
add e4beb1f Add empty config value for scope based config setting (#5551)
add 6ac834a Adding AutoScaling for cks + CKS CoreOS EOL update +
systemvmtemplate improvements (#4329)
add 2a42a01 xcp-ng: fix vm boot options (#5543)
add 798d7be VR: skip dhcp/dns health check in some cases (#5554)
add 404e264c CloudStack fails to migrate VM with volume when there are
datadisks attatched (#5410)
add 45967cf marvin: Use deploy as is for Vmware tests in test_data (#5557)
add 07efd7c Updated storage type of the volume, in the volume response,
based on the underlying storage pool. (#5560)
add 152159b kvm: Add the source disk format for disk conversion/copy
using 'qemu-img convert', when specified explicitly. (#5561)
add 79e6fe4 Fix warning caused due to duplicate declaration of plugin -
pom.xml (#5568)
add daf29a0 fix display ip address allow input (#5569)
add 4ed916d UI: Restrict viewing project invitation options when
configuration is disabled (#5572)
add ad8f375 engine/schema: add unique constraint for sshkeys UUID column
(#5565)
add 1b464b4 api: Fix RestartNetwork response type (#5571)
add 6b757d5 CKS: use cluster-autoscaler-standard.yaml in kubernetes repo
(#5574)
add e73445e api: Fix response object for various APIs (#5573)
add 26b5d94 fix the error of not being able to read the length of numeric
(#5577)
add a5372a9 Fix storage cleanup corner case preventing VM deletion (#5575)
add f29aef8 VPC: support LB in multiple vpc tiers if LB provider is
VpcVirtualRouter (#5580)
add 330e8e6 vmware: fix NPE for volume migration CLUSTER to ZONE-wide
pool (#5582)
add a8b19ee Merge pull request #5583 from apache/4.15
add 75a8c8f Fixing error in kube smoke tests (#5585)
add 6e67edc ui: Prevent users from viewing - Project Configure Limits tab
(#5601)
add f2ca11f Fix systemVM template name in metadata file (#5598)
add e63234e ui: Hidden features checkbox as user role (#5597)
add 298774e sort list idps by alphabest (#5599)
add c66f308 fix the error of not being able to search for ostype
selectbox (#5607)
add de6293b ui: Prevent multiple VM selection and list only VMs IP (#5609)
add 646b955 fix incorrect switching between pages (#5608)
add a93e771 ui: Removing double footer in NSP forms (#5612)
add 6f88220 Fix duplicate provider field (#5614)
add 5ec7a29 Replace multiple + and / symbols by - and _ to have URL-safe
base64 going to the API (#5593)
add ac75fac ui: Fix wrong label for addBrocadeVcsDevice (#5621)
add 0a88e71 Check the pool used space from the bytes used in the storage
pool stats collector, for non-default primary storage pools that cannot
provide stats. (#5586)
add 77fb93c core: use the URL scheme same as iframe for non-SSL enabled
consoles (#5624)
add 269a57b ui: ip6gateway is missing in createNetwork API (#5643)
add 7105a05 ui: show password after reinstalling VM (#5638)
add 817c7c3 ui: fix jobid key for migrate VM storage (#5644)
add cb67da5 cks: refactor code to be architecture agnostic (#5629)
add a1942b4 usage: updateNewMaxId after sanity check (#5646)
add d717d8a upgrade/systemvm: add template zone entries (#5642)
add 1928723 engine/schema: fix build error in #5642 (#5657)
add 47ecaaf Marvin: change some vlans in test_data.py (#5645)
add fe1ddfb linstor-volume-plugin: Only create diskless assignments on
nodes (#5661)
add 0ad7424 api,server,engine/schema: admin listvm api clusterid (#5659)
add 261fe32 Revert "parallel nic adding (#5541)" (#5665)
add 44c08b5 Updating pom.xml version numbers for release 4.16.0.0
add 93c3c3b Updating pom.xml version numbers for release 4.16.1.0-SNAPSHOT
add 3f79436 Updating pom.xml version numbers for release 4.17.0.0-SNAPSHOT
add 462e051 Fix version and add schema upgrade path
add bdab514 New upgrade schema path and workaround for system VM template
auto registration
add b0bf069 Merge branch '4.16' into main
add e27dd53 Fix build and version numbers
add b4aabad Replace string libraries with
org.apache.commons.lang3.StringUtils (#5386)
add 4568a68 CsDhcp.py: fix runtests.sh error (#5671)
add 0684aff ui: fix incorrect auto-select (#5693)
add a8e7315 UI : Fix SSL certificate submit button not working (#5682)
add e93d674 ui-primary-storage: hide provider if Linstor protocol (#5672)
add c95f8e2 server: set network rate for additional public IPs (#5670)
add dd458fe IPv6: fix deploy vm issue in ipv6-only networks without VR
(#5648)
add babf94f UI: Autoscroll to Error Field (#5200)
add d800487 Merge remote-tracking branch 'origin/4.16' into main
add c165e20 Schema changes and disk offering column change from "type" to
"compute_only"
add 47c6246 Few more changes
add 6e23c75 Decoupled service offering and disk offering
add f137b49 Remove diskofferingid from vminstance VO
add 6ffead7 Decouple service offering and disk offering states
add 311b371 diskoffering getsize() is only for strict disk offerings
add 9051d3e Fix deployVM flow
add 2e946c7 Added new API params to compute offering creation
add 8e03700 Add diskofferingstrictness to serviceoffering vo under quota
add fc6f5d7 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
add e11fa75 Fix User vm response to show proper service offering and disk
offerings
add 6c3943f Added disk size strictness in disk offering response
add f609d27 Added disk offering strictness to the service offering
response
add 79e5572 Remove comments
add 0fdc774 Added UI changes for Disk offering strictness in add compute
offering form and Disk size strictness in add disk offering form
add 15266ac Added diskoffering details to the service offering response
add a47a5f2 Added UI changes in deployvm wizard to accept override disk
offering id
add 94007aa Fix delete compute offering
add 4bd6ce0 Fix VM deployment from custom service offering
add 61a809b Move uselocalstorage column access from service offering to
disk offering
add 094e064 UI: Separated compute and disk releated parameters in add
compute offering wizard, also added association to disk offering
add cae5738 Fixed diskoffering automatic selection on add compute
offering wizard
add 43b9f2b UI: move compute only toggle button outside the box in add
compute offering wizard
add 8c22797 Added volumeId parameter to listDiskOfferings API and the
disksizestrictness flag of the current disk offering is honored while list disk
offerings
add 787060b Added configuration parameter to decide whether to check
volume tags on the destination storagepool during migration
add 6686176 Added disk offering change checks during resize volume
operation
add b7ba141 Added new API changeofferingforVolume API and corresponding
changes
add 5c8d3a1 Add UI form for changeOfferingForVolume API
add 47685ef Fix UI conflicts
add dd8da07 Fix service offering usage as disk offering
add 6fa31b4 Fix unit test failures
add a4e69d9 fix user_vm_view
add 98d41a3 Addressed review comments
add 6c46288 Fixed service_offering_view
add c144e93 Fix service offering edit flow
add dea935b Fix service offering constructor to address custom offering
add 54b1ad7 Fix domain_router_view to get proper service offering id
add adae083 Removed unused import
add b6b35fe Addressed review comments and fixed update service offering
flow with storage tags
add e1f53c4 Added marvin test cases for checking disk offering strictness
add 7a41a88 review comments addressed
add cecda20 Remove system_use column from disk offering join
add a72936e update volume_view to update system_use column from service
offering and not disk offering
add 4fd350a Fix changeOfferingForVolume API for custom disk offering
add 97bd725 Fix global setting implementation
add fb3f8b2 Fix list volumes, after changing system_use column from disk
offering to service offering in volume_view
add 49467a7 Changes for override root disk offering in deployvm wizard in
case of custom offering
add 882d701 Fix a unit test case
add 8a41fae Fixed recent unit test cases with new serviceofferingvo
constructor
add a99caa8 Fix unit test in VolumeApiServiceImpl
add c88fff3 Added storage id for the list disk offering API and
corresponding UI changes in migrateVolume and changeOfferingForVolume flow
add 1a5808b Rename global configuration parameter from
storage.pool.tags.disk.offering.strictness to
match.storage.pool.tags.with.disk.offering
add ccfd41f Fix smoke test failures
add 07fbae4 Added tool tip for migrate volume UI form
add f8ed1e9 Address review comments and fix UI form of deploy VM in case
of ISO.
add 434c015 Fixed resize volume UI form for data disk
add d30a386 UI changes to disable override root disk size when override
root disk offering is enabled
add e0cdd16 UI fix in deploy vm wizard
add 59b1a3d Fix listdiskoffering after rebasing with main
add b15d0a2 Fixed UI in migrate and changeofferingfor volume to handle
empty disk offering list Removed the volume's current disk offering from
listDiskOffering response list
add d4641ef Added custom Iops to resize volume form and removed the
current disk offering during change offering for volume UI form
add 179b025 Fix false response on updateDiskOffering API
add 114094b Added search field for changeofferingforvolume UI form
add 2273452 Fix resize volume and migrate volume to update volume path if
DRS is applied on volume in datastore cluster
add 222bd89 Removed DB changes from 4.16 upgrade file
add f516d7a Resolving merge conflicts with main 4.17
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 (187efe7)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering
(f516d7a)
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:
.travis.yml | 1 +
README.md | 2 +-
agent/pom.xml | 2 +-
agent/src/main/java/com/cloud/agent/Agent.java | 9 +-
.../src/main/java/com/cloud/agent/AgentShell.java | 6 +-
.../download/DirectTemplateDownloaderImpl.java | 2 +-
.../download/MetalinkDirectTemplateDownloader.java | 2 +-
api/pom.xml | 2 +-
.../com/cloud/agent/api/storage/OVFHelper.java | 8 +-
.../cloud/configuration/ConfigurationService.java | 9 +
api/src/main/java/com/cloud/event/EventTypes.java | 2 +
api/src/main/java/com/cloud/network/Network.java | 2 +-
.../java/com/cloud/network/PhysicalNetwork.java | 2 +-
.../java/com/cloud/offering/NetworkOffering.java | 2 +-
.../java/com/cloud/projects/ProjectService.java | 2 +-
api/src/main/java/com/cloud/vm/NicProfile.java | 2 +-
api/src/main/java/com/cloud/vm/UserVmService.java | 2 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 4 +
.../java/org/apache/cloudstack/acl/RoleType.java | 5 +-
.../main/java/org/apache/cloudstack/acl/Rule.java | 7 +-
.../org/apache/cloudstack/api/ApiArgValidator.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 10 +
.../command/admin/account/CreateAccountCmd.java | 2 +-
.../command/admin/acl/BaseRolePermissionCmd.java | 4 +-
.../api/command/admin/acl/ImportRoleCmd.java | 9 +-
.../api/command/admin/acl/ListRolesCmd.java | 3 +-
.../cloudstack/api/command/admin/acl/RoleCmd.java | 5 +-
.../acl/project/ListProjectRolePermissionsCmd.java | 3 +-
.../admin/annotation/ListAnnotationsCmd.java | 4 +-
.../admin/backup/UpdateBackupOfferingCmd.java | 107 +++
.../api/command/admin/ca/IssueCertificateCmd.java | 6 +-
.../api/command/admin/ca/RevokeCertificateCmd.java | 4 +-
.../api/command/admin/config/UpdateCfgCmd.java | 4 +-
.../admin/network/UpdateNetworkOfferingCmd.java | 6 +-
.../UpdatePodManagementNetworkIpRangeCmd.java | 154 ++++
.../admin/offering/CreateServiceOfferingCmd.java | 8 +-
.../admin/offering/UpdateDiskOfferingCmd.java | 6 +-
.../admin/offering/UpdateServiceOfferingCmd.java | 7 +-
.../ChangeOutOfBandManagementPasswordCmd.java | 4 +-
.../ConfigureOutOfBandManagementCmd.java | 28 +-
.../api/command/admin/user/CreateUserCmd.java | 2 +-
.../admin/vm/ImportUnmanagedInstanceCmd.java | 14 +-
.../api/command/admin/vm/ListVMsCmdByAdmin.java | 11 +-
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 6 +-
.../user/account/AddAccountToProjectCmd.java | 4 +-
.../command/user/account/AddUserToProjectCmd.java | 4 +-
.../AssignVirtualMachineToBackupOfferingCmd.java | 3 +-
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 2 +-
.../RemoveFromLoadBalancerRuleCmd.java | 2 +-
.../command/user/network/CreateNetworkACLCmd.java | 2 +-
.../api/command/user/network/ListNetworksCmd.java | 4 +-
.../command/user/network/RestartNetworkCmd.java | 3 +-
.../api/command/user/project/DeleteProjectCmd.java | 9 +-
.../api/command/user/project/UpdateProjectCmd.java | 4 +-
.../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 2 +-
.../gslb/RemoveFromGlobalLoadBalancerRuleCmd.java | 2 +-
.../user/resource/ListDetailOptionsCmd.java | 4 +-
.../AuthorizeSecurityGroupEgressCmd.java | 2 +-
.../AuthorizeSecurityGroupIngressCmd.java | 2 +-
.../api/command/user/vm/DeployVMCmd.java | 5 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 3 +-
.../api/command/user/vm/UpdateVMCmd.java | 10 +-
.../api/command/user/vpc/RestartVPCCmd.java | 2 +-
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 2 +
.../cloudstack/api/response/DomainResponse.java | 9 +
.../api/response/OutOfBandManagementResponse.java | 4 +-
.../java/org/apache/cloudstack/backup/Backup.java | 2 +-
.../apache/cloudstack/backup/BackupManager.java | 3 +
client/conf/server.properties.in | 4 +
client/pom.xml | 2 +-
.../java/org/apache/cloudstack/ServerDaemon.java | 14 +-
core/pom.xml | 2 +-
.../agent/api/storage/MigrateVolumeCommand.java | 17 +-
.../agent/api/storage/ResizeVolumeCommand.java | 8 +
.../virtualnetwork/VirtualRoutingResource.java | 2 +-
.../java/com/cloud/agent/transport/Request.java | 5 +-
.../main/java/com/cloud/info/ConsoleProxyInfo.java | 2 +-
.../com/cloud/storage/template/OVAProcessor.java | 2 +-
.../storage/template/S3TemplateDownloader.java | 5 +-
.../apache/cloudstack/ca/SetupKeystoreAnswer.java | 4 +-
.../cloudstack/diagnostics/DiagnosticsAnswer.java | 4 +-
.../java/com/cloud/info/ConsoleProxyInfoTest.java | 10 +-
.../api/agent/test/CheckNetworkAnswerTest.java | 2 +-
debian/changelog | 12 +
debian/rules | 4 +
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../main/java/com/cloud/vm/VirtualMachineGuru.java | 12 +
.../java/com/cloud/vm/VirtualMachineManager.java | 4 +-
.../service/NetworkOrchestrationService.java | 3 +
engine/components-api/pom.xml | 2 +-
.../java/com/cloud/storage/StorageManager.java | 2 +
engine/network/pom.xml | 2 +-
engine/orchestration/pom.xml | 2 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 6 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 66 +-
.../engine/orchestration/NetworkOrchestrator.java | 55 +-
.../engine/orchestration/VolumeOrchestrator.java | 2 +-
engine/pom.xml | 2 +-
engine/schema/pom.xml | 165 +++-
.../src/main/java/com/cloud/dc/dao/ClusterDao.java | 3 +
.../main/java/com/cloud/dc/dao/ClusterDaoImpl.java | 18 +
.../com/cloud/dc/dao/DataCenterIpAddressDao.java | 2 +
.../cloud/dc/dao/DataCenterIpAddressDaoImpl.java | 12 +-
.../com/cloud/domain/dao/DomainDetailsDaoImpl.java | 28 +-
.../src/main/java/com/cloud/host/HostVO.java | 2 +-
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 2 +-
.../com/cloud/network/dao/LoadBalancerDao.java | 4 +
.../com/cloud/network/dao/LoadBalancerDaoImpl.java | 32 +
.../java/com/cloud/storage/dao/VMTemplateDao.java | 5 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 33 +
.../cloud/storage/dao/VMTemplatePoolDaoImpl.java | 2 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 2 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 16 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 13 +-
.../upgrade/SystemVmTemplateRegistration.java | 897 +++++++++++++++++++++
.../upgrade/dao/BasicTemplateDataStoreDaoImpl.java | 236 ++++++
.../com/cloud/upgrade/dao/Upgrade410to420.java | 19 +-
.../com/cloud/upgrade/dao/Upgrade41520to41600.java | 181 +----
.../com/cloud/upgrade/dao/Upgrade41600to41610.java | 87 ++
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 86 ++
.../cloud/usage/dao/UsageVMSnapshotDaoImpl.java | 2 +-
.../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java | 2 +-
.../java/com/cloud/user/AccountDetailsDaoImpl.java | 52 +-
.../main/java/com/cloud/user/UserAccountVO.java | 4 +-
.../src/main/java/com/cloud/user/UserVO.java | 4 +-
.../java/com/cloud/user/dao/AccountDaoImpl.java | 4 +-
.../src/main/java/com/cloud/vm/UserVmVO.java | 11 +
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 4 +-
.../com/cloud/vm/dao/NicSecondaryIpDaoImpl.java | 2 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 3 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 22 +
.../cloudstack/acl/dao/ProjectRoleDaoImpl.java | 4 +-
.../annotation/dao/AnnotationDaoImpl.java | 5 +-
.../apache/cloudstack/backup/BackupOfferingVO.java | 8 +
.../storage/datastore/db/ImageStoreDao.java | 7 +
.../storage/datastore/db/ImageStoreDaoImpl.java | 53 +-
.../storage/datastore/db/ImageStoreVO.java | 4 +
.../META-INF/db/schema-41520to41600-cleanup.sql | 2 +-
.../resources/META-INF/db/schema-41520to41600.sql | 131 +--
...cleanup.sql => schema-41600to41610-cleanup.sql} | 6 +-
...to41600-cleanup.sql => schema-41600to41610.sql} | 6 +-
...cleanup.sql => schema-41610to41700-cleanup.sql} | 6 +-
...ma-41520to41600.sql => schema-41610to41700.sql} | 502 +-----------
engine/schema/templateConfig.sh | 82 ++
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
.../storage/configdrive/ConfigDriveBuilder.java | 2 +-
.../configdrive/ConfigDriveBuilderTest.java | 2 +-
engine/storage/datamotion/pom.xml | 2 +-
.../storage/motion/AncientDataMotionStrategy.java | 9 +-
.../storage/motion/DataMotionServiceImpl.java | 2 +-
.../KvmNonManagedStorageDataMotionStrategy.java | 24 +-
.../motion/StorageSystemDataMotionStrategy.java | 16 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/TemplateDataFactoryImpl.java | 2 +-
.../storage/image/TemplateServiceImpl.java | 9 +-
.../storage/image/store/TemplateObject.java | 6 +-
engine/storage/integration-test/pom.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/image/db/TemplateDataStoreDaoImpl.java | 4 +-
.../image/deployasis/DeployAsIsHelperImpl.java | 4 +-
engine/storage/volume/pom.xml | 2 +-
.../datastore/provider/DefaultHostListener.java | 2 +-
.../cloudstack/storage/volume/VolumeObject.java | 2 +-
.../storage/volume/VolumeServiceImpl.java | 6 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 13 +
.../framework/config/impl/ConfigDepotImpl.java | 10 +
framework/db/pom.xml | 2 +-
.../java/com/cloud/utils/db/GenericDaoBase.java | 4 +-
.../test/java/com/cloud/utils/db/GroupByTest.java | 25 +-
framework/direct-download/pom.xml | 2 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../quota/dao/QuotaEmailTemplatesDaoImpl.java | 4 +-
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
.../security/keystore/KeystoreManagerImpl.java | 5 +-
framework/spring/lifecycle/pom.xml | 2 +-
.../lifecycle/registry/ExtensionRegistry.java | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/centos7/cloud.spec | 6 +
packaging/centos8/cloud.spec | 6 +
packaging/suse15/cloud.spec | 6 +
plugins/acl/dynamic-role-based/pom.xml | 2 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 4 +-
plugins/acl/project-role-based/pom.xml | 2 +-
plugins/acl/static-role-based/pom.xml | 2 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
.../discovery/ApiDiscoveryServiceImpl.java | 4 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 2 +-
plugins/api/rate-limit/pom.xml | 2 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 3 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
plugins/backup/dummy/pom.xml | 2 +-
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/VeeamBackupProvider.java | 29 +-
.../cloudstack/backup/veeam/VeeamClient.java | 46 +-
plugins/ca/root-ca/pom.xml | 2 +-
.../ca/provider/RootCACustomTrustManager.java | 12 +-
.../cloudstack/ca/provider/RootCAProvider.java | 8 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
plugins/dedicated-resources/pom.xml | 2 +-
.../implicit-dedication/pom.xml | 2 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../BaremetalKickStartPxeResource.java | 2 +-
.../networkservice/BaremetalPingPxeResource.java | 3 +-
.../Force10BaremetalSwitchBackend.java | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
.../resource/HypervDirectConnectResource.java | 4 +-
plugins/hypervisors/kvm/pom.xml | 2 +-
.../cloud/hypervisor/kvm/dpdk/DpdkDriverImpl.java | 2 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 5 +-
.../hypervisor/kvm/resource/IvsVifDriver.java | 2 +-
.../kvm/resource/LibvirtComputingResource.java | 52 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 12 +-
.../kvm/resource/LibvirtStoragePoolXMLParser.java | 2 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 10 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 22 +-
.../RollingMaintenanceAgentExecutor.java | 4 +-
.../RollingMaintenanceExecutorBase.java | 2 +-
.../RollingMaintenanceServiceExecutor.java | 2 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 7 +-
.../LibvirtOvsFetchInterfaceCommandWrapper.java | 16 +-
...virtRevokeDirectDownloadCertificateWrapper.java | 5 +-
...tupDirectDownloadCertificateCommandWrapper.java | 5 +-
.../wrapper/LibvirtStartCommandWrapper.java | 32 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 4 +-
.../kvm/storage/KVMStorageProcessor.java | 24 +-
.../kvm/storage/LinstorStorageAdaptor.java | 1 -
.../kvm/storage/ScaleIOStorageAdaptor.java | 35 +-
.../org/apache/cloudstack/utils/linux/MemStat.java | 7 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 67 +-
.../kvm/resource/LibvirtComputingResourceTest.java | 14 +-
.../apache/cloudstack/utils/linux/MemStatTest.java | 2 +-
plugins/hypervisors/ovm/pom.xml | 2 +-
plugins/hypervisors/ovm3/pom.xml | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
plugins/hypervisors/vmware/pom.xml | 2 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 2 +-
.../vmware/manager/VmwareManagerImpl.java | 13 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 4 +-
.../hypervisor/vmware/resource/VmwareResource.java | 299 ++++---
.../storage/resource/VmwareStorageProcessor.java | 27 +-
.../motion/VmwareStorageMotionStrategy.java | 9 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 2 +-
.../xenserver/resource/CitrixResourceBase.java | 63 +-
.../resource/Xenserver625StorageProcessor.java | 2 +-
.../wrapper/xenbase/XenServerUtilitiesHelper.java | 4 +-
.../motion/XenServerStorageMotionStrategy.java | 2 +-
.../com/cloud/hypervisor/XenServerGuruTest.java | 2 +-
.../resource/Xenserver625StorageProcessorTest.java | 2 +-
.../wrapper/xenbase/CitrixRequestWrapperTest.java | 2 +-
plugins/integrations/cloudian/pom.xml | 2 +-
.../cloudian/api/CloudianSsoLoginCmd.java | 4 +-
.../cloudstack/cloudian/client/CloudianClient.java | 12 +-
.../cloudstack/cloudian/client/CloudianUtils.java | 6 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../kubernetes/cluster/KubernetesCluster.java | 5 +
.../cluster/KubernetesClusterManagerImpl.java | 276 ++++---
.../cluster/KubernetesClusterService.java | 26 +-
.../kubernetes/cluster/KubernetesClusterVO.java | 46 ++
.../kubernetes/cluster/KubernetesClusterVmMap.java | 1 +
.../cluster/KubernetesClusterVmMapVO.java | 48 +-
.../KubernetesClusterActionWorker.java | 89 +-
...ernetesClusterResourceModifierActionWorker.java | 157 +++-
.../KubernetesClusterScaleWorker.java | 137 ++--
.../KubernetesClusterStartWorker.java | 105 +--
.../KubernetesClusterUpgradeWorker.java | 36 +-
.../cluster/dao/KubernetesClusterVmMapDao.java | 1 +
.../cluster/dao/KubernetesClusterVmMapDaoImpl.java | 13 +-
.../cluster/utils/KubernetesClusterUtil.java | 22 +-
.../version/KubernetesVersionManagerImpl.java | 33 +-
.../version/AddKubernetesSupportedVersionCmd.java | 4 +-
.../cluster/CreateKubernetesClusterCmd.java | 14 +-
.../cluster/ScaleKubernetesClusterCmd.java | 46 +-
.../ListKubernetesSupportedVersionsCmd.java | 4 +-
.../api/response/KubernetesClusterResponse.java | 24 +
.../KubernetesSupportedVersionResponse.java | 12 +
.../main/resources/conf/k8s-control-node-add.yml | 97 +--
.../src/main/resources/conf/k8s-control-node.yml | 105 +--
.../src/main/resources/conf/k8s-node.yml | 92 ++-
.../main/resources/script/autoscale-kube-cluster | 93 +++
.../src/main/resources/script/deploy-provider | 2 +-
.../main/resources/script/upgrade-kubernetes.sh | 22 +-
plugins/integrations/prometheus/pom.xml | 2 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 10 +-
plugins/metrics/pom.xml | 2 +-
.../cloudstack/response/VolumeMetricsResponse.java | 4 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
.../cloud/network/bigswitch/BigSwitchBcfApi.java | 2 +-
.../cloud/network/bigswitch/BigSwitchBcfUtils.java | 2 +-
.../network/guru/BigSwitchBcfGuestNetworkGuru.java | 2 +-
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
.../network/lb/ElasticLoadBalancerManagerImpl.java | 3 +-
plugins/network-elements/f5/pom.xml | 2 +-
plugins/network-elements/globodns/pom.xml | 2 +-
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 2 +
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../contrail/management/ContrailManagerImpl.java | 2 +-
.../contrail/management/ServerDBSyncImpl.java | 2 +-
.../network/contrail/model/NetworkPolicyModel.java | 2 +-
.../contrail/model/ServiceInstanceModel.java | 2 +-
.../contrail/model/VirtualMachineModel.java | 2 +-
.../contrail/management/MockAccountManager.java | 1 -
plugins/network-elements/juniper-srx/pom.xml | 2 +-
plugins/network-elements/netscaler/pom.xml | 2 +-
.../resource/NetScalerControlCenterResource.java | 4 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
plugins/network-elements/ovs/pom.xml | 2 +-
.../cloud/network/guru/OvsGuestNetworkGuru.java | 13 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../IpmitoolOutOfBandManagementDriver.java | 5 +-
.../driver/ipmitool/IpmitoolWrapper.java | 5 +-
.../nested-cloudstack/pom.xml | 2 +-
.../NestedCloudStackOutOfBandManagementDriver.java | 6 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 2 +-
plugins/storage-allocators/random/pom.xml | 2 +-
plugins/storage/image/default/pom.xml | 2 +-
.../CloudStackImageStoreLifeCycleImpl.java | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
.../driver/DateraPrimaryDataStoreDriver.java | 6 +-
.../storage/datastore/util/DateraObject.java | 3 +-
.../storage/datastore/util/DateraUtil.java | 2 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 34 +-
plugins/storage/volume/linstor/pom.xml | 2 +-
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 2 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../datastore/api/StoragePoolStatistics.java | 10 +-
.../datastore/client/ScaleIOGatewayClientImpl.java | 100 +--
.../driver/ScaleIOPrimaryDataStoreDriver.java | 6 +-
.../storage/datastore/util/ScaleIOUtil.java | 6 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
.../driver/SolidFirePrimaryDataStoreDriver.java | 2 +-
.../storage/datastore/util/SolidFireUtil.java | 2 +-
plugins/user-authenticators/ldap/pom.xml | 2 +-
.../cloudstack/api/command/LdapImportUsersCmd.java | 2 +-
.../cloudstack/ldap/ADLdapUserManagerImpl.java | 2 +-
.../apache/cloudstack/ldap/LdapAuthenticator.java | 4 +-
.../cloudstack/ldap/OpenLdapUserManagerImpl.java | 2 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
.../cloud/server/auth/MD5UserAuthenticator.java | 4 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
.../server/auth/PBKDF2UserAuthenticator.java | 4 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
.../server/auth/PlainTextUserAuthenticator.java | 4 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../api/command/SAML2LoginAPIAuthenticatorCmd.java | 2 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
.../server/auth/SHA256SaltedUserAuthenticator.java | 4 +-
pom.xml | 14 +-
quickcloud/pom.xml | 2 +-
scripts/storage/secondary/createtmplt.sh | 27 +-
scripts/storage/secondary/setup-sysvm-tmplt | 172 ++++
scripts/util/create-kubernetes-binaries-iso.sh | 23 +-
scripts/vm/hypervisor/kvm/patch.sh | 7 +-
scripts/vm/hypervisor/xenserver/ovstunnel | 26 +-
scripts/vm/network/vnet/cloudstack_pluginlib.py | 2 +-
scripts/vm/network/vnet/ovstunnel.py | 34 +-
scripts/vm/systemvm/injectkeys.sh | 48 +-
server/conf/cloudstack-sudoers.in | 2 +-
server/pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 154 ++--
.../main/java/com/cloud/api/ApiResponseHelper.java | 80 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 12 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 39 +-
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 1 +
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 4 +-
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 11 +-
.../java/com/cloud/api/query/vo/HostJoinVO.java | 2 +-
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 7 +
.../configuration/ConfigurationManagerImpl.java | 253 +++++-
.../java/com/cloud/consoleproxy/AgentHookBase.java | 20 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 4 +-
.../deploy/DeploymentPlanningManagerImpl.java | 8 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 41 +-
.../cloud/hypervisor/kvm/dpdk/DpdkHelperImpl.java | 2 +-
.../java/com/cloud/network/Ipv6AddressManager.java | 2 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 15 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 2 +-
.../java/com/cloud/network/NetworkModelImpl.java | 57 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 100 ++-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 7 +-
.../cloud/network/router/CommandSetupHelper.java | 9 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 12 +-
.../cloud/network/router/VpcNetworkHelperImpl.java | 2 +-
.../com/cloud/network/rules/FirewallRules.java | 7 +-
.../cloud/network/rules/LoadBalancingRules.java | 6 +-
.../network/security/SecurityGroupManagerImpl.java | 2 +-
.../cloud/network/vpc/NetworkACLServiceImpl.java | 4 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 3 +-
.../com/cloud/projects/ProjectManagerImpl.java | 51 +-
.../com/cloud/resource/ResourceManagerImpl.java | 21 +-
.../resourcelimit/ResourceLimitManagerImpl.java | 6 +-
.../com/cloud/server/ConfigurationServerImpl.java | 14 +-
.../com/cloud/server/ManagementServerImpl.java | 18 +-
.../main/java/com/cloud/server/StatsCollector.java | 9 +-
.../com/cloud/servlet/ConsoleProxyServlet.java | 2 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 192 ++++-
.../com/cloud/storage/VolumeApiServiceImpl.java | 56 +-
.../storage/snapshot/SnapshotManagerImpl.java | 8 +-
.../com/cloud/tags/ResourceManagerUtilImpl.java | 2 +-
.../src/main/java/com/cloud/test/TestAppender.java | 5 +-
.../java/com/cloud/user/DomainManagerImpl.java | 4 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 2 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 213 +++--
.../cloudstack/acl/ProjectRoleManagerImpl.java | 5 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 11 +-
.../agent/lb/IndirectAgentLBServiceImpl.java | 4 +-
.../annotation/AnnotationManagerImpl.java | 19 +-
.../cloudstack/backup/BackupManagerImpl.java | 121 ++-
.../org/apache/cloudstack/ca/CAManagerImpl.java | 14 +-
.../diagnostics/DiagnosticsServiceImpl.java | 29 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 12 +-
.../cloudstack/network/ssl/CertServiceImpl.java | 8 +-
.../OutOfBandManagementServiceImpl.java | 16 +-
.../cloudstack/vm/UnmanagedVMsManagerImpl.java | 55 +-
.../com/cloud/network/Ipv6AddressManagerTest.java | 2 +-
.../network/vpc/NetworkACLServiceImplTest.java | 2 +-
.../com/cloud/projects/MockProjectManagerImpl.java | 2 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 18 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 9 +
.../cloudstack/backup/BackupManagerTest.java | 123 +++
.../networkoffering/ChildTestConfiguration.java | 9 +-
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
services/console-proxy/server/pom.xml | 2 +-
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 2 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 2 +-
.../websocket/WebSocketReverseProxy.java | 32 +-
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
.../SecondaryStorageManagerImpl.java | 8 +-
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../storage/resource/HttpUploadServerHandler.java | 2 +-
.../resource/NfsSecondaryStorageResource.java | 14 +-
.../storage/template/DownloadManagerImpl.java | 4 +-
...t-guest-sshkey-password-userdata-configdrive.in | 508 ++++++++++++
systemvm/debian/etc/dnsmasq.conf.tmpl | 1 +
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 12 +-
systemvm/debian/opt/cloud/bin/setup/bootstrap.sh | 1 +
systemvm/debian/opt/cloud/bin/setup/cksnode.sh | 76 ++
.../debian/opt/cloud/bin/setup/cloud-early-config | 9 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 16 +-
systemvm/debian/opt/cloud/bin/setup/postinit.sh | 15 +-
systemvm/debian/root/health_checks/dhcp_check.py | 15 +-
systemvm/debian/root/health_checks/dns_check.py | 6 +-
systemvm/pom.xml | 2 +-
test/integration/component/test_public_ip.py | 10 +-
.../test_vpc_distributed_routing_offering.py | 4 +-
.../test_enable_account_settings_for_domain.py | 514 ++++++++++++
test/integration/smoke/test_kubernetes_clusters.py | 461 ++++++-----
.../smoke/test_privategw_acl_ovs_gre.py | 707 ++++++++++++++++
test/integration/smoke/test_snapshots.py | 20 +-
test/integration/smoke/test_vpc_redundant.py | 8 +-
test/pom.xml | 2 +-
tools/apidoc/pom.xml | 2 +-
tools/appliance/systemvmtemplate/http/preseed.cfg | 6 +-
.../appliance/systemvmtemplate/scripts/cleanup.sh | 3 +-
.../scripts/configure_conntrack.sh | 2 -
.../scripts/configure_systemvm_services.sh | 22 +-
.../scripts/install_systemvm_packages.sh | 26 +-
tools/appliance/systemvmtemplate/template.json | 1 -
tools/checkstyle/pom.xml | 2 +-
.../checkstyle/src/main/resources/cloud-style.xml | 4 +
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 27 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/docker/README.md | 25 +-
tools/docker/supervisord.conf | 7 +
tools/marvin/marvin/config/test_data.py | 50 +-
tools/marvin/marvin/lib/base.py | 1 +
tools/marvin/marvin/lib/common.py | 4 +-
tools/marvin/pom.xml | 2 +-
tools/marvin/setup.py | 6 +-
tools/pom.xml | 2 +-
ui/public/locales/en.json | 25 +-
ui/src/components/header/ProjectMenu.vue | 12 +-
ui/src/components/view/ListView.vue | 10 +-
ui/src/components/view/QuickView.vue | 6 +-
ui/src/components/view/ResourceLimitTab.vue | 2 +-
ui/src/components/view/ResourceView.vue | 23 +-
ui/src/components/view/SearchView.vue | 31 +-
ui/src/config/section/compute.js | 9 +-
ui/src/config/section/event.js | 8 +-
ui/src/config/section/image.js | 2 +-
ui/src/config/section/network.js | 11 +-
ui/src/config/section/offering.js | 10 +-
ui/src/config/section/project.js | 13 +-
ui/src/views/AutogenView.vue | 48 +-
ui/src/views/auth/Login.vue | 11 +-
ui/src/views/compute/AssignInstance.vue | 46 +-
ui/src/views/compute/AttachIso.vue | 2 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 24 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 2 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 28 +-
ui/src/views/compute/DestroyVM.vue | 2 +-
ui/src/views/compute/EditVM.vue | 13 +-
ui/src/views/compute/InstanceTab.vue | 15 +-
ui/src/views/compute/KubernetesServiceTab.vue | 62 +-
ui/src/views/compute/MigrateVMStorage.vue | 4 +-
ui/src/views/compute/ScaleKubernetesCluster.vue | 140 +++-
ui/src/views/compute/StartVirtualMachine.vue | 2 +-
ui/src/views/compute/UpgradeKubernetesCluster.vue | 2 +-
ui/src/views/compute/backup/FormSchedule.vue | 2 +-
.../views/compute/wizard/NetworkConfiguration.vue | 4 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 5 +-
ui/src/views/dashboard/CapacityDashboard.vue | 12 +-
ui/src/views/dashboard/UsageDashboard.vue | 2 +-
ui/src/views/iam/AddAccount.vue | 32 +-
ui/src/views/iam/AddLdapAccount.vue | 2 +-
ui/src/views/iam/AddUser.vue | 73 +-
ui/src/views/iam/ChangeUserPassword.vue | 2 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 6 +-
ui/src/views/iam/CreateRole.vue | 2 +-
ui/src/views/iam/DomainActionForm.vue | 2 +-
ui/src/views/iam/EditUser.vue | 2 +-
ui/src/views/iam/ImportRole.vue | 2 +-
ui/src/views/iam/RolePermissionTab.vue | 6 +
.../views/image/AddKubernetesSupportedVersion.vue | 14 +-
ui/src/views/image/IsoZones.vue | 18 +-
ui/src/views/image/RegisterOrUploadIso.vue | 43 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 45 +-
ui/src/views/image/TemplateZones.vue | 18 +-
.../image/UpdateKubernetesSupportedVersion.vue | 2 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 24 +-
ui/src/views/infra/AddPrimaryStorage.vue | 40 +-
ui/src/views/infra/AddSecondaryStorage.vue | 15 +-
ui/src/views/infra/ClusterAdd.vue | 13 +-
ui/src/views/infra/HostAdd.vue | 13 +-
ui/src/views/infra/InfraSummary.vue | 4 +-
ui/src/views/infra/MigrateData.vue | 2 +-
ui/src/views/infra/PodAdd.vue | 15 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 37 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 2 +-
.../views/infra/network/IpRangesTabManagement.vue | 2 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 2 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 2 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 5 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 2 +-
.../network/providers/AddNetscalerLoadBalancer.vue | 2 +-
.../infra/network/providers/AddNiciraNvpDevice.vue | 2 +-
.../network/providers/AddPaloAltoFirewall.vue | 2 +-
.../infra/network/providers/AddSrxFirewall.vue | 2 +-
ui/src/views/infra/routers/RouterHealthCheck.vue | 2 +-
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 2 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 2 +-
ui/src/views/infra/zone/StaticInputsForm.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 8 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 33 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 2 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 2 +-
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 20 +-
ui/src/views/network/AclListRulesTab.vue | 6 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 21 +-
ui/src/views/network/CreateL2NetworkForm.vue | 28 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 53 +-
ui/src/views/network/CreateVlanIpRange.vue | 2 +-
ui/src/views/network/CreateVpc.vue | 14 +-
ui/src/views/network/CreateVpnCustomerGateway.vue | 7 +-
ui/src/views/network/FirewallRules.vue | 2 +-
.../views/network/IngressEgressRuleConfigure.vue | 2 +-
ui/src/views/network/LoadBalancing.vue | 18 +-
ui/src/views/network/PortForwarding.vue | 26 +-
ui/src/views/network/PublicIpResource.vue | 73 +-
ui/src/views/network/StaticRoutesTab.vue | 2 +-
ui/src/views/network/UpdateNetwork.vue | 257 ++++++
ui/src/views/network/VpcTab.vue | 6 +-
ui/src/views/network/VpcTiersTab.vue | 6 +-
ui/src/views/offering/AddComputeOffering.vue | 26 +-
ui/src/views/offering/AddDiskOffering.vue | 31 +-
ui/src/views/offering/AddNetworkOffering.vue | 198 +++--
ui/src/views/offering/AddVpcOffering.vue | 18 +-
ui/src/views/offering/ImportBackupOffering.vue | 18 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 26 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 8 +-
ui/src/views/plugins/quota/QuotaTariff.vue | 15 +-
ui/src/views/project/AddAccountOrUserToProject.vue | 4 +-
ui/src/views/project/InvitationTokenTemplate.vue | 2 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 4 +-
ui/src/views/storage/AttachVolume.vue | 2 +-
.../views/storage/CreateSnapshotFromVMSnapshot.vue | 2 +-
ui/src/views/storage/CreateVolume.vue | 15 +-
ui/src/views/storage/FormSchedule.vue | 2 +-
ui/src/views/storage/ResizeVolume.vue | 2 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 2 +-
ui/src/views/storage/TakeSnapshot.vue | 2 +-
ui/src/views/storage/UploadLocalVolume.vue | 14 +-
ui/src/views/tools/ImportUnmanagedInstance.vue | 38 +-
ui/src/views/tools/ManageInstances.vue | 14 +-
ui/tests/common/index.js | 5 +-
ui/tests/mock/mockStore.js | 3 +-
ui/tests/unit/views/AutogenView.spec.js | 169 ++--
ui/tests/unit/views/compute/MigrateWizard.spec.js | 6 +-
usage/pom.xml | 2 +-
.../java/com/cloud/usage/UsageSanityChecker.java | 3 +-
.../cloud/usage/parser/VMInstanceUsageParser.java | 2 +-
utils/pom.xml | 2 +-
.../src/main/java/com/cloud/utils/StringUtils.java | 40 +-
utils/src/main/java/com/cloud/utils/SwiftUtil.java | 2 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 8 +-
.../utils/crypt/EncryptionSecretKeyChecker.java | 6 +-
.../main/java/com/cloud/utils/db/DbProperties.java | 5 +-
.../cloud/utils/log/CglibThrowableRenderer.java | 2 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 4 +-
.../cloud/utils/security/CertificateHelper.java | 14 +-
.../com/cloud/utils/server/ServerProperties.java | 63 ++
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 4 +-
.../main/java/com/cloud/utils/ssh/SshHelper.java | 2 +-
.../java/com/cloud/utils/storage/S3/S3Utils.java | 5 +-
.../apache/cloudstack/utils/CloudStackVersion.java | 8 +-
.../utils/imagestore/ImageStoreUtil.java | 2 +-
.../cloudstack/utils/process/ProcessRunner.java | 3 +-
.../cloudstack/utils/redfish/RedfishClient.java | 2 +-
.../cloudstack/utils/security/CertUtils.java | 6 +-
.../cloudstack/utils/security/ChecksumValue.java | 2 +-
.../cloudstack/utils/security/DigestHelper.java | 2 +-
.../utils/volume/VirtualMachineDiskInfo.java | 2 +-
.../test/java/com/cloud/utils/StringUtilsTest.java | 6 -
.../crypto/EncryptionSecretKeyCheckerTest.java | 2 +-
.../utils/log/CglibThrowableRendererTest.java | 2 +-
.../cloudstack/utils/process/ProcessTest.java | 4 +-
vmware-base/pom.xml | 7 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 2 +-
.../vmware/mo/DistributedVirtualSwitchMO.java | 9 +
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 2 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 240 +++---
.../hypervisor/vmware/mo/VirtualMachineMO.java | 78 +-
.../cloud/hypervisor/vmware/util/VmwareClient.java | 2 +-
.../hypervisor/vmware/util/VmwareContextPool.java | 6 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 4 +-
.../vmware/mo/HypervisorHostHelperTest.java | 61 +-
679 files changed, 10265 insertions(+), 4246 deletions(-)
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/backup/UpdateBackupOfferingCmd.java
create mode 100644
api/src/main/java/org/apache/cloudstack/api/command/admin/network/UpdatePodManagementNetworkIpRangeCmd.java
create mode 100644
engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java
create mode 100644
engine/schema/src/main/java/com/cloud/upgrade/dao/BasicTemplateDataStoreDaoImpl.java
create mode 100644
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41600to41610.java
create mode 100644
engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41610to41700.java
copy
engine/schema/src/main/resources/META-INF/db/{schema-41520to41600-cleanup.sql
=> schema-41600to41610-cleanup.sql} (85%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41520to41600-cleanup.sql
=> schema-41600to41610.sql} (85%)
copy
engine/schema/src/main/resources/META-INF/db/{schema-41520to41600-cleanup.sql
=> schema-41610to41700-cleanup.sql} (85%)
copy engine/schema/src/main/resources/META-INF/db/{schema-41520to41600.sql =>
schema-41610to41700.sql} (57%)
create mode 100644 engine/schema/templateConfig.sh
create mode 100755
plugins/integrations/kubernetes-service/src/main/resources/script/autoscale-kube-cluster
mode change 100644 => 100755
plugins/integrations/kubernetes-service/src/main/resources/script/upgrade-kubernetes.sh
create mode 100755 scripts/storage/secondary/setup-sysvm-tmplt
create mode 100644
server/src/test/java/org/apache/cloudstack/backup/BackupManagerTest.java
create mode 100644
setup/bindir/cloud-set-guest-sshkey-password-userdata-configdrive.in
create mode 100755 systemvm/debian/opt/cloud/bin/setup/cksnode.sh
create mode 100644
test/integration/smoke/test_enable_account_settings_for_domain.py
create mode 100644 test/integration/smoke/test_privategw_acl_ovs_gre.py
create mode 100644 ui/src/views/network/UpdateNetwork.vue
create mode 100644
utils/src/main/java/com/cloud/utils/server/ServerProperties.java
