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/29 12:11:51 UTC

[cloudstack] branch healthcheck-main updated (2b9014f908 -> 55990b3b5c)

This is an automated email from the ASF dual-hosted git repository.

nvazquez pushed a change to branch healthcheck-main
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


 discard 2b9014f908 healthcheck hack, please don't merge this
     add 51f69f7134 server: do not return inaccessible entity details to normal users (#5827)
     add 2774bc156f use physical size instead of virtual size for migration. (#5750)
     add 3cbde8cd6c UI - Hide shrink disk option on XCP-NG/Xenserver (#5829)
     add 5c02f6d507 Merge branch '4.16' into main
     add e993a20e5a [Veeam] Force ACS to use the template repository to clone job (#5774)
     add 5d7ea30f87 vmware: Remove restriction, in VMWare, to resize only SCSI disks (#5650)
     add 6d35b520d3 server: fix vm can be recovered by other accounts (#5822)
     add 84b9b61b9b api: fix typo in Volume Destroy state - volume can be recovered (#5833)
     add feb4343abe ui: fix create network/vpc offering form (#5840)
     add 48006de3e3 kvm: Set RAW format to RBD DATADISK (#5801)
     add 946f9156e5 vmware: Persist empty values instead of null (#5748)
     add 0f926b5d68 UI: Add s3 provider option to create secondary storage (#5726)
     add 4916f3c90d UI - Fix Locked "Override Root Disk Size" switch (#5843)
     add 028d338aaa remove VmWorkJob after adding a nic to a vm (#5658)
     add fadd74aaca network: fix vm can be deployed on L2 network of other accounts (#5784)
     add 7ea2cbd889 Storage pool absent (#5841)
     add 9293f5bd27 server: fix enable/disable static nat if userdata is not supported (#5839)
     add e1b56be67c Merge branch '4.16' into main
     add c08592cad8 ui: update vm haenable only for supported vms (#5847)
     add 2e2d328cde Add toggle button on the UI for list including elements in projects. (#5790)
     add 223bc11d2a ui: fix paging in enable static NAT form (#5849)
     add 216bea1978 ipv6: disable IPv6-only shared network with VR (#5810)
     add c17ae740f4 ui: fix getDiagnosticsData files field (#5853)
     add d78a815442 server: fix update vm with unconstrained offering (#5828)
     add 42a941cc70 Merge branch '4.16' into main
     add 001f4213c8 UI - Deploy VM with params from the template, iso, network pages (#5653)
     add 4746509c82 [UI] Cancel all requests api, async jobs in UI when user logs out (#5663)
     add c86b98e682 ui: show account configure limits tab for domain-admin (#5858)
     add a6271b8306 Merge branch '4.16' into main
     add 619c754903 Clear cache APIs when the switch domain with SAML user (#5855)
     add 59a615cf21 ui: fix deploy vm in basic zone (#5856)
     add a42ed1fb89 add a setting to config.json that allows users to set theme (#5584)
     add f5b0d2f056 ui: fix create user domain, account selection (#5487)
     add e18ff602f8 Prevent upgrade failures if there are existing annotations permissions (#5846)
     add 0efdc535a5 Merge branch '4.16' into main
     add 7f000f5016 Now correct values are shown when configuring limits for a domain. (#5874)
     add 0e2c09baca UI - Fixes Pod, Cluster selected is incorrect on addHost dialog (#5869)
     add fb35f46a96 Delete ldap config from UI (#5871)
     add f3289fb596 server: fix regular user can create isolated network without sourcenat (#5844)
     add 4996b800b5 Now correct values are shown when configuring limits for a domain. (#5874) (#5880)
     add f639f56834 fill volume attached field (#5865)
     add 97d6cd50a0 Merge branch '4.16' into main
     add 68a5e5aa77 ui: show password with success notification (#5889)
     add 06b5e84182 Removed redundant parsing of VMSnapshot usage record. (#5872)
     add d18ef1c0fd ui: add custom form for update template (#5434)
     add 1ed0830bc4 [Vmware][Deploy-as-is] Refactor the OVF parsing (#5825)
     add 84f5768e64 [VMware][Deploy-as-is] OVF properties not importing when template is uploaded from local (#5861)
     add 982eef202f Merge branch '4.16' into main
     add d26ce157db Fix camel case (#5898)
     add b9905c7e37 simplify code using object shorthand in multiple views (#5899)
     add f15cab16da server: Decouple service (compute) offering and disk offering (#5008)
     add 28f6067f3c packaging: use modern systemctl enable/disable (#5881)
     add 065847e6af UI: Fixes asynchronous when destroying wrong item VM (#5884)
     add ee9c05b5fa UI - Added option to allow users to select volumes when doing destroy the list of VMs (#5893)
     add 6fa8538666 Adding placeholders for custom NSP vues (#5620)
     add 0e150954d0 Allow direct download templates from IPv6 host address.  (#5900)
     add f610e89ea9 Merge branch '4.16' into main
     add 1fc7d70da2 Add idempotent primary keys on tables missing them (#5785)
     add 571339f872 Merge branch '4.16' into main
     add a6567f3cc5 Fix internet dependent test from 'UriUtilsParametrizedTest' class (#5905)
     add 3e92a63155 [XenServer/XCP-ng] Pass the image store NFS version on storage commands (#5886)
     add 5f07e4daaf ui: fix filtering readonly details while VM update (#5887)
     add c1bba2a308 Do not restart VPC tiers with cleanup (#5873)
     add fde34df560 Make sure other than user VMs can have multiple NICs in a network (#5896)
     add 1b3e7f65b7 Update proper destroy status when SSVM is destroyed. (#5908)
     add ddd311c695 [XenServer/XCP-ng] Sync the 'platform' setting according to the 'cpu.corespersocket' setting (#5892)
     add 8adb8df2fe server: find suitable disk offering for volume upload (#5852)
     add bf70566c2c Merge branch '4.16' into main
     add 62b806ac13 api,server: add params for updatehypervisorcapabilities API (#5473)
     add 638779ca37 vm-import: fix unmanaged instance listing (#5400)
     add 4a1ebb3fa5 server: allow normal users to create isolated network without source nat (#5920)
     add 194bf6ead9 Merge remote-tracking branch 'apache/4.16'
     add f458964e52 ui: fix related key for section (#5929)
     add 26e4e18218 kvm: Use lscpu to get cpu max speed (#5506)
     add ef7debb487 Filter usage for project (#5866)
     add ecf85aa65b VMware7 support: Add schema changes for update2 and update3 (#5870)
     add 56a8852c4c Remove code that reserves extra interfaces based on the global setting router.extra.public.nics in case of VMware. (#5912)
     add 966b32c234 ui: fix ssh keypair navigation (#5931)
     add e3f0e3b544 Merge branch '4.16' into main
     add 649be0d8c7 simplify code using optional chaining in multiple views (#5630)
     add 2c11171517 Fix 'endpointe.url' global settings configuration typo (#5832)
     add 0f1cd6009d add logging to deployment planners (#5859)
     add 5adf608f80 mvn: upgrade to xerces 2.12.2 (#5944)
     add 5db6b86200 [issue-5946] upgrade to xstream 1.4.19 (#5947)
     add 81b49b835a ui: fix select networks for template nic (#5933)
     add 6c9f0c1f3f Fix #3448 quota calculation for monthly tariffs (#5517)
     add eeaad0bfe7 [issue-5939] upgrade commons-compress to 1.21 (#5942)
     add af58284560 server,config: respect storage.max.volume.size and make it dynamic (#5857)
     add da56a2a806 maven: migrate short-term to reload4j v1.2.18 (#5878)
     add 208ae84dd7 Merge branch '4.16' into main
     add 6495bc1a47 packaging: display First Install and Onboarding Message (#5851)
     add 41d25d54a7 Merge remote-tracking branch 'origin/4.16'
     add 38181b2afa Optional chaining used to enhance readability (#5961)
     add e609aa8e9c Skip systemVM template registration for Simulator (#5954)
     add c7885f55eb maven: upgrade bouncycastle due to cve (#5949)
     add 453aeb02f0 Add ID search capability to sshkeypairs (#5963)
     add ce81a8e708 test: sleep 30s after restarting mgt server in test_kubernetes_supported_versions.py to fix test failures with test_secondary_storage.py (#5962)
     add b275c29709 UI - Add Network: shows "Offering for Isolated networks with no Source Nat service" on Network Offering for normal users (#5904)
     add 143b72d67e cleanup: Network Throttling for Additional Networks code in DirectVifDriver.java  (#5875)
     add 85ced4447b API: Fix listSSHKeyPairs API when listing all resources (listall=true & projectid=-1) (#5958)
     add 3fc4ef478d replace Random with SecureRandom (#5966)
     add b5655c3b77 [issue-5952] upgrade to jetty 9.4.44.v20210927 (#5953)
     add 791d0634f7 [issue-5943] xerces 2.12.2 (#5968)
     add 640118ce2b Add disk space in systemVM template registration script (#5956)
     add f88f934274 api, server: fix add-remove vpn user without vpn owner (#5850)
     add 4ffb949a58 Fix of revert RBD snapshots (#5544)
     add 850714c1fc Merge branch '4.16' into main
     add 5db62c15a4 Removed duplicate import for StringUtils (#5975)
     add a6d9fa61b9 Role escalation prevention (#5879)
     add bc93163eec ui: Allow domain admin to configure subdomain limits (#5978)
     add e9d8d7942d Merge branch '4.16'
     add 122b018057 Quota test fixes (#5959)
     add a3bb84b495 [VMware] Update SCSI controllers for VMs (#5910)
     add 5297b52d98 Improve the guest OS hypervisor mappings addition on upgrade. (#5911)
     add 212a4dedfc Merge branch '4.16' into main
     add 7f0a322b7d [Vmware] Prevent NPE on template registration if guest OS is removed (#5980)
     add 8db598bc0f set pod after migration (#5972)
     add 48b1e73573 Merge branch '4.16' into main
     add bcd0979a5a Fixed possible blank domain UUID amd created new unit tests. (#5835)
     add 2d8f070ea4 When creating a new firewall egress rule, the source and destination CIDRs were not being trimmed, this commit changes this to trim both CIDRs from the user input. (#5867)
     add a094dbc76e Add option to infer boot type and mode from template (#5974)
     add 2c0adabad6 Added customization options for menu and dashboard elements (#5937)
     add 47a170757a [UI] Addressing Dynamically Scale of KVM VMs (#5923)
     add b489b5828e [UI] Added account field to upload volume (#5914)
     add 7aa9d3cd51 UI: fix delete domain (#5882)
     add 9f23fbe7b6 [Simulator] Fix NPE in SolidFireHostListener (#5955)
     add fe03e306ac Fix attach volume error for VM - different scope for VM volume and volume disk offering (#5982)
     add 97d42e9980 Fix: allow executing CopyCommand operations in parallel when it is set (#5960)
     add b1bb22d984 ui: Pass rootdisksize only if template is not deployasis (#5995)
     add e0a5df50ce CKS Enhancements and SystemVM template upgrade improvements (#5863)
     add b50542a11c Merge branch '4.16' into main
     add d4f40ecc6a Fixed strings import issue (#5998)
     add 59dda5b129 Added a log line to HttpUploadServerHandler (#5983)
     add ee947e1310 [marvin, VMware] Fix repeated test failures observed on 'main' branch (#5992)
     add ed30683e52 [Simulator] Add zone wide storage (#5986)
     add d82cd5569a Respect VM UEFI details on first boot (#5990)
     add 478e24493e Block remove of VM which has backup offering (#5457)
     add c543f5f546 server: reapply checkVmProfileAndHost to check guest os preference (#6000)
     add 545f85936a Merge branch '4.16' into main
     add ac794a0c85 ui: minor change with help text on dashboard (#6003)
     add f74e87fbf8 Merge branch '4.16'
     add f96f6faf24 Improve messages on adding hosts errors (#5988)
     add 550c810538 [VMware] Support for removal of NIC on IP disassociation on the VR (#5985)
     add 9eefc76fc5 UI: Filter menu UX improvements (#5994)
     add 72a77d553d UI: Fix issue while listing projects in the Project Menu - DashBoard (#6006)
     add d311f88d35 Allow scaling VM to a service offering having different storage tags (#5996)
     add 50955432d4 [Veeam] Change the VM assign flow logic in a Backup Offering (#5903)
     add e662535dce UI: Fix move VM out of a project (#6010)
     add b8ce07475d UI: fix network list when assign vm to other accounts in project view (#6009)
     add 5d1e54a4ab server: fix host anti-affinity when start batch vms (#6002)
     add e7082d9384 Fix Usage event when a volume in allocated state is deleted (#5901)
     add 2a1a012a4d Allow domain admin to change domain and account settings (#4339)
     add b9e973ab9b ui: Adding option to select columns to display (#6001)
     add e3d0ce9304 Improve default network offering setting for egress policy (#5970)
     add 4e826d504e system_use column is now moved from disk_offering table to service_offering table, because it is applicable only to service offering. (#6015)
     add 831f7cff54  Support mutiple management networks in systemvms (#4678)
     add b4b1f9b861 ui: Hide column selector in detail view (#6022)
     add c0fe3dc827 ui : Fix linting issue (#6023)
     add 982462b537 ui: Display yes / no for vm requiring upgrade (#6024)
     add bc1498de40 ui: Fix column names translation issue (#6025)
     add 36d3f434d1 UI: Reword the setting panel warning (#6020)
     add 86f6675898 Merge branch '4.16'
     add 5de1995376 api: update description of internal LB APIs (#6035)
     add ca12ef31ac ui: add VXLAN network identifiers (VNIs) in message.guest.traffic.in.advanced.zone (#6034)
     add 3a1f6923a2 Merge branch '4.16' into main
     add 19b8da290c prevent <ctrl>-<enter> handler from <space> from toggling checkboxes (#6027)
     add 909c437cca Merge branch '4.16'
     add 027e6030af [KVM] Disconnect the volumes with the proper storage adaptor. (#6029)
     add 1484f5a418 Merge branch '4.16' into main
     add a8cc261143 [vmware, ssvm] Scale down of ssvm (#6042)
     add cb2ddc45ac Merge branch '4.16' into main
     add 85c59979f7 Multiple SSH Keys support (#5965)
     add b4db3db617 Use default timeout and retransmission values for the NFS mount. (#6019)
     add 980c0bff03 Fix spelling (#6041)
     add cad9332082 Updating pom.xml version numbers for release 4.16.1.0
     add bc70535ee5 Updating pom.xml version numbers for release 4.16.2.0-SNAPSHOT
     add fa068ae7ce Merge branch '4.16'
     add 807ebf426a UI: Missing message on VM import for not found networks (#6055)
     add ef5c1dff36 Upgrade Tomcat embed version (#6028)
     add 4ebc7413f0 Fix API parameter description for boottype/bootmode (#6054)
     add c366511294 UI: Missing message on VM import for not found networks (#6055)
     add 8eed111521 Merge branch '4.16'
     add 648f2c1d82 Fix NPE on CIDR list check (#6053)
     add 3a74ec78be api: Fix search by name (#6032)
     add 4d54e8e84c Allow specifying disk size, min/max iops for offering linked with custom disk offering (#6018)
     add 2820a36f86 Check the network access when deploying VM in Advanced Security Group. (#6050)
     add cb872ab6bd Merge branch '4.16'
     add 2f6fc56e74 maven: Fix build on osx (#6056)
     add 08bb4ad9fe spelling: Fix spelling `Occured` to `Occurred` (#6061)
     add 84f19d8f36 UI: update vm with userdata (#6051)
     add c7c982f642 Merge branch '4.16'
     add b014617416 no axis (#5993)
     add e4d70d4214 UI: Fix Autogenview cleared resource (#6066)
     add 7631dede8a Merge branch '4.16'
     add 3b7166ea99 Upgrade netty version (#6059)
     add 92d831c6f1 ui: Add link to account role in listview (#6065)
     add 6b913a76cf ui: Add user initials as avatar if no icon present (#6070)
     add 7facd49d33 Merge branch '4.16'
     add 6401c850b7 Fix spelling (#6064)
     add 5534b7afda api: Warn if query parameters have multiple values (#5009)
     add 8f427f601a Adapt script to bash version 3 (#6069)
     add 7fbfd4c6ea UI: Fix navigation to domains (#6072)
     add 67601b5a78 Merge branch '4.16'
     add c2bcad8571 ui: Set icon to osdisplayname to avoid multiple api calls (#6075)
     add 7439581c77 Merge branch '4.16'
     add d258da5524 UI: Upgrade to Vue3 library (#5151)
     add 5f07ddaca9 Refactor account type (#6048)
     add 00c1bdb365 UI: Reload page on closing Bulk Action modal (#6077)
     add 36c11d1d1f Merge branch '4.16'
     add b1e01a89a9 UI: Fix Dedicating resource to a domain (#6085)
     add 07d1ffc4e7 UI: Fix route to domain details (#6086)
     add 0a4cf5b0b9 ui: Fix dashboard links (#6083)
     add 3a456f1b31 server: mark volume snapshots as Destroyed if it does not exist on primary and secondary storage when delete a volume (#6057)
     add e3132af64e Merge branch '4.16'
     add 067c1de080 Fix get upload params NPE (#6079)
     add 8dc5db137f Merge branch '4.16'
     add 9ad5d346c4 ui: Fix storage pool label for protocol (#6089)
     add 71056191f2 Honour isrecursive above listall (#6045)
     add 7e6339753d ui: fix deploy vm stay on page (#6099)
     add 401a89cf56 ui: fix bulk destroy vm with expunge (#6098)
     add 4c3dbd541c fix navigation back error (#6093)
     add 603f88a9e5 [UI] Dont show project view menu when user doesn't have permission (#6081)
     add 59f0d558ec ui: fix mac learning warning visibility in add network offering (#6095)
     add d828fd247f ui: fix physical network guest traffix type tab (#6096)
     add 6ff378f6a3 travis: run nosetests-2.7 (#6113)
     add 3354f817eb Merge branch '4.16'
     add afdc73f911 Update VM priority (cpu_shares) when live scaling it (#6031)
     add 1119a22d74 UI: Show protocol on zone wide storage (#6117)
     add f84d63dd0e UI: Fix alignement of message (#6109)
     add 704a939c65 cks: Fix missing .service files when bootstraping in cks (#6076)
     add 594c2c1b07 UI: Fixes the style/css of deploy VM with stay on-page button. (#6108)
     add a4c6b12b26 ui: Fix CreateKubernetesCluster for ha (#6106)
     add b2965462ea ui: update npm dependencies to latest (#6091)
     add 56bf418185 fixes form.getFieldValue is not a function (#6110)
     add ca9e28dc84 api: Fix issue observed with message publish on creation of domain (#6118)
     add 75b54171ae Travis - fix test failures observed (#6119)
     add 2647542b7f Merge branch '4.16'
     add 3fc31ca1e5 Revert "Honour isrecursive above listall (#6045)" (#6126)
     add 6f3c18f3a7 alert: Send alert for ha'ed vm's (#5664)
     add c146449ab8 Create profiles to download systemvm-templates (#5602)
     add 15e3a10f94 UI: Fix change offering type (#6135)
     add 6a53517d37 New feature: Reserve and release Public IPs (#6046)
     add 4be99fe971 api: Allow updating VM settings when custom contrained offering is used (#6136)
     add 6e061d90fe Merge branch '4.16'
     add f8b648b938 Fix migration of VM with volume on Ubuntu (#6116)
     add c3854ba781 Merge branch '4.16'
     add 7350067d43 ui: Fix icon on Load Balancing view tab (#6137)
     add 88d77c86a7 server: fix NPE when router.service.offering is set due to service/disk offering refactoring (#6120)
     add 3e4e417389 account check made explicit - cleanup (#6122)
     add 13efa59097 Router health check notification mail to show router name next to UUID (#6130)
     add 38a0ded053 ui: Support to specify security groups when updating/editing a VM (adv zone + SG) (#6138)
     add 6125886f3d Set UefiCapabilty for all hypervisors in hostresponse (#6140)
     add f8aca04733 UI: Prevent passing boottype/bootmode when template is deploy-as-is (#6151)
     add a026f41e12 ui: Fix router link access (#6158)
     add f5e77f7cf5 travis: Fix failing travis tests on main (#6152)
     add fb43076f9e Fix linux native bridge for SUSE in cloudutils (#6134)
     add 6d9b60adfb Merge branch '4.16'
     add f596dbb1f5 Fix wrong label entity.type (#6157)
     add f0993ce098 ui: Remove misleading links for users (#6159)
     add 5845de4004 kvm: support multiple local storage pools (#6147)
     add aa00ef90c9 Prevent vm's from stopping while enabling maintenance mode (#4636)
     add add657a899 api: Remove redundant API parameters (#6143)
     add 182899d0b5 Add Python flake8 linting for W291 trailing whitespace with Super-Linter (#4687)
     add 6d11e2faa9 ui, Adv zone + SG: Fix invocation of create/revoke APIs for ingress/egress security group rules (#6170)
     add f4b9ab034b UI: fix create l2 network offering with userdata (#6174)
     add cc70843555 Merge branch '4.16'
     add 15937369fe Fix spelling (#6161)
     add 9162a9b77a Avoid multiple if else (#6171)
     add bcd1a3274a api: Fix reset configuration (#6168)
     add 908f594f00 configDrive: Fix failure to delete (unstarted) VM (#6146)
     add a69ab3b28f Ensure configdrive path is edited properly during live migration (#6173)
     add 944b6037cc Merge remote-tracking branch 'apache/4.16'
     add aab1e8a9d0 ui: Fix scale kubernetes (cks) cluster form (#6176)
     add d910c3c6cc UI: fix update public IP ranges (#6177)
     add ee27708ffb SAML: replace first number with random alphabet if request ID starts with a number (#6165)
     add 1c238e101d Merge branch '4.16'
     add 1a304ccf68 UI - Fixes UI bugs (#6162)
     add e339c4b964 ui: fix vpc tier redirect to show details (#6178)
     add 2f2d6cbe38 KVM: Enhance CPU speed detection on hosts (#6175)
     add 66a6671e0b ui,refactor: fix missing label in update network form (#6181)
     add 5f3a392eb5 Merge branch '4.16'
     add 2c8c476656 CKS: Support deployment of CKS clusters on Advanced zones with security groups (#6132)
     add b88cfc226e Mount disabled storage pool on host reboot (#6164)
     add 022906d9bd UI: Fix minor UI issues (#6182)
     add f12e1a39d9 Remove duplicate entry from `.gitignore` (#6192)
     add 5ab4309298 agent: Detect existing hosts with UEFI support (#6139)
     add 960513aa97 test: update test_kubernetes_clusters.py to support advanced zone with security groups (#6183)
     add 1c8d8cdef2 ui: Fix label for LUN number (#6204)
     add 7e6d1f1f85 ui: fix acl rules listing (#6206)
     add a66dee4374 .asf.yaml: introduce new .asf.yaml file
     add e4b6992def server: fix list reserved/free public ips in project (#6198)
     add 47454eca7d VR: add '-m <protocol>' for tcp or udp protocol (#6188)
     add c61ea9f96d VR: Do not add iptables rules for the revoked ip addresses (#6189)
     add 306baea228 Merge branch '4.16'
     add 9cc8da2a30 api: Update account type when updating account role (#6156)
     add ca8782b703 api: add vpcname to networkacl response (#6207)
     add 4193109c1d ui: Logout before login (#6193)
     add e65825c4a1 .asf.yaml: dummy fix to re-kick asf-infra integration (#6210)
     add 553809b4d6 [Infra] testing adding myself as collaborator
     add 0cb949451a [infra] adding back original collaborator
     add 133b195688 Probot integrations (#6211)
     add afc819e5c8 Added new field to updateBackupOffering API. (#6190)
     add 9a8c7b1a8c .github: fix first PR welcome message by boring-cyborg (#6217)
     add 1500e1f70c .github: add merge conflict checker per RM request (#6221)
     add 2b1c4fbe6e .github: fix workflow settings and allow branch pushes to main by committers (#6225)
     add 68fa9a1061 Allow storage.overprovisioning.factor to be <1 which allows underprovisioning of storage pools (#6218)
     add 676fe31ca9 UI: Fixes removing undesired API parameters on form submit (#6196)
     add 1cdacccdc0 maven: support JaCoCo and other quality checks (#6228)
     add 5630ca4411 .github: update action tag as per https://issues.apache.org/jira/browse/INFRA-23109
     add 6bf812cdc9 .github: fix github action workflows
     add daa7bdb046 upgrade: update minreq.sysvmtemplate.version to the latest template  version (#6227)
     add c1c381fcd1 api: Prevent modifying acl rules order for default ACLs (#6187)
     add 2b075ed39e Storage-based Snapshots for KVM VMs (#3724)
     add d2aa13fd78 Display proper gateway length in health check result (#6226)
     add c8ce6c0496 ui: Project owner (normal user) unable to perform any operations in the project (#6233)
     add 4c89f08ebf .github: fix github event/pr username for conflict msg advice
     add e7071ec196 server: increment deviceid while importing vm data volumes (#6123)
     add 5b617ba3ff Merge remote-tracking branch 'origin/4.16'
     add 8add4df0fa .github: fix github actions error
     add e0ce0228cc ui: Fix Add secondary storage (#6241)
     add ee2ded8200 potential null pointer in condition; AYAI9l8k5Irk9_td-cXb (#6237)
     add 1b46635947 Merge remote-tracking branch 'origin/4.16' into main
     add 16f2896940 Persistence of VM stats (#5984)
     add 5eb2b693e9 fixes login button not work and Single Sign-On tab disabled after logout (#6197)
     add b6072fc826 Allow expunging a VM on a deleted host when using host cache and ConfigDrive userdata service (#6234)
     add ed55002795 Merge branch '4.16'
     add 63a9da9548 ui: use different icon labe for releaseIpAddress action (#6235)
     add 177f04839c UI: Fix protocol reset after changing provider on Add Primary Storage (#6243)
     add 5435b0abfe Direct download certificates additions and improvements (#6104)
     add 431c352a6d Synchronization of network devices on newly added hosts for Persistent Networks (#5977)
     add 72f13a6cea .github: fix incorrect tagging of PR author
     add 39fad2d9d7 KVM disk-only based snapshot of volumes instead of taking VM's full snapshot and extracting disks (#5297)
     add 6ec013718a ui: Fix uploadCustomCertificate form in infraSummary view (#6248)
     add 19a7774cab VR: add rules for traffic between static nat and private gateway static routes (#6153)
     add 7e8db7cece Merge branch '4.16'
     add daa13af626 UI: fix icon user-delete-outlined for release dedicated public ip range (#6255)
     add 91a5f0e285 server: honor global setting system.vm.default.hypervisor as first option when deploy VRs (#6160)
     add 67002b67ec Merge branch '4.16'
     add 42a92dcdd3 Extract the IO_URING configuration into the agent.properties (#6253)
     add 65dc2df896 Merge branch '4.16'
     add 6140903004 local versions of .env ignored (#6256)
     add fc31b527b1 maven: upgrade to latest spring-framework release (#6250)
     add c7941278f7 Allow creating snapshot from VM snapshot (#4739)
     add fbf77978e1 Fix: Allow disabling the login attempts mechanism for disabling users (#6254)
     add 3674aff4d4 Merge branch '4.16'
     add b4ac98efa3 ui: Display action buttons in Project Accounts Tab view if project Admin (#6257)
     add 08bfb4444a ui: Add project switch to the Kubernetes tab (#6260)
     add bbb4ffa593 UI: fix dedicate public ip range to domain (#6258)
     add a1fb44e41f Merge branch '4.16'
     add 05c907b3a8 ui: Allow editing VM and template settings (#6262)
     add cd24cf2daa .github: improve coverage run (#6238)
     add 9067938a0d .github: try kicking coverage via pull_request_target sync
     add 4004dfcfd8 StorPool storage plugin (#6007)
     add aa0197c141 kvm: truncate vnc password to 8 chars (#6244)
     add fecc5254de ui: fixes style ui issues (#6261)
     add 50b2dc2789 server: Fix #6263 Cannot scale VM with custom offering (#6267)
     add cfa4f33940 .github/linters: Enable flake8 W293 blank line contains whitespace (#6268)
     add 2dcdc56115 .github: run coverage on pull request (#6265)
     add 3ac91aa452 pom: add sonar project properties
     add c265df965e Fix spelling (#6185)
     add dcb9143330 .github: use pull_request_target which has access to token
     add 023305e86d .github: fetch all history for comparing PR changes
     add 976464ccb9 .github: enable fork-point while finding list of changes files
     add 14dd467a43 ui: Incorrect column key specified in secondary store column filter (#6275)
     add b2086595ca .github: debug github event
     add 1b2461b200 .github: debug github event using env variable
     add cc139464f3 .github: use event specific sha and base_sha for comparing changes
     add 15928f8cc8 .github: detect and kick packaging jobs
     add 70122007bb Updated SAML2 auth sessionkey cookie path (#6149)
     add 8a1b1250e8 ui: remove mandatory rule on root disk controller field while registering / updating a template (#6279)
     add 365966dd0a UI: Fix custom unconstrained for a zone does not show CPU speed (#6285)
     add 334891a4b9 Merge branch '4.16'
     add a5014a28a6 New feature: give access permission of networks to other accounts in same domain (#5769)
     add b2338f7158 Updated reset configuration, to return the updated config value in the response (#6284)
     add 7ea0dea479 Merge branch '4.16'
     add 4313c3def7 Allow users to view reserved System VM IPs, if they're already allocated to user (#5902)
     add c339f6eef9 ui: Fix bulk deletion of ssh key pairs (#6286)
     add ccac1a383f Feat/add vdisk UUID to list volume (#5848)
     add 40193a04eb .github: fix coverage issue, don't kick pkging automatically
     add 9f076ff10d UI: checksum field is optional for direct-download templates on kvm (#6290)
     add 25f92c50f0 ui: Fix Internal LB LB rule column and missing translation (#6288)
     add 56fb7ac128 UI: hide Virtual Routers tab for domain admins (#6289)
     add 5cf8064467 Fix: Prevent NPE on disk offering search while listing VMs (#6287)
     add 18d9c6dfc6 fix mismatching between db uuids and custom attributes uuids (#5382)
     add 830f3061bc SystemVM optimizations (#5831)
     add debfb455ea Added configuration and Integration test to restrict public template … (#4774)
     add 974e57a7c2 Added attach and detach features to UI for ROOT disks as well as deviceID for ROOT and DATADISK (#6201)
     add 54a181fe6b ui: Toggle Theme to default(light) on login (#6299)
     add 9a53bada19 UI: fix netmask is not passed to api when create share network (#6300)
     add 545e89c1cb Mshost stats (#5588)
     add f4e95e3105 Fix VM stats inconsistencies (#6245)
     add bba38fa2ea DB: fix duplicated changes in schema-41610to41700.sql (#6306)
     add 4525f8c8e7 KVM: Enable SSL if keystore exists (#6200)
     add 293517ad72 server: fix NPE in travis and merge #6305 (#6303)
     add 48f7f10089 xen: Fix volume snapshot deletion when it has child snapshots (#6296)
     add f97562212c server: do not display 'Default Egress Policy' for vpc tiers (#6301)
     add 5fa8fa5580 Fix upload volume format (#6297)
     add d0f918d8e6 Merge branch '4.16'
     add aef4916e1c UI: Fix Usage Server stats date display (#6308)
     add 3f7b879513 UI: Fix upload resource icon button (#6309)
     add 523805c8bc schema,server,api: events improvement (#5997)
     add 6471f8418a Fixes InfraMammary screen not display when at least one section doesn't meet the display condition (#6312)
     add a0ee0dcd8a fix the issue of waring when building (#6311)
     add a9bbcf8700 remove superfluent counter and fix log message (#6313)
     add 4a914aa88d network: ipv6 static routes (#5786)
     add 7233c38567 .github: enable PR sonar integration
     add 9f27c992da .github: skip coverage data when string is empty
     add 05e4f9515e .github: fix sonarcloud integration
     add a2abd7fdc2 .github: fix typo in passing merge branch name
     add 4cc830d04a [VMWare] error when detaching volume (#6283)
     add e53ed9e350 network: fix event, acl, firewall for ipv6 nw (#6314)
     add f8920b9312 ui,api: fix api resourcename and user/project event resource (#6315)
     add 453bb57fd2 Disable creating StorPool logs when there isn't StorPool primary storage (#6317)
     add 06e2c38679 Fix user shared networks tests (#6319)
     add d039753994 ui: add route for network acl event resource (#6322)
     add c315724e76 Fix grammatical errors on en.json (#6281)
     add c379430dab .github: sonarcloud integration fixes
     add 87a402cc2b UI: Fix filter width to fix options (#6325)
     add b85d5e491a ui: Fix groupaction for nw cleanup and Notify when groupaction fails (#6333)
     add fd8dfa108e Added allowuserdrivenbackups toggle to the edit backup offering button (#6323)
     add 923a5a4425 Improve log when live patching fails (#6324)
     add 23f6db7735 test: fix ipv6 network test for xenserver (#6329)
     add e0487c43fb UI: Fix detail settings (#6335)
     add 3bd723ca06 Change patch path during live patching of systemVMs  (#6328)
     add 76b3066d52 ui: Fix migrate systemVM icon when stopped (#6337)
     add 55990b3b5c healthcheck hack, please don't merge this

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   (2b9014f908)
            \
             N -- N -- N   refs/heads/healthcheck-main (55990b3b5c)

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:
 .asf.yaml                                          |    49 +
 .github/boring-cyborg.yml                          |   221 +
 .github/linters/.flake8                            |    19 +
 .github/workflows/coverage-check.yml               |   113 +
 .github/workflows/linter.yml                       |    32 +
 .github/workflows/merge-conflict-checker.yml       |    35 +
 .gitignore                                         |     2 +-
 .travis.yml                                        |     5 +-
 agent/bindir/cloud-setup-agent.in                  |     2 +-
 agent/conf/agent.properties                        |    12 +-
 agent/src/main/java/com/cloud/agent/Agent.java     |     4 +-
 .../src/main/java/com/cloud/agent/AgentShell.java  |    75 +-
 .../download/DirectTemplateDownloaderImpl.java     |     2 +-
 .../cloud/agent/properties/AgentProperties.java    |     7 +
 .../com/cloud/agent/api/storage/OVFHelper.java     |   271 +-
 .../com/cloud/agent/api/storage/OVFParser.java     |   112 +
 .../com/cloud/agent/api/to/FirewallRuleTO.java     |     3 +
 .../java/com/cloud/agent/api/to/IpAddressTO.java   |    21 +
 .../java/com/cloud/agent/api/to/NetworkTO.java     |     9 +
 api/src/main/java/com/cloud/capacity/Capacity.java |     1 +
 .../cloud/configuration/ConfigurationService.java  |    19 +
 .../com/cloud/dc/DataCenterGuestIpv6Prefix.java    |    32 +
 api/src/main/java/com/cloud/event/ActionEvent.java |     4 +
 api/src/main/java/com/cloud/event/Event.java       |     4 +
 api/src/main/java/com/cloud/event/EventTypes.java  |    39 +-
 .../main/java/com/cloud/hypervisor/Hypervisor.java |    76 +-
 .../cloud/hypervisor/HypervisorCapabilities.java   |     2 +
 api/src/main/java/com/cloud/network/GuestVlan.java |    19 +-
 .../java/com/cloud/network/GuestVlanRange.java     |    32 +
 api/src/main/java/com/cloud/network/IpAddress.java |     1 +
 .../network/Ipv6GuestPrefixSubnetNetworkMap.java   |    37 +
 .../main/java/com/cloud/network/Ipv6Service.java   |    94 +
 api/src/main/java/com/cloud/network/Network.java   |    35 +-
 .../cloud/network/NetworkMigrationResponder.java   |     2 +-
 .../main/java/com/cloud/network/NetworkModel.java  |     5 +
 .../java/com/cloud/network/NetworkPermission.java  |    26 +
 .../java/com/cloud/network/NetworkService.java     |    27 +-
 .../java/com/cloud/network/guru/NetworkGuru.java   |     2 +-
 .../com/cloud/network/router/VirtualRouter.java    |     2 +
 .../java/com/cloud/network/rules/FirewallRule.java |     2 +-
 .../network/security/SecurityGroupService.java     |     4 +
 .../cloud/network/vpc/VpcProvisioningService.java  |     3 +-
 .../java/com/cloud/network/vpc/VpcService.java     |     6 +-
 .../cloud/network/vpn/RemoteAccessVpnService.java  |     2 +
 .../com/cloud/network/vpn/Site2SiteVpnService.java |     2 +
 .../main/java/com/cloud/offering/DiskOffering.java |    10 +-
 .../java/com/cloud/offering/NetworkOffering.java   |     7 +-
 .../java/com/cloud/offering/ServiceOffering.java   |    61 +-
 .../cloud/server/ManagementServerHostStats.java    |   113 +
 .../java/com/cloud/server/ManagementService.java   |    12 +-
 api/src/main/java/com/cloud/storage/GuestOS.java   |     2 +-
 .../cloud/storage/GuestOSHypervisorMapping.java    |    57 +
 api/src/main/java/com/cloud/storage/Snapshot.java  |     4 +-
 api/src/main/java/com/cloud/storage/Volume.java    |     8 +-
 .../java/com/cloud/storage/VolumeApiService.java   |     5 +
 .../cloud/storage/snapshot/SnapshotApiService.java |     6 +
 api/src/main/java/com/cloud/user/Account.java      |    58 +-
 .../main/java/com/cloud/user/AccountService.java   |    11 +-
 api/src/main/java/com/cloud/vm/DiskProfile.java    |    20 +
 api/src/main/java/com/cloud/vm/InstanceGroup.java  |     3 +-
 api/src/main/java/com/cloud/vm/UserVmService.java  |    20 +-
 api/src/main/java/com/cloud/vm/VirtualMachine.java |     2 -
 .../main/java/com/cloud/vm/VmDetailConstants.java  |     3 +
 .../java/org/apache/cloudstack/acl/APIChecker.java |     3 +
 .../apache/cloudstack/acl/ProjectRoleService.java  |     3 +-
 .../java/org/apache/cloudstack/acl/RoleType.java   |    63 +-
 .../org/apache/cloudstack/alert/AlertService.java  |     1 +
 .../org/apache/cloudstack/api/ApiArgValidator.java |    16 +-
 .../apache/cloudstack/api/ApiCommandJobType.java   |    58 -
 .../cloudstack/api/ApiCommandResourceType.java     |   118 +
 .../org/apache/cloudstack/api/ApiConstants.java    |    47 +-
 .../org/apache/cloudstack/api/BaseAsyncCmd.java    |    15 -
 .../java/org/apache/cloudstack/api/BaseCmd.java    |    32 +-
 .../org/apache/cloudstack/api/BaseListCmd.java     |     5 -
 .../api/BaseResponseWithAssociatedNetwork.java     |    40 +
 .../cloudstack/api/BaseUpdateTemplateOrIsoCmd.java |     2 +-
 .../org/apache/cloudstack/api/IBaseListCmd.java    |     2 -
 .../apache/cloudstack/api/ResponseGenerator.java   |    45 +-
 .../command/admin/account/CreateAccountCmd.java    |    19 +-
 .../command/admin/account/DeleteAccountCmd.java    |     8 +-
 .../command/admin/account/DisableAccountCmd.java   |    11 +-
 .../command/admin/account/EnableAccountCmd.java    |    11 +
 .../command/admin/account/UpdateAccountCmd.java    |    11 +
 .../api/command/admin/acl/CreateRoleCmd.java       |     9 +-
 .../api/command/admin/acl/DeleteRoleCmd.java       |    16 +-
 .../api/command/admin/acl/UpdateRoleCmd.java       |    14 +-
 .../admin/acl/project/ListProjectRolesCmd.java     |     6 +-
 .../command/admin/autoscale/CreateCounterCmd.java  |     6 +-
 .../command/admin/autoscale/DeleteCounterCmd.java  |     6 +-
 .../admin/backup/UpdateBackupOfferingCmd.java      |    27 +-
 .../api/command/admin/ca/ListCaCertificateCmd.java |     2 +-
 .../command/admin/ca/ProvisionCertificateCmd.java  |     6 +-
 .../api/command/admin/cluster/AddClusterCmd.java   |     6 +
 .../command/admin/cluster/DeleteClusterCmd.java    |    11 +
 .../command/admin/cluster/UpdateClusterCmd.java    |    11 +
 .../config/UpdateHypervisorCapabilitiesCmd.java    |    30 +-
 .../admin/diagnostics/GetDiagnosticsDataCmd.java   |    20 +-
 .../admin/diagnostics/RunDiagnosticsCmd.java       |    21 +-
 .../ListTemplateDirectDownloadCertificatesCmd.java |   110 +
 ...visionTemplateDirectDownloadCertificateCmd.java |    78 +
 ...RevokeTemplateDirectDownloadCertificateCmd.java |    72 +-
 ...UploadTemplateDirectDownloadCertificateCmd.java |    44 +-
 .../api/command/admin/domain/CreateDomainCmd.java  |     6 +
 .../api/command/admin/domain/DeleteDomainCmd.java  |    11 +
 .../api/command/admin/domain/UpdateDomainCmd.java  |    11 +
 .../api/command/admin/guest/AddGuestOsCmd.java     |     6 +-
 .../command/admin/guest/AddGuestOsMappingCmd.java  |     6 +-
 .../api/command/admin/guest/RemoveGuestOsCmd.java  |     6 +-
 .../admin/guest/RemoveGuestOsMappingCmd.java       |     6 +-
 .../api/command/admin/guest/UpdateGuestOsCmd.java  |     6 +-
 .../admin/guest/UpdateGuestOsMappingCmd.java       |     6 +-
 .../admin/host/CancelHostAsDegradedCmd.java        |     8 +-
 .../command/admin/host/CancelMaintenanceCmd.java   |     8 +-
 .../admin/host/DeclareHostAsDegradedCmd.java       |     8 +-
 .../api/command/admin/host/ListHostTagsCmd.java    |     6 +-
 .../api/command/admin/host/ListHostsCmd.java       |     6 +-
 .../admin/host/PrepareForMaintenanceCmd.java       |     8 +-
 .../api/command/admin/host/ReconnectHostCmd.java   |     8 +-
 .../admin/host/ReleaseHostReservationCmd.java      |     8 +-
 .../admin/internallb/ListInternalLBVMsCmd.java     |     6 +-
 .../admin/internallb/StartInternalLBVMCmd.java     |     8 +-
 .../admin/internallb/StopInternalLBVMCmd.java      |     8 +-
 .../api/command/admin/management/ListMgmtsCmd.java |     6 +-
 .../network/AddNetworkServiceProviderCmd.java      |     6 +-
 .../network/CreateGuestNetworkIpv6PrefixCmd.java   |   115 +
 .../network/CreateManagementNetworkIpRangeCmd.java |     2 +-
 .../admin/network/CreateNetworkOfferingCmd.java    |    10 +
 .../admin/network/CreatePhysicalNetworkCmd.java    |     6 +-
 .../admin/network/DedicateGuestVlanRangeCmd.java   |     4 +-
 .../network/DeleteGuestNetworkIpv6PrefixCmd.java   |   101 +
 .../network/DeleteNetworkServiceProviderCmd.java   |     6 +-
 .../admin/network/DeletePhysicalNetworkCmd.java    |    11 +-
 .../network/ListDedicatedGuestVlanRangesCmd.java   |     6 +-
 .../network/ListGuestNetworkIpv6PrefixesCmd.java   |    88 +
 .../command/admin/network/ListGuestVlansCmd.java   |   113 +
 .../admin/network/ListNetworksCmdByAdmin.java      |    16 +-
 .../network/ReleaseDedicatedGuestVlanRangeCmd.java |     6 +-
 .../admin/network/UpdateNetworkOfferingCmd.java    |    11 +
 .../network/UpdateNetworkServiceProviderCmd.java   |     6 +-
 .../admin/network/UpdatePhysicalNetworkCmd.java    |     6 +-
 .../admin/offering/CreateDiskOfferingCmd.java      |    14 +
 .../admin/offering/CreateServiceOfferingCmd.java   |    27 +-
 .../admin/offering/UpdateDiskOfferingCmd.java      |    11 +
 .../admin/offering/UpdateServiceOfferingCmd.java   |    11 +
 .../IssueOutOfBandManagementPowerActionCmd.java    |     6 +-
 .../api/command/admin/pod/CreatePodCmd.java        |     8 +
 .../api/command/admin/pod/DeletePodCmd.java        |    11 +
 .../api/command/admin/pod/UpdatePodCmd.java        |    11 +
 .../admin/region/CreatePortableIpRangeCmd.java     |     6 +-
 .../admin/region/DeletePortableIpRangeCmd.java     |     6 +-
 .../admin/resource/StartRollingMaintenanceCmd.java |    57 +-
 .../admin/router/ConfigureOvsElementCmd.java       |     8 +-
 .../router/ConfigureVirtualRouterElementCmd.java   |     8 +-
 .../api/command/admin/router/DestroyRouterCmd.java |     8 +-
 .../api/command/admin/router/ListRoutersCmd.java   |     6 +-
 .../api/command/admin/router/RebootRouterCmd.java  |     8 +-
 .../api/command/admin/router/StartRouterCmd.java   |     8 +-
 .../api/command/admin/router/StopRouterCmd.java    |     8 +-
 .../admin/router/UpgradeRouterTemplateCmd.java     |     6 +-
 .../CancelPrimaryStorageMaintenanceCmd.java        |     8 +-
 .../storage/FindStoragePoolsForMigrationCmd.java   |     6 +-
 .../command/admin/storage/ListStoragePoolsCmd.java |     6 +-
 .../command/admin/storage/ListStorageTagsCmd.java  |     6 +-
 .../storage/MigrateSecondaryStorageDataCmd.java    |    11 +
 .../PreparePrimaryStorageForMaintenanceCmd.java    |     8 +-
 .../admin/storage/UpdateStoragePoolCmd.java        |    11 +
 .../command/admin/systemvm/DestroySystemVmCmd.java |     8 +-
 .../command/admin/systemvm/ListSystemVMsCmd.java   |     6 +-
 .../command/admin/systemvm/PatchSystemVMCmd.java   |   108 +
 .../command/admin/systemvm/RebootSystemVmCmd.java  |     8 +-
 .../command/admin/systemvm/StartSystemVMCmd.java   |     8 +-
 .../command/admin/systemvm/StopSystemVmCmd.java    |     8 +-
 .../api/command/admin/usage/AddTrafficTypeCmd.java |     6 +-
 .../command/admin/usage/DeleteTrafficTypeCmd.java  |     6 +-
 .../command/admin/usage/UpdateTrafficTypeCmd.java  |     6 +-
 .../api/command/admin/user/CreateUserCmd.java      |     6 +
 .../api/command/admin/user/DeleteUserCmd.java      |    11 +
 .../api/command/admin/user/DisableUserCmd.java     |     6 +-
 .../api/command/admin/user/ListUsersCmd.java       |     9 +-
 .../api/command/admin/user/MoveUserCmd.java        |    20 +-
 .../api/command/admin/user/RegisterCmd.java        |    11 +
 .../api/command/admin/user/UpdateUserCmd.java      |    11 +
 .../api/command/admin/vm/AssignVMCmd.java          |    10 +
 .../api/command/admin/vm/ExpungeVMCmd.java         |     8 +-
 .../api/command/admin/vm/MigrateVMCmd.java         |    11 +
 .../vm/MigrateVirtualMachineWithVolumeCmd.java     |    11 +
 .../api/command/admin/vm/RecoverVMCmd.java         |    14 +
 .../command/admin/vm/UnmanageVMInstanceCmd.java    |     8 +-
 .../admin/volume/MigrateVolumeCmdByAdmin.java      |     3 +-
 .../admin/vpc/CreatePrivateGatewayByAdminCmd.java  |    74 +
 .../command/admin/vpc/CreatePrivateGatewayCmd.java |   225 -
 .../command/admin/vpc/CreateVPCOfferingCmd.java    |    16 +-
 .../command/admin/vpc/DeletePrivateGatewayCmd.java |    10 +-
 .../command/admin/vpc/DeleteVPCOfferingCmd.java    |    10 +
 .../command/admin/vpc/UpdateVPCOfferingCmd.java    |    11 +
 .../admin/zone/MarkDefaultZoneForAccountCmd.java   |    12 +-
 .../user/account/AddAccountToProjectCmd.java       |    11 +
 .../command/user/account/AddUserToProjectCmd.java  |    13 +-
 .../user/account/DeleteAccountFromProjectCmd.java  |    11 +
 .../user/account/DeleteUserFromProjectCmd.java     |    11 +
 .../api/command/user/account/ListAccountsCmd.java  |    23 +-
 .../user/account/ListProjectAccountsCmd.java       |     6 +
 .../command/user/address/AssociateIPAddrCmd.java   |     6 +-
 .../user/address/DisassociateIPAddrCmd.java        |     8 +-
 .../user/address/ListPublicIpAddressesCmd.java     |     6 +-
 .../api/command/user/address/ReleaseIPAddrCmd.java |   104 +
 .../api/command/user/address/ReserveIPAddrCmd.java |   174 +
 .../api/command/user/address/UpdateIPAddrCmd.java  |    11 +
 .../user/affinitygroup/CreateAffinityGroupCmd.java |     6 +-
 .../user/affinitygroup/DeleteAffinityGroupCmd.java |    11 +-
 .../user/affinitygroup/ListAffinityGroupsCmd.java  |     6 +-
 .../affinitygroup/UpdateVMAffinityGroupCmd.java    |     6 +-
 .../user/autoscale/CreateAutoScalePolicyCmd.java   |     6 +-
 .../user/autoscale/CreateAutoScaleVmGroupCmd.java  |     6 +-
 .../autoscale/CreateAutoScaleVmProfileCmd.java     |     6 +-
 .../command/user/autoscale/CreateConditionCmd.java |     6 +-
 .../user/autoscale/DeleteAutoScalePolicyCmd.java   |     6 +-
 .../user/autoscale/DeleteAutoScaleVmGroupCmd.java  |     6 +-
 .../autoscale/DeleteAutoScaleVmProfileCmd.java     |     6 +-
 .../command/user/autoscale/DeleteConditionCmd.java |     6 +-
 .../user/autoscale/DisableAutoScaleVmGroupCmd.java |     6 +-
 .../user/autoscale/EnableAutoScaleVmGroupCmd.java  |     6 +-
 .../user/autoscale/UpdateAutoScalePolicyCmd.java   |     6 +-
 .../user/autoscale/UpdateAutoScaleVmGroupCmd.java  |     6 +-
 .../autoscale/UpdateAutoScaleVmProfileCmd.java     |     6 +-
 .../api/command/user/backup/CreateBackupCmd.java   |     6 +-
 .../api/command/user/event/ListEventsCmd.java      |    17 +-
 .../user/firewall/CreateEgressFirewallRuleCmd.java |    75 +-
 .../user/firewall/CreateFirewallRuleCmd.java       |     6 +-
 .../user/firewall/CreatePortForwardingRuleCmd.java |     6 +-
 .../user/firewall/DeleteEgressFirewallRuleCmd.java |     6 +-
 .../user/firewall/DeleteFirewallRuleCmd.java       |     6 +-
 .../user/firewall/DeletePortForwardingRuleCmd.java |     6 +-
 .../user/ipv6/CreateIpv6FirewallRuleCmd.java       |   266 +
 .../user/ipv6/DeleteIpv6FirewallRuleCmd.java       |   111 +
 .../user/ipv6/ListIpv6FirewallRulesCmd.java        |   118 +
 .../user/ipv6/UpdateIpv6FirewallRuleCmd.java       |   189 +
 .../api/command/user/iso/AttachIsoCmd.java         |    11 +
 .../api/command/user/iso/DeleteIsoCmd.java         |     8 +-
 .../api/command/user/iso/DetachIsoCmd.java         |    11 +
 .../api/command/user/iso/ExtractIsoCmd.java        |     8 +-
 .../api/command/user/iso/ListIsosCmd.java          |     6 +-
 .../api/command/user/iso/RegisterIsoCmd.java       |     6 +
 .../api/command/user/iso/UpdateIsoCmd.java         |    11 +
 .../CreateApplicationLoadBalancerCmd.java          |     8 +-
 .../loadbalancer/CreateLoadBalancerRuleCmd.java    |     6 +-
 .../DeleteApplicationLoadBalancerCmd.java          |     8 +-
 .../loadbalancer/DeleteLoadBalancerRuleCmd.java    |     6 +-
 .../ListApplicationLoadBalancersCmd.java           |     2 +-
 .../UpdateApplicationLoadBalancerCmd.java          |     2 +-
 .../user/nat/CreateIpForwardingRuleCmd.java        |     6 +-
 .../user/nat/DeleteIpForwardingRuleCmd.java        |     6 +-
 .../api/command/user/nat/DisableStaticNatCmd.java  |    15 +
 .../api/command/user/nat/EnableStaticNatCmd.java   |    10 +
 .../command/user/network/CreateNetworkACLCmd.java  |     7 +
 .../user/network/CreateNetworkACLListCmd.java      |    11 +
 .../api/command/user/network/CreateNetworkCmd.java |    35 +-
 .../user/network/CreateNetworkPermissionsCmd.java  |   130 +
 .../command/user/network/DeleteNetworkACLCmd.java  |    11 +
 .../user/network/DeleteNetworkACLListCmd.java      |    11 +
 .../api/command/user/network/DeleteNetworkCmd.java |    11 +-
 .../user/network/ListNetworkPermissionsCmd.java    |    94 +
 .../api/command/user/network/ListNetworksCmd.java  |    26 +
 .../user/network/MoveNetworkAclItemCmd.java        |     6 +
 .../user/network/RemoveNetworkPermissionsCmd.java  |   129 +
 .../user/network/ResetNetworkPermissionsCmd.java   |    89 +
 .../command/user/network/RestartNetworkCmd.java    |    21 +-
 .../user/network/UpdateNetworkACLItemCmd.java      |    11 +
 .../user/network/UpdateNetworkACLListCmd.java      |    11 +
 .../api/command/user/network/UpdateNetworkCmd.java |    13 +-
 .../user/offering/ListDiskOfferingsCmd.java        |    16 +
 .../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java   |     6 +-
 .../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java   |     6 +-
 .../AuthorizeSecurityGroupEgressCmd.java           |     8 +-
 .../AuthorizeSecurityGroupIngressCmd.java          |     8 +-
 .../user/securitygroup/ListSecurityGroupsCmd.java  |     6 +-
 .../RevokeSecurityGroupEgressCmd.java              |     8 +-
 .../RevokeSecurityGroupIngressCmd.java             |     8 +-
 .../command/user/snapshot/CreateSnapshotCmd.java   |    10 +-
 .../snapshot/CreateSnapshotFromVMSnapshotCmd.java  |    10 +-
 .../user/snapshot/CreateSnapshotPolicyCmd.java     |    15 +-
 .../command/user/snapshot/DeleteSnapshotCmd.java   |     8 +-
 .../command/user/snapshot/ListSnapshotsCmd.java    |     6 +-
 .../command/user/snapshot/RevertSnapshotCmd.java   |     8 +-
 .../user/snapshot/UpdateSnapshotPolicyCmd.java     |     2 +-
 .../api/command/user/ssh/ListSSHKeyPairsCmd.java   |     5 +
 .../api/command/user/template/CopyTemplateCmd.java |    13 +-
 .../command/user/template/CreateTemplateCmd.java   |     8 +-
 .../command/user/template/DeleteTemplateCmd.java   |     8 +-
 .../command/user/template/ExtractTemplateCmd.java  |    13 +-
 .../template/GetUploadParamsForTemplateCmd.java    |     7 +-
 .../command/user/template/ListTemplatesCmd.java    |     6 +-
 .../command/user/template/RegisterTemplateCmd.java |     6 +-
 .../command/user/template/UpdateTemplateCmd.java   |    11 +
 .../api/command/user/vm/AddIpToVmNicCmd.java       |     6 +-
 .../api/command/user/vm/AddNicToVMCmd.java         |    16 +-
 .../api/command/user/vm/DeployVMCmd.java           |    37 +-
 .../api/command/user/vm/DestroyVMCmd.java          |     8 +-
 .../api/command/user/vm/ListNicsCmd.java           |     6 +-
 .../cloudstack/api/command/user/vm/ListVMsCmd.java |    57 +-
 .../api/command/user/vm/RebootVMCmd.java           |     8 +-
 .../api/command/user/vm/RemoveIpFromVmNicCmd.java  |     6 +-
 .../api/command/user/vm/ResetVMPasswordCmd.java    |     8 +-
 .../api/command/user/vm/ResetVMSSHKeyCmd.java      |    30 +-
 .../api/command/user/vm/RestoreVMCmd.java          |    11 +
 .../cloudstack/api/command/user/vm/ScaleVMCmd.java |    49 +-
 .../cloudstack/api/command/user/vm/StartVMCmd.java |     8 +-
 .../cloudstack/api/command/user/vm/StopVMCmd.java  |     8 +-
 .../api/command/user/vm/UpdateVMCmd.java           |    16 +-
 .../api/command/user/vm/UpdateVmNicIpCmd.java      |     6 +-
 .../api/command/user/vm/UpgradeVMCmd.java          |    33 +
 .../user/vmsnapshot/CreateVMSnapshotCmd.java       |    10 +-
 .../user/vmsnapshot/DeleteVMSnapshotCmd.java       |    10 +
 .../user/vmsnapshot/RevertToVMSnapshotCmd.java     |    10 +
 .../api/command/user/volume/AttachVolumeCmd.java   |    15 +-
 .../user/volume/ChangeOfferingForVolumeCmd.java    |   159 +
 .../api/command/user/volume/CreateVolumeCmd.java   |     6 +-
 .../api/command/user/volume/DeleteVolumeCmd.java   |    11 +
 .../api/command/user/volume/DestroyVolumeCmd.java  |     8 +-
 .../api/command/user/volume/DetachVolumeCmd.java   |     8 +-
 .../api/command/user/volume/ExtractVolumeCmd.java  |     8 +-
 .../api/command/user/volume/ListVolumesCmd.java    |     7 +-
 .../api/command/user/volume/MigrateVolumeCmd.java  |    30 +-
 .../api/command/user/volume/RecoverVolumeCmd.java  |    11 +
 .../user/volume/RemoveResourceDetailCmd.java       |     6 +-
 .../api/command/user/volume/ResizeVolumeCmd.java   |    15 +-
 .../api/command/user/volume/UpdateVolumeCmd.java   |     8 +-
 .../api/command/user/volume/UploadVolumeCmd.java   |    10 +-
 .../command/user/vpc/CreatePrivateGatewayCmd.java  |   217 +
 .../api/command/user/vpc/CreateStaticRouteCmd.java |     6 +-
 .../api/command/user/vpc/DeleteStaticRouteCmd.java |     6 +-
 .../api/command/user/vpc/DeleteVPCCmd.java         |    11 +
 .../api/command/user/vpc/RestartVPCCmd.java        |    18 +
 .../api/command/user/vpc/UpdateVPCCmd.java         |    11 +
 .../command/user/vpn/CreateRemoteAccessVpnCmd.java |    11 +
 .../user/vpn/CreateVpnCustomerGatewayCmd.java      |    29 +-
 .../command/user/vpn/DeleteRemoteAccessVpnCmd.java |    10 +
 .../user/vpn/DeleteVpnCustomerGatewayCmd.java      |    11 +
 .../api/command/user/vpn/RemoveVpnUserCmd.java     |     3 +-
 .../user/vpn/UpdateVpnCustomerGatewayCmd.java      |    11 +
 .../cloudstack/api/response/AccountResponse.java   |     4 +-
 .../DataCenterGuestIpv6PrefixResponse.java         |    87 +
 ...irectDownloadCertificateHostStatusResponse.java |    73 +
 .../DirectDownloadCertificateResponse.java         |   162 +
 .../api/response/DiskOfferingResponse.java         |    12 +
 .../api/response/DomainRouterResponse.java         |    12 +
 .../cloudstack/api/response/EventResponse.java     |    39 +-
 .../cloudstack/api/response/FirewallResponse.java  |     8 +
 .../api/response/GuestVlanRangeResponse.java       |     4 +-
 .../cloudstack/api/response/GuestVlanResponse.java |   156 +
 .../cloudstack/api/response/HostResponse.java      |     7 -
 .../response/HypervisorCapabilitiesResponse.java   |    15 +-
 .../cloudstack/api/response/IpRangeResponse.java   |    27 +-
 .../cloudstack/api/response/Ipv6RouteResponse.java |    56 +
 .../api/response/ManagementServerResponse.java     |   103 +-
 .../api/response/NetworkACLResponse.java           |     8 +
 .../api/response/NetworkOfferingResponse.java      |    12 +
 .../api/response/NetworkPermissionsResponse.java   |    87 +
 .../cloudstack/api/response/NetworkResponse.java   |    62 +-
 .../api/response/PrivateGatewayResponse.java       |     5 +-
 .../api/response/ProjectAccountResponse.java       |     4 +-
 .../api/response/SSHKeyPairResponse.java           |     4 +
 .../api/response/ServiceOfferingResponse.java      |    50 +
 .../cloudstack/api/response/StatsResponse.java     |   147 +
 .../cloudstack/api/response/UserResponse.java      |     9 +-
 .../cloudstack/api/response/UserVmResponse.java    |    38 +-
 .../api/response/VlanIpRangeResponse.java          |    21 +-
 .../cloudstack/api/response/VolumeResponse.java    |    24 +-
 .../api/response/VpcOfferingResponse.java          |    12 +
 .../cloudstack/api/response/VpcResponse.java       |     9 +
 .../cloudstack/config/ApiServiceConfiguration.java |     2 +-
 .../org/apache/cloudstack/context/CallContext.java |    19 +
 .../cloudstack/diagnostics/DiagnosticsType.java    |     2 +-
 .../direct/download/DirectDownloadCertificate.java |     1 +
 .../download/DirectDownloadCertificateHostMap.java |    26 +
 .../direct/download/DirectDownloadManager.java     |    60 +-
 .../management/ManagementServerStatus.java         |    45 +
 .../org/apache/cloudstack/query/QueryService.java  |     3 +
 .../com/cloud/agent/api/storage/OVFHelperTest.java |    29 +-
 .../test/java/com/cloud/user/AccountTypeTest.java  |    55 +
 .../org/apache/cloudstack/acl/RoleTypeTest.java    |    38 +-
 .../cloudstack/api/ApiCommandResourceTypeTest.java |    71 +
 .../admin/account/CreateAccountCmdTest.java        |     8 +-
 .../admin/systemvm/PatchSystemVMCmdTest.java       |    92 +
 .../api/command/test/UpdateRoleCmdTest.java        |     2 +-
 .../firewall/CreateEgressFirewallRuleCmdTest.java  |   317 +
 .../cloudstack/api/response/StatsResponseTest.java |   135 +
 client/pom.xml                                     |    91 +-
 client/src/main/webapp/WEB-INF/web.xml             |     3 +
 cloud-cli/cloudapis/__init__.py                    |     6 +-
 cloud-cli/cloudtool/__init__.py                    |    22 +-
 cloud-cli/cloudtool/utils.py                       |    38 +-
 .../com/cloud/agent/api/FreezeThawVMAnswer.java    |    39 +
 .../com/cloud/agent/api/FreezeThawVMCommand.java   |    56 +
 .../com/cloud/agent/api/PatchSystemVmAnswer.java   |    44 +
 .../com/cloud/agent/api/PatchSystemVmCommand.java  |    58 +
 .../main/java/com/cloud/agent/api/ReadyAnswer.java |    15 +
 .../cloud/agent/api/SetupGuestNetworkCommand.java  |    45 +
 .../java/com/cloud/agent/api/VmStatsEntry.java     |   159 +-
 .../java/com/cloud/agent/api/VmStatsEntryBase.java |   192 +
 .../api/routing/SetIpv6FirewallRulesAnswer.java    |    39 +
 .../api/routing/SetIpv6FirewallRulesCommand.java   |    55 +
 .../agent/api/routing/SetNetworkACLCommand.java    |    16 +-
 .../agent/resource/virtualnetwork/VRScripts.java   |     2 +
 .../virtualnetwork/VirtualRoutingResource.java     |    23 +-
 .../facade/AbstractConfigItemFacade.java           |     3 +
 .../facade/SetGuestNetworkConfigItem.java          |    24 +-
 .../facade/SetIpv6FirewallRulesConfigItem.java     |    60 +
 .../facade/SetNetworkAclConfigItem.java            |     6 +-
 .../resource/virtualnetwork/model/ConfigBase.java  |     1 +
 .../virtualnetwork/model/FirewallRule.java         |     8 +
 .../virtualnetwork/model/GuestNetwork.java         |    75 +-
 .../resource/virtualnetwork/model/NetworkACL.java  |     9 +
 .../java/com/cloud/resource/ServerResource.java    |     7 +
 .../com/cloud/storage/template/OVAProcessor.java   |    14 +-
 .../diagnostics/CopyToSecondaryStorageCommand.java |     8 +-
 .../cloudstack/storage/command/CopyCmdAnswer.java  |     5 +
 .../storage/command/RevertSnapshotCommand.java     |     8 +-
 .../storage/command/UploadStatusAnswer.java        |    21 +-
 .../cloud/storage/template/OVAProcessorTest.java   |     2 +
 .../api/agent/test/CheckNetworkAnswerTest.java     |     2 +-
 debian/cloudstack-agent.postinst                   |     7 +
 debian/cloudstack-common.install                   |     2 +-
 debian/cloudstack-management.postinst              |     7 +
 debian/cloudstack-usage.postinst                   |     7 +
 debian/rules                                       |     5 +-
 .../main/java/com/cloud/vm/VirtualMachineGuru.java |    25 +
 .../service/NetworkOrchestrationService.java       |     6 +-
 .../service/VolumeOrchestrationService.java        |     9 +
 .../engine/service/api/OrchestrationService.java   |     5 +-
 .../engine/subsystem/api/storage/DataObject.java   |     2 +
 .../api/storage/HypervisorHostListener.java        |     2 +
 .../api/storage/PrimaryDataStoreDriver.java        |    29 +
 .../api/storage/SecondaryStorageService.java       |     3 +-
 .../subsystem/api/storage/SnapshotDataFactory.java |     2 +
 .../api/storage/StorageStrategyFactory.java        |     8 +
 .../subsystem/api/storage/VMSnapshotStrategy.java  |     8 +
 .../main/java/com/cloud/alert/AlertManager.java    |     6 +
 .../cloud/configuration/ConfigurationManager.java  |     6 +-
 .../cloud/hypervisor/HypervisorGuruManager.java    |     2 +
 .../java/com/cloud/network/vpc/VpcManager.java     |     2 +-
 .../java/com/cloud/storage/StorageManager.java     |    22 +-
 .../java/com/cloud/agent/manager/AgentAttache.java |     4 +-
 .../com/cloud/agent/manager/AgentManagerImpl.java  |    32 +-
 .../agent/manager/ClusteredAgentManagerImpl.java   |    10 +-
 .../cloud/agent/manager/ConnectedAgentAttache.java |     2 +-
 .../com/cloud/vm/VirtualMachineManagerImpl.java    |   155 +-
 .../cloud/entity/api/VMEntityManagerImpl.java      |     2 +-
 .../engine/orchestration/CloudOrchestrator.java    |    76 +-
 .../engine/orchestration/DataMigrationUtility.java |    60 +-
 .../engine/orchestration/NetworkOrchestrator.java  |   381 +-
 .../engine/orchestration/StorageOrchestrator.java  |    69 +-
 .../engine/orchestration/VolumeOrchestrator.java   |   144 +-
 .../cloud/vm/VirtualMachineManagerImplTest.java    |    23 +-
 engine/schema/pom.xml                              |   132 +-
 .../main/java/com/cloud/capacity/CapacityVO.java   |     1 +
 .../com/cloud/dc/DataCenterGuestIpv6PrefixVO.java  |    99 +
 .../main/java/com/cloud/dc/DataCenterVnetVO.java   |     9 +-
 .../schema/src/main/java/com/cloud/dc/VlanVO.java  |     2 +-
 .../cloud/dc/dao/DataCenterGuestIpv6PrefixDao.java |    28 +
 .../dc/dao/DataCenterGuestIpv6PrefixDaoImpl.java   |    43 +
 .../src/main/java/com/cloud/dc/dao/VlanDao.java    |     4 +
 .../main/java/com/cloud/dc/dao/VlanDaoImpl.java    |    47 +
 .../src/main/java/com/cloud/event/EventVO.java     |    24 +
 .../src/main/java/com/cloud/host/dao/HostDao.java  |     7 +
 .../main/java/com/cloud/host/dao/HostDaoImpl.java  |    14 +-
 .../main/java/com/cloud/host/dao/HostTagsDao.java  |     2 +-
 .../java/com/cloud/host/dao/HostTagsDaoImpl.java   |     2 +-
 .../cloud/hypervisor/HypervisorCapabilitiesVO.java |     3 +-
 .../dao/HypervisorCapabilitiesDaoImpl.java         |     2 +-
 .../network/Ipv6GuestPrefixSubnetNetworkMapVO.java |   129 +
 .../cloud/network/dao/AccountGuestVlanMapVO.java   |     4 +-
 .../java/com/cloud/network/dao/IPAddressDao.java   |     2 +
 .../com/cloud/network/dao/IPAddressDaoImpl.java    |    20 +
 .../dao/Ipv6GuestPrefixSubnetNetworkMapDao.java    |    33 +
 .../Ipv6GuestPrefixSubnetNetworkMapDaoImpl.java    |   111 +
 .../java/com/cloud/network/dao/NetworkDao.java     |     2 +
 .../java/com/cloud/network/dao/NetworkDaoImpl.java |    10 +
 .../com/cloud/network/dao/NetworkDetailsDao.java   |     2 +-
 .../cloud/network/dao/NetworkDetailsDaoImpl.java   |     7 +
 .../main/java/com/cloud/network/dao/NetworkVO.java |     4 +-
 .../network/security/dao/VmRulesetLogDaoImpl.java  |     2 +-
 .../com/cloud/network/vpc/dao/VpcOfferingDao.java  |     5 +
 .../cloud/network/vpc/dao/VpcOfferingDaoImpl.java  |    19 +
 .../network/vpc/dao/VpcOfferingDetailsDao.java     |     1 +
 .../network/vpc/dao/VpcOfferingDetailsDaoImpl.java |    26 +
 .../com/cloud/offerings/NetworkOfferingVO.java     |     4 +-
 .../cloud/offerings/dao/NetworkOfferingDao.java    |     7 +
 .../offerings/dao/NetworkOfferingDaoImpl.java      |    23 +
 .../java/com/cloud/service/ServiceOfferingVO.java  |   205 +-
 .../com/cloud/service/dao/ServiceOfferingDao.java  |     2 +
 .../cloud/service/dao/ServiceOfferingDaoImpl.java  |    43 +-
 .../java/com/cloud/storage/DiskOfferingVO.java     |    51 +-
 .../src/main/java/com/cloud/storage/GuestOSVO.java |     2 +-
 .../main/java/com/cloud/storage/SnapshotVO.java    |    12 +-
 .../src/main/java/com/cloud/storage/VolumeVO.java  |    15 +
 .../com/cloud/storage/dao/DiskOfferingDao.java     |     8 +-
 .../com/cloud/storage/dao/DiskOfferingDaoImpl.java |    55 +-
 .../java/com/cloud/storage/dao/GuestOSDao.java     |     1 +
 .../java/com/cloud/storage/dao/GuestOSDaoImpl.java |    22 +-
 .../cloud/storage/dao/GuestOSHypervisorDao.java    |     2 +
 .../storage/dao/GuestOSHypervisorDaoImpl.java      |    19 +-
 .../java/com/cloud/storage/dao/SnapshotDao.java    |     6 +
 .../com/cloud/storage/dao/SnapshotDaoImpl.java     |    15 +-
 .../com/cloud/upgrade/DatabaseUpgradeChecker.java  |     9 +-
 .../main/java/com/cloud/upgrade/GuestOsMapper.java |   191 +
 .../com/cloud/upgrade/RolePermissionChecker.java   |    61 +
 .../upgrade/SystemVmTemplateRegistration.java      |    81 +-
 .../com/cloud/upgrade/dao/Upgrade41400to41500.java |   238 +
 .../com/cloud/upgrade/dao/Upgrade41500to41510.java |   139 +
 .../com/cloud/upgrade/dao/Upgrade41510to41520.java |    13 +
 .../com/cloud/upgrade/dao/Upgrade41520to41600.java |    37 +
 .../com/cloud/upgrade/dao/Upgrade41600to41610.java |     9 +
 .../com/cloud/upgrade/dao/Upgrade41610to41700.java |    30 +-
 .../com/cloud/upgrade/dao/Upgrade481to490.java     |     5 +-
 .../java/com/cloud/usage/UsageIPAddressVO.java     |    19 +-
 .../com/cloud/usage/UsageLoadBalancerPolicyVO.java |    18 +-
 .../com/cloud/usage/UsageNetworkOfferingVO.java    |    17 +-
 .../com/cloud/usage/UsagePortForwardingRuleVO.java |    18 +-
 .../java/com/cloud/usage/UsageSecurityGroupVO.java |    17 +-
 .../com/cloud/usage/UsageSnapshotOnPrimaryVO.java  |    16 +-
 .../main/java/com/cloud/usage/UsageStorageVO.java  |    20 +-
 .../java/com/cloud/usage/UsageVMInstanceVO.java    |    17 +-
 .../java/com/cloud/usage/UsageVMSnapshotVO.java    |    17 +-
 .../main/java/com/cloud/usage/UsageVPNUserVO.java  |    17 +-
 .../main/java/com/cloud/usage/UsageVolumeVO.java   |    18 +-
 .../java/com/cloud/usage/dao/UsageDaoImpl.java     |     2 +-
 .../com/cloud/usage/dao/UsageIPAddressDaoImpl.java |     6 +-
 .../usage/dao/UsageLoadBalancerPolicyDaoImpl.java  |    12 +-
 .../usage/dao/UsagePortForwardingRuleDaoImpl.java  |    12 +-
 .../com/cloud/usage/dao/UsageStorageDaoImpl.java   |    16 +-
 .../cloud/usage/dao/UsageVMSnapshotDaoImpl.java    |    12 +-
 .../usage/dao/UsageVMSnapshotOnPrimaryDaoImpl.java |     6 +-
 .../com/cloud/usage/dao/UsageVolumeDaoImpl.java    |    12 +-
 .../src/main/java/com/cloud/user/AccountVO.java    |    13 +-
 .../main/java/com/cloud/user/UserStatsLogVO.java   |    15 +-
 .../src/main/java/com/cloud/user/UserVO.java       |     2 +-
 .../java/com/cloud/user/dao/AccountDaoImpl.java    |    18 +-
 .../java/com/cloud/user/dao/SSHKeyPairDao.java     |     2 +
 .../java/com/cloud/user/dao/SSHKeyPairDaoImpl.java |    11 +
 .../src/main/java/com/cloud/vm/DomainRouterVO.java |    11 +
 .../main/java/com/cloud/vm/InstanceGroupVO.java    |     8 +-
 .../src/main/java/com/cloud/vm/UserVmVO.java       |     4 +-
 .../src/main/java/com/cloud/vm/VMInstanceVO.java   |    14 +-
 .../src/main/java/com/cloud/vm/VmStatsVO.java      |    87 +
 .../java/com/cloud/vm/dao/ConsoleProxyDaoImpl.java |     2 +-
 .../java/com/cloud/vm/dao/DomainRouterDao.java     |     2 +-
 .../java/com/cloud/vm/dao/DomainRouterDaoImpl.java |     9 +-
 .../src/main/java/com/cloud/vm/dao/NicDao.java     |     2 +
 .../src/main/java/com/cloud/vm/dao/NicDaoImpl.java |    11 +
 .../main/java/com/cloud/vm/dao/UserVmDaoImpl.java  |     2 +-
 .../main/java/com/cloud/vm/dao/VMInstanceDao.java  |     1 +
 .../java/com/cloud/vm/dao/VMInstanceDaoImpl.java   |    19 +-
 .../src/main/java/com/cloud/vm/dao/VmStatsDao.java |    82 +
 .../main/java/com/cloud/vm/dao/VmStatsDaoImpl.java |   122 +
 .../apache/cloudstack/acl/dao/ProjectRoleDao.java  |     2 +-
 .../cloudstack/acl/dao/ProjectRoleDaoImpl.java     |    20 +-
 .../DirectDownloadCertificateHostMapDao.java       |     1 +
 .../DirectDownloadCertificateHostMapDaoImpl.java   |     9 +
 .../DirectDownloadCertificateHostMapVO.java        |    16 +-
 .../engine/cloud/entity/api/db/VMEntityVO.java     |    13 +-
 .../cloudstack/network/NetworkPermissionVO.java    |    61 +
 .../network/dao/NetworkPermissionDao.java          |    65 +
 .../network/dao/NetworkPermissionDaoImpl.java      |    98 +
 .../storage/datastore/db/SnapshotDataStoreDao.java |    11 +
 .../spring-engine-schema-core-daos-context.xml     |     6 +
 .../main/resources/META-INF/db/schema-2214to30.sql |     4 +-
 .../main/resources/META-INF/db/schema-227to228.sql |     4 +-
 .../main/resources/META-INF/db/schema-302to40.sql  |     2 +-
 .../main/resources/META-INF/db/schema-307to410.sql |    14 +-
 .../main/resources/META-INF/db/schema-40to410.sql  |     8 +-
 .../main/resources/META-INF/db/schema-410to420.sql |     2 +-
 .../resources/META-INF/db/schema-41400to41500.sql  |   243 -
 .../resources/META-INF/db/schema-41500to41510.sql  |    96 -
 .../resources/META-INF/db/schema-41520to41600.sql  |    29 +-
 .../resources/META-INF/db/schema-41600to41610.sql  |   144 +-
 .../resources/META-INF/db/schema-41610to41700.sql  |   912 +
 .../main/resources/META-INF/db/schema-442to450.sql |     2 +-
 .../main/resources/META-INF/db/schema-452to460.sql |     2 +-
 .../src/test/java/com/cloud/host/HostVOTest.java   |     4 +-
 .../cloud/usage/dao/UsageStorageDaoImplTest.java   |     4 +-
 engine/schema/templateConfig.sh                    |    31 +-
 .../cache/manager/StorageCacheManagerImpl.java     |     2 +-
 .../storage/motion/AncientDataMotionStrategy.java  |     3 +
 .../KvmNonManagedStorageDataMotionStrategy.java    |     6 +-
 .../motion/StorageSystemDataMotionStrategy.java    |     2 +-
 .../storage/image/SecondaryStorageServiceImpl.java |    13 +-
 .../storage/image/store/TemplateObject.java        |     9 +
 .../storage/snapshot/DefaultSnapshotStrategy.java  |   221 +-
 .../storage/snapshot/SnapshotDataFactoryImpl.java  |    10 +-
 .../storage/snapshot/SnapshotObject.java           |     6 +-
 .../vmsnapshot/DefaultVMSnapshotStrategy.java      |    24 +-
 .../vmsnapshot/ScaleIOVMSnapshotStrategy.java      |    32 +-
 .../vmsnapshot/StorageVMSnapshotStrategy.java      |   481 +
 ...ing-engine-storage-snapshot-storage-context.xml |     3 +
 .../snapshot/DefaultSnapshotStrategyTest.java      |   162 +
 .../vmsnapshot/VMSnapshotStrategyKVMTest.java      |   436 +
 .../allocator/AbstractStoragePoolAllocator.java    |     9 +-
 .../storage/helper/StorageStrategyFactoryImpl.java |    10 +
 .../storage/image/BaseImageStoreDriverImpl.java    |     6 +-
 .../storage/image/NfsImageStoreDriverImpl.java     |    22 +-
 .../storage/image/db/SnapshotDataStoreDaoImpl.java |    47 +-
 .../image/deployasis/DeployAsIsHelperImpl.java     |    78 +-
 .../storage/snapshot/SnapshotEntityImpl.java       |     2 +-
 .../image/db/SnapshotDataStoreDaoImplTest.java     |    77 +
 .../datastore/provider/DefaultHostListener.java    |   105 +-
 .../cloudstack/storage/volume/VolumeObject.java    |    19 +
 .../storage/volume/VolumeServiceImpl.java          |     8 +-
 .../java/com/cloud/cluster/ClusterManager.java     |    52 +-
 .../java/com/cloud/cluster/ClusterManagerImpl.java |    56 +-
 .../java/com/cloud/cluster/ClusterServicePdu.java  |     1 +
 .../cluster/ClusterServiceServletContainer.java    |     2 +-
 .../cloud/cluster/ManagementServerStatusVO.java    |   184 +
 .../cloud/cluster/dao/ManagementServerHostDao.java |     7 +-
 .../cluster/dao/ManagementServerStatusDao.java     |    24 +
 .../cluster/dao/ManagementServerStatusDaoImpl.java |    48 +
 .../main/java/com/cloud/dao/EntityManagerImpl.java |     9 +-
 .../src/main/java/com/cloud/utils/db/DbUtil.java   |    42 +-
 .../java/com/cloud/utils/db/GenericDaoBase.java    |    21 +-
 .../main/java/com/cloud/utils/db/Merovingian2.java |     2 +-
 .../java/com/cloud/utils/db/GlobalLockTest.java    |     2 +-
 framework/direct-download/pom.xml                  |     8 +
 .../direct/download/DirectDownloadService.java     |     9 +-
 .../framework/messagebus/MessageBusBase.java       |     2 +-
 .../framework/messagebus/MessageDetector.java      |     2 +-
 .../framework/jobs/dao/VmWorkJobDao.java           |     2 +
 .../framework/jobs/dao/VmWorkJobDaoImpl.java       |    14 +
 .../framework/jobs/impl/AsyncJobManagerImpl.java   |     4 +-
 .../cloudstack/framework/jobs/impl/AsyncJobVO.java |     2 +-
 .../framework/jobs/impl/VmWorkJobVO.java           |    24 +
 framework/managed-context/pom.xml                  |     6 +-
 .../cloudstack/quota/QuotaAlertManagerImpl.java    |     8 +-
 .../apache/cloudstack/quota/QuotaManagerImpl.java  |    36 +-
 .../cloudstack/quota/vo/ServiceOfferingVO.java     |   228 +-
 .../quota/QuotaAlertManagerImplTest.java           |     8 +-
 .../cloudstack/quota/QuotaManagerImplTest.java     |    26 +-
 .../web/CloudStackContextLoaderListener.java       |     3 +-
 packaging/centos7/cloud.spec                       |    37 +-
 packaging/centos8/cloud.spec                       |    37 +-
 packaging/package.sh                               |    19 +-
 packaging/suse15/cloud.spec                        |    37 +-
 .../acl/DynamicRoleBasedAPIAccessChecker.java      |     9 +
 .../acl/DynamicRoleBasedAPIAccessCheckerTest.java  |     4 +-
 .../acl/ProjectRoleBasedApiAccessChecker.java      |    11 +-
 .../acl/StaticRoleBasedAPIAccessChecker.java       |     8 +
 .../affinity/ExplicitDedicationProcessor.java      |     6 +
 .../affinity/HostAntiAffinityProcessor.java        |     3 +-
 plugins/alert-handlers/snmp-alerts/pom.xml         |     4 +-
 plugins/alert-handlers/syslog-alerts/pom.xml       |     4 +-
 .../cloudstack/discovery/ApiDiscoveryService.java  |     5 +
 .../discovery/ApiDiscoveryServiceImpl.java         |    19 +
 .../ratelimit/ApiRateLimitServiceImpl.java         |    13 +-
 .../cloudstack/ratelimit/ApiRateLimitTest.java     |     2 +-
 .../cloudstack/backup/veeam/VeeamClient.java       |    34 +-
 .../cloudstack/backup/veeam/VeeamClientTest.java   |    57 +
 .../java/com/cloud/utils/db/StaticStrategy.java    |     2 +-
 .../cloudstack/api/command/QuotaSummaryCmd.java    |     3 +-
 .../api/response/QuotaResponseBuilderImpl.java     |     4 +-
 .../api/response/QuotaResponseBuilderImplTest.java |     2 +-
 .../dedicated/manager/DedicatedApiUnitTest.java    |     2 +-
 .../cloud/deploy/ImplicitDedicationPlanner.java    |     2 +-
 .../implicitplanner/ImplicitPlannerTest.java       |     2 +-
 .../manager/BaremetalVlanManagerImpl.java          |    42 +-
 .../networkservice/BareMetalResourceBase.java      |     2 +-
 .../api/BaremetalProvisionDoneNotificationCmd.java |     3 +-
 .../security_group_agent/cs_sg_agent.py            |   102 +-
 .../security_group_agent/sglib.py                  |    44 +-
 .../security_group_agent/xmlobject.py              |    52 +-
 .../DotNet/ServerResource/AgentShell/Program.cs    |     8 +-
 .../resource/HypervDirectConnectResource.java      |     4 +-
 .../hypervisor/kvm/resource/DirectVifDriver.java   |     9 +-
 .../kvm/resource/LibvirtComputingResource.java     |   242 +-
 .../kvm/resource/LibvirtKvmAgentHook.java          |     2 +-
 .../hypervisor/kvm/resource/LibvirtVMDef.java      |     2 +-
 .../LibvirtBackupSnapshotCommandWrapper.java       |     2 +-
 .../wrapper/LibvirtFreezeThawVMCommandWrapper.java |   103 +
 .../LibvirtGetStorageStatsCommandWrapper.java      |     3 +
 .../LibvirtManageSnapshotCommandWrapper.java       |     2 +-
 .../wrapper/LibvirtMigrateCommandWrapper.java      |     4 +-
 .../LibvirtPatchSystemVmCommandWrapper.java        |   112 +
 .../wrapper/LibvirtReadyCommandWrapper.java        |    25 +-
 .../LibvirtRevertSnapshotCommandWrapper.java       |   123 +-
 .../wrapper/LibvirtScaleVmCommandWrapper.java      |    21 +-
 .../wrapper/LibvirtStartCommandWrapper.java        |    19 +-
 .../resource/wrapper/LibvirtUtilitiesHelper.java   |    35 +
 .../kvm/storage/IscsiAdmStorageAdaptor.java        |    16 +-
 .../kvm/storage/IscsiAdmStoragePool.java           |     8 +
 .../kvm/storage/IscsiStorageCleanupMonitor.java    |     4 +-
 .../kvm/storage/KVMStoragePoolManager.java         |    27 +-
 .../kvm/storage/KVMStorageProcessor.java           |   457 +-
 .../kvm/storage/LibvirtStorageAdaptor.java         |    65 +-
 .../hypervisor/kvm/storage/LibvirtStoragePool.java |     9 +-
 .../kvm/storage/LinstorStorageAdaptor.java         |    25 +-
 .../kvm/storage/ManagedNfsStorageAdaptor.java      |    10 +-
 .../kvm/storage/ScaleIOStorageAdaptor.java         |    19 +-
 .../hypervisor/kvm/storage/StorageAdaptor.java     |     4 +-
 .../apache/cloudstack/utils/linux/KVMHostInfo.java |    57 +-
 .../org/apache/cloudstack/utils/linux/MemStat.java |     4 +-
 .../apache/cloudstack/utils/qemu/QemuCommand.java  |    51 +
 .../org/apache/cloudstack/utils/qemu/QemuImg.java  |    45 +-
 .../kvm/resource/LibvirtComputingResourceTest.java |   143 +-
 .../LibvirtRevertSnapshotCommandWrapperTest.java   |   170 +
 .../wrapper/LibvirtScaleVmCommandWrapperTest.java  |    39 +-
 .../wrapper/LibvirtUtilitiesHelperTest.java        |    71 +-
 .../kvm/storage/KVMStorageProcessorTest.java       |   265 +-
 .../cloudstack/utils/linux/KVMHostInfoTest.java    |    34 +
 .../apache/cloudstack/utils/linux/MemStatTest.java |     6 +
 .../scripts/vm/hypervisor/ovm/ConfigFileOps.py     |    36 +-
 .../scripts/vm/hypervisor/ovm/OvmCommonModule.py   |    16 +-
 .../scripts/vm/hypervisor/ovm/OvmDiskModule.py     |    10 +-
 .../scripts/vm/hypervisor/ovm/OvmDispatcher.py     |     4 +-
 .../scripts/vm/hypervisor/ovm/OvmFaultConstants.py |    18 +-
 .../vm/hypervisor/ovm/OvmHaHeartBeatModule.py      |    24 +-
 .../scripts/vm/hypervisor/ovm/OvmHostModule.py     |    54 +-
 .../scripts/vm/hypervisor/ovm/OvmLoggerModule.py   |    12 +-
 .../scripts/vm/hypervisor/ovm/OvmNetworkModule.py  |   100 +-
 .../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py    |    22 +-
 .../scripts/vm/hypervisor/ovm/OvmObjectModule.py   |     4 +-
 .../vm/hypervisor/ovm/OvmSecurityGroupModule.py    |   134 +-
 .../vm/hypervisor/ovm/OvmStoragePoolModule.py      |   105 +-
 .../main/scripts/vm/hypervisor/ovm/OvmVifModule.py |    10 +-
 .../main/scripts/vm/hypervisor/ovm/OvmVmModule.py  |   108 +-
 .../scripts/vm/hypervisor/ovm/OvmVolumeModule.py   |    29 +-
 plugins/hypervisors/ovm3/pom.xml                   |     4 +-
 .../cloud/hypervisor/ovm3/objects/Connection.java  |     2 +-
 .../cloud/agent/manager/MockNetworkManager.java    |     3 +
 .../agent/manager/MockNetworkManagerImpl.java      |    12 +
 .../com/cloud/agent/manager/MockVmManagerImpl.java |     2 +-
 .../cloud/agent/manager/SimulatorManagerImpl.java  |    15 +-
 plugins/hypervisors/vmware/pom.xml                 |     8 -
 .../java/com/cloud/hypervisor/guru/VMwareGuru.java |     9 +-
 .../cloud/hypervisor/guru/VmwareVmImplementer.java |     4 +-
 .../hypervisor/vmware/VmwareServerDiscoverer.java  |     5 -
 .../hypervisor/vmware/manager/VmwareManager.java   |     2 -
 .../vmware/manager/VmwareManagerImpl.java          |    10 +-
 .../vmware/manager/VmwareStorageManagerImpl.java   |     2 +-
 .../hypervisor/vmware/resource/VmwareResource.java |   507 +-
 .../resource/VmwareStorageLayoutHelper.java        |    24 +-
 .../storage/resource/VmwareStorageProcessor.java   |     4 +-
 .../vmware/VmwareDatacenterApiUnitTest.java        |     2 +-
 .../xenserver/discoverer/XcpServerDiscoverer.java  |     3 -
 .../xenserver/resource/CitrixResourceBase.java     |    96 +-
 .../resource/XenServerStorageProcessor.java        |    20 +-
 .../resource/Xenserver625StorageProcessor.java     |    55 +-
 .../xenbase/CitrixCheckSshCommandWrapper.java      |     2 +-
 .../xenbase/CitrixCreateCommandWrapper.java        |     2 +-
 .../CitrixNetworkElementCommandWrapper.java        |     3 +-
 .../xenbase/CitrixPatchSystemVmCommandWrapper.java |   111 +
 .../wrapper/xenbase/CitrixReadyCommandWrapper.java |    13 +-
 .../xenbase/CitrixRebootRouterCommandWrapper.java  |     2 +-
 .../wrapper/xenbase/CitrixStartCommandWrapper.java |    32 +
 .../xenserver/resource/CitrixResourceBaseTest.java |    33 +
 .../wrapper/xenbase/CitrixRequestWrapperTest.java  |     2 +-
 plugins/integrations/kubernetes-service/pom.xml    |    11 +-
 .../kubernetes/cluster/KubernetesCluster.java      |     1 +
 .../cluster/KubernetesClusterManagerImpl.java      |   157 +-
 .../kubernetes/cluster/KubernetesClusterVO.java    |    11 +
 .../KubernetesClusterActionWorker.java             |   105 +-
 ...ernetesClusterResourceModifierActionWorker.java |   146 +-
 .../KubernetesClusterScaleWorker.java              |     8 +-
 .../KubernetesClusterStartWorker.java              |   101 +-
 .../KubernetesClusterUpgradeWorker.java            |    10 +-
 .../cluster/CreateKubernetesClusterCmd.java        |    14 +-
 .../main/resources/conf/k8s-control-node-add.yml   |    46 +-
 .../src/main/resources/conf/k8s-control-node.yml   |    48 +-
 .../src/main/resources/conf/k8s-node.yml           |    46 +-
 .../main/resources/script/upgrade-kubernetes.sh    |     2 +-
 .../version/KubernetesVersionServiceTest.java      |    18 +-
 .../apache/cloudstack/api/ListDbMetricsCmd.java    |    56 +
 .../apache/cloudstack/api/ListMgmtsMetricsCmd.java |    56 +
 .../cloudstack/api/ListUsageServerMetricsCmd.java  |    57 +
 .../apache/cloudstack/api/ListVMsMetricsCmd.java   |    14 +
 .../cloudstack/api/ListVMsUsageHistoryCmd.java     |   100 +
 .../org/apache/cloudstack/api/MetricConstants.java |    56 +
 .../apache/cloudstack/metrics/MetricsService.java  |    13 +
 .../cloudstack/metrics/MetricsServiceImpl.java     |   564 +-
 .../response/ClusterMetricsResponse.java           |     2 +-
 .../cloudstack/response/DbMetricsResponse.java     |   107 +
 .../cloudstack/response/HostMetricsSummary.java    |    51 +
 .../response/ManagementServerMetricsResponse.java  |   211 +
 .../response/UsageServerMetricsResponse.java       |    68 +
 .../cloudstack/response/VmMetricsResponse.java     |    10 +-
 .../response/VmMetricsStatsResponse.java           |    62 +
 .../cloudstack/response/VolumeMetricsResponse.java |     2 +-
 .../cloudstack/response/ZoneMetricsResponse.java   |     2 +-
 .../cloudstack/metrics/MetricsServiceImplTest.java |   316 +
 .../network/guru/BigSwitchBcfGuestNetworkGuru.java |     3 +-
 plugins/network-elements/f5/pom.xml                |     8 -
 .../cloudstack/element/GloboDnsElementTest.java    |     2 +-
 .../internallbvmmgr/InternalLBVMManagerTest.java   |     5 +-
 .../internallbvmmgr/InternalLBVMServiceTest.java   |     5 +-
 plugins/network-elements/juniper-contrail/pom.xml  |     6 +
 .../api/command/CreateServiceInstanceCmd.java      |     5 +
 .../contrail/management/ContrailManagerImpl.java   |    28 +-
 .../contrail/management/ServiceManagerImpl.java    |     2 +-
 .../contrail/management/ServiceVirtualMachine.java |     2 +-
 .../contrail/management/ManagementServerMock.java  |     2 +-
 .../contrail/management/MockAccountManager.java    |    15 +-
 plugins/network-elements/juniper-srx/pom.xml       |     4 -
 .../api/commands/AddNetscalerLoadBalancerCmd.java  |     2 +-
 .../com/cloud/api/commands/StopNetScalerVMCmd.java |     8 +-
 .../resource/NetScalerControlCenterResource.java   |     2 +-
 .../cloud/network/resource/NetscalerResource.java  |     6 +-
 .../cloud/network/guru/OvsGuestNetworkGuru.java    |    15 +-
 .../stratosphere-ssp/sspmock/sspmock.py            |     4 +-
 .../cloud/network/guru/VxlanGuestNetworkGuru.java  |    10 +-
 plugins/pom.xml                                    |    15 +-
 .../datastore/provider/ElastistorHostListener.java |     5 +
 .../storage/datastore/util/ElastistorUtil.java     |     2 +-
 .../driver/DateraPrimaryDataStoreDriver.java       |    18 +
 .../datastore/provider/DateraHostListener.java     |     5 +
 .../CloudStackPrimaryDataStoreDriverImpl.java      |    21 +-
 .../driver/LinstorPrimaryDataStoreDriverImpl.java  |    20 +-
 .../driver/NexentaPrimaryDataStoreDriver.java      |    18 +
 .../datastore/provider/NexentaHostListener.java    |     5 +
 .../driver/SamplePrimaryDataStoreDriverImpl.java   |    18 +
 .../driver/ScaleIOPrimaryDataStoreDriver.java      |    18 +
 .../datastore/provider/ScaleIOHostListener.java    |     5 +
 .../driver/SolidFirePrimaryDataStoreDriver.java    |    18 +
 .../datastore/provider/SolidFireHostListener.java  |    14 +-
 .../provider/SolidFireSharedHostListener.java      |    14 +-
 plugins/storage/volume/storpool/README.md          |   344 +
 plugins/storage/volume/storpool/pom.xml            |    68 +
 .../api/storage/StorPoolBackupSnapshotCommand.java |    30 +
 .../StorPoolBackupTemplateFromSnapshotCommand.java |    30 +
 .../agent/api/storage/StorPoolCopyCommand.java     |    60 +
 .../StorPoolCopyVolumeToSecondaryCommand.java      |    30 +
 .../storage/StorPoolDownloadTemplateCommand.java   |    37 +
 .../api/storage/StorPoolDownloadVolumeCommand.java |    30 +
 .../storage/StorPoolMigrateWithVolumesCommand.java |    55 +
 .../storage/StorPoolModifyStoragePoolAnswer.java   |    94 +
 .../storage/StorPoolModifyStoragePoolCommand.java  |    36 +
 .../api/storage/StorPoolResizeVolumeCommand.java   |    39 +
 .../StorPoolBackupSnapshotCommandWrapper.java      |   109 +
 ...olBackupTemplateFromSnapshotCommandWrapper.java |   161 +
 ...torPoolCopyVolumeToSecondaryCommandWrapper.java |   124 +
 .../StorPoolDownloadTemplateCommandWrapper.java    |   134 +
 .../StorPoolDownloadVolumeCommandWrapper.java      |   162 +
 .../StorPoolModifyStorageCommandWrapper.java       |   146 +
 .../StorPoolResizeVolumeCommandWrapper.java        |    98 +
 .../kvm/storage/StorPoolStorageAdaptor.java        |   388 +
 .../kvm/storage/StorPoolStoragePool.java           |   164 +
 .../collector/StorPoolAbandonObjectsCollector.java |   327 +
 .../driver/StorPoolPrimaryDataStoreDriver.java     |   976 +
 .../StorPoolPrimaryDataStoreLifeCycle.java         |   321 +
 .../datastore/provider/StorPoolHostListener.java   |   234 +
 .../provider/StorPoolPrimaryDataStoreProvider.java |    78 +
 .../datastore/util/StorPoolFeaturesAndFixes.java   |    40 +
 .../storage/datastore/util/StorPoolHelper.java     |   298 +
 .../storage/datastore/util/StorPoolUtil.java       |   609 +
 .../storage/motion/StorPoolDataMotionStrategy.java |   575 +
 .../snapshot/StorPoolConfigurationManager.java     |    46 +
 .../storage/snapshot/StorPoolSnapshotStrategy.java |   289 +
 .../snapshot/StorPoolVMSnapshotStrategy.java       |   387 +
 .../storage-volume-storpool/module.properties      |    18 +
 .../spring-storage-volume-storpool-context.xml     |    38 +
 plugins/user-authenticators/ldap/pom.xml           |     4 +
 .../api/command/LdapCreateAccountCmd.java          |    13 +-
 .../cloudstack/api/command/LdapImportUsersCmd.java |    13 +-
 .../api/command/LinkAccountToLdapCmd.java          |    36 +-
 .../api/command/LinkDomainToLdapCmd.java           |    10 +-
 .../api/response/LinkAccountToLdapResponse.java    |     6 +-
 .../api/response/LinkDomainToLdapResponse.java     |     6 +-
 .../apache/cloudstack/ldap/LdapAuthenticator.java  |     8 +-
 .../apache/cloudstack/ldap/LdapManagerImpl.java    |     8 +-
 .../org/apache/cloudstack/ldap/LdapTrustMapVO.java |    16 +-
 .../cloudstack/ldap/LdapAuthenticatorSpec.groovy   |     2 +-
 .../cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy |     4 +-
 .../api/command/LdapCreateAccountCmdTest.java      |     2 +-
 .../api/command/LdapImportUsersCmdTest.java        |     2 +-
 .../api/command/LinkAccountToLdapCmdTest.java      |     8 +-
 .../api/command/LinkDomainToLdapCmdTest.java       |     8 +-
 .../cloudstack/ldap/LdapAuthenticatorTest.java     |     5 +-
 .../api/command/GetServiceProviderMetaDataCmd.java |     2 +-
 .../api/command/ListAndSwitchSAMLAccountCmd.java   |    52 +-
 .../apache/cloudstack/api/command/ListIdpsCmd.java |     2 +-
 .../api/command/ListSamlAuthorizationCmd.java      |     2 +-
 .../api/command/SAML2LoginAPIAuthenticatorCmd.java |     4 +-
 .../command/SAML2LogoutAPIAuthenticatorCmd.java    |     2 +-
 .../java/org/apache/cloudstack/saml/SAMLUtils.java |     7 +-
 .../java/org/apache/cloudstack/SAMLUtilsTest.java  |    10 +
 .../command/ListAndSwitchSAMLAccountCmdTest.java   |     2 +-
 pom.xml                                            |    56 +-
 python/bindir/cloud-external-ipallocator.py        |    30 +-
 python/incubation/cloud-web-ipallocator.py         |    30 +-
 python/lib/cloudutils/__init__.py                  |     4 +-
 python/lib/cloudutils/cloudException.py            |     6 +-
 python/lib/cloudutils/configFileOps.py             |    34 +-
 python/lib/cloudutils/networkConfig.py             |    26 +-
 python/lib/cloudutils/serviceConfig.py             |     3 +
 scripts/installer/cloudstack-help-text             |    43 +
 scripts/installer/export-templates.sh              |   192 +
 scripts/network/exdhcp/dhcpd_edithosts.py          |     8 +-
 scripts/network/ping/baremetal_user_data.py        |    30 +-
 scripts/network/ping/prepare_kickstart_bootfile.py |     8 +-
 .../ping/prepare_kickstart_kernel_initrd.py        |    12 +-
 scripts/network/ping/prepare_tftp_bootfile.py      |     8 +-
 scripts/storage/qcow2/get_domr_kernel.sh           |     2 +-
 scripts/storage/qcow2/managesnapshot.sh            |    28 +-
 scripts/storage/secondary/setup-sysvm-tmplt        |     2 +
 scripts/util/create-kubernetes-binaries-iso.sh     |    22 +-
 scripts/util/ipmi.py                               |    16 +-
 scripts/util/keystore-cert-import                  |    42 +-
 scripts/util/macgen.py                             |     6 +-
 scripts/vm/hypervisor/kvm/kvmheartbeat.sh          |     2 +-
 scripts/vm/hypervisor/kvm/setup_agent.sh           |     8 +-
 scripts/vm/hypervisor/vmware/discover_networks.py  |     8 +-
 .../vm/hypervisor/xenserver/cloud-plugin-storage   |     4 +
 .../hypervisor/xenserver/cloudstack_pluginlib.py   |     6 +-
 scripts/vm/hypervisor/xenserver/mockxcpplugin.py   |     4 +-
 scripts/vm/hypervisor/xenserver/ovs-vif-flows.py   |     6 +-
 scripts/vm/hypervisor/xenserver/perfmon.py         |     6 +-
 scripts/vm/hypervisor/xenserver/vmops              |    20 +-
 scripts/vm/hypervisor/xenserver/vmopsSnapshot      |    13 +-
 scripts/vm/hypervisor/xenserver/xcposs/NFSSR.py    |    16 +-
 scripts/vm/hypervisor/xenserver/xcposs/patch       |     4 +-
 scripts/vm/hypervisor/xenserver/xcpserver/NFSSR.py |    16 +-
 scripts/vm/hypervisor/xenserver/xcpserver/patch    |     4 +-
 .../xenserver/xenserver56/InterfaceReconfigure.py  |    28 +-
 .../vm/hypervisor/xenserver/xenserver56/NFSSR.py   |    16 +-
 scripts/vm/hypervisor/xenserver/xenserver56/patch  |     4 +-
 .../hypervisor/xenserver/xenserver56fp1/NFSSR.py   |    16 +-
 .../vm/hypervisor/xenserver/xenserver56fp1/patch   |     4 +-
 .../vm/hypervisor/xenserver/xenserver60/NFSSR.py   |    16 +-
 scripts/vm/hypervisor/xenserver/xenserver60/patch  |     4 +-
 scripts/vm/hypervisor/xenserver/xenserver62/patch  |     4 +-
 scripts/vm/hypervisor/xenserver/xenserver65/patch  |     4 +-
 scripts/vm/network/vnet/cloudstack_pluginlib.py    |     4 +-
 scripts/vm/network/vnet/modifyvlan.sh              |     6 +
 scripts/vm/network/vnet/ovstunnel.py               |     6 +-
 scripts/vm/systemvm/injectkeys.sh                  |     8 -
 server/pom.xml                                     |    10 +
 .../src/main/java/com/cloud/acl/DomainChecker.java |    79 +-
 .../java/com/cloud/alert/AlertManagerImpl.java     |    55 +-
 .../java/com/cloud/api/ApiAsyncJobDispatcher.java  |     8 +-
 server/src/main/java/com/cloud/api/ApiDBUtils.java |    90 +-
 .../src/main/java/com/cloud/api/ApiDispatcher.java |    15 +-
 .../main/java/com/cloud/api/ApiResponseHelper.java |   323 +-
 server/src/main/java/com/cloud/api/ApiServer.java  |    28 +-
 server/src/main/java/com/cloud/api/ApiServlet.java |    15 +-
 .../java/com/cloud/api/ApiSessionListener.java     |    83 +
 .../com/cloud/api/ResponseObjectTypeAdapter.java   |     4 +
 .../api/auth/DefaultLoginAPIAuthenticatorCmd.java  |     2 +-
 .../api/auth/DefaultLogoutAPIAuthenticatorCmd.java |     2 +-
 .../com/cloud/api/dispatch/ParamProcessWorker.java |    78 +-
 .../java/com/cloud/api/query/QueryManagerImpl.java |   285 +-
 .../com/cloud/api/query/ViewResponseHelper.java    |    10 +-
 .../cloud/api/query/dao/AccountJoinDaoImpl.java    |     2 +-
 .../api/query/dao/DiskOfferingJoinDaoImpl.java     |    15 +-
 .../api/query/dao/DomainRouterJoinDaoImpl.java     |    20 +-
 .../com/cloud/api/query/dao/HostJoinDaoImpl.java   |    11 +-
 .../api/query/dao/ManagementServerJoinDao.java     |    23 +
 .../api/query/dao/ManagementServerJoinDaoImpl.java |    23 +
 .../api/query/dao/NetworkOfferingJoinDaoImpl.java  |    16 +-
 .../api/query/dao/ProjectAccountJoinDaoImpl.java   |     2 +-
 .../api/query/dao/ServiceOfferingJoinDaoImpl.java  |     8 +
 .../cloud/api/query/dao/TemplateJoinDaoImpl.java   |     2 +-
 .../com/cloud/api/query/dao/UserVmJoinDao.java     |     2 +-
 .../com/cloud/api/query/dao/UserVmJoinDaoImpl.java |    24 +-
 .../com/cloud/api/query/dao/VolumeJoinDaoImpl.java |    12 +-
 .../api/query/dao/VpcOfferingJoinDaoImpl.java      |     7 +
 .../java/com/cloud/api/query/vo/AccountJoinVO.java |     6 +-
 .../cloud/api/query/vo/AffinityGroupJoinVO.java    |     6 +-
 .../com/cloud/api/query/vo/AsyncJobJoinVO.java     |    12 +-
 .../cloud/api/query/vo/ControlledViewEntity.java   |     3 +-
 .../com/cloud/api/query/vo/DiskOfferingJoinVO.java |    23 +-
 .../com/cloud/api/query/vo/DomainRouterJoinVO.java |    13 +-
 .../java/com/cloud/api/query/vo/EventJoinVO.java   |    20 +-
 .../cloud/api/query/vo/InstanceGroupJoinVO.java    |     8 +-
 .../cloud/api/query/vo/ManagementServerJoinVO.java |   173 +
 .../cloud/api/query/vo/NetworkOfferingJoinVO.java  |     6 +
 .../cloud/api/query/vo/ProjectAccountJoinVO.java   |     6 +-
 .../api/query/vo/ProjectInvitationJoinVO.java      |     6 +-
 .../com/cloud/api/query/vo/ResourceTagJoinVO.java  |     6 +-
 .../cloud/api/query/vo/SecurityGroupJoinVO.java    |     6 +-
 .../cloud/api/query/vo/ServiceOfferingJoinVO.java  |    35 +
 .../com/cloud/api/query/vo/TemplateJoinVO.java     |     6 +-
 .../com/cloud/api/query/vo/UserAccountJoinVO.java  |     6 +-
 .../java/com/cloud/api/query/vo/UserVmJoinVO.java  |    14 +-
 .../java/com/cloud/api/query/vo/VolumeJoinVO.java  |    17 +-
 .../com/cloud/api/query/vo/VpcOfferingJoinVO.java  |     7 +
 .../main/java/com/cloud/configuration/Config.java  |    20 +-
 .../configuration/ConfigurationManagerImpl.java    |   680 +-
 .../consoleproxy/ConsoleProxyManagerImpl.java      |    20 +-
 .../deploy/DeploymentPlanningManagerImpl.java      |    73 +-
 .../com/cloud/event/ActionEventInterceptor.java    |    40 +-
 .../java/com/cloud/event/ActionEventUtils.java     |   238 +-
 .../java/com/cloud/event/dao/EventJoinDaoImpl.java |    43 +-
 .../com/cloud/ha/HighAvailabilityManagerImpl.java  |     7 +-
 .../com/cloud/hypervisor/HypervisorGuruBase.java   |     1 +
 .../hypervisor/HypervisorGuruManagerImpl.java      |     7 +
 .../kvm/discoverer/LibvirtServerDiscoverer.java    |   102 +-
 .../network/ExternalFirewallDeviceManagerImpl.java |     2 +-
 .../ExternalLoadBalancerDeviceManagerImpl.java     |     4 +-
 .../com/cloud/network/IpAddressManagerImpl.java    |    44 +-
 .../com/cloud/network/Ipv6AddressManagerImpl.java  |    16 +-
 .../java/com/cloud/network/Ipv6ServiceImpl.java    |   708 +
 .../cloud/network/NetworkMigrationManagerImpl.java |     7 +-
 .../java/com/cloud/network/NetworkModelImpl.java   |   173 +-
 .../java/com/cloud/network/NetworkServiceImpl.java |  1408 +-
 .../com/cloud/network/as/AutoScaleManagerImpl.java |    20 +-
 .../network/element/ConfigDriveNetworkElement.java |    16 +-
 .../network/element/VirtualRouterElement.java      |     4 +-
 .../network/element/VpcVirtualRouterElement.java   |     4 +-
 .../network/firewall/FirewallManagerImpl.java      |    55 +-
 .../network/guru/ExternalGuestNetworkGuru.java     |    32 +-
 .../com/cloud/network/guru/GuestNetworkGuru.java   |    79 +-
 .../com/cloud/network/guru/PrivateNetworkGuru.java |     2 +-
 .../com/cloud/network/guru/PublicNetworkGuru.java  |     5 +
 .../network/lb/LoadBalancingRulesManagerImpl.java  |    13 +-
 .../cloud/network/router/CommandSetupHelper.java   |   167 +-
 .../com/cloud/network/router/NetworkHelper.java    |     5 +-
 .../cloud/network/router/NetworkHelperImpl.java    |    52 +-
 .../com/cloud/network/router/NicProfileHelper.java |     2 +-
 .../cloud/network/router/NicProfileHelperImpl.java |     4 +-
 .../router/VirtualNetworkApplianceManagerImpl.java |    87 +-
 .../cloud/network/router/VpcNetworkHelperImpl.java |     2 +-
 .../VpcVirtualNetworkApplianceManagerImpl.java     |     2 +-
 .../com/cloud/network/rules/RulesManagerImpl.java  |    37 +-
 .../network/security/SecurityGroupManagerImpl.java |     2 +-
 .../network/security/SecurityManagerMBeanImpl.java |     2 +-
 .../cloud/network/vpc/NetworkACLManagerImpl.java   |    15 +-
 .../cloud/network/vpc/NetworkACLServiceImpl.java   |     5 +-
 .../java/com/cloud/network/vpc/VpcManagerImpl.java |   328 +-
 .../network/vpn/RemoteAccessVpnManagerImpl.java    |    58 +-
 .../cloud/network/vpn/Site2SiteVpnManagerImpl.java |     8 +-
 .../com/cloud/projects/ProjectManagerImpl.java     |    75 +-
 .../com/cloud/resource/ResourceManagerImpl.java    |    34 +-
 .../resource/RollingMaintenanceManagerImpl.java    |    51 +-
 .../resourceicon/ResourceIconManagerImpl.java      |    43 +-
 .../resourcelimit/ResourceLimitManagerImpl.java    |    12 +-
 .../com/cloud/server/ConfigurationServerImpl.java  |    22 +-
 .../java/com/cloud/server/DbStatsCollection.java   |    31 +
 .../java/com/cloud/server/ManagementServer.java    |     3 +
 .../server/ManagementServerHostStatsEntry.java     |   456 +
 .../com/cloud/server/ManagementServerImpl.java     |   387 +-
 .../main/java/com/cloud/server/StatsCollector.java |  1008 +-
 .../com/cloud/servlet/ConsoleProxyServlet.java     |     8 +-
 .../cloud/storage/ImageStoreUploadMonitorImpl.java |    23 +-
 .../java/com/cloud/storage/StorageManagerImpl.java |   112 +-
 .../com/cloud/storage/VolumeApiServiceImpl.java    |   665 +-
 .../cloud/storage/listener/StoragePoolMonitor.java |    15 +-
 .../cloud/storage/snapshot/SnapshotManager.java    |     2 +
 .../storage/snapshot/SnapshotManagerImpl.java      |   113 +-
 .../storage/snapshot/SnapshotSchedulerImpl.java    |    12 +-
 .../com/cloud/tags/ResourceManagerUtilImpl.java    |    36 +-
 .../com/cloud/tags/TaggedResourceManagerImpl.java  |    32 +-
 .../cloud/template/HypervisorTemplateAdapter.java  |     2 +-
 .../com/cloud/template/TemplateAdapterBase.java    |     2 +-
 .../com/cloud/template/TemplateManagerImpl.java    |    72 +-
 .../main/java/com/cloud/test/DatabaseConfig.java   |    24 +-
 .../java/com/cloud/usage/UsageServiceImpl.java     |   104 +-
 .../main/java/com/cloud/user/AccountManager.java   |     2 +-
 .../java/com/cloud/user/AccountManagerImpl.java    |   328 +-
 .../java/com/cloud/user/DomainManagerImpl.java     |    68 +-
 .../java/com/cloud/vm/SystemVmLoadScanner.java     |     2 +-
 .../main/java/com/cloud/vm/UserVmManagerImpl.java  |   542 +-
 .../cloud/vm/snapshot/VMSnapshotManagerImpl.java   |    72 +-
 .../cloudstack/acl/ProjectRoleManagerImpl.java     |     4 +-
 .../org/apache/cloudstack/acl/RoleManagerImpl.java |     4 +-
 .../affinity/AffinityGroupServiceImpl.java         |     6 +-
 .../annotation/AnnotationManagerImpl.java          |    89 +-
 .../cloudstack/backup/BackupManagerImpl.java       |    77 +-
 .../org/apache/cloudstack/ca/CAManagerImpl.java    |    16 +-
 .../diagnostics/DiagnosticsServiceImpl.java        |     4 +-
 .../diagnostics/to/DiagnosticsDataObject.java      |     5 +
 .../direct/download/DirectDownloadManagerImpl.java |   220 +-
 .../org/apache/cloudstack/ha/HAManagerImpl.java    |     7 +-
 .../deployment/RouterDeploymentDefinition.java     |   516 +
 .../RouterDeploymentDefinitionBuilder.java         |   218 +
 .../deployment/VpcRouterDeploymentDefinition.java  |   205 +
 .../cloudstack/network/ssl/CertServiceImpl.java    |     2 +-
 .../network/topology/BasicNetworkVisitor.java      |     6 +
 .../OutOfBandManagementServiceImpl.java            |    59 +-
 .../outofbandmanagement/PowerOperationTask.java    |     8 +-
 .../apache/cloudstack/snapshot/SnapshotHelper.java |   255 +
 .../storage/image/deployasis/DeployAsIsHelper.java |     6 +-
 .../cloudstack/vm/UnmanagedVMsManagerImpl.java     |    57 +-
 .../deployment/RouterDeploymentDefinition.java     |   512 -
 .../RouterDeploymentDefinitionBuilder.java         |   214 -
 .../deployment/VpcRouterDeploymentDefinition.java  |   205 -
 .../core/spring-server-core-managers-context.xml   |    10 +-
 server/src/test/async-job-component.xml            |     1 +
 .../test/java/com/cloud/api/ApiDispatcherTest.java |    94 +
 .../java/com/cloud/api/ApiResponseHelperTest.java  |    43 +
 .../api/dispatch/CommandCreationWorkerTest.java    |     2 +-
 .../dispatch/ParamGenericValidationWorkerTest.java |    10 +-
 .../com/cloud/api/query/QueryManagerImplTest.java  |   190 +
 .../api/query/dao/TemplateJoinDaoImplTest.java     |     2 +-
 .../configuration/ConfigurationManagerTest.java    |     2 +-
 .../deploy/DeploymentPlanningManagerImplTest.java  |    10 +-
 .../cloud/event/ActionEventInterceptorTest.java    |   320 +
 .../java/com/cloud/event/ActionEventUtilsTest.java |   201 +-
 .../com/cloud/event/dao/EventJoinDaoImplTest.java  |    69 +
 .../cloud/network/CreatePrivateNetworkTest.java    |    16 +-
 .../cloud/network/DedicateGuestVlanRangesTest.java |    20 +-
 .../com/cloud/network/IpAddressManagerTest.java    |     3 +-
 .../com/cloud/network/MockNetworkModelImpl.java    |    11 +
 .../cloud/network/UpdatePhysicalNetworkTest.java   |     2 +-
 .../network/element/VirtualRouterElementTest.java  |     7 +-
 .../cloud/network/lb/AssignLoadBalancerTest.java   |    56 +-
 .../cloud/network/lb/UpdateLoadBalancerTest.java   |     2 +-
 .../cloud/resource/ResourceManagerImplTest.java    |     6 +-
 .../resourceicon/ResourceIconManagerImplTest.java  |   133 +
 .../com/cloud/server/ManagementServerImplTest.java |   114 +
 .../java/com/cloud/server/StatsCollectorTest.java  |   206 +-
 .../cloud/storage/VolumeApiServiceImplTest.java    |    79 +-
 .../com/cloud/storage/dao/AsyncJobJoinDaoTest.java |     4 +-
 .../storage/snapshot/SnapshotManagerTest.java      |     9 +-
 .../cloud/template/TemplateManagerImplTest.java    |    14 +-
 .../com/cloud/user/AccountManagerImplTest.java     |    35 +-
 .../AccountManagerImplVolumeDeleteEventTest.java   |     6 +-
 .../java/com/cloud/user/DomainManagerImplTest.java |   153 +-
 .../com/cloud/user/MockAccountManagerImpl.java     |    18 +-
 .../java/com/cloud/vm/FirstFitPlannerTest.java     |     2 +-
 .../java/com/cloud/vm/UserVmManagerImplTest.java   |    37 +-
 .../test/java/com/cloud/vm/UserVmManagerTest.java  |    33 +-
 .../java/com/cloud/vm/dao/UserVmDaoImplTest.java   |     2 +-
 .../cloud/vpc/MockConfigurationManagerImpl.java    |    35 +-
 .../java/com/cloud/vpc/MockNetworkManagerImpl.java |    63 +-
 .../java/com/cloud/vpc/MockNetworkModelImpl.java   |    11 +
 .../com/cloud/vpc/MockSite2SiteVpnManagerImpl.java |     9 +
 .../java/com/cloud/vpc/NetworkACLManagerTest.java  |    12 +-
 .../java/com/cloud/vpc/NetworkACLServiceTest.java  |     2 +-
 .../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java |     5 +
 .../com/cloud/vpc/dao/MockVpcOfferingDaoImpl.java  |    10 +
 .../cloudstack/affinity/AffinityApiUnitTest.java   |     4 +-
 .../affinity/AffinityGroupServiceImplTest.java     |     4 +-
 .../annotation/AnnotationManagerImplTest.java      |   193 +
 .../cloudstack/backup/BackupManagerTest.java       |    37 +-
 .../deployment/RouterDeploymentDefinitionTest.java |   851 +
 .../RouterDeploymentDefinitionTestBase.java        |   152 +
 .../VpcRouterDeploymentDefinitionTest.java         |   292 +
 .../cloudstack/network/ssl/CertServiceTest.java    |    32 +-
 .../networkoffering/CreateNetworkOfferingTest.java |    24 +-
 .../cloudstack/privategw/AclOnPrivateGwTest.java   |     2 +-
 .../GlobalLoadBalancingRulesServiceImplTest.java   |    28 +-
 .../cloudstack/service/ServiceOfferingVOTest.java  |     5 +-
 .../cloudstack/snapshot/SnapshotHelperTest.java    |   302 +
 .../cloudstack/vm/UnmanagedVMsManagerImplTest.java |     6 +-
 .../deployment/RouterDeploymentDefinitionTest.java |   851 -
 .../RouterDeploymentDefinitionTestBase.java        |   152 -
 .../VpcRouterDeploymentDefinitionTest.java         |   292 -
 .../src/test/resources/createNetworkOffering.xml   |     7 +
 services/console-proxy/rdpconsole/pom.xml          |     6 +-
 .../main/java/common/adapter/AwtBellAdapter.java   |     2 +-
 .../src/main/java/common/asn1/Sequence.java        |     4 +-
 .../rdpclient/ntlmssp/ClientNtlmsspPubKeyAuth.java |     2 +-
 .../java/rdpclient/rdp/ServerDemandActivePDU.java  |     2 +-
 .../rdp/ServerMCSAttachUserConfirmPDU.java         |     2 +-
 .../main/java/rdpclient/rdp/ServerX224DataPdu.java |     4 +-
 .../src/main/java/streamer/BaseElement.java        |     4 +-
 .../src/main/java/streamer/DataSource.java         |     2 +-
 .../src/main/java/streamer/InputStreamSource.java  |     2 +-
 .../src/main/java/streamer/OutputStreamSink.java   |     2 +-
 .../src/main/java/streamer/PipelineImpl.java       |     2 +-
 .../rdpconsole/src/main/java/streamer/Queue.java   |     4 +-
 .../src/main/java/streamer/SyncLink.java           |     6 +-
 .../src/main/java/streamer/apr/AprSocketSink.java  |     2 +-
 .../main/java/streamer/apr/AprSocketSource.java    |     2 +-
 .../java/streamer/bco/BcoSocketWrapperImpl.java    |    21 +-
 .../src/main/java/streamer/debug/FakeSource.java   |     6 +-
 .../src/main/java/streamer/debug/MockServer.java   |     2 +-
 services/console-proxy/server/pom.xml              |     4 +-
 .../java/com/cloud/consoleproxy/ConsoleProxy.java  |    15 +-
 .../cloud/consoleproxy/ConsoleProxyClientBase.java |     4 +-
 .../cloud/consoleproxy/ConsoleProxyGCThread.java   |     2 +-
 .../ConsoleProxyHttpHandlerHelper.java             |     2 +-
 .../PremiumSecondaryStorageManagerImpl.java        |     6 +-
 .../SecondaryStorageManagerImpl.java               |    22 +-
 services/secondary-storage/server/pom.xml          |     6 +-
 .../storage/resource/HttpUploadServerHandler.java  |     7 +-
 .../resource/NfsSecondaryStorageResource.java      |    14 +-
 .../cloudstack/storage/template/UploadEntity.java  |    21 +-
 setup/db/create-schema.sql                         |    10 +-
 systemvm/agent/noVNC/core/rfb.js                   |     2 +-
 systemvm/debian/etc/radvd.conf.tmpl                |    12 +
 .../etc/systemd/system/cloud-early-config.service  |     7 +-
 .../etc/systemd/system/cloud-postinit.service      |     1 -
 .../etc/systemd/system/cloud-preinit.service       |    18 +
 systemvm/debian/opt/cloud/bin/checkrouter.sh       |     4 +-
 systemvm/debian/opt/cloud/bin/configure.py         |   329 +-
 systemvm/debian/opt/cloud/bin/cs/CsAddress.py      |    41 +-
 systemvm/debian/opt/cloud/bin/cs/CsConfig.py       |    20 +-
 systemvm/debian/opt/cloud/bin/cs/CsDatabag.py      |    81 +
 systemvm/debian/opt/cloud/bin/cs/CsNetfilter.py    |    45 +
 systemvm/debian/opt/cloud/bin/cs/CsRedundant.py    |   105 +
 systemvm/debian/opt/cloud/bin/cs/CsRoute.py        |    50 +
 .../debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py   |   116 +
 systemvm/debian/opt/cloud/bin/diagnostics.py       |    12 +
 systemvm/debian/opt/cloud/bin/merge.py             |     5 +
 systemvm/debian/opt/cloud/bin/patched.sh           |    19 +
 systemvm/debian/opt/cloud/bin/setup/bootstrap.sh   |   134 +-
 systemvm/debian/opt/cloud/bin/setup/cksnode.sh     |     6 +-
 .../debian/opt/cloud/bin/setup/cloud-early-config  |    91 +-
 systemvm/debian/opt/cloud/bin/setup/common.sh      |   141 +-
 .../debian/opt/cloud/bin/setup/consoleproxy.sh     |    13 +-
 systemvm/debian/opt/cloud/bin/setup/dhcpsrvr.sh    |     9 -
 systemvm/debian/opt/cloud/bin/setup/elbvm.sh       |     9 -
 systemvm/debian/opt/cloud/bin/setup/ilbvm.sh       |     1 -
 systemvm/debian/opt/cloud/bin/setup/init.sh        |   217 +
 systemvm/debian/opt/cloud/bin/setup/postinit.sh    |    16 +-
 systemvm/debian/opt/cloud/bin/setup/router.sh      |    20 +-
 systemvm/debian/opt/cloud/bin/setup/secstorage.sh  |     9 -
 systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh   |     2 -
 .../debian/root/health_checks/gateways_check.py    |     2 +-
 .../debian/root/health_checks/haproxy_check.py     |     2 +-
 systemvm/patch-sysvms.sh                           |   135 +
 systemvm/pom.xml                                   |    31 +-
 test/integration/__init__.py                       |     4 +-
 .../broken/maint/test_escalation_templates.py      |     8 +-
 .../broken/maint/test_vpc_host_maintenance.py      |    38 +-
 .../maint/test_zone_level_local_storage_setting.py |     2 +-
 test/integration/broken/misc/test_vm_sync.py       |     2 +-
 test/integration/broken/test_ss_project_limits.py  |     2 +-
 test/integration/broken/test_vpn_service.py        |     2 +-
 test/integration/component/__init__.py             |     4 +-
 .../maint/test_egress_rules_host_maintenance.py    |     4 +-
 .../maint/test_ip_resource_count_for_vpc.py        |     2 +-
 .../component/maint/test_redundant_router.py       |     6 +-
 .../component/maint/testpath_vMotion_vmware.py     |    10 +-
 .../component/test_acl_isolatednetwork.py          |     8 +-
 .../component/test_acl_isolatednetwork_delete.py   |    92 +-
 .../integration/component/test_acl_listsnapshot.py |    16 +-
 test/integration/component/test_acl_listvm.py      |    12 +-
 test/integration/component/test_acl_listvolume.py  |    16 +-
 .../component/test_acl_sharednetwork.py            |   146 +-
 ...est_acl_sharednetwork_deployVM-impersonation.py |    18 +-
 test/integration/component/test_affinity_groups.py |     2 +-
 .../component/test_affinity_groups_projects.py     |    72 +-
 .../component/test_allocation_states.py            |     4 +-
 test/integration/component/test_asa1000v_fw.py     |     4 +-
 test/integration/component/test_assign_vm.py       |     2 +-
 test/integration/component/test_baremetal.py       |    12 +-
 test/integration/component/test_blocker_bugs.py    |    10 +-
 test/integration/component/test_brocade_vcs.py     |     2 +-
 .../integration/component/test_browse_templates.py |    44 +-
 test/integration/component/test_browse_volumes.py  |     4 +-
 .../component/test_concurrent_snapshots_limit.py   |     8 +-
 .../component/test_dynamic_compute_offering.py     |     6 +-
 test/integration/component/test_haproxy.py         |     2 +-
 test/integration/component/test_host.py            |    24 +-
 .../component/test_hypervisor_capabilities.py      |   289 +
 test/integration/component/test_interop_xd_ccp.py  |    18 +-
 test/integration/component/test_ip_reservation.py  |     4 +-
 test/integration/component/test_lb_secondary_ip.py |     8 +-
 .../component/test_multiple_ips_per_nic.py         |     2 +-
 .../component/test_multiple_nic_support.py         |     4 +-
 .../component/test_netscaler_configs.py            |    18 +-
 test/integration/component/test_netscaler_lb.py    |    20 +-
 .../component/test_netscaler_lb_algo.py            |     2 +-
 .../integration/component/test_netscaler_nw_off.py |     2 +-
 .../component/test_network_permissions.py          |   760 +
 .../component/test_non_contiguous_vlan.py          |     2 +-
 .../component/test_organization_states.py          |     6 +-
 .../component/test_persistent_networks.py          |   286 +-
 test/integration/component/test_portable_ip.py     |    18 +-
 test/integration/component/test_project_configs.py |     6 +-
 test/integration/component/test_project_limits.py  |    66 +-
 .../component/test_project_resources.py            |     4 +-
 test/integration/component/test_project_usage.py   |     6 +-
 test/integration/component/test_ps_max_limits.py   |     4 +-
 .../component/test_ps_project_limits.py            |     4 +-
 .../component/test_redundant_router_services.py    |     4 +-
 test/integration/component/test_resource_limits.py |    26 +-
 .../component/test_rootvolume_resize.py            |     2 +-
 test/integration/component/test_secsr_mount.py     |    16 +-
 test/integration/component/test_security_groups.py |     2 +-
 test/integration/component/test_shared_networks.py |     8 +-
 test/integration/component/test_snapshot_gc.py     |     2 +-
 test/integration/component/test_stopped_vm.py      |     4 +-
 test/integration/component/test_tags.py            |    88 +-
 .../test_template_access_across_domains.py         |   626 +
 .../component/test_updateResourceCount.py          |    18 +-
 .../component/test_user_private_gateway.py         |   425 +
 .../component/test_user_shared_network.py          |   631 +
 .../component/test_volume_destroy_recover.py       |     8 +-
 test/integration/component/test_vpc_network.py     |     8 +-
 .../component/test_vpc_network_lbrules.py          |     6 +-
 .../component/test_vpc_network_pfrules.py          |     4 +-
 .../component/test_vpc_network_staticnatrule.py    |    12 +-
 .../component/test_vpc_vm_life_cycle.py            |    24 +-
 test/integration/plugins/datera/TestVolumes.py     |     2 +-
 .../plugins/storpool/MigrateVolumeToStorPool.py    |   439 +
 .../plugins/storpool/TestStorPoolVolumes.py        |  2153 +
 .../plugins/storpool/TestTagsOnStorPool.py         |   576 +
 .../plugins/storpool/TestVmSnapshots.py            |   369 +
 test/integration/plugins/storpool/sp_util.py       |   748 +
 test/integration/plugins/test_quota.py             |    41 +-
 test/integration/smoke/__init__.py                 |     4 +-
 test/integration/smoke/test_accounts.py            |     6 +-
 test/integration/smoke/test_affinity_groups.py     |     6 +-
 .../smoke/test_affinity_groups_projects.py         |     4 +-
 .../smoke/test_backup_recovery_dummy.py            |     6 +-
 .../test_create_list_domain_account_project.py     |     2 +-
 .../smoke/test_deploy_vgpu_enabled_vm.py           |    24 +-
 .../smoke/test_deploy_vm_with_userdata.py          |     2 +-
 test/integration/smoke/test_direct_download.py     |    14 +-
 test/integration/smoke/test_events_resource.py     |   197 +
 test/integration/smoke/test_guest_vlan_range.py    |     2 +-
 test/integration/smoke/test_kubernetes_clusters.py |    44 +-
 .../smoke/test_kubernetes_supported_versions.py    |     4 +-
 test/integration/smoke/test_list_ids_parameter.py  |    10 +-
 test/integration/smoke/test_loadbalance.py         |     2 +-
 test/integration/smoke/test_metrics_api.py         |   229 +-
 .../smoke/test_nested_virtualization.py            |     6 +-
 test/integration/smoke/test_network_ipv6.py        |  1261 +
 test/integration/smoke/test_password_server.py     |     4 +-
 test/integration/smoke/test_persistent_network.py  |    12 +-
 test/integration/smoke/test_public_ip_range.py     |     6 +-
 test/integration/smoke/test_pvlan.py               |    17 +-
 test/integration/smoke/test_reset_vm_on_reboot.py  |     2 +-
 test/integration/smoke/test_resource_detail.py     |    18 +-
 test/integration/smoke/test_router_dnsservice.py   |     2 +-
 .../smoke/test_routers_iptables_default_policy.py  |    22 +-
 test/integration/smoke/test_routers_network_ops.py |     4 +-
 test/integration/smoke/test_service_offerings.py   |   246 +-
 test/integration/smoke/test_snapshots.py           |     2 +-
 test/integration/smoke/test_ssvm.py                |     2 +-
 test/integration/smoke/test_storage_policy.py      |     2 +
 test/integration/smoke/test_vm_snapshot_kvm.py     |   326 +
 test/integration/smoke/test_volumes.py             |    93 +-
 test/integration/smoke/test_vpc_redundant.py       |    20 +-
 test/integration/smoke/test_vpc_router_nics.py     |    10 +-
 test/integration/testpaths/__init__.py             |     4 +-
 .../testpaths/testpath_attach_disk_zwps.py         |     2 +-
 test/integration/testpaths/testpath_netmask.py     |     2 +-
 test/integration/testpaths/testpath_revert_snap.py |    10 +-
 .../testpaths/testpath_snapshot_hadrning.py        |     4 +-
 test/integration/testpaths/testpath_stopped_vm.py  |    10 +-
 .../testpaths/testpath_volume_recurring_snap.py    |    18 +-
 .../testpaths/testpath_volume_snapshot.py          |    42 +-
 .../testpaths/testpath_volumelifecycle.py          |     8 +-
 test/pom.xml                                       |     4 +-
 test/selenium/common/shared.py                     |     2 +-
 test/selenium/lib/Global_Locators.py               |     4 +-
 test/selenium/lib/initialize.py                    |     2 +-
 test/selenium/smoke/Login_and_Accounts.py          |   134 +-
 test/selenium/smoke/Service_Offering.py            |   216 +-
 test/selenium/smoke/TemplatesAndISO.py             |   108 +-
 test/selenium/smoke/VM_lifeCycle.py                |   388 +-
 test/selenium/smoke/main.py                        |    16 +-
 .../java/com/cloud/test/regression/ApiCommand.java |     2 +-
 .../cloud/test/stress/StressTestDirectAttach.java  |     2 +-
 .../com/cloud/test/stress/TestClientWithAPI.java   |     2 +-
 .../java/com/cloud/test/utils/ConsoleProxy.java    |     2 +-
 test/systemvm/test_update_config.py                |    42 +-
 .../scripts/configure_systemvm_services.sh         |    15 +-
 .../scripts/install_systemvm_packages.sh           |     2 +-
 tools/appliance/systemvmtemplate/template.json     |     4 +-
 tools/bugs-wiki/search-bugs.py                     |     4 +-
 tools/bugs-wiki/search-wiki.py                     |     4 +-
 tools/devcloud-kvm/devcloud-kvm.py                 |    14 +-
 tools/docker/Dockerfile.marvin                     |     2 +-
 tools/marvin/marvin/cloudstackException.py         |     2 +-
 tools/marvin/marvin/config/test_data.py            |     9 +
 tools/marvin/marvin/deployDataCenter.py            |     2 +-
 tools/marvin/marvin/lib/__init__.py                |     4 +-
 tools/marvin/marvin/lib/base.py                    |    90 +-
 tools/marvin/marvin/lib/common.py                  |    42 +-
 tools/marvin/marvin/lib/ncc.py                     |    14 +-
 tools/marvin/marvin/lib/utils.py                   |    12 +-
 tools/marvin/marvin/lib/vcenter.py                 |     2 +-
 tools/marvin/marvin/misc/build/advanced_env.py     |    12 +-
 tools/marvin/marvin/misc/build/bashUtils.py        |    26 +-
 tools/marvin/marvin/misc/build/buildGenerator.py   |    28 +-
 tools/marvin/marvin/misc/build/configure.py        |    22 +-
 tools/marvin/marvin/misc/build/restartMgmt.py      |     2 +-
 tools/marvin/marvin/misc/build/testSetupSuccess.py |     8 +-
 tools/marvin/marvin/misc/build/xunitmp/setup.py    |     2 +-
 .../marvin/misc/build/xunitmp/xunitmultiprocess.py |     4 +-
 tools/marvin/marvin/sandbox/__init__.py            |     4 +-
 tools/marvin/marvin/sandbox/advanced/__init__.py   |     4 +-
 .../marvin/marvin/sandbox/advanced/advanced_env.py |    14 +-
 tools/marvin/marvin/sandbox/advancedsg/__init__.py |     4 +-
 .../marvin/sandbox/advancedsg/advancedsg_env.py    |    12 +-
 tools/marvin/marvin/sandbox/basic/__init__.py      |     4 +-
 tools/marvin/marvin/sandbox/basic/basic_env.py     |    14 +-
 tools/marvin/marvin/sandbox/demo/__init__.py       |     4 +-
 tools/marvin/marvin/sandbox/demo/live/__init__.py  |     4 +-
 .../marvin/sandbox/demo/live/testSshDeployVM.py    |    14 +-
 .../marvin/sandbox/demo/simulator/__init__.py      |     4 +-
 .../sandbox/demo/simulator/simulator_setup.py      |    14 +-
 .../sandbox/demo/simulator/testcase/__init__.py    |     4 +-
 .../demo/simulator/testcase/libs/__init__.py       |     4 +-
 .../sandbox/demo/simulator/testcase/libs/base.py   |   155 +-
 .../sandbox/demo/simulator/testcase/libs/common.py |    38 +-
 .../sandbox/demo/simulator/testcase/libs/utils.py  |     8 +-
 .../demo/simulator/testcase/test_vm_life_cycle.py  |    82 +-
 tools/marvin/marvin/sandbox/testSetupSuccess.py    |    12 +-
 tools/ngui/precache.py                             |     2 +-
 tools/ngui/static/js/lib/angular.js                |     2 +-
 tools/ngui/static/js/lib/jquery-1.7.2.js           |     2 +-
 tools/travis/script.sh                             |     2 +-
 ui/.babelrc                                        |     3 +
 ui/.gitignore                                      |     2 +
 ui/docs/customize.md                               |     9 +
 ui/jest.config.js                                  |     3 +-
 ui/package-lock.json                               | 48755 +++++++++++++++----
 ui/package.json                                    |    83 +-
 ui/public/config.json                              |     2 +
 ui/public/locales/ar.json                          |    10 +-
 ui/public/locales/ca.json                          |    10 +-
 ui/public/locales/de_DE.json                       |    12 +-
 ui/public/locales/el_GR.json                       |    13 +-
 ui/public/locales/en.json                          |  3516 +-
 ui/public/locales/es.json                          |     8 +-
 ui/public/locales/fr_FR.json                       |     8 +-
 ui/public/locales/hu.json                          |     8 +-
 ui/public/locales/it_IT.json                       |    10 +-
 ui/public/locales/ja_JP.json                       |     4 +-
 ui/public/locales/ko_KR.json                       |    12 +-
 ui/public/locales/nb_NO.json                       |     8 +-
 ui/public/locales/nl_NL.json                       |     8 +-
 ui/public/locales/pl.json                          |    10 +-
 ui/public/locales/pt_BR.json                       |    11 +-
 ui/public/locales/ru_RU.json                       |     4 +-
 ui/public/locales/zh_CN.json                       |     4 +-
 ui/src/App.vue                                     |     7 +-
 ui/src/api/index.js                                |    13 +-
 ui/src/assets/icons/cloudian.svg                   |    12 -
 ui/src/assets/icons/debian.svg                     |     2 -
 ui/src/assets/icons/kubernetes.svg                 |     9 -
 ui/src/components/CheckBoxInputPair.vue            |    11 +-
 ui/src/components/CheckBoxSelectPair.vue           |    18 +-
 ui/src/components/header/HeaderNotice.vue          |    38 +-
 ui/src/components/header/ProjectMenu.vue           |    54 +-
 ui/src/components/header/SamlDomainSwitcher.vue    |    34 +-
 ui/src/components/header/TranslationMenu.vue       |    55 +-
 ui/src/components/header/UserMenu.vue              |    60 +-
 ui/src/components/menu/SMenu.vue                   |   169 +
 ui/src/components/menu/SideMenu.vue                |    22 +-
 ui/src/components/menu/index.js                    |     2 +-
 ui/src/components/menu/menu.js                     |   207 -
 ui/src/components/multitab/MultiTab.vue            |    10 +-
 ui/src/components/page/GlobalFooter.vue            |     2 +-
 ui/src/components/page/GlobalHeader.vue            |    29 +-
 ui/src/components/page/GlobalLayout.vue            |    41 +-
 ui/src/components/page/PageHeader.vue              |     8 +-
 ui/src/components/page/PageLayout.vue              |    20 +-
 ui/src/components/page/SHeaderNotice.vue           |     4 +-
 ui/src/components/view/ActionButton.vue            |    49 +-
 ui/src/components/view/AnnotationsTab.vue          |   145 +-
 ui/src/components/view/BulkActionProgress.vue      |    53 +-
 ui/src/components/view/BulkActionView.vue          |    42 +-
 ui/src/components/view/DedicateData.vue            |    28 +-
 ui/src/components/view/DedicateDomain.vue          |    11 +-
 ui/src/components/view/DedicateModal.vue           |    19 +-
 ui/src/components/view/DetailSettings.vue          |   191 +-
 ui/src/components/view/DetailsTab.vue              |   125 +-
 ui/src/components/view/EventsTab.vue               |   171 +
 ui/src/components/view/FormView.vue                |   131 -
 ui/src/components/view/InfoCard.vue                |   301 +-
 .../view/InstanceNicsNetworkSelectListView.vue     |   139 +
 .../InstanceVolumesStoragePoolSelectListView.vue   |    15 +-
 ui/src/components/view/ListResourceTable.vue       |    41 +-
 ui/src/components/view/ListView.vue                |   389 +-
 ui/src/components/view/NicNetworkSelectForm.vue    |   228 +
 ui/src/components/view/QuickView.vue               |    13 +-
 ui/src/components/view/ResourceCountUsage.vue      |    40 +-
 ui/src/components/view/ResourceIcon.vue            |    10 +-
 ui/src/components/view/ResourceLimitTab.vue        |    70 +-
 ui/src/components/view/ResourceView.vue            |    86 +-
 ui/src/components/view/SearchView.vue              |   292 +-
 ui/src/components/view/Setting.vue                 |   134 +-
 ui/src/components/view/SettingItem.vue             |    29 +-
 ui/src/components/view/SettingsTab.vue             |    42 +-
 ui/src/components/view/StoragePoolSelectView.vue   |    55 +-
 ui/src/components/view/TreeView.vue                |   239 +-
 ui/src/components/view/UploadResourceIcon.vue      |    66 +-
 ui/src/components/view/VmwareData.vue              |    11 +-
 ui/src/components/widgets/Breadcrumb.vue           |    17 +-
 ui/src/components/widgets/Console.vue              |     5 +-
 ui/src/components/widgets/Drawer.vue               |     4 +-
 ui/src/components/widgets/OsLogo.vue               |     7 +-
 ui/src/components/widgets/ResourceLabel.vue        |    69 +
 ui/src/components/widgets/Status.vue               |    45 +-
 ui/src/components/widgets/TooltipButton.vue        |    68 +-
 ui/src/components/widgets/TooltipLabel.vue         |     2 +-
 ui/src/config/eventBus.js                          |     4 +-
 ui/src/config/router.js                            |    46 +-
 ui/src/config/section/account.js                   |    47 +-
 ui/src/config/section/compute.js                   |   184 +-
 ui/src/config/section/config.js                    |    24 +-
 ui/src/config/section/domain.js                    |    42 +-
 ui/src/config/section/event.js                     |    12 +-
 ui/src/config/section/image.js                     |    96 +-
 ui/src/config/section/infra.js                     |    25 +-
 ui/src/config/section/infra/clusters.js            |    37 +-
 ui/src/config/section/infra/hosts.js               |    45 +-
 ui/src/config/section/infra/ilbvms.js              |    17 +-
 ui/src/config/section/infra/managementServers.js   |    41 +
 ui/src/config/section/infra/nsp.js                 |     9 +-
 ui/src/config/section/infra/phynetworks.js         |    29 +-
 ui/src/config/section/infra/pods.js                |    30 +-
 ui/src/config/section/infra/primaryStorages.js     |    32 +-
 ui/src/config/section/infra/routers.js             |    80 +-
 ui/src/config/section/infra/secondaryStorages.js   |    29 +-
 ui/src/config/section/infra/systemVms.js           |    49 +-
 ui/src/config/section/infra/zones.js               |    50 +-
 ui/src/config/section/network.js                   |   247 +-
 ui/src/config/section/offering.js                  |   109 +-
 ui/src/config/section/plugin/cloudian.js           |     3 +-
 ui/src/config/section/plugin/quota.js              |    23 +-
 ui/src/config/section/project.js                   |    42 +-
 ui/src/config/section/role.js                      |    19 +-
 ui/src/config/section/storage.js                   |   125 +-
 ui/src/config/section/tools.js                     |     8 +-
 ui/src/config/section/user.js                      |    41 +-
 ui/src/config/settings.js                          |    11 +-
 ui/src/core/bootstrap.js                           |    42 +-
 ui/src/core/ext.js                                 |    12 +-
 ui/src/core/lazy_lib/components_use.js             |   119 +-
 ui/src/core/lazy_lib/icons_use.js                  |   308 +
 ui/src/core/lazy_use.js                            |    29 +-
 ui/src/core/use.js                                 |    50 -
 ui/src/layouts/PageView.vue                        |     2 +-
 ui/src/layouts/RouteView.vue                       |     4 +-
 ui/src/layouts/UserLayout.vue                      |    14 +-
 ui/src/locales/index.js                            |    20 +-
 ui/src/main.js                                     |    58 +-
 ui/src/permission.js                               |    26 +-
 ui/src/router/index.js                             |    14 +-
 ui/src/store/getters.js                            |     6 +-
 ui/src/store/index.js                              |     7 +-
 ui/src/store/modules/app.js                        |    55 +-
 ui/src/store/modules/user.js                       |    92 +-
 ui/src/store/mutation-types.js                     |     3 +-
 ui/src/style/common/function.less                  |  1383 +
 ui/src/style/dark-mode.less                        |    90 +-
 ui/src/style/vars.less                             |   137 +-
 ui/src/utils/axios.js                              |     6 +-
 ui/src/utils/directives.js                         |    53 +-
 ui/src/utils/filter.js                             |    30 +-
 ui/src/utils/helper/permission.js                  |     8 +-
 ui/src/utils/mixin.js                              |    18 +-
 ui/src/utils/plugins.js                            |   208 +-
 ui/src/utils/renderIcon.js                         |    62 +
 ui/src/utils/request.js                            |    61 +-
 ui/src/views/AutogenView.vue                       |   616 +-
 ui/src/views/auth/Login.vue                        |   244 +-
 ui/src/views/compute/AssignInstance.vue            |    82 +-
 ui/src/views/compute/AttachIso.vue                 |    58 +-
 ui/src/views/compute/ChangeAffinity.vue            |    12 +-
 ui/src/views/compute/CreateKubernetesCluster.vue   |   333 +-
 ui/src/views/compute/CreateSSHKeyPair.vue          |    91 +-
 ui/src/views/compute/CreateSnapshotWizard.vue      |    72 +-
 ui/src/views/compute/DeployVM.vue                  |  1236 +-
 ui/src/views/compute/DestroyVM.vue                 |   412 +-
 ui/src/views/compute/EditVM.vue                    |   191 +-
 ui/src/views/compute/InstanceTab.vue               |   191 +-
 ui/src/views/compute/KubernetesServiceTab.vue      |    73 +-
 ui/src/views/compute/MigrateVMStorage.vue          |     5 +-
 ui/src/views/compute/MigrateWizard.vue             |    73 +-
 ui/src/views/compute/ResetSshKeyPair.vue           |   178 +
 ui/src/views/compute/ScaleKubernetesCluster.vue    |   132 +-
 ui/src/views/compute/ScaleVM.vue                   |   103 +-
 ui/src/views/compute/StartVirtualMachine.vue       |    90 +-
 ui/src/views/compute/UpgradeKubernetesCluster.vue  |    49 +-
 ui/src/views/compute/backup/BackupSchedule.vue     |    60 +-
 ui/src/views/compute/backup/FormSchedule.vue       |   163 +-
 .../compute/wizard/AffinityGroupSelection.vue      |     4 +-
 .../compute/wizard/ComputeOfferingSelection.vue    |    22 +-
 ui/src/views/compute/wizard/ComputeSelection.vue   |    25 +-
 .../views/compute/wizard/DiskOfferingSelection.vue |    53 +-
 ui/src/views/compute/wizard/DiskSizeSelection.vue  |    27 +-
 ui/src/views/compute/wizard/MultiDiskSelection.vue |    35 +-
 .../views/compute/wizard/MultiNetworkSelection.vue |    39 +-
 .../views/compute/wizard/NetworkConfiguration.vue  |   212 +-
 ui/src/views/compute/wizard/NetworkSelection.vue   |   105 +-
 .../compute/wizard/SecurityGroupSelection.vue      |     4 +-
 .../views/compute/wizard/SshKeyPairSelection.vue   |    80 +-
 .../views/compute/wizard/TemplateIsoRadioGroup.vue |    56 +-
 .../views/compute/wizard/TemplateIsoSelection.vue  |    28 +-
 ui/src/views/dashboard/CapacityDashboard.vue       |    67 +-
 ui/src/views/dashboard/OnboardingDashboard.vue     |    32 +-
 ui/src/views/dashboard/UsageDashboard.vue          |   140 +-
 ui/src/views/dashboard/UsageDashboardChart.vue     |    54 +-
 ui/src/views/iam/AddAccount.vue                    |   219 +-
 ui/src/views/iam/AddLdapAccount.vue                |   130 +-
 ui/src/views/iam/AddUser.vue                       |   198 +-
 ui/src/views/iam/ChangeUserPassword.vue            |    89 +-
 ui/src/views/iam/ConfigureSamlSsoAuth.vue          |    55 +-
 ui/src/views/iam/CreateRole.vue                    |   104 +-
 ui/src/views/iam/DomainActionForm.vue              |   187 +-
 ui/src/views/iam/DomainView.vue                    |    35 +-
 ui/src/views/iam/EditUser.vue                      |    85 +-
 ui/src/views/iam/ImportRole.vue                    |   132 +-
 ui/src/views/iam/PermissionEditable.vue            |    24 +-
 ui/src/views/iam/RolePermissionTab.vue             |    87 +-
 ui/src/views/iam/RuleDelete.vue                    |     8 +-
 ui/src/views/iam/SSLCertificateTab.vue             |    64 +-
 .../views/image/AddKubernetesSupportedVersion.vue  |   173 +-
 ui/src/views/image/IsoZones.vue                    |    95 +-
 ui/src/views/image/RegisterOrUploadIso.vue         |   162 +-
 ui/src/views/image/RegisterOrUploadTemplate.vue    |   451 +-
 ui/src/views/image/TemplateZones.vue               |   160 +-
 .../image/UpdateKubernetesSupportedVersion.vue     |    45 +-
 ui/src/views/image/UpdateTemplate.vue              |   395 +
 .../views/image/UpdateTemplateIsoPermissions.vue   |    38 +-
 ui/src/views/image/UploadLocalIso.vue              |    56 -
 ui/src/views/image/UploadLocalTemplate.vue         |    56 -
 ui/src/views/infra/AddPrimaryStorage.vue           |   446 +-
 ui/src/views/infra/AddSecondaryStorage.vue         |   339 +-
 ui/src/views/infra/ClusterAdd.vue                  |    38 +-
 ui/src/views/infra/CpuSockets.vue                  |    30 +-
 ui/src/views/infra/HostAdd.vue                     |   285 +-
 ui/src/views/infra/HostInfo.vue                    |    13 +-
 ui/src/views/infra/InfraSummary.vue                |   161 +-
 ui/src/views/infra/Metrics.vue                     |   235 +
 ui/src/views/infra/MigrateData.vue                 |   125 +-
 ui/src/views/infra/PodAdd.vue                      |    92 +-
 ui/src/views/infra/Resources.vue                   |     9 +-
 ui/src/views/infra/network/DedicatedVLANTab.vue    |   149 +-
 ui/src/views/infra/network/EditTrafficLabel.vue    |   120 +-
 ui/src/views/infra/network/IpRangesTabGuest.vue    |   219 +-
 .../views/infra/network/IpRangesTabManagement.vue  |   129 +-
 ui/src/views/infra/network/IpRangesTabPublic.vue   |   358 +-
 ui/src/views/infra/network/IpRangesTabStorage.vue  |   115 +-
 ui/src/views/infra/network/ServiceProvidersTab.vue |   251 +-
 .../infra/network/providers/AddF5LoadBalancer.vue  |    96 +-
 .../network/providers/AddNetscalerLoadBalancer.vue |   112 +-
 .../infra/network/providers/AddNiciraNvpDevice.vue |    80 +-
 .../network/providers/AddPaloAltoFirewall.vue      |   128 +-
 .../infra/network/providers/AddSrxFirewall.vue     |   112 +-
 .../infra/network/providers/ProviderDetail.vue     |    26 +-
 .../views/infra/network/providers/ProviderItem.vue |    18 +-
 .../infra/network/providers/ProviderListView.vue   |    29 +-
 ui/src/views/infra/routers/RouterHealthCheck.vue   |    55 +-
 .../views/infra/zone/AdvancedGuestTrafficForm.vue  |   104 +-
 ui/src/views/infra/zone/IpAddressRangeForm.vue     |   271 +-
 ui/src/views/infra/zone/PhysicalNetworksTab.vue    |    11 +-
 ui/src/views/infra/zone/StaticInputsForm.vue       |   243 +-
 ui/src/views/infra/zone/SystemVmsTab.vue           |    11 +-
 ui/src/views/infra/zone/ZoneWizard.vue             |    14 +-
 ui/src/views/infra/zone/ZoneWizardAddResources.vue |    69 +-
 ui/src/views/infra/zone/ZoneWizardLaunchZone.vue   |   326 +-
 .../infra/zone/ZoneWizardNetworkSetupStep.vue      |    14 +-
 .../zone/ZoneWizardPhysicalNetworkSetupStep.vue    |   166 +-
 .../views/infra/zone/ZoneWizardZoneDetailsStep.vue |   444 +-
 ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue |   147 +-
 ui/src/views/network/AclListRulesTab.vue           |   264 +-
 ui/src/views/network/CreateIsolatedNetworkForm.vue |   280 +-
 ui/src/views/network/CreateL2NetworkForm.vue       |   229 +-
 ui/src/views/network/CreateNetwork.vue             |    15 +-
 ui/src/views/network/CreateNetworkPermission.vue   |   247 +
 ui/src/views/network/CreateSharedNetworkForm.vue   |   821 +-
 ui/src/views/network/CreateVlanIpRange.vue         |   198 +-
 ui/src/views/network/CreateVpc.vue                 |   134 +-
 ui/src/views/network/CreateVpnCustomerGateway.vue  |   295 +-
 ui/src/views/network/EgressRulesTab.vue            |    99 +-
 ui/src/views/network/EnableStaticNat.vue           |    74 +-
 ui/src/views/network/FirewallRules.vue             |   138 +-
 ui/src/views/network/GuestIpRanges.vue             |    24 +-
 ui/src/views/network/GuestVlanNetworksTab.vue      |   135 +
 .../views/network/IngressEgressRuleConfigure.vue   |   135 +-
 ui/src/views/network/InternalLBAssignVmForm.vue    |    14 +-
 ui/src/views/network/InternalLBAssignedVmTab.vue   |    32 +-
 ui/src/views/network/IpAddressesTab.vue            |   119 +-
 ui/src/views/network/Ipv6FirewallRulesTab.vue      |   535 +
 ui/src/views/network/LoadBalancing.vue             |   374 +-
 ui/src/views/network/NetworkPermissions.vue        |   207 +
 ui/src/views/network/NicsTable.vue                 |    28 +-
 ui/src/views/network/PortForwarding.vue            |   204 +-
 ui/src/views/network/PublicIpResource.vue          |    31 +-
 ui/src/views/network/ReservePublicIP.vue           |   332 +
 ui/src/views/network/RoutersTab.vue                |    37 +-
 ui/src/views/network/StaticRoutesTab.vue           |    64 +-
 ui/src/views/network/UpdateNetwork.vue             |   127 +-
 ui/src/views/network/VpcTab.vue                    |   301 +-
 ui/src/views/network/VpcTiersTab.vue               |   292 +-
 ui/src/views/network/VpnDetails.vue                |    55 +-
 ui/src/views/offering/AddComputeOffering.vue       |   865 +-
 ui/src/views/offering/AddDiskOffering.vue          |   412 +-
 ui/src/views/offering/AddNetworkOffering.vue       |   498 +-
 ui/src/views/offering/AddVpcOffering.vue           |   232 +-
 ui/src/views/offering/ImportBackupOffering.vue     |    96 +-
 ui/src/views/offering/UpdateOfferingAccess.vue     |   108 +-
 .../views/plugins/quota/EditTariffValueWizard.vue  |    56 +-
 .../views/plugins/quota/EmailTemplateDetails.vue   |     7 +-
 ui/src/views/plugins/quota/QuotaBalance.vue        |    13 +-
 ui/src/views/plugins/quota/QuotaSummary.vue        |     1 -
 .../views/plugins/quota/QuotaSummaryResource.vue   |    11 +-
 ui/src/views/plugins/quota/QuotaUsage.vue          |    11 +-
 ui/src/views/project/AccountsTab.vue               |    97 +-
 ui/src/views/project/AddAccountOrUserToProject.vue |   140 +-
 ui/src/views/project/InvitationTokenTemplate.vue   |    44 +-
 ui/src/views/project/InvitationsTemplate.vue       |    80 +-
 ui/src/views/project/ProjectDetailsTab.vue         |    30 +-
 .../views/project/iam/ProjectRolePermissionTab.vue |    65 +-
 ui/src/views/project/iam/ProjectRoleTab.vue        |   141 +-
 ui/src/views/setting/ResourceSettingsTab.vue       |    58 -
 ui/src/views/storage/AttachVolume.vue              |    67 +-
 ui/src/views/storage/ChangeOfferingForVolume.vue   |   271 +
 .../views/storage/CreateSnapshotFromVMSnapshot.vue |    51 +-
 ui/src/views/storage/CreateVolume.vue              |   162 +-
 ui/src/views/storage/FormSchedule.vue              |   164 +-
 ui/src/views/storage/MigrateVolume.vue             |   108 +-
 ui/src/views/storage/ResizeVolume.vue              |    82 +-
 ui/src/views/storage/RestoreAttachBackupVolume.vue |    61 +-
 ui/src/views/storage/ScheduledSnapshots.vue        |    74 +-
 ui/src/views/storage/TakeSnapshot.vue              |    64 +-
 ui/src/views/storage/UploadLocalVolume.vue         |   261 +-
 ui/src/views/storage/UploadVolume.vue              |   327 +
 ui/src/views/tools/ImportUnmanagedInstance.vue     |   174 +-
 ui/src/views/tools/ManageInstances.vue             |   134 +-
 ui/src/vue-app.js                                  |    31 +
 ui/tests/common/index.js                           |    58 +-
 ui/tests/mock/mockI18n.js                          |     8 +-
 ui/tests/mock/mockRouter.js                        |    38 +-
 ui/tests/mock/mockStore.js                         |    16 +-
 ui/tests/mockData/ActionButton.mock.json           |     6 +-
 ui/tests/mockData/AutogenView.mock.json            |   513 +-
 ui/tests/mockData/MigrateWizard.mock.json          |   101 +-
 ui/tests/mockData/Status.mock.json                 |   113 +-
 ui/tests/setup.js                                  |    31 +-
 ui/tests/unit/components/view/ActionButton.spec.js |   343 +-
 ui/tests/unit/components/widgets/Status.spec.js    |   361 +-
 ui/tests/unit/views/AutogenView.spec.js            |  4514 +-
 ui/tests/unit/views/compute/MigrateWizard.spec.js  |   938 +-
 ui/theme.config.js                                 |    10 +
 ui/vue.config.js                                   |    17 +-
 .../java/com/cloud/usage/UsageManagerImpl.java     |    10 +-
 .../cloud/usage/parser/IPAddressUsageParser.java   |     4 +-
 .../usage/parser/LoadBalancerUsageParser.java      |     4 +-
 .../usage/parser/PortForwardingUsageParser.java    |     4 +-
 .../com/cloud/usage/parser/StorageUsageParser.java |     4 +-
 .../usage/parser/VMSanpshotOnPrimaryParser.java    |   131 -
 .../usage/parser/VMSnapshotOnPrimaryParser.java    |   131 +
 .../cloud/usage/parser/VMSnapshotUsageParser.java  |     4 +-
 .../com/cloud/usage/parser/VolumeUsageParser.java  |     4 +-
 utils/pom.xml                                      |    12 +-
 .../main/java/com/cloud/utils/EncryptionUtil.java  |    14 +-
 utils/src/main/java/com/cloud/utils/FileUtil.java  |    28 +
 utils/src/main/java/com/cloud/utils/LogUtils.java  |    40 +-
 utils/src/main/java/com/cloud/utils/UriUtils.java  |     6 +-
 .../cloud/utils/cisco/n1kv/vsm/NetconfHelper.java  |     2 +-
 .../java/com/cloud/utils/db/EntityManager.java     |     2 +
 .../main/java/com/cloud/utils/net/NetUtils.java    |    54 +-
 .../main/java/com/cloud/utils/script/Script.java   |    19 +-
 .../java/com/cloud/utils/ssh/SSHCmdHelper.java     |    13 +-
 .../main/java/com/cloud/utils/ssh/SshHelper.java   |    42 +
 .../com/cloud/utils/validation/ChecksumUtil.java   |    34 +
 .../cloudstack/utils/security/DigestHelper.java    |    18 +-
 .../cloudstack/utils/security/KeyStoreUtils.java   |     1 +
 .../test/java/com/cloud/utils/FileUtilTest.java    |    69 +
 .../com/cloud/utils/UriUtilsParametrizedTest.java  |    30 +-
 .../cloud/utils/validation/ChecksumUtilTest.java   |    62 +
 vmware-base/pom.xml                                |     8 -
 .../hypervisor/vmware/mo/HypervisorHostHelper.java |     2 +-
 .../hypervisor/vmware/mo/VirtualMachineMO.java     |    61 +-
 .../hypervisor/vmware/util/VmwareContext.java      |     2 +-
 1752 files changed, 122458 insertions(+), 39104 deletions(-)
 create mode 100644 .asf.yaml
 create mode 100644 .github/boring-cyborg.yml
 create mode 100644 .github/linters/.flake8
 create mode 100644 .github/workflows/coverage-check.yml
 create mode 100644 .github/workflows/linter.yml
 create mode 100644 .github/workflows/merge-conflict-checker.yml
 create mode 100644 api/src/main/java/com/cloud/agent/api/storage/OVFParser.java
 create mode 100644 api/src/main/java/com/cloud/dc/DataCenterGuestIpv6Prefix.java
 create mode 100644 api/src/main/java/com/cloud/network/GuestVlanRange.java
 create mode 100644 api/src/main/java/com/cloud/network/Ipv6GuestPrefixSubnetNetworkMap.java
 create mode 100644 api/src/main/java/com/cloud/network/Ipv6Service.java
 create mode 100644 api/src/main/java/com/cloud/network/NetworkPermission.java
 create mode 100644 api/src/main/java/com/cloud/server/ManagementServerHostStats.java
 create mode 100644 api/src/main/java/com/cloud/storage/GuestOSHypervisorMapping.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/ApiCommandJobType.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/ApiCommandResourceType.java
 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/direct/download/ListTemplateDirectDownloadCertificatesCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/ProvisionTemplateDirectDownloadCertificateCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/CreateGuestNetworkIpv6PrefixCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/DeleteGuestNetworkIpv6PrefixCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/network/ListGuestNetworkIpv6PrefixesCmd.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/systemvm/PatchSystemVMCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayByAdminCmd.java
 delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vpc/CreatePrivateGatewayCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/address/ReleaseIPAddrCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/address/ReserveIPAddrCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/CreateIpv6FirewallRuleCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/DeleteIpv6FirewallRuleCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/ListIpv6FirewallRulesCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/ipv6/UpdateIpv6FirewallRuleCmd.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
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/volume/ChangeOfferingForVolumeCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/vpc/CreatePrivateGatewayCmd.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/DataCenterGuestIpv6PrefixResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/DirectDownloadCertificateHostStatusResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/DirectDownloadCertificateResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/GuestVlanResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/Ipv6RouteResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/NetworkPermissionsResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/StatsResponse.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/direct/download/DirectDownloadCertificateHostMap.java
 create mode 100644 api/src/main/java/org/apache/cloudstack/management/ManagementServerStatus.java
 create mode 100644 api/src/test/java/com/cloud/user/AccountTypeTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/ApiCommandResourceTypeTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/systemvm/PatchSystemVMCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/firewall/CreateEgressFirewallRuleCmdTest.java
 create mode 100644 api/src/test/java/org/apache/cloudstack/api/response/StatsResponseTest.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/FreezeThawVMAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/FreezeThawVMCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/PatchSystemVmAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/PatchSystemVmCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/VmStatsEntryBase.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesAnswer.java
 create mode 100644 core/src/main/java/com/cloud/agent/api/routing/SetIpv6FirewallRulesCommand.java
 create mode 100644 core/src/main/java/com/cloud/agent/resource/virtualnetwork/facade/SetIpv6FirewallRulesConfigItem.java
 create mode 100644 engine/schema/src/main/java/com/cloud/dc/DataCenterGuestIpv6PrefixVO.java
 create mode 100644 engine/schema/src/main/java/com/cloud/dc/dao/DataCenterGuestIpv6PrefixDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/dc/dao/DataCenterGuestIpv6PrefixDaoImpl.java
 create mode 100644 engine/schema/src/main/java/com/cloud/network/Ipv6GuestPrefixSubnetNetworkMapVO.java
 create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/Ipv6GuestPrefixSubnetNetworkMapDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/network/dao/Ipv6GuestPrefixSubnetNetworkMapDaoImpl.java
 create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/GuestOsMapper.java
 create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/RolePermissionChecker.java
 create mode 100644 engine/schema/src/main/java/com/cloud/vm/VmStatsVO.java
 create mode 100644 engine/schema/src/main/java/com/cloud/vm/dao/VmStatsDao.java
 create mode 100644 engine/schema/src/main/java/com/cloud/vm/dao/VmStatsDaoImpl.java
 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 engine/storage/snapshot/src/main/java/org/apache/cloudstack/storage/vmsnapshot/StorageVMSnapshotStrategy.java
 create mode 100644 engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/snapshot/DefaultSnapshotStrategyTest.java
 create mode 100644 engine/storage/snapshot/src/test/java/org/apache/cloudstack/storage/vmsnapshot/VMSnapshotStrategyKVMTest.java
 create mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImplTest.java
 create mode 100644 framework/cluster/src/main/java/com/cloud/cluster/ManagementServerStatusVO.java
 create mode 100644 framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerStatusDao.java
 create mode 100644 framework/cluster/src/main/java/com/cloud/cluster/dao/ManagementServerStatusDaoImpl.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtFreezeThawVMCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtPatchSystemVmCommandWrapper.java
 create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuCommand.java
 create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtRevertSnapshotCommandWrapperTest.java
 create mode 100644 plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixPatchSystemVmCommandWrapper.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/api/ListDbMetricsCmd.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/api/ListMgmtsMetricsCmd.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/api/ListUsageServerMetricsCmd.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsUsageHistoryCmd.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/api/MetricConstants.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/response/DbMetricsResponse.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/response/HostMetricsSummary.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/response/ManagementServerMetricsResponse.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/response/UsageServerMetricsResponse.java
 create mode 100644 plugins/metrics/src/main/java/org/apache/cloudstack/response/VmMetricsStatsResponse.java
 create mode 100644 plugins/metrics/src/test/java/org/apache/cloudstack/metrics/MetricsServiceImplTest.java
 create mode 100644 plugins/storage/volume/storpool/README.md
 create mode 100644 plugins/storage/volume/storpool/pom.xml
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolBackupSnapshotCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolBackupTemplateFromSnapshotCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolCopyCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolCopyVolumeToSecondaryCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolDownloadTemplateCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolDownloadVolumeCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolMigrateWithVolumesCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolModifyStoragePoolAnswer.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolModifyStoragePoolCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/agent/api/storage/StorPoolResizeVolumeCommand.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolBackupSnapshotCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolBackupTemplateFromSnapshotCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolCopyVolumeToSecondaryCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolDownloadTemplateCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolDownloadVolumeCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolModifyStorageCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/StorPoolResizeVolumeCommandWrapper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStorageAdaptor.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/com/cloud/hypervisor/kvm/storage/StorPoolStoragePool.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/collector/StorPoolAbandonObjectsCollector.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriver.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/lifecycle/StorPoolPrimaryDataStoreLifeCycle.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/provider/StorPoolHostListener.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/provider/StorPoolPrimaryDataStoreProvider.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolFeaturesAndFixes.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolHelper.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/datastore/util/StorPoolUtil.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/motion/StorPoolDataMotionStrategy.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolConfigurationManager.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolSnapshotStrategy.java
 create mode 100644 plugins/storage/volume/storpool/src/main/java/org/apache/cloudstack/storage/snapshot/StorPoolVMSnapshotStrategy.java
 create mode 100644 plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/module.properties
 create mode 100644 plugins/storage/volume/storpool/src/main/resources/META-INF/cloudstack/storage-volume-storpool/spring-storage-volume-storpool-context.xml
 create mode 100755 scripts/installer/cloudstack-help-text
 create mode 100644 scripts/installer/export-templates.sh
 create mode 100644 server/src/main/java/com/cloud/api/ApiSessionListener.java
 create mode 100644 server/src/main/java/com/cloud/api/query/dao/ManagementServerJoinDao.java
 create mode 100644 server/src/main/java/com/cloud/api/query/dao/ManagementServerJoinDaoImpl.java
 create mode 100644 server/src/main/java/com/cloud/api/query/vo/ManagementServerJoinVO.java
 create mode 100644 server/src/main/java/com/cloud/network/Ipv6ServiceImpl.java
 create mode 100644 server/src/main/java/com/cloud/server/DbStatsCollection.java
 create mode 100644 server/src/main/java/com/cloud/server/ManagementServerHostStatsEntry.java
 create mode 100644 server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinition.java
 create mode 100644 server/src/main/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 create mode 100644 server/src/main/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinition.java
 create mode 100644 server/src/main/java/org/apache/cloudstack/snapshot/SnapshotHelper.java
 delete mode 100644 server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinition.java
 delete mode 100644 server/src/main/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionBuilder.java
 delete mode 100644 server/src/main/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinition.java
 create mode 100644 server/src/test/java/com/cloud/api/ApiDispatcherTest.java
 create mode 100644 server/src/test/java/com/cloud/api/query/QueryManagerImplTest.java
 create mode 100644 server/src/test/java/com/cloud/event/ActionEventInterceptorTest.java
 create mode 100644 server/src/test/java/com/cloud/event/dao/EventJoinDaoImplTest.java
 create mode 100644 server/src/test/java/com/cloud/resourceicon/ResourceIconManagerImplTest.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/annotation/AnnotationManagerImplTest.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTest.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/network/router/deployment/RouterDeploymentDefinitionTestBase.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 create mode 100644 server/src/test/java/org/apache/cloudstack/snapshot/SnapshotHelperTest.java
 delete mode 100644 server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTest.java
 delete mode 100644 server/src/test/java/org/cloud/network/router/deployment/RouterDeploymentDefinitionTestBase.java
 delete mode 100644 server/src/test/java/org/cloud/network/router/deployment/VpcRouterDeploymentDefinitionTest.java
 create mode 100644 systemvm/debian/etc/radvd.conf.tmpl
 create mode 100644 systemvm/debian/etc/systemd/system/cloud-preinit.service
 create mode 100755 systemvm/debian/opt/cloud/bin/cs/CsVpcGuestNetwork.py
 create mode 100644 systemvm/debian/opt/cloud/bin/patched.sh
 create mode 100644 systemvm/debian/opt/cloud/bin/setup/init.sh
 create mode 100644 systemvm/patch-sysvms.sh
 create mode 100644 test/integration/component/test_hypervisor_capabilities.py
 create mode 100644 test/integration/component/test_network_permissions.py
 create mode 100644 test/integration/component/test_template_access_across_domains.py
 create mode 100644 test/integration/component/test_user_private_gateway.py
 create mode 100644 test/integration/component/test_user_shared_network.py
 create mode 100644 test/integration/plugins/storpool/MigrateVolumeToStorPool.py
 create mode 100644 test/integration/plugins/storpool/TestStorPoolVolumes.py
 create mode 100644 test/integration/plugins/storpool/TestTagsOnStorPool.py
 create mode 100644 test/integration/plugins/storpool/TestVmSnapshots.py
 create mode 100644 test/integration/plugins/storpool/sp_util.py
 create mode 100644 test/integration/smoke/test_events_resource.py
 create mode 100644 test/integration/smoke/test_network_ipv6.py
 create mode 100644 test/integration/smoke/test_vm_snapshot_kvm.py
 create mode 100644 ui/src/components/menu/SMenu.vue
 delete mode 100644 ui/src/components/menu/menu.js
 create mode 100644 ui/src/components/view/EventsTab.vue
 delete mode 100644 ui/src/components/view/FormView.vue
 create mode 100644 ui/src/components/view/InstanceNicsNetworkSelectListView.vue
 create mode 100644 ui/src/components/view/NicNetworkSelectForm.vue
 create mode 100644 ui/src/components/widgets/ResourceLabel.vue
 create mode 100644 ui/src/config/section/infra/managementServers.js
 create mode 100644 ui/src/core/lazy_lib/icons_use.js
 delete mode 100644 ui/src/core/use.js
 create mode 100644 ui/src/style/common/function.less
 create mode 100644 ui/src/utils/renderIcon.js
 create mode 100644 ui/src/views/compute/ResetSshKeyPair.vue
 create mode 100644 ui/src/views/image/UpdateTemplate.vue
 delete mode 100644 ui/src/views/image/UploadLocalIso.vue
 delete mode 100644 ui/src/views/image/UploadLocalTemplate.vue
 create mode 100644 ui/src/views/infra/Metrics.vue
 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/Ipv6FirewallRulesTab.vue
 create mode 100644 ui/src/views/network/NetworkPermissions.vue
 create mode 100644 ui/src/views/network/ReservePublicIP.vue
 delete mode 100644 ui/src/views/setting/ResourceSettingsTab.vue
 create mode 100644 ui/src/views/storage/ChangeOfferingForVolume.vue
 create mode 100644 ui/src/views/storage/UploadVolume.vue
 create mode 100644 ui/src/vue-app.js
 delete mode 100644 usage/src/main/java/com/cloud/usage/parser/VMSanpshotOnPrimaryParser.java
 create mode 100644 usage/src/main/java/com/cloud/usage/parser/VMSnapshotOnPrimaryParser.java
 create mode 100644 utils/src/main/java/com/cloud/utils/validation/ChecksumUtil.java
 create mode 100644 utils/src/test/java/com/cloud/utils/FileUtilTest.java
 create mode 100644 utils/src/test/java/com/cloud/utils/validation/ChecksumUtilTest.java