You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by da...@apache.org on 2023/01/11 15:42:54 UTC
[cloudstack] branch 4.17 updated (d33d84fa0fb -> dc3be47710f)
This is an automated email from the ASF dual-hosted git repository.
dahn pushed a change to branch 4.17
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
from d33d84fa0fb server/UI: fix some issues with network offering details (#7057)
add 0bcc609f055 Updating pom.xml version numbers for release 4.18.0.0-SNAPSHOT
add 8333e8fbd71 Fix upgrade version on files
add 2aca7800115 Merge branch '4.17'
add 1feef50b5ab Add upgrade path for 4.18.0
add 7526c5fc088 Merge branch '4.17'
add e20a57dc138 Merge branch '4.17'
add 64262d943f0 Merge branch '4.17'
add 84eed6db72f Merge branch '4.17'
add a32f19b34d7 Merge branch '4.17'
add 5b9b117301d add a default value for customColumns
add 98bc4415da2 Revert "some component tests fixes (#5442)"
add 691fd469eac Merge remote-tracking branch 'origin/4.17'
add 25ed664628b Fix main branch by removing unnecessary commits, syncing 4.17 to main
add d6488c50194 ui: add a provider for primary storage when adding zone wizard (#6429)
add 8b721a9318c Merge remote-tracking branch 'origin/4.17'
add d1e397f9d8a Merge remote-tracking branch 'origin/4.17'
add eb92b50feaa Merge branch '4.17'
add 6ac14fad1b5 Removed unused labels (#6326)
add 8448fe27a61 Enable CPU cap for SSVMs and CPVMs (#6420)
add e1fb2be835f Add check for update only name and/or description of disk offering (#6410)
add ff7831d751c Merge remote-tracking branch 'apache/4.17'
add 7b0ebe2e376 Allow for arbitrary disk offering details to be saved/displayed (#6474)
add ea9124e49c6 [KVM improve logs in migrate VM process (#6331)
add c1cb84b4939 Updating and adding missing labels on pt_BR locale (#6154)
add 7ba43e447cd Enable flake8 rule W292 No newline at end of file (#6274)
add 3fc825e246a Merge remote-tracking branch 'origin/4.17'
add 5fe095ee0a7 Merge remote-tracking branch 'origin/4.17'
add 6607a985977 Merge remote-tracking branch 'origin/4.17'
add 7d932e574d4 engine/schema: Fix API deleteTrafficType not filtering physical network (#6510)
add 15ab4819283 chore: Set permissions for GitHub actions (#6467)
add 711d4b9f0f1 Merge remote-tracking branch 'origin/4.17'
add a470f3353af Merge branch '4.17'
add aa7dd309dba Create event TEMPLATE_UPDATE for virtual machine image update calls. (#6521)
add e57a0f99805 Merge remote-tracking branch 'origin/4.17'
add 7ff3e7f9683 Merge remote-tracking branch 'origin/4.17'
add a039250b3b7 .github: Lint modified files only with Super-Linter (#6531)
add 0cae4406fb6 Merge remote-tracking branch 'origin/4.17'
add 65b0bcb0696 api: Deprecated changeServiceForVirtualMachine API and replaced all the occurences in the tests with scaleVirtualMachine (#6540)
add e1c7a447cc3 Merge remote-tracking branch 'origin/4.17'
add 35b5315dae5 maven: update dependencies (#6539)
add ba65b518089 Merge remote-tracking branch 'origin/4.17'
add 7a1401a111d changes logo when risezes the page (#6504)
add 12ecfa88cd6 Added deprecated API indication in the API doc (#6545)
add 731a83babfb add global setting to allow parallel execution on vmware (#6413)
add 4baaf736b93 Merge remote-tracking branch 'origin/4.17'
add 5dc86adddc9 Merge remote-tracking branch 'origin/4.17'
add 71bc088a707 Improve login time (#6412)
add 661956cc607 Merge remote-tracking branch 'origin/4.17'
add d4460a8afc9 Scope setting changes in ldap and utils pom.xml files (#6557)
add 3bedddba4bf Update API documentation for resizing (#6556)
add 9ef5e8fa85b Merge remote-tracking branch 'origin/4.17'
add 61e4e862c4d [Veeam] externalize restore timeout (#6320)
add 5f04018bf09 Merge remote-tracking branch 'origin/4.17'
add e38e175e8d1 Merge branch '4.17'
add c938bae8c6b Merge remote-tracking branch 'origin/4.17'
add 3cba4266c80 Merge remote-tracking branch 'apache/4.17' into main
add ac2857158d8 externalizes used protocol to upload isos, volumes and templates (#6506)
add 9bc3b7b98c1 List service offerings without host tags when filtering VM which the current service offering has host tags (#6359)
add 6ba0ef2f500 Find VBRViDatastore/VBRServer by name (#6582)
add f9347ecf2cb Fix spelling (#6597)
add d4d310c790e ui: Close form right after receiving the job id (#6603)
add ddb11b1b966 Merge remote-tracking branch 'apache/4.17' into main
add 117ce1aac42 Create password policies configurations (#6567)
add 9c63c393711 Add new parameter to createLoadBalancerRule API (#6460)
add c4ab8fffab7 Merge remote-tracking branch 'origin/4.17'
add 4d41b6bc445 Merge remote-tracking branch 'origin/4.17'
add d3ec27dc790 Fixed Veeam listing restore points (#6555)
add 840c3f6a7ad Merge remote-tracking branch 'origin/4.17'
add 9717ed9af24 Improve log messages on VolumeOrchestrator class (#6408)
add d9b770eb486 Merge remote-tracking branch 'apache/4.17' into main
add 152a2748457 README: add codecov badge
add 75da982d730 Updated resource counter to include correct size after volume creation/resize and other improvements (#6587)
add 7ae6fdf053b Merge remote-tracking branch 'apache/4.17' into main
add 8e428c7b0c9 Merge remote-tracking branch 'origin/4.17'
add 83008e55cf3 Merge remote-tracking branch 'origin/4.17'
add f23a4db6d26 kvm: Add usermode interface option to Libvirt Domain XML builder (#6640)
add bd6bcffccc2 Merge remote-tracking branch 'apache/4.17' into main
add ad0ae839746 ui: Revise Chinese language pack (#6653)
add f76b6c686d6 Merge remote-tracking branch 'apache/4.17' into main
add c5262443595 Merge remote-tracking branch 'apache/4.17' into main
add 9f7e0cc2d57 VM stats history visualization (#6401)
add 201f06697df Merge remote-tracking branch 'origin/4.17'
add d4b8e2cbe87 Validate host tags on VM live scale (#6409)
add e720b72e158 Merge remote-tracking branch 'apache/4.17' into main
add c58118148e1 Remove unsupported params from API calls on the UI (#6686)
add 65c70704227 Merge remote-tracking branch 'apache/4.17' into main
add 687a21c116c Merge remote-tracking branch 'apache/4.17' into main
add cf18549dbb0 Merge remote-tracking branch 'apache/4.17' into main
add 78b68fd7e6e api,server: custom dns for guest network (#6425)
add 68c09f92d17 Merge remote-tracking branch 'origin/4.17'
add 9c2a462d1a7 Merge remote-tracking branch 'apache/4.17' into main
add 7be7ef66fb3 Improve error message on storage tags update (#6269)
add b2fbe7bb121 console: Console access enhancements (#6577)
add ba35437da7d UI: Build Dockerfile with Node v14 (#6712)
add 14656733d81 Fix min balance for API quotaCredits to be optional (#6691)
add bf4e9059dd6 Merge remote-tracking branch 'apache/4.17' into main
add e39b7ac0d94 ui: fixes errors in the Console.vue (#6741)
add bbc12605767 Resource reservation framework (#6694)
add 434f15a9b29 Merge remote-tracking branch 'origin/4.17'
add 1a0a61fd9f6 Allow option of exposing VM domain info via instance metadata (#6710)
add 7905a76bd26 Merge remote-tracking branch 'apache/4.17' into main
add 3889e46eb63 fix description of configuration `max.data.migration.wait.time` (#6749)
add efbf74ee069 Added new logs to volume creation (#6689)
add d4c6586546c Return vm userdata (#6683)
add 697e12f8f78 kvm: volume encryption feature (#6522)
add 8ab8fdc1db4 Fix migrate volume permissions (#6224)
add 2e5588c5ead Merge remote-tracking branch 'apache/4.17' into main
add d9dd4c1e3ad mvn: bump version ahead of next major release (#6767)
add 53b658636f9 fix usage charging for deleted/resized volumes (#6737)
add 7fa41ddfcc7 README: update and refactor project README page (#6782)
add 33bd08369b7 Show name instead of description in the infocards and breadcrumbs (#6769)
add 67024b036a0 vr: fix packet interface mismatch (#6656)
add 784578d46c0 Merge remote-tracking branch 'origin/4.17'
add 4e2f461b315 Prometheus exporter enhancement (#4438)
add c83dee58517 server: fix exception in DeploymentPlanningManagerImplTest (#6799)
add 713a236843c UserData as first class resource (#6202)
add 93f09265c3a server: Don't allow service offering change if encryption value would change (#6776)
add 8785f781b69 Ignore calls to PowerFlex for host revocation when host is null (#6742)
add de8aae16198 [StepSecurity] ci: Harden GitHub Actions in merge-conflict-checker.yml (#6802)
add eb26ca1f95b server: Allow download of system vm templates (#6750)
add 6786c24138b kvm: fix backup volume snapshot fails on RBD storage (#6790)
add b8d834e7596 quota: Improves email configurations descriptions (#6806)
add ff961c95948 linstor: support QoS(IOPs) and small improvements (#6682)
add eff10bcd8d2 server: always use iops settings from new disk-offer (#6681)
add 0400765e1f3 packaging: rpm dependencies: which and file (#6638)
add 9a381db9566 Merge remote-tracking branch 'origin/4.17'
add 82d91d596bc api: Return object name in the listHypervisorCapabilities API (#6771)
add 0535d9b5e1a ui: Add message upon network offering creation to warn user of VR creation (#6684)
add 69e158d77d2 Refactor TestHttp.testHttpclient to avoid the Exception Suppression (#6733)
add f7b29856d17 Refactor SnapshotDataStoreDaoImpl (#6751)
add d6044fb5a63 Fix to make recovered volumes be accounted for by Usage (#6772)
add 8d276c02206 Improve description of `secstorage.encrypt.copy` (#6811)
add 5a54dc19b65 Rename validateUUID method to isUuid (#6793)
add 7936eb04e9b server: Fix delete parent snapshot (#6630)
add a7ba6a18e6e [Veeam] Improve remove backup process (#6580)
add 289a43f758f packaging: Uses rng-tools for entropy, not haveged for cloudstack-management (#6775)
add 2ca164ac96b Quota custom tariffs (#5909)
add ce84336ef63 Merge release branch 4.17 to main
add 17fe98432da Remove unnecessary escape method (#6692)
add 48ffa5dc0b9 Support multiple ceph monitors (#6792)
add 4a063637493 Ova download fix (#6758)
add c37709c44bc Removing extra details in error message (#6835)
add 13d22c2f542 Set network state to implemented when no services (#6838)
add 14937e1adbc Fixed NPE on volume creation from snapshot (#6839)
add adfaa730b14 Externalizes logrotate service frequency timer in VR (#6507)
add f580a8d7a23 Quota enable config to user/domain scope (#6690)
add 23033fbb748 Add live migration of system VMs (KVM) (#6491)
add d7dedfff1fa Changed userdata names on Add instance page (#6854)
add 0c93a85b3a3 add ip rule for VPC extra IPs (#6846)
add fa39e61a4cc Fix spelling (#6609)
add 1ee58ec3477 Introducing Hamcrest API to simplify assertion in ImplicitPlannerTest (#6676)
add 4c5a2ba3a6e Updated Hellenic (Greek) Translation Draft (for 4.18) (#6843)
add 5b09340420e Fix flaky tests in SMTPMailSenderTest.java and ReflectionToStringBuilderUtilsTest.java (#6875)
add 1843632c24d Fix memory stats for KVM (#6358)
add 982450ed81b Remove password change notice on SSH Key Pair reset (#6862)
add b8b66b7a3db Fix typos and improve javadocs on ByteScaleUtils (#6877)
add e65c22d8835 Fix spelling (#6860)
add 8e538028b23 Enable Flake8 rule W391 (#6606)
add 60420b0dd80 gha(python): fix `W391` blank line at end of file (#6897)
add c5e657ddd80 VOLUME.DETACH, created during VM removal has type VirtualMachine instead of Volume and has "Vm Id: XXX" in the description. (#199) (#6891)
add a880109d507 Update README.md
add 7aeb5b08104 Simplify Test Case ApplicationLoadBalancerTest.searchForNonExistingLoadBalancer (#6882)
add ea8fdc20cfb Bring in the JUnit Assume Feature to CABackgroundTaskTest (#6883)
add adec8110521 Fix time format (#6893)
add 94fd03df137 fix flaky tests (#6905)
add 4abb8b9ebf1 python command not working in ubuntu 20.04 for apidocs and marvin (#6889)
add 3d8ea4f3b3e Merge remote-tracking branch 'origin/4.17'
add a63b2aba7aa VM Autoscaling with virtual router (#6571)
add 7c61d8aeaff Set root volume as destroyed when destroying a VM (#6868)
add 684f3f4c497 Improvements and cleanup on the javadocs of QemuImg (#6917)
add 90413cb307a client: Improve cloudstack-setup-management message (#6822)
add 74623aa3d30 Merge remote-tracking branch 'apache/4.17'
add ffe2fa51d56 When VM is created and ROOT volume is created it should emit a VOLUME.CREATE event (#6939)
add 44e13900e66 schema: Add upgrade path from 4.17.2.0 same as 4.17.1.0 (#6965)
add ed1ac1c1610 schema: Fix migration path (#6927)
add 8aaa5edaa14 api: fixed flaky test (#6967)
add 19a4e9dd50e veeam: Fix escape powershell comand when listing Veeam repository names (#6943)
add 0b491427479 debian: add python3-setuptools to dependencies (#6930)
add 90203934ec1 server: Fix double ServiceOfferingDao (#6911)
add 66747d04c4b storpool: fix on remove the Iops limits (#6902)
add 1be7c2f3488 Merge remote-tracking branch 'origin/4.17'
add 01b79e797c2 Merge remote-tracking branch 'origin/4.17' into main
add 72b6ab9c512 Merge remote-tracking branch 'origin/4.17' into main
add f2e7d6b90ea Allow ssvm agent certs to contain host IP for NAT situations (#6864)
add 3106dba28c1 git-pr py3 compatible (#6961)
add def7ce655df Fix spelling (#6898)
add f7f03adddbf Merge remote-tracking branch 'origin/4.17' into main
add 8fd4ed88c27 delete configuration `task.cleanup.retry.interval` (#6910)
add fc5bd85ecbf Improves CPU usage info (#6784)
add 162af93e114 make api rate limit test more robust (#6984)
add 2ed7868f275 Inserts timer in check detach volume (#6508)
add 1af4f2c47a4 Rephrasing confusing messages (#6876)
add 239e9dd8613 Merge remote-tracking branch 'origin/4.17' into main
add 96aaeac2a00 Fixes script that perform change password on hosts (#6783)
add 43b4525f71e [VMware] Remove unnecessary logs on VM deployments (#6996)
add 41717b09777 allow a new upgrade version without DB changes to be inserted (#6858)
add 87b25b94f5e scripts: parametrize systemvm, router restart (#6574)
add 588287af17f test: use normal user for createing networks, vpcs (#6988)
add 95074f69ba2 README: that time of the year! :christmas_tree: (#6982)
add 9ccec161db5 Minor console access refactor and improvements (#6919)
add 6d74815798f Fixing grammar and spelling in en.json (#6884)
add 575fffc097e Allow root admin to deploy in VPCs in child domains (#6832)
add cc676cbc833 Metrics plugin: expose full domain path instead of name (#6959)
add 440d7805cbc Support for parameter `cidrlist` added to the UI (#6869)
add 889045fba5a new plugins: Add non-strict affinity groups (#6845)
add 34e4376c164 ui: fix persist networks config in deploy vm form (#6994)
add 512aa9cbc51 AutoScaling: update smoke test and consider db upgrade from a fork (#6977)
add 2dc9f1e32c1 .github: Migrate Travis to Github Actions and Simulator based CI (#6956)
add bf5cacb3bb2 gha(linters): enable 7 more Python `flake8` checks (#7005)
add cdaad257ea3 resolve sanity check last id file acces problems (#6825)
add d0902893b82 Fix spelling (#7002)
add 0fe2e6950e9 Improving code related to the Agent properties (#6348)
add 9f8533eaf02 Gives the possibility to redirect to external links when the property is defined (#6505)
add 91645349b06 Allow privateips on console proxy (#6808)
add fab4fc2a140 Merge remote-tracking branch 'origin/4.17'
add 4ade096aeb2 server: fix broken unit test in configurationManagerImplTest (#7018)
add d52e4d72b60 systemvmtemplate: update Debian ISO URL and checksum (#7013)
add f4e359dbb09 Merge remote-tracking branch 'origin/4.17'
add ca7e1ac1abb packaging: allow universal EL pkging to support EL8, EL9, Suse15 (#6844)
add ffccfc61729 Ensure Prometheus doesn't return values when the capacity_state is Disabled (#7007)
add dc40ea130fc UI: fix ui test errors (#7030)
add 9a18ea28dd2 .github: use ubuntu:22.04 for Sonar jacoco coverage checks
add 1c2728da918 Semicolons not required (#7035)
add 0bedb58fbe1 engine/orchestration: enable unit tests and fix errors (#7034)
add 97c7a0743cc README: Replace Travis badge with Github Actions
add 194b0b4610b Merge remote-tracking branch 'apache/4.17' into main
add 73a610da943 revert cleanup of test_acl_sharenetworks (#7033)
add 4133f0e9799 Update usage when scaling vms (#7011)
add a9b49f3ae90 Cleanup APIs getCommandName (#7022)
add af59e76df6c add index to speed up querying IPs in the network-tab (#7028)
add 4d76054377f Fix volume snapshot in VM with attached ISO (#7037)
add 3044d63a8be Configurable MTU for VR (#6426)
add 908981e8484 Allow download of System VM templates through the UI (#7039)
add 3ace9a514cd alter ordering of backup offerings (#7044)
add e952e032015 Merge release branch 4.17 to main
add d0b34b75765 test: fix NetworkOrchestrator unit test failure (#7049)
add 1380c604b1e server: add Host Control Plane State to uservm and systemvm response (#6946)
add 16ec8105e4a Merge release branch 4.17 to main
add c2b75f4c81c README: revert project logo and update README
add 20306d61292 Allow creating atmost 1 physical network with null tag (#6781)
add 6790371fe2d fix merge diff display (#7047)
add 2d1d2944e53 merge release branch 4.17 into main
add a3289f8ac0c Merge remote-tracking branch 'apache/4.17' into main
add 9009dd1db88 Emc networker b&r (#6550)
add cc527523fa7 Allow users to inform timezones on APIs that have the date parameter (#7032)
add 602f22a0d37 UI: fix cannot list lb rules if cidr_list is NULL (#7058)
add d2bb6a2510e UI: support serviceofferingid when create vpc offering (#7054)
add f3e05543ccc Merge release branch 4.17 to main
add 9cfebdf6e56 Allow domain admins to inform tags when creating offerings (#7052)
add b392084950d Enable live volume migration for StorPool and small fixes (#6661)
add df96af3de47 delete F5 and SRX plugins (#7023)
add a85973a0cab ssvm: synchorise when adding iptables and routing rules (#6942)
add 00426ede465 Add `pre-commit` workflow with 3 Git hooks (#6273)
add c2350f96755 update owasp dep checker for 'column width bug' (#7068)
add dc3be47710f Merge branch 'main' into 4.17
No new revisions were added by this update.
Summary of changes:
.github/boring-cyborg.yml | 4 +-
.github/linters/.flake8 | 14 +-
.github/workflows/build.yml | 66 +
.github/workflows/ci.yml | 280 +
.github/workflows/codecov.yml | 4 +
.github/workflows/coverage-check.yml | 94 -
.github/workflows/linter.yml | 44 +-
.github/workflows/main-coverage.yml | 63 -
.github/workflows/main-sonar-check.yml | 63 +
.github/workflows/merge-conflict-checker.yml | 9 +
.github/workflows/rat.yml | 47 +
.github/workflows/sonar-check.yml | 67 +
.github/workflows/ui.yml | 54 +
.pre-commit-config.yaml | 42 +
.travis.yml | 228 -
CHANGES.md | 10 +-
CONTRIBUTING.md | 2 +-
INSTALL.md | 2 +-
README.md | 50 +-
agent/conf/agent.properties | 497 +-
agent/pom.xml | 2 +-
agent/src/main/java/com/cloud/agent/Agent.java | 6 +-
.../src/main/java/com/cloud/agent/AgentShell.java | 136 +-
.../src/main/java/com/cloud/agent/IAgentShell.java | 1 -
.../cloud/agent/properties/AgentProperties.java | 725 ++-
.../properties/AgentPropertiesFileHandler.java | 40 +-
.../consoleproxy/ConsoleProxyResource.java | 24 +-
.../test/java/com/cloud/agent/AgentShellTest.java | 308 +
.../properties/AgentPropertiesFileHandlerTest.java | 52 +
.../agent/properties/AgentPropertiesTest.java | 43 +
api/pom.xml | 2 +-
api/src/main/java/com/cloud/agent/api/Answer.java | 2 +-
.../main/java/com/cloud/agent/api/to/DiskTO.java | 1 +
.../java/com/cloud/agent/api/to/IpAddressTO.java | 18 +-
.../com/cloud/agent/api/to/LoadBalancerTO.java | 123 +-
.../java/com/cloud/agent/api/to/NetworkTO.java | 10 +
.../main/java/com/cloud/agent/api/to/NicTO.java | 9 +
.../com/cloud/agent/api/to/StorageFilerTO.java | 2 +
.../cloud/configuration/ConfigurationService.java | 3 +
.../java/com/cloud/configuration/Resource.java | 5 +-
.../com/cloud/deploy/DataCenterDeployment.java | 38 +
.../main/java/com/cloud/deploy/DeploymentPlan.java | 19 +
api/src/main/java/com/cloud/event/EventTypes.java | 11 +
api/src/main/java/com/cloud/host/ControlState.java | 41 +
api/src/main/java/com/cloud/host/Host.java | 1 +
.../main/java/com/cloud/host/HostEnvironment.java | 1 -
.../java/com/cloud/hypervisor/HypervisorGuru.java | 4 +-
api/src/main/java/com/cloud/network/Network.java | 13 +
.../main/java/com/cloud/network/NetworkModel.java | 46 +-
.../java/com/cloud/network/NetworkProfile.java | 34 +
.../java/com/cloud/network/NetworkService.java | 16 +
api/src/main/java/com/cloud/network/Networks.java | 2 +-
.../com/cloud/network/as/AutoScaleCounter.java | 9 +-
.../java/com/cloud/network/as/AutoScalePolicy.java | 21 +-
.../com/cloud/network/as/AutoScaleService.java | 5 +-
.../com/cloud/network/as/AutoScaleVmGroup.java | 31 +-
.../com/cloud/network/as/AutoScaleVmProfile.java | 8 +-
.../main/java/com/cloud/network/as/Condition.java | 2 +-
.../main/java/com/cloud/network/as/Counter.java | 18 +-
.../com/cloud/network/lb/LoadBalancingRule.java | 10 +-
.../network/lb/LoadBalancingRulesService.java | 12 +-
.../network/router/VirtualRouterAutoScale.java | 132 +
.../java/com/cloud/network/rules/LoadBalancer.java | 2 +
api/src/main/java/com/cloud/network/vpc/Vpc.java | 14 +-
.../java/com/cloud/network/vpc/VpcService.java | 12 +-
.../main/java/com/cloud/offering/DiskOffering.java | 4 +
.../java/com/cloud/offering/NetworkOffering.java | 2 +
.../java/com/cloud/server/ManagementService.java | 31 +
.../main/java/com/cloud/server/ResourceTag.java | 1 +
.../java/com/cloud/storage/MigrationOptions.java | 9 +-
api/src/main/java/com/cloud/storage/Storage.java | 46 +-
api/src/main/java/com/cloud/storage/Volume.java | 8 +
.../java/com/cloud/storage/VolumeApiService.java | 10 +
.../com/cloud/template/TemplateApiService.java | 5 +
.../com/cloud/template/VirtualMachineTemplate.java | 6 +
.../java/com/cloud/user/ResourceLimitService.java | 17 +-
api/src/main/java/com/cloud/user/UserData.java | 32 +
api/src/main/java/com/cloud/uservm/UserVm.java | 8 +
api/src/main/java/com/cloud/vm/DiskProfile.java | 12 +-
api/src/main/java/com/cloud/vm/Nic.java | 2 +
api/src/main/java/com/cloud/vm/NicIpAlias.java | 2 +-
api/src/main/java/com/cloud/vm/NicProfile.java | 11 +
api/src/main/java/com/cloud/vm/UserVmService.java | 65 +-
.../java/com/cloud/vm/VirtualMachineProfile.java | 1 +
.../java/org/apache/cloudstack/acl/APIChecker.java | 15 +-
.../org/apache/cloudstack/acl/APILimitChecker.java | 30 -
.../org/apache/cloudstack/alert/AlertService.java | 2 +
.../cloudstack/annotation/AnnotationService.java | 5 +-
.../org/apache/cloudstack/api/ApiArgValidator.java | 2 +-
.../org/apache/cloudstack/api/ApiConstants.java | 28 +-
.../java/org/apache/cloudstack/api/BaseCmd.java | 42 +-
.../apache/cloudstack/api/ResponseGenerator.java | 8 +-
.../command/admin/account/CreateAccountCmd.java | 6 -
.../command/admin/account/DeleteAccountCmd.java | 10 -
.../command/admin/account/DisableAccountCmd.java | 6 -
.../command/admin/account/EnableAccountCmd.java | 6 -
.../api/command/admin/account/LockAccountCmd.java | 6 -
.../command/admin/account/UpdateAccountCmd.java | 6 -
.../api/command/admin/acl/CreateRoleCmd.java | 9 +-
.../command/admin/acl/CreateRolePermissionCmd.java | 9 +-
.../api/command/admin/acl/DeleteRoleCmd.java | 8 +-
.../command/admin/acl/DeleteRolePermissionCmd.java | 8 +-
.../api/command/admin/acl/ImportRoleCmd.java | 9 +-
.../command/admin/acl/ListRolePermissionsCmd.java | 8 +-
.../api/command/admin/acl/ListRolesCmd.java | 8 +-
.../api/command/admin/acl/UpdateRoleCmd.java | 8 +-
.../command/admin/acl/UpdateRolePermissionCmd.java | 10 +-
.../admin/acl/project/CreateProjectRoleCmd.java | 8 +-
.../project/CreateProjectRolePermissionCmd.java | 8 +-
.../admin/acl/project/DeleteProjectRoleCmd.java | 8 +-
.../project/DeleteProjectRolePermissionCmd.java | 8 +-
.../acl/project/ListProjectRolePermissionsCmd.java | 8 +-
.../admin/acl/project/ListProjectRolesCmd.java | 8 +-
.../admin/acl/project/UpdateProjectRoleCmd.java | 8 +-
.../project/UpdateProjectRolePermissionCmd.java | 8 +-
.../api/command/admin/alert/GenerateAlertCmd.java | 8 +-
.../command/admin/annotation/AddAnnotationCmd.java | 8 +-
.../admin/annotation/ListAnnotationsCmd.java | 13 +-
.../admin/annotation/RemoveAnnotationCmd.java | 8 +-
.../annotation/UpdateAnnotationVisibilityCmd.java | 8 +-
.../command/admin/autoscale/CreateCounterCmd.java | 9 +-
.../command/admin/autoscale/DeleteCounterCmd.java | 8 +-
.../admin/backup/DeleteBackupOfferingCmd.java | 8 +-
.../admin/backup/ImportBackupOfferingCmd.java | 8 +-
.../backup/ListBackupProviderOfferingsCmd.java | 7 +-
.../admin/backup/ListBackupProvidersCmd.java | 8 +-
.../admin/backup/UpdateBackupOfferingCmd.java | 8 +-
.../api/command/admin/ca/IssueCertificateCmd.java | 8 +-
.../api/command/admin/ca/ListCAProvidersCmd.java | 8 +-
.../api/command/admin/ca/ListCaCertificateCmd.java | 8 +-
.../command/admin/ca/ProvisionCertificateCmd.java | 9 +-
.../api/command/admin/ca/RevokeCertificateCmd.java | 8 +-
.../api/command/admin/cluster/AddClusterCmd.java | 6 -
.../command/admin/cluster/DeleteClusterCmd.java | 6 -
.../api/command/admin/cluster/ListClustersCmd.java | 6 -
.../command/admin/cluster/UpdateClusterCmd.java | 6 -
.../api/command/admin/config/ListCfgsByCmd.java | 6 -
.../admin/config/ListDeploymentPlannersCmd.java | 6 -
.../config/ListHypervisorCapabilitiesCmd.java | 6 -
.../api/command/admin/config/ResetCfgCmd.java | 6 -
.../api/command/admin/config/UpdateCfgCmd.java | 6 -
.../config/UpdateHypervisorCapabilitiesCmd.java | 6 -
.../admin/diagnostics/GetDiagnosticsDataCmd.java | 8 +-
.../admin/diagnostics/RunDiagnosticsCmd.java | 11 +-
.../ListTemplateDirectDownloadCertificatesCmd.java | 9 +-
...visionTemplateDirectDownloadCertificateCmd.java | 8 +-
...RevokeTemplateDirectDownloadCertificateCmd.java | 10 +-
...UploadTemplateDirectDownloadCertificateCmd.java | 240 +-
.../api/command/admin/domain/CreateDomainCmd.java | 8 +-
.../api/command/admin/domain/DeleteDomainCmd.java | 6 -
.../admin/domain/ListDomainChildrenCmd.java | 6 -
.../api/command/admin/domain/UpdateDomainCmd.java | 6 -
.../api/command/admin/guest/AddGuestOsCmd.java | 6 -
.../command/admin/guest/AddGuestOsMappingCmd.java | 6 -
.../command/admin/guest/ListGuestOsMappingCmd.java | 8 +-
.../api/command/admin/guest/RemoveGuestOsCmd.java | 6 -
.../admin/guest/RemoveGuestOsMappingCmd.java | 6 -
.../api/command/admin/guest/UpdateGuestOsCmd.java | 6 -
.../admin/guest/UpdateGuestOsMappingCmd.java | 6 -
.../command/admin/ha/ConfigureHAForHostCmd.java | 9 +-
.../command/admin/ha/DisableHAForClusterCmd.java | 8 +-
.../api/command/admin/ha/DisableHAForHostCmd.java | 9 +-
.../api/command/admin/ha/DisableHAForZoneCmd.java | 8 +-
.../command/admin/ha/EnableHAForClusterCmd.java | 8 +-
.../api/command/admin/ha/EnableHAForHostCmd.java | 9 +-
.../api/command/admin/ha/EnableHAForZoneCmd.java | 8 +-
.../command/admin/ha/ListHostHAProvidersCmd.java | 8 +-
.../command/admin/ha/ListHostHAResourcesCmd.java | 8 +-
.../api/command/admin/host/AddHostCmd.java | 6 -
.../command/admin/host/AddSecondaryStorageCmd.java | 6 -
.../admin/host/CancelHostAsDegradedCmd.java | 5 -
.../command/admin/host/CancelMaintenanceCmd.java | 6 -
.../admin/host/DeclareHostAsDegradedCmd.java | 5 -
.../api/command/admin/host/DeleteHostCmd.java | 6 -
.../admin/host/FindHostsForMigrationCmd.java | 6 -
.../api/command/admin/host/ListHostTagsCmd.java | 8 +-
.../api/command/admin/host/ListHostsCmd.java | 6 -
.../admin/host/PrepareForMaintenanceCmd.java | 6 -
.../api/command/admin/host/ReconnectHostCmd.java | 6 -
.../admin/host/ReleaseHostReservationCmd.java | 6 -
.../api/command/admin/host/UpdateHostCmd.java | 6 -
.../command/admin/host/UpdateHostPasswordCmd.java | 6 -
.../ConfigureInternalLoadBalancerElementCmd.java | 6 -
.../CreateInternalLoadBalancerElementCmd.java | 6 -
.../ListInternalLoadBalancerElementsCmd.java | 6 -
.../api/command/admin/management/ListMgmtsCmd.java | 9 +-
.../command/admin/network/AddNetworkDeviceCmd.java | 6 -
.../network/AddNetworkServiceProviderCmd.java | 6 -
.../network/CreateGuestNetworkIpv6PrefixCmd.java | 8 +-
.../network/CreateManagementNetworkIpRangeCmd.java | 10 +-
.../admin/network/CreateNetworkOfferingCmd.java | 10 -
.../admin/network/CreatePhysicalNetworkCmd.java | 6 -
.../network/CreateStorageNetworkIpRangeCmd.java | 8 +-
.../admin/network/DedicateGuestVlanRangeCmd.java | 6 -
.../network/DeleteGuestNetworkIpv6PrefixCmd.java | 8 +-
.../network/DeleteManagementNetworkIpRangeCmd.java | 10 +-
.../admin/network/DeleteNetworkDeviceCmd.java | 6 -
.../admin/network/DeleteNetworkOfferingCmd.java | 6 -
.../network/DeleteNetworkServiceProviderCmd.java | 6 -
.../admin/network/DeletePhysicalNetworkCmd.java | 6 -
.../network/DeleteStorageNetworkIpRangeCmd.java | 6 -
.../network/ListDedicatedGuestVlanRangesCmd.java | 6 -
.../network/ListGuestNetworkIpv6PrefixesCmd.java | 8 +-
.../command/admin/network/ListGuestVlansCmd.java | 8 +-
.../network/ListNetworkIsolationMethodsCmd.java | 6 -
.../network/ListNetworkServiceProvidersCmd.java | 6 -
.../admin/network/ListPhysicalNetworksCmd.java | 6 -
.../network/ListStorageNetworkIpRangeCmd.java | 5 -
.../network/ListSupportedNetworkServicesCmd.java | 6 -
.../command/admin/network/MigrateNetworkCmd.java | 9 +-
.../api/command/admin/network/MigrateVPCCmd.java | 9 +-
.../network/ReleaseDedicatedGuestVlanRangeCmd.java | 6 -
.../admin/network/UpdateNetworkOfferingCmd.java | 6 -
.../network/UpdateNetworkServiceProviderCmd.java | 6 -
.../admin/network/UpdatePhysicalNetworkCmd.java | 6 -
.../UpdatePodManagementNetworkIpRangeCmd.java | 8 +-
.../network/UpdateStorageNetworkIpRangeCmd.java | 6 -
.../admin/offering/CreateDiskOfferingCmd.java | 18 +-
.../admin/offering/CreateServiceOfferingCmd.java | 19 +-
.../admin/offering/DeleteDiskOfferingCmd.java | 6 -
.../admin/offering/DeleteServiceOfferingCmd.java | 6 -
...AccountAllowedToCreateOfferingsWithTagsCmd.java | 56 +
.../admin/offering/UpdateDiskOfferingCmd.java | 8 -
.../admin/offering/UpdateServiceOfferingCmd.java | 9 -
.../ChangeOutOfBandManagementPasswordCmd.java | 9 +-
.../ConfigureOutOfBandManagementCmd.java | 8 +-
.../DisableOutOfBandManagementForClusterCmd.java | 8 +-
.../DisableOutOfBandManagementForHostCmd.java | 8 +-
.../DisableOutOfBandManagementForZoneCmd.java | 8 +-
.../EnableOutOfBandManagementForClusterCmd.java | 8 +-
.../EnableOutOfBandManagementForHostCmd.java | 8 +-
.../EnableOutOfBandManagementForZoneCmd.java | 8 +-
.../IssueOutOfBandManagementPowerActionCmd.java | 9 +-
.../api/command/admin/pod/CreatePodCmd.java | 8 -
.../api/command/admin/pod/DeletePodCmd.java | 6 -
.../api/command/admin/pod/ListPodsByCmd.java | 6 -
.../api/command/admin/pod/UpdatePodCmd.java | 6 -
.../api/command/admin/region/AddRegionCmd.java | 6 -
.../admin/region/CreatePortableIpRangeCmd.java | 6 -
.../api/command/admin/region/RemoveRegionCmd.java | 6 -
.../api/command/admin/region/UpdateRegionCmd.java | 6 -
.../command/admin/resource/ArchiveAlertsCmd.java | 6 -
.../command/admin/resource/DeleteAlertsCmd.java | 6 -
.../api/command/admin/resource/ListAlertsCmd.java | 6 -
.../command/admin/resource/ListCapacityCmd.java | 6 -
.../admin/resource/StartRollingMaintenanceCmd.java | 11 +-
.../admin/resource/UploadCustomCertificateCmd.java | 6 -
.../admin/resource/icon/DeleteResourceIconCmd.java | 6 -
.../admin/resource/icon/ListResourceIconCmd.java | 6 -
.../admin/resource/icon/UploadResourceIconCmd.java | 6 -
.../admin/router/ConfigureOvsElementCmd.java | 6 -
.../router/ConfigureVirtualRouterElementCmd.java | 6 -
.../router/CreateVirtualRouterElementCmd.java | 6 -
.../api/command/admin/router/DestroyRouterCmd.java | 6 -
.../router/GetRouterHealthCheckResultsCmd.java | 8 +-
.../command/admin/router/ListOvsElementsCmd.java | 6 -
.../api/command/admin/router/ListRoutersCmd.java | 6 -
.../admin/router/ListVirtualRouterElementsCmd.java | 6 -
.../api/command/admin/router/RebootRouterCmd.java | 6 -
.../api/command/admin/router/StartRouterCmd.java | 6 -
.../api/command/admin/router/StopRouterCmd.java | 6 -
.../api/command/admin/router/UpgradeRouterCmd.java | 6 -
.../admin/router/UpgradeRouterTemplateCmd.java | 6 -
.../command/admin/storage/AddImageStoreCmd.java | 6 -
.../storage/CreateSecondaryStagingStoreCmd.java | 6 -
.../admin/storage/CreateStoragePoolCmd.java | 6 -
.../command/admin/storage/DeleteImageStoreCmd.java | 6 -
.../api/command/admin/storage/DeletePoolCmd.java | 6 -
.../storage/DeleteSecondaryStagingStoreCmd.java | 6 -
.../storage/FindStoragePoolsForMigrationCmd.java | 6 -
.../command/admin/storage/ListImageStoresCmd.java | 6 -
.../command/admin/storage/ListStoragePoolsCmd.java | 6 -
.../admin/storage/ListStorageProvidersCmd.java | 6 -
.../command/admin/storage/ListStorageTagsCmd.java | 6 -
.../storage/MigrateSecondaryStorageDataCmd.java | 10 +-
.../command/admin/storage/SyncStoragePoolCmd.java | 8 +-
.../storage/UpdateCloudToUseObjectStoreCmd.java | 6 -
.../storage/UpdateStorageCapabilitiesCmd.java | 9 +-
.../admin/storage/UpdateStoragePoolCmd.java | 6 -
.../api/command/admin/swift/AddSwiftCmd.java | 6 -
.../api/command/admin/swift/ListSwiftsCmd.java | 6 -
.../command/admin/systemvm/DestroySystemVmCmd.java | 8 +-
.../command/admin/systemvm/ListSystemVMsCmd.java | 6 -
.../command/admin/systemvm/MigrateSystemVMCmd.java | 6 -
.../command/admin/systemvm/PatchSystemVMCmd.java | 9 +-
.../command/admin/systemvm/RebootSystemVmCmd.java | 6 -
.../command/admin/systemvm/ScaleSystemVMCmd.java | 2 +-
.../command/admin/systemvm/StartSystemVMCmd.java | 6 -
.../command/admin/systemvm/StopSystemVmCmd.java | 6 -
.../command/admin/systemvm/UpgradeSystemVMCmd.java | 8 +-
.../command/admin/template/PrepareTemplateCmd.java | 6 -
.../command/admin/usage/AddTrafficMonitorCmd.java | 6 -
.../api/command/admin/usage/AddTrafficTypeCmd.java | 6 -
.../admin/usage/DeleteTrafficMonitorCmd.java | 6 -
.../command/admin/usage/DeleteTrafficTypeCmd.java | 6 -
.../admin/usage/GenerateUsageRecordsCmd.java | 6 -
.../admin/usage/ListTrafficMonitorsCmd.java | 6 -
.../usage/ListTrafficTypeImplementorsCmd.java | 5 -
.../command/admin/usage/ListTrafficTypesCmd.java | 6 -
.../command/admin/usage/ListUsageRecordsCmd.java | 9 +-
.../api/command/admin/usage/ListUsageTypesCmd.java | 6 -
.../admin/usage/RemoveRawUsageRecordsCmd.java | 6 -
.../command/admin/usage/UpdateTrafficTypeCmd.java | 6 -
.../api/command/admin/user/CreateUserCmd.java | 6 -
.../api/command/admin/user/DeleteUserCmd.java | 6 -
.../api/command/admin/user/DisableUserCmd.java | 6 -
.../api/command/admin/user/EnableUserCmd.java | 6 -
.../api/command/admin/user/GetUserCmd.java | 6 -
.../api/command/admin/user/GetUserKeysCmd.java | 11 +-
.../api/command/admin/user/ListUsersCmd.java | 6 -
.../api/command/admin/user/LockUserCmd.java | 6 -
.../api/command/admin/user/MoveUserCmd.java | 6 -
.../api/command/admin/user/RegisterCmd.java | 6 -
.../api/command/admin/user/UpdateUserCmd.java | 6 -
.../command/admin/vlan/CreateVlanIpRangeCmd.java | 10 +-
.../admin/vlan/DedicatePublicIpRangeCmd.java | 6 -
.../command/admin/vlan/DeleteVlanIpRangeCmd.java | 6 -
.../command/admin/vlan/ListVlanIpRangesCmd.java | 6 -
.../admin/vlan/ReleasePublicIpRangeCmd.java | 6 -
.../command/admin/vlan/UpdateVlanIpRangeCmd.java | 10 +-
.../api/command/admin/vm/AssignVMCmd.java | 6 -
.../api/command/admin/vm/ExpungeVMCmd.java | 6 -
.../api/command/admin/vm/GetVMUserDataCmd.java | 5 -
.../admin/vm/ImportUnmanagedInstanceCmd.java | 8 +-
.../admin/vm/ListUnmanagedInstancesCmd.java | 9 +-
.../api/command/admin/vm/MigrateVMCmd.java | 6 -
.../vm/MigrateVirtualMachineWithVolumeCmd.java | 43 +-
.../api/command/admin/vm/RecoverVMCmd.java | 6 -
.../command/admin/vm/ResetVMUserDataCmdAdmin.java | 31 +
.../api/command/admin/vm/ScaleVMCmdByAdmin.java | 2 +-
.../command/admin/vm/UnmanageVMInstanceCmd.java | 10 +-
.../api/command/admin/vm/UpgradeVMCmdByAdmin.java | 9 +-
.../admin/vpc/CreatePrivateGatewayByAdminCmd.java | 2 +-
.../command/admin/vpc/CreateVPCOfferingCmd.java | 6 -
.../command/admin/vpc/DeletePrivateGatewayCmd.java | 6 -
.../command/admin/vpc/DeleteVPCOfferingCmd.java | 6 -
.../command/admin/vpc/UpdateVPCOfferingCmd.java | 6 -
.../api/command/admin/zone/CreateZoneCmd.java | 6 -
.../api/command/admin/zone/DeleteZoneCmd.java | 6 -
.../admin/zone/MarkDefaultZoneForAccountCmd.java | 6 -
.../api/command/admin/zone/UpdateZoneCmd.java | 6 -
.../user/account/AddAccountToProjectCmd.java | 6 -
.../command/user/account/AddUserToProjectCmd.java | 8 +-
.../user/account/DeleteAccountFromProjectCmd.java | 6 -
.../user/account/DeleteUserFromProjectCmd.java | 8 +-
.../user/account/ListProjectAccountsCmd.java | 6 -
.../user/address/DisassociateIPAddrCmd.java | 6 -
.../api/command/user/address/ReleaseIPAddrCmd.java | 6 -
.../api/command/user/address/ReserveIPAddrCmd.java | 6 -
.../api/command/user/address/UpdateIPAddrCmd.java | 8 +-
.../user/affinitygroup/CreateAffinityGroupCmd.java | 6 -
.../user/affinitygroup/DeleteAffinityGroupCmd.java | 6 -
.../affinitygroup/ListAffinityGroupTypesCmd.java | 6 -
.../user/affinitygroup/ListAffinityGroupsCmd.java | 6 -
.../user/autoscale/CreateAutoScalePolicyCmd.java | 14 +-
.../user/autoscale/CreateAutoScaleVmGroupCmd.java | 15 +-
.../autoscale/CreateAutoScaleVmProfileCmd.java | 139 +-
.../command/user/autoscale/CreateConditionCmd.java | 23 +-
.../user/autoscale/DeleteAutoScalePolicyCmd.java | 6 -
.../user/autoscale/DeleteAutoScaleVmGroupCmd.java | 18 +-
.../autoscale/DeleteAutoScaleVmProfileCmd.java | 6 -
.../command/user/autoscale/DeleteConditionCmd.java | 8 +-
.../user/autoscale/ListAutoScalePoliciesCmd.java | 17 +-
.../user/autoscale/ListAutoScaleVmGroupsCmd.java | 13 +-
.../user/autoscale/ListAutoScaleVmProfilesCmd.java | 6 -
.../command/user/autoscale/ListConditionsCmd.java | 12 +-
.../command/user/autoscale/ListCountersCmd.java | 9 +-
.../user/autoscale/UpdateAutoScalePolicyCmd.java | 20 +-
.../user/autoscale/UpdateAutoScaleVmGroupCmd.java | 18 +-
.../autoscale/UpdateAutoScaleVmProfileCmd.java | 54 +-
.../command/user/autoscale/UpdateConditionCmd.java | 117 +
.../AssignVirtualMachineToBackupOfferingCmd.java | 11 +-
.../api/command/user/backup/CreateBackupCmd.java | 9 +-
.../user/backup/CreateBackupScheduleCmd.java | 8 +-
.../api/command/user/backup/DeleteBackupCmd.java | 23 +-
.../user/backup/DeleteBackupScheduleCmd.java | 8 +-
.../user/backup/ListBackupOfferingsCmd.java | 7 +-
.../command/user/backup/ListBackupScheduleCmd.java | 10 +-
.../api/command/user/backup/ListBackupsCmd.java | 9 +-
.../RemoveVirtualMachineFromBackupOfferingCmd.java | 11 +-
.../api/command/user/backup/RestoreBackupCmd.java | 9 +-
.../RestoreVolumeFromBackupAndAttachToVMCmd.java | 9 +-
.../user/backup/UpdateBackupScheduleCmd.java | 3 +-
.../command/user/config/ListCapabilitiesCmd.java | 6 -
.../command/user/consoleproxy/ConsoleEndpoint.java | 103 +
.../consoleproxy/CreateConsoleEndpointCmd.java | 114 +
.../api/command/user/event/ArchiveEventsCmd.java | 6 -
.../api/command/user/event/DeleteEventsCmd.java | 6 -
.../api/command/user/event/ListEventTypesCmd.java | 6 -
.../api/command/user/event/ListEventsCmd.java | 6 -
.../user/firewall/CreateEgressFirewallRuleCmd.java | 6 -
.../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/firewall/ListEgressFirewallRulesCmd.java | 6 -
.../user/firewall/ListFirewallRulesCmd.java | 6 -
.../user/firewall/ListPortForwardingRulesCmd.java | 6 -
.../user/firewall/UpdateEgressFirewallRuleCmd.java | 6 -
.../user/firewall/UpdateFirewallRuleCmd.java | 8 +-
.../user/firewall/UpdatePortForwardingRuleCmd.java | 6 -
.../user/guest/ListGuestOsCategoriesCmd.java | 6 -
.../api/command/user/guest/ListGuestOsCmd.java | 6 -
.../user/ipv6/CreateIpv6FirewallRuleCmd.java | 8 +-
.../user/ipv6/DeleteIpv6FirewallRuleCmd.java | 8 +-
.../user/ipv6/ListIpv6FirewallRulesCmd.java | 8 +-
.../user/ipv6/UpdateIpv6FirewallRuleCmd.java | 8 +-
.../api/command/user/iso/DeleteIsoCmd.java | 10 -
.../api/command/user/iso/ExtractIsoCmd.java | 10 -
.../api/command/user/job/ListAsyncJobsCmd.java | 8 +-
.../command/user/job/QueryAsyncJobResultCmd.java | 6 -
.../loadbalancer/AssignCertToLoadBalancerCmd.java | 6 -
.../loadbalancer/AssignToLoadBalancerRuleCmd.java | 8 +-
.../CreateApplicationLoadBalancerCmd.java | 6 -
.../loadbalancer/CreateLBHealthCheckPolicyCmd.java | 6 -
.../loadbalancer/CreateLoadBalancerRuleCmd.java | 24 +-
.../DeleteApplicationLoadBalancerCmd.java | 6 -
.../loadbalancer/DeleteLBHealthCheckPolicyCmd.java | 6 -
.../loadbalancer/DeleteLoadBalancerRuleCmd.java | 6 -
.../user/loadbalancer/DeleteSslCertCmd.java | 8 +-
.../ListApplicationLoadBalancersCmd.java | 6 -
.../loadbalancer/ListLBHealthCheckPoliciesCmd.java | 6 -
.../loadbalancer/ListLBStickinessPoliciesCmd.java | 6 -
.../loadbalancer/ListLoadBalancerRulesCmd.java | 6 -
.../command/user/loadbalancer/ListSslCertsCmd.java | 6 -
.../RemoveCertFromLoadBalancerCmd.java | 6 -
.../RemoveFromLoadBalancerRuleCmd.java | 8 +-
.../UpdateApplicationLoadBalancerCmd.java | 6 -
.../loadbalancer/UpdateLBHealthCheckPolicyCmd.java | 6 -
.../loadbalancer/UpdateLBStickinessPolicyCmd.java | 6 -
.../loadbalancer/UpdateLoadBalancerRuleCmd.java | 6 -
.../user/loadbalancer/UploadSslCertCmd.java | 6 -
.../user/nat/CreateIpForwardingRuleCmd.java | 6 -
.../user/nat/DeleteIpForwardingRuleCmd.java | 6 -
.../api/command/user/nat/DisableStaticNatCmd.java | 6 -
.../api/command/user/nat/EnableStaticNatCmd.java | 6 -
.../command/user/nat/ListIpForwardingRulesCmd.java | 6 -
.../command/user/network/CreateNetworkACLCmd.java | 6 -
.../user/network/CreateNetworkACLListCmd.java | 6 -
.../api/command/user/network/CreateNetworkCmd.java | 44 +
.../user/network/CreateNetworkPermissionsCmd.java | 8 +-
.../command/user/network/DeleteNetworkACLCmd.java | 6 -
.../user/network/DeleteNetworkACLListCmd.java | 6 -
.../api/command/user/network/DeleteNetworkCmd.java | 6 -
.../user/network/ListNetworkACLListsCmd.java | 6 -
.../command/user/network/ListNetworkACLsCmd.java | 6 -
.../user/network/ListNetworkOfferingsCmd.java | 6 -
.../user/network/ListNetworkPermissionsCmd.java | 8 +-
.../user/network/RemoveNetworkPermissionsCmd.java | 8 +-
.../user/network/ReplaceNetworkACLListCmd.java | 6 -
.../user/network/ResetNetworkPermissionsCmd.java | 8 +-
.../command/user/network/RestartNetworkCmd.java | 6 -
.../user/network/UpdateNetworkACLListCmd.java | 6 -
.../api/command/user/network/UpdateNetworkCmd.java | 47 +-
.../user/offering/ListDiskOfferingsCmd.java | 15 +-
.../user/offering/ListServiceOfferingsCmd.java | 14 +-
.../api/command/user/project/CreateProjectCmd.java | 6 -
.../api/command/user/project/DeleteProjectCmd.java | 6 -
.../user/project/DeleteProjectInvitationCmd.java | 6 -
.../user/project/ListProjectInvitationsCmd.java | 6 -
.../api/command/user/project/ListProjectsCmd.java | 6 -
.../command/user/project/SuspendProjectCmd.java | 6 -
.../api/command/user/project/UpdateProjectCmd.java | 6 -
.../user/project/UpdateProjectInvitationCmd.java | 6 -
.../api/command/user/region/ListRegionsCmd.java | 6 -
.../ha/gslb/AssignToGlobalLoadBalancerRuleCmd.java | 6 -
.../ha/gslb/CreateGlobalLoadBalancerRuleCmd.java | 6 -
.../ha/gslb/DeleteGlobalLoadBalancerRuleCmd.java | 6 -
.../ha/gslb/ListGlobalLoadBalancerRuleCmd.java | 6 -
.../ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java | 6 -
.../user/resource/GetCloudIdentifierCmd.java | 6 -
.../user/resource/ListDetailOptionsCmd.java | 8 +-
.../command/user/resource/ListHypervisorsCmd.java | 6 -
.../user/resource/ListResourceLimitsCmd.java | 6 -
.../user/resource/UpdateResourceCountCmd.java | 6 -
.../user/resource/UpdateResourceLimitCmd.java | 6 -
.../AuthorizeSecurityGroupEgressCmd.java | 6 -
.../AuthorizeSecurityGroupIngressCmd.java | 6 -
.../user/securitygroup/CreateSecurityGroupCmd.java | 6 -
.../user/securitygroup/DeleteSecurityGroupCmd.java | 6 -
.../user/securitygroup/ListSecurityGroupsCmd.java | 6 -
.../RevokeSecurityGroupEgressCmd.java | 6 -
.../RevokeSecurityGroupIngressCmd.java | 6 -
.../user/securitygroup/UpdateSecurityGroupCmd.java | 9 +-
.../command/user/snapshot/CreateSnapshotCmd.java | 10 +-
.../snapshot/CreateSnapshotFromVMSnapshotCmd.java | 6 -
.../user/snapshot/CreateSnapshotPolicyCmd.java | 6 -
.../command/user/snapshot/DeleteSnapshotCmd.java | 6 -
.../user/snapshot/DeleteSnapshotPoliciesCmd.java | 6 -
.../user/snapshot/ListSnapshotPoliciesCmd.java | 6 -
.../command/user/snapshot/ListSnapshotsCmd.java | 6 -
.../command/user/snapshot/RevertSnapshotCmd.java | 6 -
.../user/snapshot/UpdateSnapshotPolicyCmd.java | 10 +-
.../api/command/user/ssh/CreateSSHKeyPairCmd.java | 5 -
.../api/command/user/ssh/DeleteSSHKeyPairCmd.java | 6 -
.../api/command/user/ssh/ListSSHKeyPairsCmd.java | 6 -
.../command/user/ssh/RegisterSSHKeyPairCmd.java | 6 -
.../api/command/user/tag/CreateTagsCmd.java | 6 -
.../api/command/user/tag/DeleteTagsCmd.java | 6 -
.../api/command/user/tag/ListTagsCmd.java | 6 -
.../command/user/template/DeleteTemplateCmd.java | 10 -
.../command/user/template/ExtractTemplateCmd.java | 10 -
.../template/UpdateTemplatePermissionsCmd.java | 2 +-
.../command/user/userdata/DeleteUserDataCmd.java | 114 +
.../user/userdata/LinkUserDataToTemplateCmd.java | 124 +
.../api/command/user/userdata/ListUserDataCmd.java | 79 +
.../command/user/userdata/RegisterUserDataCmd.java | 143 +
.../api/command/user/vm/DeployVMCmd.java | 26 +
.../api/command/user/vm/GetVMPasswordCmd.java | 5 -
.../api/command/user/vm/ListNicsCmd.java | 6 -
.../cloudstack/api/command/user/vm/ListVMsCmd.java | 16 +
.../api/command/user/vm/RemoveIpFromVmNicCmd.java | 6 -
.../api/command/user/vm/ResetVMUserDataCmd.java | 173 +
.../api/command/user/vm/RestoreVMCmd.java | 2 +-
.../cloudstack/api/command/user/vm/ScaleVMCmd.java | 4 +-
.../cloudstack/api/command/user/vm/StartVMCmd.java | 11 +
.../api/command/user/vm/UpdateVMCmd.java | 32 +-
.../api/command/user/vm/UpdateVmNicIpCmd.java | 6 -
.../api/command/user/vm/UpgradeVMCmd.java | 7 +-
.../api/command/user/vmgroup/CreateVMGroupCmd.java | 6 -
.../api/command/user/vmgroup/DeleteVMGroupCmd.java | 6 -
.../api/command/user/vmgroup/ListVMGroupsCmd.java | 6 -
.../api/command/user/vmgroup/UpdateVMGroupCmd.java | 6 -
.../user/vmsnapshot/CreateVMSnapshotCmd.java | 6 -
.../user/vmsnapshot/DeleteVMSnapshotCmd.java | 6 -
.../command/user/vmsnapshot/ListVMSnapshotCmd.java | 6 -
.../command/user/volume/AddResourceDetailCmd.java | 6 -
.../user/volume/ChangeOfferingForVolumeCmd.java | 8 +-
.../api/command/user/volume/DeleteVolumeCmd.java | 6 -
.../api/command/user/volume/ExtractVolumeCmd.java | 10 -
.../user/volume/ListResourceDetailsCmd.java | 6 -
.../api/command/user/volume/ListVolumesCmd.java | 8 +
.../user/volume/RemoveResourceDetailCmd.java | 6 -
.../api/command/user/vpc/CreateStaticRouteCmd.java | 6 -
.../api/command/user/vpc/CreateVPCCmd.java | 39 +-
.../api/command/user/vpc/DeleteStaticRouteCmd.java | 6 -
.../api/command/user/vpc/DeleteVPCCmd.java | 6 -
.../command/user/vpc/ListPrivateGatewaysCmd.java | 6 -
.../api/command/user/vpc/ListStaticRoutesCmd.java | 6 -
.../api/command/user/vpc/ListVPCOfferingsCmd.java | 6 -
.../api/command/user/vpc/RestartVPCCmd.java | 6 -
.../api/command/user/vpc/UpdateVPCCmd.java | 10 +-
.../api/command/user/vpn/AddVpnUserCmd.java | 6 -
.../command/user/vpn/CreateRemoteAccessVpnCmd.java | 8 +-
.../command/user/vpn/CreateVpnConnectionCmd.java | 6 -
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 6 -
.../api/command/user/vpn/CreateVpnGatewayCmd.java | 6 -
.../command/user/vpn/DeleteRemoteAccessVpnCmd.java | 6 -
.../command/user/vpn/DeleteVpnConnectionCmd.java | 6 -
.../user/vpn/DeleteVpnCustomerGatewayCmd.java | 6 -
.../api/command/user/vpn/DeleteVpnGatewayCmd.java | 6 -
.../command/user/vpn/ListRemoteAccessVpnsCmd.java | 8 +-
.../command/user/vpn/ListVpnConnectionsCmd.java | 6 -
.../user/vpn/ListVpnCustomerGatewaysCmd.java | 6 -
.../api/command/user/vpn/ListVpnGatewaysCmd.java | 6 -
.../api/command/user/vpn/ListVpnUsersCmd.java | 6 -
.../api/command/user/vpn/RemoveVpnUserCmd.java | 6 -
.../command/user/vpn/ResetVpnConnectionCmd.java | 6 -
.../command/user/vpn/UpdateRemoteAccessVpnCmd.java | 8 +-
.../command/user/vpn/UpdateVpnConnectionCmd.java | 6 -
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 6 -
.../api/command/user/vpn/UpdateVpnGatewayCmd.java | 6 -
.../api/response/AnnotationResponse.java | 4 +-
.../api/response/AutoScalePolicyResponse.java | 8 +
.../api/response/AutoScaleVmGroupResponse.java | 141 +-
.../api/response/AutoScaleVmProfileResponse.java | 30 +-
.../cloudstack/api/response/ConditionResponse.java | 22 +-
.../response/ConsoleEndpointWebsocketResponse.java | 88 +
.../cloudstack/api/response/CounterResponse.java | 8 +
.../response/CreateConsoleEndpointResponse.java | 76 +
.../api/response/DiskOfferingResponse.java | 16 +
.../api/response/DomainRouterResponse.java | 8 +
.../cloudstack/api/response/HostResponse.java | 15 +
.../response/HypervisorCapabilitiesResponse.java | 4 +
...ntAllowedToCreateOfferingsWithTagsResponse.java | 34 +
.../api/response/LBStickinessPolicyResponse.java | 4 +-
.../api/response/LoadBalancerResponse.java | 2 +-
.../cloudstack/api/response/NetworkResponse.java | 56 +-
.../cloudstack/api/response/NicResponse.java | 16 +-
.../api/response/PrivateGatewayResponse.java | 2 +-
.../api/response/ServiceOfferingResponse.java | 7 +
.../cloudstack/api/response/SystemVmResponse.java | 12 +
.../cloudstack/api/response/TemplateResponse.java | 44 +
.../cloudstack/api/response/UserDataResponse.java | 128 +
.../cloudstack/api/response/UserVmResponse.java | 103 +-
.../api/response/VMSnapshotResponse.java | 2 +-
.../cloudstack/api/response/VolumeResponse.java | 12 +
.../cloudstack/api/response/VpcResponse.java | 40 +
.../cloudstack/api/response/ZoneResponse.java | 24 +
.../apache/cloudstack/backup/BackupManager.java | 4 +-
.../apache/cloudstack/backup/BackupProvider.java | 5 +-
.../java/org/apache/cloudstack/ca/CAManager.java | 5 +
.../consoleproxy/ConsoleAccessManager.java | 29 +
.../org/apache/cloudstack/context/CallContext.java | 14 +
.../apache/cloudstack/region/RegionService.java | 2 +-
.../apache/cloudstack/usage/UsageUnitTypes.java | 52 +
.../cloudstack/user/ResourceReservation.java | 37 +
.../com/cloud/agent/api/storage/OVFHelperTest.java | 2 +-
.../com/cloud/agent/api/to/LoadBalancerTOTest.java | 176 +
.../com/cloud/deploy/DataCenterDeploymentTest.java | 57 +
.../test/java/com/cloud/host/ControlStateTest.java | 109 +
.../com/cloud/network/as/AutoScalePolicyTest.java | 55 +
.../com/cloud/network/as/AutoScaleVmGroupTest.java | 51 +
.../network/router/VirtualRouterAutoScaleTest.java | 68 +
.../vm/MigrateVirtualMachineWithVolumeCmdTest.java | 226 +
.../api/command/test/AddHostCmdTest.java | 3 +-
.../command/test/AddSecondaryStorageCmdTest.java | 3 +-
.../test/CreateAutoScaleVmProfileCmdTest.java | 176 +
.../api/command/test/ResetVMUserDataCmdTest.java | 138 +
.../test/UpdateAutoScaleVmProfileCmdTest.java | 129 +
.../api/command/test/UpdateConditionCmdTest.java | 132 +
.../command/user/network/CreateNetworkCmdTest.java | 298 +
.../command/user/network/UpdateNetworkCmdTest.java | 176 +
.../user/userdata/DeleteUserDataCmdTest.java | 98 +
.../userdata/LinkUserDataToTemplateCmdTest.java | 109 +
.../command/user/userdata/ListUserDataCmdTest.java | 89 +
.../user/userdata/RegisterUserDataCmdTest.java | 113 +
.../api/command/user/vpc/CreateVPCCmdTest.java | 165 +
.../api/command/user/vpc/UpdateVPCCmdTest.java | 94 +
.../cloudstack/usage/UsageUnitTypesTest.java | 53 +
api/test/integration/api/__init__.py | 2 +-
api/test/integration/api/test/__init__.py | 2 +-
api/test/integration/api/test/account/__init__.py | 2 +-
client/bindir/cloud-setup-management.in | 2 +-
client/pom.xml | 39 +-
cloud-cli/cloudapis/__init__.py | 1 -
cloud-cli/cloudapis/cloud.py | 2 -
core/pom.xml | 2 +-
.../api/ConsoleAccessAuthenticationCommand.java | 13 +-
.../com/cloud/agent/api/NetworkUsageCommand.java | 2 +-
.../agent/api/proxy/AllowConsoleAccessCommand.java | 44 +
.../api/routing/GetAutoScaleMetricsAnswer.java | 51 +
.../api/routing/GetAutoScaleMetricsCommand.java | 65 +
.../agent/api/routing/NetworkElementCommand.java | 1 +
.../agent/api/routing/UpdateNetworkCommand.java | 59 +
.../api/storage/CreateDatadiskTemplateCommand.java | 6 +
.../agent/api/storage/ResizeVolumeCommand.java | 24 +
.../agent/resource/virtualnetwork/VRScripts.java | 2 +
.../virtualnetwork/VirtualRoutingResource.java | 54 +
.../facade/IpAssociationConfigItem.java | 1 +
.../facade/SetGuestNetworkConfigItem.java | 4 +-
.../virtualnetwork/model/GuestNetwork.java | 10 +
.../resource/virtualnetwork/model/IpAddress.java | 9 +-
.../com/cloud/info/ConsoleProxyConnectionInfo.java | 9 +
.../main/java/com/cloud/info/ConsoleProxyInfo.java | 9 +
.../java/com/cloud/info/ConsoleProxyStatus.java | 5 +
.../com/cloud/network/HAProxyConfigurator.java | 13 +-
.../com/cloud/resource/ServerResourceBase.java | 131 +-
.../StorageSubsystemCommandHandlerBase.java | 4 +-
.../cloudstack/storage/command/DettachCommand.java | 9 +
.../cloudstack/storage/to/VolumeObjectTO.java | 27 +
.../core/spring-core-registry-core-context.xml | 2 +-
.../virtualnetwork/VirtualRoutingResourceTest.java | 2 +-
.../com/cloud/network/HAProxyConfiguratorTest.java | 13 +
.../com/cloud/resource/ServerResourceBaseTest.java | 241 +
.../template/LocalTemplateDownloaderTest.java | 6 +-
.../cloudstack/api/agent/test/AnswerTest.java | 2 +-
.../agent/test/GetAutoScaleMetricsAnswerTest.java | 93 +
.../agent/test/GetAutoScaleMetricsCommandTest.java | 77 +
debian/changelog | 18 +-
debian/cloudstack-usage.postinst | 7 +
debian/control | 6 +-
debian/rules | 1 +
developer/pom.xml | 2 +-
engine/api/pom.xml | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 5 +-
.../cloud/entity/api/VirtualMachineEntity.java | 2 +-
.../service/NetworkOrchestrationService.java | 3 +-
.../subsystem/api/storage/DataMotionStrategy.java | 2 +-
.../subsystem/api/storage/EndPointSelector.java | 8 +
.../engine/subsystem/api/storage/SnapshotInfo.java | 8 +
.../engine/subsystem/api/storage/TemplateInfo.java | 5 +
.../engine/subsystem/api/storage/VolumeInfo.java | 4 +
engine/components-api/pom.xml | 2 +-
.../main/java/com/cloud/alert/AlertManager.java | 2 +-
.../java/com/cloud/capacity/CapacityManager.java | 92 +-
.../cloud/deploy/DeploymentPlanningManager.java | 6 +
.../network/lb/LoadBalancingRulesManager.java | 15 +-
.../java/com/cloud/network/vpc/VpcManager.java | 4 +-
.../java/com/cloud/storage/StorageManager.java | 40 +-
.../com/cloud/vm/VirtualMachineProfileImpl.java | 5 +-
engine/network/pom.xml | 2 +-
engine/orchestration/pom.xml | 5 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 2 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 59 +-
.../engine/cloud/entity/api/VMEntityManager.java | 2 +-
.../cloud/entity/api/VMEntityManagerImpl.java | 5 +-
.../cloud/entity/api/VirtualMachineEntityImpl.java | 4 +-
.../engine/orchestration/NetworkOrchestrator.java | 173 +-
.../engine/orchestration/VolumeOrchestrator.java | 561 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 157 +-
.../orchestration/NetworkOrchestratorTest.java | 158 +-
.../engine/provisioning/test/ProvisioningTest.java | 63 +-
.../src/test/resources/provisioningContext.xml | 47 -
engine/pom.xml | 2 +-
engine/schema/pom.xml | 8 +-
.../java/com/cloud/capacity/dao/CapacityDao.java | 3 +
.../com/cloud/capacity/dao/CapacityDaoImpl.java | 52 +-
.../src/main/java/com/cloud/dc/DataCenterVO.java | 10 +-
.../src/main/java/com/cloud/host/HostVO.java | 3 +-
.../com/cloud/network/as/AutoScalePolicyVO.java | 29 +-
.../network/as/AutoScaleVmGroupStatisticsVO.java | 168 +
.../com/cloud/network/as/AutoScaleVmGroupVO.java | 54 +-
.../com/cloud/network/as/AutoScaleVmProfileVO.java | 85 +-
.../java/com/cloud/network/as/ConditionVO.java | 17 +-
.../main/java/com/cloud/network/as/CounterVO.java | 12 +-
.../cloud/network/as/dao/AutoScaleVmGroupDao.java | 9 +
.../network/as/dao/AutoScaleVmGroupDaoImpl.java | 70 +-
.../as/dao/AutoScaleVmGroupStatisticsDao.java | 41 +
.../as/dao/AutoScaleVmGroupStatisticsDaoImpl.java | 138 +
.../network/as/dao/AutoScaleVmGroupVmMapDao.java | 7 +
.../as/dao/AutoScaleVmGroupVmMapDaoImpl.java | 78 +-
.../com/cloud/network/as/dao/ConditionDaoImpl.java | 2 +-
.../java/com/cloud/network/as/dao/CounterDao.java | 2 +-
.../com/cloud/network/as/dao/CounterDaoImpl.java | 12 +-
.../java/com/cloud/network/dao/IPAddressDao.java | 2 +
.../com/cloud/network/dao/IPAddressDaoImpl.java | 8 +
.../java/com/cloud/network/dao/LoadBalancerVO.java | 13 +-
.../java/com/cloud/network/dao/NetworkDao.java | 4 -
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 4 +-
.../main/java/com/cloud/network/dao/NetworkVO.java | 71 +-
.../src/main/java/com/cloud/network/vpc/VpcVO.java | 52 +-
.../network/vpc/dao/VpcOfferingServiceMapDao.java | 2 +-
.../vpc/dao/VpcOfferingServiceMapDaoImpl.java | 4 +-
.../com/cloud/offerings/NetworkOfferingVO.java | 12 +
.../main/java/com/cloud/projects/ProjectVO.java | 5 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 3 +-
.../service/dao/ServiceOfferingDetailsDaoImpl.java | 2 +-
.../java/com/cloud/storage/DiskOfferingVO.java | 9 +
.../main/java/com/cloud/storage/VMTemplateVO.java | 27 +
.../src/main/java/com/cloud/storage/VolumeVO.java | 18 +-
.../storage/dao/GuestOSHypervisorDaoImpl.java | 5 +-
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 17 +-
.../main/java/com/cloud/storage/dao/VolumeDao.java | 16 +
.../java/com/cloud/storage/dao/VolumeDaoImpl.java | 30 +
.../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 +
.../cloud/upgrade/DatabaseVersionHierarchy.java | 9 +-
.../com/cloud/upgrade/dao/Upgrade2214to30.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade222to224.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade304to305.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade305to306.java | 4 +-
.../com/cloud/upgrade/dao/Upgrade410to420.java | 2 +-
.../com/cloud/upgrade/dao/Upgrade41610to41700.java | 1 +
.../com/cloud/upgrade/dao/Upgrade41720to41800.java | 233 +
.../com/cloud/upgrade/dao/Upgrade430to440.java | 2 +-
.../src/main/java/com/cloud/usage/UsageVO.java | 6 +
.../main/java/com/cloud/usage/dao/UsageDao.java | 5 +-
.../java/com/cloud/usage/dao/UsageDaoImpl.java | 86 +-
.../src/main/java/com/cloud/user/AccountVO.java | 7 +-
.../src/main/java/com/cloud/user/UserDataVO.java | 120 +
.../src/main/java/com/cloud/user/UserVO.java | 3 +-
.../main/java/com/cloud/user/dao/AccountDao.java | 1 +
.../java/com/cloud/user/dao/AccountDaoImpl.java | 16 +-
.../main/java/com/cloud/user/dao/UserDataDao.java | 28 +
.../java/com/cloud/user/dao/UserDataDaoImpl.java | 66 +
.../schema/src/main/java/com/cloud/vm/NicVO.java | 12 +
.../src/main/java/com/cloud/vm/UserVmVO.java | 30 +-
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 3 +-
.../java/com/cloud/vm/constants/VmDetails.java | 32 +
.../src/main/java/com/cloud/vm/dao/NicDao.java | 4 +
.../src/main/java/com/cloud/vm/dao/NicDaoImpl.java | 16 +
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 21 +-
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 61 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 25 +
.../java/org/apache/cloudstack/acl/RoleVO.java | 6 +
.../lb/ApplicationLoadBalancerRuleVO.java | 8 +
.../cloudstack/reservation/ReservationVO.java | 90 +
.../cloudstack/reservation/dao/ReservationDao.java | 28 +
.../reservation/dao/ReservationDaoImpl.java | 75 +
.../resourcedetail/ResourceDetailsDao.java | 2 +-
.../resourcedetail/ResourceDetailsDaoBase.java | 2 +-
.../dao/DiskOfferingDetailsDaoImpl.java | 2 +-
.../org/apache/cloudstack/secret/PassphraseVO.java | 73 +
.../cloudstack/secret/dao/PassphraseDao.java | 25 +
.../cloudstack/secret/dao/PassphraseDaoImpl.java | 25 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 8 +-
.../datastore/db/SnapshotDataStoreDaoImpl.java | 466 ++
...n-daos-between-management-and-usage-context.xml | 70 +
.../spring-engine-schema-core-daos-context.xml | 45 +-
.../resources/META-INF/db/schema-2211to2212.sql | 2 +-
.../main/resources/META-INF/db/schema-228to229.sql | 2 +-
.../resources/META-INF/db/schema-229to2210.sql | 2 +-
.../main/resources/META-INF/db/schema-305to306.sql | 2 +-
.../resources/META-INF/db/schema-41000to41100.sql | 2 +-
.../main/resources/META-INF/db/schema-410to420.sql | 4 +-
.../resources/META-INF/db/schema-41610to41700.sql | 2 +-
.../META-INF/db/schema-41720to41800-cleanup.sql | 20 +
.../resources/META-INF/db/schema-41720to41800.sql | 1005 +++
.../main/resources/META-INF/db/schema-420to421.sql | 2 +-
.../src/test/java/com/cloud/host/HostVOTest.java | 122 +-
.../cloud/network/as/AutoScaleVmProfileVOTest.java | 65 +
.../as/dao/AutoScaleVmGroupDaoImplTest.java | 137 +
.../dao/AutoScaleVmGroupStatisticsDaoImplTest.java | 247 +
.../as/dao/AutoScaleVmGroupVmMapDaoImplTest.java | 204 +
.../com/cloud/network/dao/NetworkDaoImplTest.java | 66 +
.../cloud/upgrade/DatabaseUpgradeCheckerTest.java | 40 +-
.../upgrade/DatabaseVersionHierarchyTest.java | 117 +
engine/service/pom.xml | 2 +-
engine/storage/cache/pom.xml | 2 +-
engine/storage/configdrive/pom.xml | 2 +-
.../storage/configdrive/ConfigDriveBuilder.java | 35 +-
.../configdrive/ConfigDriveBuilderTest.java | 72 +-
engine/storage/datamotion/pom.xml | 2 +-
.../storage/motion/AncientDataMotionStrategy.java | 79 +-
.../storage/motion/DataMotionServiceImpl.java | 10 +
.../motion/StorageSystemDataMotionStrategy.java | 28 +-
.../motion/AncientDataMotionStrategyTest.java | 2 +-
engine/storage/image/pom.xml | 2 +-
.../storage/image/store/TemplateObject.java | 11 +
engine/storage/integration-test/pom.xml | 2 +-
.../apache/cloudstack/storage/test/TestHttp.java | 18 +-
.../src/test/resources/fakeDriverTestContext.xml | 2 +-
.../src/test/resources/storageContext.xml | 2 +-
engine/storage/pom.xml | 2 +-
engine/storage/snapshot/pom.xml | 2 +-
.../storage/snapshot/DefaultSnapshotStrategy.java | 64 +-
.../snapshot/DefaultSnapshotStrategyTest.java | 104 +-
.../allocator/AbstractStoragePoolAllocator.java | 78 +-
.../ClusterScopeStoragePoolAllocator.java | 29 +-
.../GarbageCollectingStoragePoolAllocator.java | 2 +-
.../allocator/LocalStoragePoolAllocator.java | 21 +-
.../allocator/ZoneWideStoragePoolAllocator.java | 14 +-
.../storage/datastore/DataObjectManagerImpl.java | 4 +-
.../storage/endpoint/DefaultEndPointSelector.java | 58 +-
.../storage/image/db/SnapshotDataStoreDaoImpl.java | 552 --
.../image/deployasis/DeployAsIsHelperImpl.java | 6 +-
.../datastore/db/SnapshotDataStoreDaoImplTest.java | 145 +
.../image/db/SnapshotDataStoreDaoImplTest.java | 77 -
engine/storage/volume/pom.xml | 2 +-
.../storage/datastore/PrimaryDataStoreImpl.java | 15 +-
.../cloudstack/storage/volume/VolumeObject.java | 91 +-
.../storage/volume/VolumeServiceImpl.java | 10 +-
framework/agent-lb/pom.xml | 2 +-
framework/ca/pom.xml | 2 +-
framework/cluster/pom.xml | 2 +-
framework/config/pom.xml | 2 +-
.../cloudstack/framework/config/ConfigKey.java | 3 +
framework/db/pom.xml | 2 +-
.../main/java/com/cloud/utils/db/GenericDao.java | 2 +
.../java/com/cloud/utils/db/GenericDaoBase.java | 41 +-
.../java/com/cloud/utils/db/SearchCriteria.java | 8 +
.../com/cloud/utils/db/GenericDaoBaseTest.java | 32 +
framework/direct-download/pom.xml | 4 +-
framework/events/pom.xml | 2 +-
framework/ipc/pom.xml | 2 +-
framework/jobs/pom.xml | 2 +-
framework/managed-context/pom.xml | 2 +-
framework/pom.xml | 2 +-
framework/quota/pom.xml | 2 +-
.../cloudstack/quota/QuotaAlertManagerImpl.java | 60 +-
.../apache/cloudstack/quota/QuotaManagerImpl.java | 666 +-
.../activationrule/presetvariables/Account.java | 32 +
.../presetvariables/BackupOffering.java | 33 +
.../presetvariables/ComputeOffering.java | 32 +
.../presetvariables/ComputingResources.java | 56 +
.../activationrule/presetvariables/Domain.java | 32 +
.../presetvariables/GenericPresetVariable.java | 52 +
.../quota/activationrule/presetvariables/Host.java | 34 +
.../presetvariables/PresetVariableHelper.java | 653 ++
.../presetvariables/PresetVariables.java | 76 +
.../activationrule/presetvariables/Resource.java | 48 +
.../quota/activationrule/presetvariables/Role.java | 34 +
.../activationrule/presetvariables/Storage.java | 46 +
.../activationrule/presetvariables/Value.java | 188 +
.../cloudstack/quota/constant/QuotaConfig.java | 24 +-
.../cloudstack/quota/constant/QuotaTypes.java | 52 +-
.../cloudstack/quota/dao/QuotaAccountDaoImpl.java | 15 +-
.../cloudstack/quota/dao/QuotaTariffDao.java | 4 +
.../cloudstack/quota/dao/QuotaTariffDaoImpl.java | 77 +-
.../apache/cloudstack/quota/dao/VmTemplateDao.java | 24 +
.../cloudstack/quota/dao/VmTemplateDaoImpl.java | 33 +
.../apache/cloudstack/quota/vo/QuotaTariffVO.java | 98 +-
.../quota/spring-framework-quota-context.xml | 1 +
.../cloudstack/quota/QuotaManagerImplTest.java | 562 +-
.../presetvariables/AccountTest.java | 34 +
.../presetvariables/BackupOfferingTest.java | 36 +
.../presetvariables/ComputeOfferingTest.java | 35 +
.../presetvariables/ComputingResourcesTest.java | 40 +
.../activationrule/presetvariables/DomainTest.java | 35 +
.../presetvariables/GenericPresetVariableTest.java | 73 +
.../activationrule/presetvariables/HostTest.java | 34 +
.../presetvariables/PresetVariableHelperTest.java | 1151 ++++
.../presetvariables/ResourceTest.java | 40 +
.../activationrule/presetvariables/RoleTest.java | 34 +
.../presetvariables/StorageTest.java | 41 +
.../activationrule/presetvariables/ValueTest.java | 139 +
.../cloudstack/quota/constant/QuotaTypesTest.java | 2 +-
.../quota/dao/QuotaAccountDaoImplTest.java | 80 +
.../cloudstack/quota/vo/QuotaTariffVOTest.java | 51 +
framework/rest/pom.xml | 2 +-
framework/security/pom.xml | 2 +-
framework/spring/lifecycle/pom.xml | 2 +-
framework/spring/module/pom.xml | 2 +-
packaging/centos7/cloud.spec | 23 +-
packaging/centos8/cloud.spec | 87 +-
packaging/centos8/replace.properties | 2 +-
packaging/{suse15 => el9} | 0
plugins/acl/dynamic-role-based/pom.xml | 2 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 84 +-
.../acl/DynamicRoleBasedAPIAccessCheckerTest.java | 84 +-
plugins/acl/project-role-based/pom.xml | 2 +-
.../acl/ProjectRoleBasedApiAccessChecker.java | 75 +-
.../acl/ProjectRoleBasedApiAccessCheckerTest.java | 154 +
plugins/acl/static-role-based/pom.xml | 2 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 55 +-
.../explicit-dedication/pom.xml | 2 +-
.../host-affinity/pom.xml | 2 +-
.../host-anti-affinity/pom.xml | 2 +-
.../non-strict-host-affinity/pom.xml | 30 +
.../affinity/NonStrictHostAffinityProcessor.java | 133 +
.../non-strict-host-affinity/module.properties | 18 +
.../spring-non-strict-host-affinity-context.xml | 37 +
.../NonStrictHostAffinityProcessorTest.java | 172 +
.../non-strict-host-anti-affinity/pom.xml | 38 +
.../NonStrictHostAntiAffinityProcessor.java | 28 +
.../module.properties | 18 +
...pring-non-strict-host-anti-affinity-context.xml | 37 +
.../NonStrictHostAntiAffinityProcessorTest.java | 172 +
plugins/alert-handlers/snmp-alerts/pom.xml | 2 +-
plugins/alert-handlers/syslog-alerts/pom.xml | 2 +-
plugins/api/discovery/pom.xml | 2 +-
.../api/command/user/discovery/ListApisCmd.java | 6 -
.../discovery/ApiDiscoveryServiceImpl.java | 52 +-
.../cloudstack/discovery/ApiDiscoveryTest.java | 188 +-
plugins/api/rate-limit/pom.xml | 2 +-
.../command/admin/ratelimit/ResetApiLimitCmd.java | 6 -
.../api/command/user/ratelimit/GetApiLimitCmd.java | 6 -
.../ratelimit/ApiRateLimitServiceImpl.java | 88 +-
.../cloudstack/ratelimit/ApiRateLimitTest.java | 18 +-
plugins/api/solidfire-intg-test/pom.xml | 2 +-
.../admin/solidfire/GetPathForVolumeCmd.java | 6 -
.../admin/solidfire/GetSolidFireAccountIdCmd.java | 6 -
.../GetSolidFireVolumeAccessGroupIdsCmd.java | 8 +-
.../admin/solidfire/GetSolidFireVolumeSizeCmd.java | 8 +-
.../solidfire/GetVolumeSnapshotDetailsCmd.java | 8 +-
.../admin/solidfire/GetVolumeiScsiNameCmd.java | 8 +-
plugins/api/vmware-sioc/pom.xml | 2 +-
.../api/command/admin/sioc/UpdateSiocInfoCmd.java | 8 +-
plugins/backup/dummy/pom.xml | 2 +-
.../cloudstack/backup/DummyBackupProvider.java | 2 +-
plugins/backup/networker/pom.xml | 54 +
.../cloudstack/backup/NetworkerBackupProvider.java | 639 ++
.../backup/networker/NetworkerBackupOffering.java | 76 +
.../backup/networker/NetworkerClient.java | 351 ++
.../backup/networker/NetworkerObject.java | 27 +
.../cloudstack/backup/networker/api/Action.java | 350 ++
.../backup/networker/api/ActionSpecificData.java | 107 +
.../cloudstack/backup/networker/api/Attribute.java | 92 +
.../backup/networker/api/BackupSpecificData.java | 75 +
.../networker/api/CompletionNotification.java | 91 +
.../cloudstack/backup/networker/api/Expire.java | 47 +
.../cloudstack/backup/networker/api/Instance.java | 124 +
.../cloudstack/backup/networker/api/Link.java | 91 +
.../backup/networker/api/NetworkerBackup.java | 334 +
.../backup/networker/api/NetworkerBackups.java | 92 +
.../backup/networker/api/ProtectionPolicies.java | 92 +
.../backup/networker/api/ProtectionPolicy.java | 175 +
.../backup/networker/api/ResourceId.java | 91 +
.../backup/networker/api/ServerBackup.java | 140 +
.../cloudstack/backup/networker/api/Size.java | 90 +
.../backup/networker/api/SummaryNotification.java | 91 +
.../backup/networker/api/Traditional.java | 238 +
.../cloudstack/networker/module.properties | 18 +
.../networker/spring-backup-networker-context.xml | 27 +
.../backup/networker/NetworkerClientTest.java | 732 +++
plugins/backup/veeam/pom.xml | 2 +-
.../cloudstack/backup/VeeamBackupProvider.java | 119 +-
.../cloudstack/backup/veeam/VeeamClient.java | 62 +-
.../cloudstack/backup/VeeamBackupProviderTest.java | 133 +
.../cloudstack/backup/veeam/VeeamClientTest.java | 25 +-
plugins/ca/root-ca/pom.xml | 2 +-
plugins/database/mysql-ha/pom.xml | 2 +-
plugins/database/quota/pom.xml | 2 +-
.../cloudstack/api/command/QuotaBalanceCmd.java | 6 -
.../cloudstack/api/command/QuotaCreditsCmd.java | 9 -
.../api/command/QuotaEmailTemplateListCmd.java | 5 -
.../api/command/QuotaEmailTemplateUpdateCmd.java | 6 -
.../cloudstack/api/command/QuotaEnabledCmd.java | 6 -
.../cloudstack/api/command/QuotaStatementCmd.java | 6 -
.../cloudstack/api/command/QuotaSummaryCmd.java | 6 -
.../api/command/QuotaTariffCreateCmd.java | 147 +
.../api/command/QuotaTariffDeleteCmd.java | 71 +
.../cloudstack/api/command/QuotaTariffListCmd.java | 39 +-
.../api/command/QuotaTariffUpdateCmd.java | 50 +-
.../cloudstack/api/command/QuotaUpdateCmd.java | 6 -
.../api/response/QuotaResponseBuilder.java | 5 +
.../api/response/QuotaResponseBuilderImpl.java | 204 +-
.../api/response/QuotaSummaryResponse.java | 12 +
.../api/response/QuotaTariffResponse.java | 89 +-
.../apache/cloudstack/quota/QuotaServiceImpl.java | 10 +-
.../api/command/QuotaTariffListCmdTest.java | 2 +-
.../api/command/QuotaTariffUpdateCmdTest.java | 2 +-
.../api/response/QuotaResponseBuilderImplTest.java | 238 +-
plugins/dedicated-resources/pom.xml | 2 +-
.../api/commands/DedicateClusterCmd.java | 6 -
.../cloudstack/api/commands/DedicateHostCmd.java | 6 -
.../cloudstack/api/commands/DedicatePodCmd.java | 6 -
.../cloudstack/api/commands/DedicateZoneCmd.java | 6 -
.../api/commands/ListDedicatedClustersCmd.java | 6 -
.../api/commands/ListDedicatedHostsCmd.java | 6 -
.../api/commands/ListDedicatedPodsCmd.java | 6 -
.../api/commands/ListDedicatedZonesCmd.java | 6 -
.../api/commands/ReleaseDedicatedClusterCmd.java | 6 -
.../api/commands/ReleaseDedicatedHostCmd.java | 6 -
.../api/commands/ReleaseDedicatedPodCmd.java | 6 -
.../api/commands/ReleaseDedicatedZoneCmd.java | 6 -
.../implicit-dedication/pom.xml | 2 +-
.../implicitplanner/ImplicitPlannerTest.java | 34 +-
.../user-concentrated-pod/pom.xml | 2 +-
.../cloud/deploy/UserConcentratedPodPlanner.java | 2 +-
.../deployment-planners/user-dispersing/pom.xml | 2 +-
plugins/event-bus/inmemory/pom.xml | 2 +-
.../mom/inmemory/InMemoryEventBusTest.java | 6 +-
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
plugins/ha-planners/skip-heurestics/pom.xml | 2 +-
plugins/host-allocators/random/pom.xml | 2 +-
plugins/hypervisors/baremetal/pom.xml | 2 +-
.../cloud/baremetal/database/BaremetalRctDao.java | 52 +-
.../baremetal/database/BaremetalRctDaoImpl.java | 52 +-
.../cloud/baremetal/database/BaremetalRctVO.java | 164 +-
.../com/cloud/baremetal/manager/BareMetalGuru.java | 8 +-
.../com/cloud/baremetal/manager/BaremetalRct.java | 250 +-
.../baremetal/manager/BaremetalVlanManager.java | 86 +-
.../manager/BaremetalVlanManagerImpl.java | 544 +-
.../networkservice/BareMetalResourceBase.java | 2 +-
.../networkservice/BaremetaNetworkGuru.java | 14 +-
.../networkservice/BaremetalPingPxeResource.java | 2 +-
.../networkservice/BaremetalRctResponse.java | 110 +-
.../networkservice/BaremetalSwitchBackend.java | 68 +-
.../BaremetalVirtualRouterCommands.java | 244 +-
.../networkservice/BaremetalVlanStruct.java | 184 +-
.../Force10BaremetalSwitchBackend.java | 332 +-
.../apache/cloudstack/api/AddBaremetalDhcpCmd.java | 6 -
.../apache/cloudstack/api/AddBaremetalRctCmd.java | 166 +-
.../cloudstack/api/DeleteBaremetalRctCmd.java | 164 +-
.../cloudstack/api/ListBaremetalDhcpCmd.java | 6 -
.../cloudstack/api/ListBaremetalPxeServersCmd.java | 5 -
.../apache/cloudstack/api/ListBaremetalRctCmd.java | 6 -
.../security_group_agent/cs_sg_agent.py | 472 +-
.../security_group_agent/xmlobject.py | 194 +-
.../HypervResource/HypervResourceController.cs | 2 +-
.../DotNet/ServerResource/HypervResource/Utils.cs | 2 +-
.../ServerResource/HypervResource/WmiCallsV2.cs | 6 +-
...on.v2.Msvm_VirtualSystemMigrationSettingData.cs | 2 +-
plugins/hypervisors/hyperv/pom.xml | 2 +-
.../cloud/hypervisor/hyperv/guru/HypervGuru.java | 4 +-
plugins/hypervisors/kvm/pom.xml | 47 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 7 +-
.../hypervisor/kvm/resource/IvsVifDriver.java | 8 +-
.../kvm/resource/LibvirtComputingResource.java | 610 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 41 +-
.../hypervisor/kvm/resource/LibvirtSecretDef.java | 4 +
.../kvm/resource/LibvirtStoragePoolDef.java | 12 +-
.../kvm/resource/LibvirtStoragePoolXMLParser.java | 13 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 157 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 11 +-
.../wrapper/LibvirtCreateCommandWrapper.java | 4 +-
...atePrivateTemplateFromVolumeCommandWrapper.java | 2 +-
.../LibvirtGetAutoScaleMetricsCommandWrapper.java | 76 +
.../wrapper/LibvirtMigrateCommandWrapper.java | 66 +-
.../LibvirtPrepareForMigrationCommandWrapper.java | 20 +-
.../wrapper/LibvirtResizeVolumeCommandWrapper.java | 139 +-
.../wrapper/LibvirtScaleVmCommandWrapper.java | 2 +-
.../wrapper/LibvirtStopCommandWrapper.java | 4 +
.../resource/wrapper/LibvirtUtilitiesHelper.java | 2 +-
.../kvm/storage/IscsiAdmStorageAdaptor.java | 20 +-
.../kvm/storage/IscsiAdmStoragePool.java | 4 +-
.../hypervisor/kvm/storage/KVMPhysicalDisk.java | 42 +-
.../hypervisor/kvm/storage/KVMStoragePool.java | 4 +-
.../kvm/storage/KVMStoragePoolManager.java | 27 +-
.../kvm/storage/KVMStorageProcessor.java | 336 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 120 +-
.../hypervisor/kvm/storage/LibvirtStoragePool.java | 8 +-
.../kvm/storage/LinstorStorageAdaptor.java | 576 --
.../hypervisor/kvm/storage/LinstorStoragePool.java | 196 -
.../kvm/storage/ManagedNfsStorageAdaptor.java | 11 +-
.../kvm/storage/ScaleIOStorageAdaptor.java | 205 +-
.../hypervisor/kvm/storage/ScaleIOStoragePool.java | 6 +-
.../hypervisor/kvm/storage/StorageAdaptor.java | 7 +-
.../cloudstack/utils/cryptsetup/CryptSetup.java | 124 +
.../utils/cryptsetup/CryptSetupException.java | 27 +
.../cloudstack/utils/cryptsetup/KeyFile.java | 76 +
.../cloudstack/utils/qemu/QemuImageOptions.java | 86 +
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 557 +-
.../apache/cloudstack/utils/qemu/QemuObject.java | 128 +
.../kvm/resource/LibvirtComputingResourceTest.java | 1502 +++--
.../kvm/resource/LibvirtDomainXMLParserTest.java | 26 +
.../kvm/resource/LibvirtStoragePoolDefTest.java | 32 +
.../resource/LibvirtStoragePoolXMLParserTest.java | 104 +
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 138 +-
.../kvm/resource/LibvirtVifDriverTest.java | 25 +-
...bvirtGetAutoScaleMetricsCommandWrapperTest.java | 120 +
.../wrapper/LibvirtMigrateCommandWrapperTest.java | 41 +-
.../wrapper/LibvirtScaleVmCommandWrapperTest.java | 2 +-
.../wrapper/LibvirtUtilitiesHelperTest.java | 2 +-
.../kvm/storage/KVMPhysicalDiskTest.java | 20 +
.../kvm/storage/KVMStorageProcessorTest.java | 94 +
.../kvm/storage/ScaleIOStorageAdaptorTest.java | 31 +
.../utils/cryptsetup/CryptSetupTest.java | 71 +
.../cloudstack/utils/cryptsetup/KeyFileTest.java | 49 +
.../utils/qemu/QemuImageOptionsTest.java | 61 +
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 59 +-
.../cloudstack/utils/qemu/QemuObjectTest.java | 41 +
plugins/hypervisors/ovm/pom.xml | 2 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 2 +-
.../src/main/java/com/cloud/ovm/object/OvmVm.java | 2 +-
.../scripts/vm/hypervisor/ovm/ConfigFileOps.py | 1 -
.../scripts/vm/hypervisor/ovm/OvmCommonModule.py | 1 -
.../scripts/vm/hypervisor/ovm/OvmDispatcher.py | 8 +-
.../scripts/vm/hypervisor/ovm/OvmFaultConstants.py | 4 +-
.../vm/hypervisor/ovm/OvmHaHeartBeatModule.py | 1 -
.../scripts/vm/hypervisor/ovm/OvmLoggerModule.py | 2 +-
.../scripts/vm/hypervisor/ovm/OvmOCFS2Module.py | 1 -
.../scripts/vm/hypervisor/ovm/OvmObjectModule.py | 2 +-
.../vm/hypervisor/ovm/OvmSecurityGroupModule.py | 38 -
.../vm/hypervisor/ovm/OvmStoragePoolModule.py | 2 -
.../main/scripts/vm/hypervisor/ovm/OvmVmModule.py | 2 +-
.../scripts/vm/hypervisor/ovm/OvmVolumeModule.py | 3 -
plugins/hypervisors/ovm3/pom.xml | 2 +-
.../ovm3/resources/helpers/Ovm3StoragePool.java | 2 +-
plugins/hypervisors/simulator/pom.xml | 2 +-
.../agent/manager/MockStorageManagerImpl.java | 6 +-
.../cloud/api/commands/ConfigureSimulatorCmd.java | 2 +-
plugins/hypervisors/ucs/pom.xml | 2 +-
.../api/AssociateUcsProfileToBladeCmd.java | 5 -
plugins/hypervisors/vmware/pom.xml | 2 +-
.../cloud/api/commands/DeleteCiscoNexusVSMCmd.java | 6 -
.../api/commands/DisableCiscoNexusVSMCmd.java | 6 -
.../cloud/api/commands/EnableCiscoNexusVSMCmd.java | 6 -
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 78 +-
.../manager/CleanupFullyClonedTemplatesTask.java | 4 +-
.../hypervisor/vmware/manager/VmwareManager.java | 2 +-
.../vmware/manager/VmwareManagerImpl.java | 7 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 6 +-
.../hypervisor/vmware/resource/VmwareResource.java | 91 +-
.../storage/resource/VmwareStorageProcessor.java | 14 +-
.../api/command/admin/zone/AddVmwareDcCmd.java | 6 -
.../zone/ImportVsphereStoragePoliciesCmd.java | 8 +-
.../api/command/admin/zone/ListVmwareDcsCmd.java | 6 -
.../admin/zone/ListVsphereStoragePoliciesCmd.java | 8 +-
...ListVsphereStoragePolicyCompatiblePoolsCmd.java | 8 +-
.../api/command/admin/zone/RemoveVmwareDcCmd.java | 6 -
.../api/command/admin/zone/UpdateVmwareDcCmd.java | 10 +-
.../vmware/resource/VmwareResourceTest.java | 121 +-
plugins/hypervisors/xenserver/pom.xml | 2 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 15 +-
.../xenserver/resource/CitrixResourceBase.java | 44 +-
.../xenserver/resource/XcpServerResource.java | 24 +
.../xenserver/resource/XenServer56Resource.java | 6 +-
...XcpServerGetAutoScaleMetricsCommandWrapper.java | 85 +
.../xcp/XcpServerNetworkUsageCommandWrapper.java | 2 +-
...nServer56GetAutoScaleMetricsCommandWrapper.java | 85 +
.../XenServer56NetworkUsageCommandWrapper.java | 2 +-
.../CitrixCreateVMSnapshotCommandWrapper.java | 2 +-
.../CitrixOvsCreateGreTunnelCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixSetupCommandWrapper.java | 2 +-
.../wrapper/xenbase/CitrixStartCommandWrapper.java | 2 +-
.../com/cloud/hypervisor/XenServerGuruTest.java | 31 +-
.../xenserver/resource/CitrixResourceBaseTest.java | 66 +-
.../xenserver/resource/XcpServerResourceTest.java | 25 +
.../resource/XenServer56ResourceTest.java | 25 +
.../wrapper/xenbase/XcpServerWrapperTest.java | 101 +-
.../wrapper/xenbase/XenServer56WrapperTest.java | 105 +-
plugins/integrations/cloudian/pom.xml | 2 +-
.../cloudian/api/CloudianIsEnabledCmd.java | 10 +-
.../cloudian/api/CloudianSsoLoginCmd.java | 10 +-
plugins/integrations/kubernetes-service/pom.xml | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 107 +-
.../KubernetesClusterDestroyWorker.java | 2 +-
...ernetesClusterResourceModifierActionWorker.java | 4 +-
.../KubernetesClusterScaleWorker.java | 3 +-
.../KubernetesClusterStartWorker.java | 12 +-
.../version/AddKubernetesSupportedVersionCmd.java | 8 +-
.../DeleteKubernetesSupportedVersionCmd.java | 8 +-
.../UpdateKubernetesSupportedVersionCmd.java | 8 +-
.../cluster/CreateKubernetesClusterCmd.java | 8 +-
.../cluster/DeleteKubernetesClusterCmd.java | 8 +-
.../cluster/GetKubernetesClusterConfigCmd.java | 8 +-
.../cluster/ListKubernetesClustersCmd.java | 8 +-
.../cluster/ScaleKubernetesClusterCmd.java | 8 +-
.../cluster/StartKubernetesClusterCmd.java | 8 +-
.../cluster/StopKubernetesClusterCmd.java | 8 +-
.../cluster/UpgradeKubernetesClusterCmd.java | 8 +-
.../ListKubernetesSupportedVersionsCmd.java | 8 +-
plugins/integrations/prometheus/pom.xml | 2 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 288 +-
.../metrics/PrometheusExporterServer.java | 3 +
.../metrics/PrometheusExporterServerImpl.java | 3 +-
plugins/metrics/pom.xml | 2 +-
.../cloudstack/api/ListClustersMetricsCmd.java | 8 +-
.../apache/cloudstack/api/ListDbMetricsCmd.java | 8 +-
.../apache/cloudstack/api/ListHostsMetricsCmd.java | 8 +-
.../cloudstack/api/ListInfrastructureCmd.java | 8 +-
.../apache/cloudstack/api/ListMgmtsMetricsCmd.java | 8 +-
.../cloudstack/api/ListStoragePoolsMetricsCmd.java | 8 +-
.../cloudstack/api/ListUsageServerMetricsCmd.java | 8 +-
.../cloudstack/api/ListVMsMetricsCmdByAdmin.java | 2 +-
.../cloudstack/api/ListVMsUsageHistoryCmd.java | 10 +-
.../cloudstack/api/ListVolumesMetricsCmd.java | 8 +-
.../apache/cloudstack/api/ListZonesMetricsCmd.java | 8 +-
plugins/network-elements/bigswitch/pom.xml | 2 +-
.../api/commands/AddBigSwitchBcfDeviceCmd.java | 6 -
.../api/commands/DeleteBigSwitchBcfDeviceCmd.java | 6 -
plugins/network-elements/brocade-vcs/pom.xml | 2 +-
.../cloud/api/commands/AddBrocadeVcsDeviceCmd.java | 6 -
.../api/commands/DeleteBrocadeVcsDeviceCmd.java | 6 -
plugins/network-elements/cisco-vnmc/pom.xml | 2 +-
plugins/network-elements/dns-notifier/pom.xml | 2 +-
.../src/main/resources/components-example.xml | 2 +-
.../network-elements/elastic-loadbalancer/pom.xml | 2 +-
.../cloud/network/lb/LoadBalanceRuleHandler.java | 2 +-
plugins/network-elements/f5/pom.xml | 41 -
.../api/commands/AddExternalLoadBalancerCmd.java | 118 -
.../cloud/api/commands/AddF5LoadBalancerCmd.java | 143 -
.../api/commands/ConfigureF5LoadBalancerCmd.java | 124 -
.../commands/DeleteExternalLoadBalancerCmd.java | 96 -
.../api/commands/DeleteF5LoadBalancerCmd.java | 112 -
.../api/commands/ListExternalLoadBalancersCmd.java | 90 -
.../commands/ListF5LoadBalancerNetworksCmd.java | 108 -
.../cloud/api/commands/ListF5LoadBalancersCmd.java | 112 -
.../cloud/api/response/F5LoadBalancerResponse.java | 109 -
.../element/F5ExternalLoadBalancerElement.java | 538 --
.../F5ExternalLoadBalancerElementService.java | 97 -
.../cloud/network/resource/F5BigIpResource.java | 1176 ----
.../META-INF/cloudstack/f5/module.properties | 18 -
.../META-INF/cloudstack/f5/spring-f5-context.xml | 34 -
plugins/network-elements/globodns/pom.xml | 2 +-
.../cloudstack/api/AddGloboDnsHostCmd.java | 6 -
.../network-elements/internal-loadbalancer/pom.xml | 2 +-
.../lb/InternalLoadBalancerVMManagerImpl.java | 1 +
plugins/network-elements/juniper-contrail/pom.xml | 2 +-
.../api/command/CreateServiceInstanceCmd.java | 6 -
.../network/contrail/management/DBSyncGeneric.java | 2 +-
.../contrail/management/ServiceVirtualMachine.java | 2 +-
.../contrail/model/VirtualMachineModel.java | 2 +-
.../contrail/management/ManagementServerMock.java | 2 +-
plugins/network-elements/juniper-srx/pom.xml | 37 -
.../cloud/api/commands/AddExternalFirewallCmd.java | 116 -
.../com/cloud/api/commands/AddSrxFirewallCmd.java | 141 -
.../api/commands/ConfigureSrxFirewallCmd.java | 123 -
.../api/commands/DeleteExternalFirewallCmd.java | 90 -
.../cloud/api/commands/DeleteSrxFirewallCmd.java | 111 -
.../api/commands/ListExternalFirewallsCmd.java | 89 -
.../api/commands/ListSrxFirewallNetworksCmd.java | 107 -
.../cloud/api/commands/ListSrxFirewallsCmd.java | 109 -
.../cloud/api/response/SrxFirewallResponse.java | 159 -
.../element/JuniperSRXExternalFirewallElement.java | 551 --
.../element/JuniperSRXFirewallElementService.java | 95 -
.../cloud/network/resource/JuniperSrxResource.java | 3795 ------------
.../META-INF/cloudstack/srx/module.properties | 18 -
.../META-INF/cloudstack/srx/spring-srx-context.xml | 35 -
plugins/network-elements/netscaler/pom.xml | 2 +-
.../api/commands/AddNetscalerLoadBalancerCmd.java | 6 -
.../ConfigureNetscalerLoadBalancerCmd.java | 6 -
.../commands/DeleteNetscalerLoadBalancerCmd.java | 6 -
.../ListNetscalerLoadBalancerNetworksCmd.java | 5 -
.../RegisterNetscalerControlCenterCmd.java | 12 +-
.../cloud/network/element/NetscalerElement.java | 14 +-
.../cloud/network/resource/NetscalerResource.java | 31 +-
plugins/network-elements/nicira-nvp/pom.xml | 2 +-
.../cloud/api/commands/AddNiciraNvpDeviceCmd.java | 6 -
.../api/commands/DeleteNiciraNvpDeviceCmd.java | 6 -
.../com/cloud/network/nicira/NiciraRestClient.java | 2 +-
plugins/network-elements/opendaylight/pom.xml | 2 +-
.../agent/OpenDaylightControllerResource.java | 2 +-
.../api/test/NeutronNetworkAdapterTest.java | 4 +-
.../api/test/NeutronNodeAdapterTest.java | 4 +-
.../api/test/NeutronPortAdapterTest.java | 4 +-
plugins/network-elements/ovs/pom.xml | 2 +-
plugins/network-elements/palo-alto/pom.xml | 2 +-
.../cloud/api/commands/AddPaloAltoFirewallCmd.java | 6 -
.../api/commands/ConfigurePaloAltoFirewallCmd.java | 6 -
.../api/commands/DeletePaloAltoFirewallCmd.java | 6 -
.../commands/ListPaloAltoFirewallNetworksCmd.java | 5 -
plugins/network-elements/stratosphere-ssp/pom.xml | 2 +-
plugins/network-elements/vxlan/pom.xml | 2 +-
.../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +-
.../nested-cloudstack/pom.xml | 2 +-
.../outofbandmanagement-drivers/redfish/pom.xml | 2 +-
plugins/pom.xml | 16 +-
plugins/storage-allocators/random/pom.xml | 2 +-
.../allocator/RandomStoragePoolAllocator.java | 20 +-
plugins/storage/image/default/pom.xml | 2 +-
plugins/storage/image/s3/pom.xml | 2 +-
plugins/storage/image/sample/pom.xml | 2 +-
plugins/storage/image/swift/pom.xml | 2 +-
plugins/storage/volume/cloudbyte/pom.xml | 2 +-
plugins/storage/volume/datera/pom.xml | 2 +-
.../driver/DateraPrimaryDataStoreDriver.java | 4 +-
plugins/storage/volume/default/pom.xml | 2 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 58 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 49 +-
plugins/storage/volume/linstor/pom.xml | 7 +-
.../kvm/storage/LinstorStorageAdaptor.java | 584 ++
.../hypervisor/kvm/storage/LinstorStoragePool.java | 197 +
.../driver/LinstorPrimaryDataStoreDriverImpl.java | 118 +-
.../LinstorPrimaryDataStoreLifeCycleImpl.java | 8 +-
plugins/storage/volume/nexenta/pom.xml | 2 +-
plugins/storage/volume/sample/pom.xml | 2 +-
plugins/storage/volume/scaleio/pom.xml | 2 +-
.../driver/ScaleIOPrimaryDataStoreDriver.java | 222 +-
.../storage/datastore/util/ScaleIOUtil.java | 2 +-
plugins/storage/volume/solidfire/pom.xml | 2 +-
plugins/storage/volume/storpool/pom.xml | 14 +-
...torPoolCopyVolumeToSecondaryCommandWrapper.java | 2 +-
.../StorPoolDownloadTemplateCommandWrapper.java | 5 +
.../StorPoolModifyStorageCommandWrapper.java | 4 +-
.../kvm/storage/StorPoolStorageAdaptor.java | 98 +-
.../kvm/storage/StorPoolStoragePool.java | 8 +-
.../driver/StorPoolPrimaryDataStoreDriver.java | 257 +-
.../datastore/provider/StorPoolHostListener.java | 39 +-
.../storage/datastore/util/StorPoolUtil.java | 71 +-
.../storage/snapshot/StorPoolSnapshotStrategy.java | 2 +-
.../snapshot/StorPoolVMSnapshotStrategy.java | 2 +-
.../driver/StorPoolPrimaryDataStoreDriverTest.java | 245 +
plugins/user-authenticators/ldap/pom.xml | 3 +-
.../cloudstack/api/command/LDAPConfigCmd.java | 6 -
.../cloudstack/api/command/LDAPRemoveCmd.java | 6 -
.../api/command/LinkAccountToLdapCmd.java | 10 +-
.../api/command/LinkDomainToLdapCmd.java | 6 -
.../apache/cloudstack/ldap/LdapConfiguration.java | 2 +-
.../ldap/LdapConfigurationResponseSpec.groovy | 2 +-
.../cloudstack/ldap/LdapContextFactorySpec.groovy | 8 +-
.../ldap/LdapCreateAccountCmdSpec.groovy | 2 +-
.../cloudstack/ldap/LdapManagerImplSpec.groovy | 2 +-
.../cloudstack/ldap/LinkDomainToLdapCmdSpec.groovy | 4 +-
.../api/command/LinkAccountToLdapCmdTest.java | 5 +-
.../api/command/LinkDomainToLdapCmdTest.java | 2 +-
plugins/user-authenticators/md5/pom.xml | 2 +-
plugins/user-authenticators/pbkdf2/pom.xml | 2 +-
plugins/user-authenticators/plain-text/pom.xml | 2 +-
plugins/user-authenticators/saml2/pom.xml | 2 +-
.../api/command/AuthorizeSAMLSSOCmd.java | 8 +-
.../api/command/ListAndSwitchSAMLAccountCmd.java | 8 +-
.../apache/cloudstack/api/command/ListIdpsCmd.java | 9 +-
.../cloudstack/saml/SAML2AuthManagerImplTest.java | 6 +-
plugins/user-authenticators/sha256salted/pom.xml | 2 +-
pom.xml | 42 +-
python/lib/cloud_utils.py | 1 -
python/lib/cloudutils/networkConfig.py | 1 -
python/lib/cloudutils/serviceConfig.py | 2 +-
python/lib/cloudutils/syscfg.py | 2 +-
quickcloud/pom.xml | 2 +-
scripts/installer/createtmplt.sh | 2 +-
scripts/installer/createvolume.sh | 2 +-
scripts/network/exdhcp/dhcpd_edithosts.py | 1 -
.../ping/prepare_kickstart_kernel_initrd.py | 1 -
scripts/storage/secondary/cloud-install-sys-tmplt | 2 +-
.../storage/secondary/cloud-install-sys-tmplt.py | 2 +-
scripts/storage/secondary/createvolume.sh | 2 +-
scripts/storage/secondary/setup-sysvm-tmplt | 2 +-
scripts/vm/hypervisor/kvm/nsrkvmbackup.sh | 260 +
scripts/vm/hypervisor/kvm/nsrkvmrestore.sh | 223 +
scripts/vm/hypervisor/update_host_passwd.sh | 12 +-
.../create_privatetemplate_from_snapshot.sh | 4 +-
scripts/vm/hypervisor/xenserver/perfmon.py | 39 +-
.../vm/hypervisor/xenserver/upgrade_snapshot.sh | 4 +-
scripts/vm/hypervisor/xenserver/vmops | 2 +-
scripts/vm/network/ovs-pvlan-kvm-vm.sh | 6 +-
scripts/vm/network/security_group.py | 4 +-
scripts/vm/network/vnet/ovstunnel.py | 1 -
server/conf/migration-components.xml | 2 +-
server/pom.xml | 2 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 22 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 94 +-
server/src/main/java/com/cloud/api/ApiServer.java | 2 +-
server/src/main/java/com/cloud/api/ApiServlet.java | 13 +
.../api/auth/DefaultLoginAPIAuthenticatorCmd.java | 8 +-
.../api/auth/DefaultLogoutAPIAuthenticatorCmd.java | 9 +-
.../com/cloud/api/dispatch/ParamProcessWorker.java | 61 +-
.../java/com/cloud/api/doc/ApiXmlDocWriter.java | 4 +-
.../src/main/java/com/cloud/api/doc/Command.java | 9 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 70 +-
.../com/cloud/api/query/ViewResponseHelper.java | 16 +-
.../cloud/api/query/dao/AccountJoinDaoImpl.java | 49 +-
.../cloud/api/query/dao/DataCenterJoinDaoImpl.java | 15 +-
.../api/query/dao/DiskOfferingJoinDaoImpl.java | 2 +
.../com/cloud/api/query/dao/DomainJoinDaoImpl.java | 49 +-
.../cloud/api/query/dao/DomainRouterJoinDao.java | 3 +
.../api/query/dao/DomainRouterJoinDaoImpl.java | 26 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 1 +
.../cloud/api/query/dao/TemplateJoinDaoImpl.java | 23 +
.../com/cloud/api/query/dao/UserVmJoinDao.java | 5 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 29 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 6 +-
.../com/cloud/api/query/vo/DiskOfferingJoinVO.java | 6 +
.../com/cloud/api/query/vo/DomainRouterJoinVO.java | 23 +
.../cloud/api/query/vo/NetworkOfferingJoinVO.java | 8 +
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 5 +
.../com/cloud/api/query/vo/TemplateJoinVO.java | 34 +
.../java/com/cloud/api/query/vo/UserVmJoinVO.java | 81 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 4 +-
.../main/java/com/cloud/configuration/Config.java | 35 +-
.../configuration/ConfigurationManagerImpl.java | 353 +-
.../AgentBasedConsoleProxyManager.java | 16 +-
.../java/com/cloud/consoleproxy/AgentHookBase.java | 19 +-
.../cloud/consoleproxy/ConsoleProxyManager.java | 42 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 35 +-
.../deploy/DeploymentPlanningManagerImpl.java | 94 +-
.../java/com/cloud/deploy/FirstFitPlanner.java | 2 +-
.../com/cloud/hypervisor/HypervisorGuruBase.java | 25 +-
.../main/java/com/cloud/hypervisor/KVMGuru.java | 141 +-
.../main/java/com/cloud/hypervisor/LXCGuru.java | 5 +-
.../network/ExternalFirewallDeviceManager.java | 2 +-
.../ExternalLoadBalancerDeviceManagerImpl.java | 7 +-
.../com/cloud/network/IpAddressManagerImpl.java | 14 +-
.../com/cloud/network/Ipv6AddressManagerImpl.java | 6 +-
.../java/com/cloud/network/Ipv6ServiceImpl.java | 5 +-
.../cloud/network/NetworkMigrationManagerImpl.java | 6 +-
.../java/com/cloud/network/NetworkModelImpl.java | 196 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 423 +-
.../com/cloud/network/as/AutoScaleManager.java | 32 +
.../com/cloud/network/as/AutoScaleManagerImpl.java | 2088 ++++++-
.../network/element/CloudZonesNetworkElement.java | 270 -
.../network/element/ConfigDriveNetworkElement.java | 29 +-
.../network/element/VirtualRouterElement.java | 22 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 48 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 11 +-
.../network/guru/ExternalGuestNetworkGuru.java | 6 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 38 +-
.../com/cloud/network/guru/PrivateNetworkGuru.java | 26 +-
.../com/cloud/network/guru/PublicNetworkGuru.java | 26 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 243 +-
.../cloud/network/router/CommandSetupHelper.java | 110 +-
.../router/VirtualNetworkApplianceManager.java | 6 +
.../router/VirtualNetworkApplianceManagerImpl.java | 60 +-
.../VpcVirtualNetworkApplianceManagerImpl.java | 17 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 273 +-
.../java/com/cloud/projects/ProjectManager.java | 2 +-
.../com/cloud/resource/ResourceManagerImpl.java | 5 +-
.../cloud/resourcelimit/CheckedReservation.java | 134 +
.../resourcelimit/ResourceLimitManagerImpl.java | 94 +-
.../com/cloud/server/ConfigurationServerImpl.java | 17 +-
.../java/com/cloud/server/ManagementServer.java | 4 +
.../com/cloud/server/ManagementServerImpl.java | 881 ++-
.../main/java/com/cloud/server/StatsCollector.java | 312 +-
.../com/cloud/servlet/ConsoleProxyClientParam.java | 37 +
.../com/cloud/servlet/ConsoleProxyServlet.java | 222 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 26 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 2 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 141 +-
.../cloud/storage/snapshot/SnapshotManager.java | 3 -
.../storage/snapshot/SnapshotManagerImpl.java | 24 +-
.../com/cloud/storage/upload/UploadListener.java | 7 +-
.../cloud/template/HypervisorTemplateAdapter.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 59 +-
.../main/java/com/cloud/test/DatabaseConfig.java | 2 +-
.../main/java/com/cloud/test/PodZoneConfig.java | 2 +-
.../java/com/cloud/user/AccountManagerImpl.java | 18 +-
.../main/java/com/cloud/user/PasswordPolicy.java | 91 +
.../java/com/cloud/user/PasswordPolicyImpl.java | 245 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 13 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 937 +--
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 6 +
.../affinity/AffinityGroupServiceImpl.java | 7 +-
.../annotation/AnnotationManagerImpl.java | 12 +
.../cloudstack/backup/BackupManagerImpl.java | 82 +-
.../org/apache/cloudstack/ca/CAManagerImpl.java | 2 +-
.../consoleproxy/ConsoleAccessManagerImpl.java | 490 ++
.../apache/cloudstack/region/RegionManager.java | 2 +-
.../apache/cloudstack/snapshot/SnapshotHelper.java | 5 +-
.../core/spring-server-core-managers-context.xml | 4 +
.../java/com/cloud/api/ApiResponseHelperTest.java | 115 +-
.../test/java/com/cloud/api/ApiServletTest.java | 2 +-
.../java/com/cloud/configuration/ConfigTest.java | 42 +
.../ConfigurationManagerImplTest.java | 194 +
.../configuration/ConfigurationManagerTest.java | 60 +
.../deploy/DeploymentPlanningManagerImplTest.java | 407 +-
.../java/com/cloud/hypervisor/KVMGuruTest.java | 12 +-
.../cloud/network/CreatePrivateNetworkTest.java | 3 +-
.../ExternalLoadBalancerDeviceManagerImplTest.java | 3 +
.../com/cloud/network/Ipv6AddressManagerTest.java | 8 +-
.../com/cloud/network/Ipv6ServiceImplTest.java | 5 +-
.../com/cloud/network/MockNetworkModelImpl.java | 19 +-
.../com/cloud/network/NetworkModelImplTest.java | 144 +
.../java/com/cloud/network/NetworkModelTest.java | 18 +
.../com/cloud/network/NetworkServiceImplTest.java | 602 +-
.../cloud/network/as/AutoScaleManagerImplTest.java | 2447 ++++++++
.../com/cloud/network/as/AutoScaleManagerTest.java | 61 +
.../element/ConfigDriveNetworkElementTest.java | 10 +-
.../network/element/VirtualRouterElementTest.java | 21 +-
.../cloud/network/guru/DirectNetworkGuruTest.java | 84 +-
.../network/guru/ExternalGuestNetworkGuruTest.java | 123 +
.../cloud/network/lb/AssignLoadBalancerTest.java | 36 +-
.../lb/LoadBalancingRulesManagerImplTest.java | 104 +
.../cloud/network/lb/UpdateLoadBalancerTest.java | 4 +-
.../network/router/CommandSetupHelperTest.java | 82 +
.../VirtualNetworkApplianceManagerImplTest.java | 23 +-
.../com/cloud/network/vpc/VpcManagerImplTest.java | 294 +-
.../resourcelimit/CheckedReservationTest.java | 102 +
.../com/cloud/server/ManagementServerImplTest.java | 350 +-
.../cloud/storage/VolumeApiServiceImplTest.java | 144 +-
.../cloud/template/TemplateManagerImplTest.java | 82 +
.../com/cloud/user/AccountManagerImplTest.java | 43 +-
.../AccountManagerImplVolumeDeleteEventTest.java | 7 +-
.../com/cloud/user/AccountManagetImplTestBase.java | 4 +-
.../java/com/cloud/user/DomainManagerImplTest.java | 6 +-
.../java/com/cloud/user/MockUsageEventDao.java | 5 +
.../com/cloud/user/PasswordPolicyImplTest.java | 163 +
.../java/com/cloud/vm/FirstFitPlannerTest.java | 2 +-
.../java/com/cloud/vm/UserVmManagerImplTest.java | 305 +-
.../test/java/com/cloud/vm/UserVmManagerTest.java | 2 +-
.../java/com/cloud/vm/dao/UserVmDaoImplTest.java | 2 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 6 +
.../java/com/cloud/vpc/MockNetworkManagerImpl.java | 4 +-
.../java/com/cloud/vpc/MockNetworkModelImpl.java | 19 +-
.../cloud/vpc/MockResourceLimitManagerImpl.java | 7 +
.../test/java/com/cloud/vpc/VpcApiUnitTest.java | 2 +-
.../java/com/cloud/vpc/dao/MockVpcDaoImpl.java | 4 +-
.../vpc/dao/MockVpcOfferingServiceMapDaoImpl.java | 2 +-
.../cloudstack/affinity/AffinityApiUnitTest.java | 2 +-
.../affinity/AffinityGroupServiceImplTest.java | 2 +-
.../cloudstack/backup/BackupManagerTest.java | 72 +
.../apache/cloudstack/ca/CABackgroundTaskTest.java | 12 +-
.../consoleproxy/ConsoleAccessManagerImplTest.java | 109 +
.../network/lb/ApplicationLoadBalancerTest.java | 17 +-
.../src/test/resources/createNetworkOffering.xml | 1 +
services/console-proxy/pom.xml | 2 +-
services/console-proxy/rdpconsole/README.txt | 2 +-
services/console-proxy/rdpconsole/pom.xml | 2 +-
.../rdpconsole/src/main/java/common/Client.java | 2 +-
.../src/main/java/rdpclient/ntlmssp/NegoFlags.java | 4 +-
...nnelJoinRequestServerMCSChannelConfirmPDUs.java | 2 +-
.../java/rdpclient/rdp/ServerIOChannelRouter.java | 2 +-
.../src/main/java/streamer/ByteBuffer.java | 2 +-
.../src/main/java/streamer/debug/MockSink.java | 2 +-
services/console-proxy/server/pom.xml | 2 +-
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 43 +-
.../com/cloud/consoleproxy/ConsoleProxyClient.java | 2 +
.../cloud/consoleproxy/ConsoleProxyClientBase.java | 6 +
.../consoleproxy/ConsoleProxyClientParam.java | 37 +
.../ConsoleProxyClientStatsCollector.java | 17 +
.../cloud/consoleproxy/ConsoleProxyGCThread.java | 10 +-
.../ConsoleProxyHttpHandlerHelper.java | 12 +-
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 9 +-
.../consoleproxy/ConsoleProxyNoVNCServer.java | 24 +-
.../consoleproxy/ConsoleProxyNoVncClient.java | 7 +
.../ConsoleProxyHttpHandlerHelperTest.java | 51 +
services/pom.xml | 2 +-
services/secondary-storage/controller/pom.xml | 2 +-
.../SecondaryStorageManagerImpl.java | 6 +
services/secondary-storage/pom.xml | 2 +-
services/secondary-storage/server/pom.xml | 2 +-
.../resource/NfsSecondaryStorageResource.java | 14 +-
.../storage/template/UploadManagerImpl.java | 2 +-
setup/bindir/cloud-sysvmadm.in | 75 +-
systemvm/agent/js/ajaxviewer.js | 2 +-
systemvm/agent/js/cloud.logger.js | 2 +-
systemvm/agent/noVNC/app/styles/base.css | 4 +-
systemvm/agent/noVNC/app/ui.js | 11 +-
systemvm/agent/noVNC/vnc.html | 4 +
systemvm/debian/etc/apache2/vhost.template | 7 +-
systemvm/debian/etc/haproxy/haproxy.cfg | 2 +-
systemvm/debian/etc/vpcdnsmasq.conf | 2 +-
systemvm/debian/opt/cloud/bin/configure.py | 7 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 49 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 9 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 10 +-
systemvm/debian/opt/cloud/bin/cs_ip.py | 2 +
systemvm/debian/opt/cloud/bin/dnsmasq.sh | 4 +-
systemvm/debian/opt/cloud/bin/get_haproxy_stats.sh | 45 +
systemvm/debian/opt/cloud/bin/loadbalancer.sh | 4 +-
systemvm/debian/opt/cloud/bin/merge.py | 1 +
systemvm/debian/opt/cloud/bin/netusage.sh | 26 +-
systemvm/debian/opt/cloud/bin/setup/bootstrap.sh | 17 +-
systemvm/debian/opt/cloud/bin/setup/common.sh | 23 +
.../debian/opt/cloud/bin/setup/consoleproxy.sh | 5 +
systemvm/debian/opt/cloud/bin/setup/router.sh | 7 +-
systemvm/debian/opt/cloud/bin/setup/secstorage.sh | 22 +-
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 19 +-
systemvm/debian/opt/cloud/bin/update_config.py | 2 -
.../opt/cloud/bin/update_interface_config.sh | 63 +
systemvm/debian/opt/cloud/bin/vpc_netusage.sh | 2 -
systemvm/debian/opt/cloud/bin/vr_cfg.sh | 2 +-
systemvm/debian/root/func.sh | 2 +-
systemvm/debian/var/www/html/latest/.htaccess | 2 +
systemvm/patch-sysvms.sh | 8 +-
systemvm/pom.xml | 2 +-
.../maint/test_zone_level_local_storage_setting.py | 6 +-
.../broken/test_ps_resource_limits_volume.py | 5 +-
test/integration/broken/test_vpc_vm_life_cycle.py | 2 +-
test/integration/broken/test_vr_metadata.py | 1 -
.../component/maint/test_hypervisor_limit.py | 2 +-
.../maint/test_ip_resource_count_for_vpc.py | 6 +-
.../component/maint/test_redundant_router.py | 8 +-
.../test_redundant_router_deployment_planning.py | 10 +-
.../maint/testpath_disable_enable_zone.py | 10 +-
.../component/maint/testpath_disablestoragepool.py | 2 +-
.../component/maint/testpath_vMotion_vmware.py | 2 +-
.../component/test_acl_isolatednetwork_delete.py | 3 +-
.../integration/component/test_acl_listsnapshot.py | 2 +-
test/integration/component/test_acl_listvm.py | 2 +-
test/integration/component/test_acl_listvolume.py | 2 +-
.../component/test_acl_sharednetwork.py | 2 -
.../component/test_advancedsg_networks.py | 12 +-
.../component/test_affinity_groups_projects.py | 3 -
test/integration/component/test_baremetal.py | 1 -
test/integration/component/test_brocade_vcs.py | 1 -
.../integration/component/test_browse_templates.py | 66 +-
test/integration/component/test_browse_volumes.py | 194 +-
.../test_concurrent_create_volume_from_snapshot.py | 1 -
test/integration/component/test_configdrive.py | 42 +
test/integration/component/test_cpu_limits.py | 2 +-
test/integration/component/test_deploy_vgpu_vm.py | 16 +-
.../component/test_deploy_vm_userdata_reg.py | 2 +-
.../integration/component/test_dhcp_dns_offload.py | 1 -
.../component/test_dynamic_compute_offering.py | 20 +-
test/integration/component/test_egress_rules.py | 3 -
.../component/test_escalations_instances.py | 5 +-
.../component/test_escalations_ipaddresses.py | 26 +-
.../component/test_escalations_templates.py | 3 -
.../component/test_escalations_vmware.py | 3 -
test/integration/component/test_haproxy.py | 6 +-
test/integration/component/test_host.py | 400 +-
.../component/test_hypervisor_capabilities.py | 1 -
test/integration/component/test_invalid_gw_nm.py | 1 -
test/integration/component/test_ldap.py | 1 -
.../integration/component/test_ldap_auto_import.py | 2 -
.../component/test_multi_tag_support.py | 434 +-
.../component/test_multiple_ips_per_nic.py | 4 +-
.../component/test_multiple_nic_support.py | 1 -
.../test_multiple_physical_network_creation.py | 405 ++
.../component/test_ncc_integration_dedicated.py | 538 +-
.../component/test_ncc_integration_shared.py | 646 +-
test/integration/component/test_network_ipv6.py | 2 +-
test/integration/component/test_network_mtu.py | 395 ++
.../component/test_network_vpc_custom_dns.py | 731 +++
.../component/test_organization_states.py | 8 +-
test/integration/component/test_public_ip.py | 10 +-
.../component/test_redundant_router_services.py | 1 -
.../component/test_snapshots_improvement.py | 4 +-
test/integration/component/test_stopped_vm.py | 2 +-
test/integration/component/test_tags.py | 2 +-
...template_from_snapshot_with_template_details.py | 2 +-
test/integration/component/test_vpc_ipv6.py | 2 +-
test/integration/component/test_vpc_offerings.py | 8 +-
.../component/test_vpc_vms_deployment.py | 2 +-
test/integration/plugins/ldap/test_ldap.py | 2 +-
.../plugins/solidfire/TestAddRemoveHosts.py | 1 -
.../plugins/solidfire/TestManagedSystemVMs.py | 1 -
.../integration/plugins/solidfire/TestSnapshots.py | 1 -
test/integration/plugins/solidfire/TestVolumes.py | 1 -
.../plugins/storpool/MigrateVolumeToStorPool.py | 7 +
.../plugins/storpool/TestStorPoolVolumes.py | 2 -
test/integration/plugins/storpool/sp_util.py | 30 +
test/integration/smoke/test_accounts.py | 12 +-
test/integration/smoke/test_annotations.py | 2 +-
test/integration/smoke/test_console_endpoint.py | 123 +
test/integration/smoke/test_create_network.py | 3 +-
.../smoke/test_deploy_vm_root_resize.py | 5 +-
.../smoke/test_deploy_vm_with_userdata.py | 2 +-
.../smoke/test_deploy_vms_in_parallel.py | 172 +
test/integration/smoke/test_disk_offerings.py | 50 +-
.../test_enable_role_based_users_in_projects.py | 1 -
test/integration/smoke/test_host_control_state.py | 252 +
test/integration/smoke/test_network.py | 101 +-
test/integration/smoke/test_network_ipv6.py | 2 +-
test/integration/smoke/test_network_permissions.py | 2 +-
test/integration/smoke/test_non_contigiousvlan.py | 1 -
.../smoke/test_nonstrict_affinity_group.py | 448 ++
test/integration/smoke/test_persistent_network.py | 2 +-
test/integration/smoke/test_pvlan.py | 4 +-
test/integration/smoke/test_register_userdata.py | 764 +++
test/integration/smoke/test_service_offerings.py | 68 +-
.../smoke/test_update_security_group.py | 2 +-
test/integration/smoke/test_vm_autoscaling.py | 1112 ++++
test/integration/smoke/test_vm_life_cycle.py | 10 +-
test/integration/smoke/test_vm_snapshots.py | 2 +-
test/integration/smoke/test_volumes.py | 557 +-
test/integration/smoke/test_vpc_ipv6.py | 2 +-
.../testpaths/testpath_delta_snapshots.py | 1 -
.../integration/testpaths/testpath_same_vm_name.py | 2 +-
.../testpaths/testpath_snapshot_hadrning.py | 10 +-
test/integration/testpaths/testpath_stopped_vm.py | 4 +-
.../testpaths/testpath_storage_migration.py | 2 +-
test/integration/testpaths/testpath_usage.py | 12 +-
test/integration/testpaths/testpath_vmlc.py | 10 +-
.../testpath_volume_cuncurrent_snapshots.py | 4 +-
.../testpaths/testpath_volumelifecycle.py | 2 +-
test/metadata/func/regression.xml | 2 +-
test/metadata/func/regression_new.xml | 4 +-
test/metadata/func/regression_test.xml | 2 +-
test/metadata/func/regression_user.xml | 2 +-
test/metadata/func/regression_works.xml | 2 +-
test/metadata/func/srxstresswithportfwd.xml | 595 --
test/metadata/func/vmapi.xml | 8 +-
test/pom.xml | 2 +-
test/selenium/browser/firefox.py | 1 -
test/selenium/common/__init__.py | 2 -
test/selenium/common/shared.py | 1 -
test/selenium/cspages/__init__.py | 2 -
test/selenium/cspages/cspage.py | 1 -
test/selenium/cspages/dashboard/__init__.py | 2 -
test/selenium/cspages/dashboard/dashboardpage.py | 1 -
test/selenium/cspages/login/__init__.py | 2 -
test/selenium/cstests/__init__.py | 1 -
test/selenium/cstests/regressiontests/__init__.py | 1 -
test/selenium/cstests/smoketests/__init__.py | 1 -
test/selenium/cstests/smoketests/smokecfg.py | 1 -
test/selenium/lib/Global_Locators.py | 2 -
test/selenium/lib/initialize.py | 2 +-
test/selenium/smoke/main.py | 3 -
.../main/java/com/cloud/test/utils/TestClient.java | 2 +-
tools/apidoc/build-apidoc.sh | 4 +-
tools/apidoc/gen_toc.py | 8 +-
tools/apidoc/generatetoc_header.xsl | 1 +
tools/apidoc/pom.xml | 2 +-
.../scripts/configure_systemvm_services.sh | 2 +-
tools/appliance/systemvmtemplate/template.json | 4 +-
tools/checkstyle/pom.xml | 2 +-
tools/cli/README | 1 -
tools/devcloud-kvm/pom.xml | 2 +-
tools/devcloud4/pom.xml | 2 +-
tools/docker/Dockerfile | 2 +-
tools/docker/Dockerfile.marvin | 4 +-
tools/docker/README.md | 2 +-
tools/git/git-fwd-merge | 7 +-
tools/git/git-pr | 48 +-
tools/marvin/marvin/cloudstackException.py | 1 -
tools/marvin/marvin/config/test_data.py | 2 +-
tools/marvin/marvin/configGenerator.py | 33 +-
tools/marvin/marvin/lib/base.py | 370 +-
tools/marvin/marvin/lib/common.py | 2 +-
tools/marvin/marvin/lib/utils.py | 3 +-
tools/marvin/marvin/misc/build/CI.md | 4 +-
tools/marvin/marvin/misc/build/bashUtils.py | 1 -
tools/marvin/marvin/misc/build/restartMgmt.py | 1 -
tools/marvin/marvin/sandbox/__init__.py | 2 -
tools/marvin/marvin/sandbox/advanced/__init__.py | 2 -
tools/marvin/marvin/sandbox/advancedsg/__init__.py | 2 -
tools/marvin/marvin/sandbox/basic/__init__.py | 2 -
tools/marvin/marvin/sandbox/demo/__init__.py | 1 -
tools/marvin/marvin/sandbox/demo/live/__init__.py | 1 -
.../marvin/sandbox/demo/simulator/__init__.py | 2 -
.../sandbox/demo/simulator/testcase/__init__.py | 2 -
.../demo/simulator/testcase/libs/__init__.py | 2 -
.../sandbox/demo/simulator/testcase/libs/common.py | 4 +-
.../demo/simulator/testcase/test_vm_life_cycle.py | 10 +-
tools/marvin/mvn-setup.py | 2 +-
tools/marvin/pom.xml | 8 +-
tools/marvin/setup.py | 2 +-
tools/{travis => marvin}/xunit-reader.py | 0
tools/ngui/precache.py | 2 +-
tools/ngui/static/js/lib/angular.js | 4 +-
tools/ngui/static/js/lib/jquery-1.7.2.js | 4 +-
tools/pom.xml | 2 +-
tools/transifex/README-transifex.txt | 2 +-
tools/travis/after_failure.sh | 24 -
tools/travis/after_script.sh | 22 -
tools/travis/after_success.sh | 20 -
tools/travis/before_install.sh | 139 -
tools/travis/before_script.sh | 27 -
tools/travis/install.sh | 76 -
tools/travis/script.sh | 36 -
.../database_comparision_during_upgrade/README | 4 +-
tools/whisker/LICENSE | 2 +-
tools/whisker/descriptor-for-packaging.xml | 2 +-
tools/whisker/descriptor.xml | 2 +-
ui/Dockerfile | 2 +-
ui/README.md | 19 +-
ui/docs/development.md | 6 +-
ui/docs/screenshot-dashboard.png | Bin 196953 -> 2285907 bytes
ui/package.json | 5 +
ui/public/assets/mini-logo.svg | 221 +
ui/public/config.json | 6 +-
ui/public/locales/ar.json | 893 +--
ui/public/locales/ca.json | 895 +--
ui/public/locales/de_DE.json | 1005 +--
ui/public/locales/el_GR.json | 6047 +++++++++----------
ui/public/locales/en.json | 1234 +---
ui/public/locales/es.json | 893 +--
ui/public/locales/fr_FR.json | 891 +--
ui/public/locales/hi.json | 66 +-
ui/public/locales/hu.json | 895 +--
ui/public/locales/it_IT.json | 895 +--
ui/public/locales/ja_JP.json | 22 +-
ui/public/locales/ko_KR.json | 1023 +---
ui/public/locales/nb_NO.json | 893 +--
ui/public/locales/nl_NL.json | 895 +--
ui/public/locales/pl.json | 896 +--
ui/public/locales/pt_BR.json | 3275 +++++-----
ui/public/locales/ru_RU.json | 893 +--
ui/public/locales/zh_CN.json | 6382 ++++++++++++--------
ui/src/components/header/ExternalLink.vue | 54 +
ui/src/components/header/Logo.vue | 40 +-
ui/src/components/header/SamlDomainSwitcher.vue | 2 +-
ui/src/components/header/UserMenu.vue | 4 +-
ui/src/components/menu/SideMenu.vue | 3 +-
ui/src/components/view/AnnotationsTab.vue | 2 +
ui/src/components/view/BulkActionProgress.vue | 3 +
ui/src/components/view/BulkActionView.vue | 13 +-
ui/src/components/view/DetailsTab.vue | 23 +-
ui/src/components/view/InfoCard.vue | 35 +-
ui/src/components/view/ListView.vue | 16 +-
ui/src/components/view/SearchView.vue | 6 +-
ui/src/components/view/SettingsTab.vue | 29 +-
ui/src/components/view/StatsTab.vue | 683 +++
ui/src/components/view/VolumesTab.vue | 125 +
ui/src/components/view/chart/LineChart.vue | 55 +
ui/src/components/view/stats/FilterStats.vue | 165 +
ui/src/components/view/stats/ResourceStatsInfo.vue | 95 +
ui/src/components/widgets/Breadcrumb.vue | 2 +-
ui/src/components/widgets/Console.vue | 32 +-
ui/src/components/widgets/TooltipLabel.vue | 10 +-
ui/src/config/router.js | 14 +-
ui/src/config/section/compute.js | 203 +-
ui/src/config/section/image.js | 15 +-
ui/src/config/section/infra/ilbvms.js | 4 +-
ui/src/config/section/infra/routers.js | 7 +-
ui/src/config/section/infra/systemVms.js | 8 +-
ui/src/config/section/network.js | 6 +-
ui/src/config/section/offering.js | 6 +-
ui/src/config/section/plugin/quota.js | 10 +-
ui/src/config/section/storage.js | 3 +-
ui/src/core/lazy_lib/icons_use.js | 6 +-
ui/src/store/modules/user.js | 2 +-
ui/src/style/README.md | 2 +-
.../style/{component => components}/dashboard.less | 0
ui/src/style/components/view/StatsTab.scss | 32 +
ui/src/utils/plugins.js | 30 +
ui/src/utils/util.js | 7 +
ui/src/views/AutogenView.vue | 50 +-
ui/src/views/compute/AutoScaleDownPolicyTab.vue | 952 +++
ui/src/views/compute/AutoScaleLoadBalancing.vue | 1221 ++++
ui/src/views/compute/AutoScaleUpPolicyTab.vue | 952 +++
ui/src/views/compute/AutoScaleVmProfile.vue | 667 ++
ui/src/views/compute/CreateAutoScaleVmGroup.vue | 3029 ++++++++++
ui/src/views/compute/CreateKubernetesCluster.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 296 +-
ui/src/views/compute/EditVM.vue | 23 +-
ui/src/views/compute/InstanceTab.vue | 70 +-
ui/src/views/compute/KubernetesServiceTab.vue | 2 +-
ui/src/views/compute/RegisterUserData.vue | 255 +
ui/src/views/compute/ResetUserData.vue | 394 ++
ui/src/views/compute/StartVirtualMachine.vue | 11 +-
.../compute/wizard/AffinityGroupSelection.vue | 9 +-
.../compute/wizard/ComputeOfferingSelection.vue | 13 +-
.../views/compute/wizard/LoadBalancerSelection.vue | 208 +
.../views/compute/wizard/NetworkConfiguration.vue | 22 +-
ui/src/views/compute/wizard/NetworkSelection.vue | 36 +-
ui/src/views/compute/wizard/UserDataSelection.vue | 202 +
ui/src/views/iam/AddLdapAccount.vue | 2 +-
ui/src/views/iam/SSLCertificateTab.vue | 1 -
.../views/image/AddKubernetesSupportedVersion.vue | 1 -
ui/src/views/image/IsoZones.vue | 2 +-
ui/src/views/image/RegisterOrUploadIso.vue | 110 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 111 +-
ui/src/views/image/TemplateZones.vue | 2 +-
ui/src/views/image/UpdateISO.vue | 307 +
ui/src/views/image/UpdateTemplate.vue | 131 +-
ui/src/views/infra/AddPrimaryStorage.vue | 14 +-
ui/src/views/infra/HostInfo.vue | 8 +
ui/src/views/infra/network/ServiceProvidersTab.vue | 59 -
.../infra/network/providers/AddSrxFirewall.vue | 381 --
.../infra/network/providers/ProviderListView.vue | 9 -
ui/src/views/infra/zone/StaticInputsForm.vue | 39 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 106 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 30 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 2 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 172 +-
ui/src/views/network/CreateL2NetworkForm.vue | 1 -
ui/src/views/network/CreateNetwork.vue | 1 -
ui/src/views/network/CreateSharedNetworkForm.vue | 370 +-
ui/src/views/network/CreateVpc.vue | 123 +-
ui/src/views/network/GuestIpRanges.vue | 1 -
ui/src/views/network/LoadBalancing.vue | 125 +-
ui/src/views/network/UpdateNetwork.vue | 146 +-
ui/src/views/network/VpcTiersTab.vue | 40 +-
ui/src/views/offering/AddComputeOffering.vue | 46 +-
ui/src/views/offering/AddDiskOffering.vue | 44 +-
ui/src/views/offering/AddNetworkOffering.vue | 27 +-
ui/src/views/offering/AddVpcOffering.vue | 53 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 1 -
ui/src/views/plugins/quota/QuotaSummary.vue | 4 +-
ui/src/views/storage/FormSchedule.vue | 3 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 4 +-
ui/src/views/tools/ManageInstances.vue | 2 +-
ui/tests/mockData/AutogenView.mock.json | 6 +-
ui/tests/unit/components/view/ActionButton.spec.js | 3 +
ui/tests/unit/views/AutogenView.spec.js | 14 +-
usage/pom.xml | 2 +-
.../java/com/cloud/usage/UsageManagerImpl.java | 5 +-
.../java/com/cloud/usage/UsageSanityChecker.java | 146 +-
.../src/main/resources/usageApplicationContext.xml | 6 +
utils/pom.xml | 9 +-
utils/src/main/java/com/cloud/utils/DateUtil.java | 2 +
.../src/main/java/com/cloud/utils/StringUtils.java | 24 +-
utils/src/main/java/com/cloud/utils/UriUtils.java | 84 +
utils/src/main/java/com/cloud/utils/UuidUtils.java | 21 +-
.../cloud/utils/cisco/n1kv/vsm/VsmResponse.java | 2 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 60 +-
.../nicira/nvp/plugin/NiciraNvpApiVersion.java | 6 +-
.../cloud/utils/rest/HttpUriRequestBuilder.java | 2 +-
.../cloudstack/utils/bytescale/ByteScaleUtils.java | 27 +-
.../utils/consoleproxy/ConsoleAccessUtils.java | 25 +
.../utils/imagestore/ImageStoreUtil.java | 4 +-
.../utils/jsinterpreter/JsInterpreter.java | 146 +
.../ReflectionToStringBuilderUtils.java | 14 +
.../src/test/java/com/cloud/utils/ScriptTest.java | 2 +-
.../test/java/com/cloud/utils/UriUtilsTest.java | 154 +-
.../test/java/com/cloud/utils/UuidUtilsTest.java | 22 +-
.../java/com/cloud/utils/net/NetUtilsTest.java | 62 +-
.../utils/bytescale/ByteScaleUtilsTest.java | 37 +-
.../utils/imagestore/ImageStoreUtilTest.java | 39 +-
.../utils/jsinterpreter/JsInterpreterTest.java | 188 +
.../utils/mailing/SMTPMailSenderTest.java | 3 +-
.../ReflectionToStringBuilderUtilsTest.java | 24 +
vmware-base/pom.xml | 2 +-
.../com/cloud/hypervisor/vmware/mo/ClusterMO.java | 16 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 2 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 65 +-
1915 files changed, 78393 insertions(+), 45870 deletions(-)
create mode 100644 .github/workflows/build.yml
create mode 100644 .github/workflows/ci.yml
delete mode 100644 .github/workflows/coverage-check.yml
delete mode 100644 .github/workflows/main-coverage.yml
create mode 100644 .github/workflows/main-sonar-check.yml
create mode 100644 .github/workflows/rat.yml
create mode 100644 .github/workflows/sonar-check.yml
create mode 100644 .github/workflows/ui.yml
create mode 100644 .pre-commit-config.yaml
delete mode 100644 .travis.yml
create mode 100644 agent/src/test/java/com/cloud/agent/properties/AgentPropertiesTest.java
create mode 100644 api/src/main/java/com/cloud/host/ControlState.java
create mode 100644 api/src/main/java/com/cloud/network/router/VirtualRouterAutoScale.java
create mode 100644 api/src/main/java/com/cloud/user/UserData.java
delete mode 100644 api/src/main/java/org/apache/cloudstack/acl/APILimitChecker.java
mode change 100755 => 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/direct/download/UploadTemplateDirectDownloadCertificateCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/offering/IsAccountAllowedToCreateOfferingsWithTagsCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/vm/ResetVMUserDataCmdAdmin.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/autoscale/UpdateConditionCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/ConsoleEndpoint.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/consoleproxy/CreateConsoleEndpointCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/vm/ResetVMUserDataCmd.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/ConsoleEndpointWebsocketResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/CreateConsoleEndpointResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/IsAccountAllowedToCreateOfferingsWithTagsResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java
create mode 100644 api/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManager.java
create mode 100644 api/src/main/java/org/apache/cloudstack/usage/UsageUnitTypes.java
create mode 100644 api/src/main/java/org/apache/cloudstack/user/ResourceReservation.java
create mode 100644 api/src/test/java/com/cloud/agent/api/to/LoadBalancerTOTest.java
create mode 100644 api/src/test/java/com/cloud/deploy/DataCenterDeploymentTest.java
create mode 100644 api/src/test/java/com/cloud/host/ControlStateTest.java
create mode 100644 api/src/test/java/com/cloud/network/as/AutoScalePolicyTest.java
create mode 100644 api/src/test/java/com/cloud/network/as/AutoScaleVmGroupTest.java
create mode 100644 api/src/test/java/com/cloud/network/router/VirtualRouterAutoScaleTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/test/CreateAutoScaleVmProfileCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/test/ResetVMUserDataCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/test/UpdateAutoScaleVmProfileCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/test/UpdateConditionCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/CreateNetworkCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/network/UpdateNetworkCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/userdata/DeleteUserDataCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/userdata/LinkUserDataToTemplateCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/userdata/ListUserDataCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/api/command/user/vpc/UpdateVPCCmdTest.java
create mode 100644 api/src/test/java/org/apache/cloudstack/usage/UsageUnitTypesTest.java
create mode 100644 core/src/main/java/com/cloud/agent/api/proxy/AllowConsoleAccessCommand.java
create mode 100644 core/src/main/java/com/cloud/agent/api/routing/GetAutoScaleMetricsAnswer.java
create mode 100644 core/src/main/java/com/cloud/agent/api/routing/GetAutoScaleMetricsCommand.java
create mode 100644 core/src/main/java/com/cloud/agent/api/routing/UpdateNetworkCommand.java
create mode 100644 core/src/test/java/com/cloud/resource/ServerResourceBaseTest.java
create mode 100644 core/src/test/java/org/apache/cloudstack/api/agent/test/GetAutoScaleMetricsAnswerTest.java
create mode 100644 core/src/test/java/org/apache/cloudstack/api/agent/test/GetAutoScaleMetricsCommandTest.java
delete mode 100644 engine/orchestration/src/test/resources/provisioningContext.xml
create mode 100644 engine/schema/src/main/java/com/cloud/network/as/AutoScaleVmGroupStatisticsVO.java
create mode 100644 engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupStatisticsDao.java
create mode 100644 engine/schema/src/main/java/com/cloud/network/as/dao/AutoScaleVmGroupStatisticsDaoImpl.java
create mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41720to41800.java
create mode 100644 engine/schema/src/main/java/com/cloud/user/UserDataVO.java
create mode 100644 engine/schema/src/main/java/com/cloud/user/dao/UserDataDao.java
create mode 100644 engine/schema/src/main/java/com/cloud/user/dao/UserDataDaoImpl.java
create mode 100644 engine/schema/src/main/java/com/cloud/vm/constants/VmDetails.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/reservation/ReservationVO.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDao.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/reservation/dao/ReservationDaoImpl.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/secret/PassphraseVO.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/secret/dao/PassphraseDao.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/secret/dao/PassphraseDaoImpl.java
create mode 100644 engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImpl.java
create mode 100644 engine/schema/src/main/resources/META-INF/cloudstack/core/spring-engine-schema-core-common-daos-between-management-and-usage-context.xml
create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41720to41800-cleanup.sql
create mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41720to41800.sql
create mode 100755 engine/schema/src/test/java/com/cloud/network/as/AutoScaleVmProfileVOTest.java
create mode 100644 engine/schema/src/test/java/com/cloud/network/as/dao/AutoScaleVmGroupDaoImplTest.java
create mode 100644 engine/schema/src/test/java/com/cloud/network/as/dao/AutoScaleVmGroupStatisticsDaoImplTest.java
create mode 100644 engine/schema/src/test/java/com/cloud/network/as/dao/AutoScaleVmGroupVmMapDaoImplTest.java
create mode 100644 engine/schema/src/test/java/com/cloud/network/dao/NetworkDaoImplTest.java
create mode 100644 engine/schema/src/test/java/com/cloud/upgrade/DatabaseVersionHierarchyTest.java
delete mode 100644 engine/storage/src/main/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
create mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/datastore/db/SnapshotDataStoreDaoImplTest.java
delete mode 100644 engine/storage/src/test/java/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImplTest.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Account.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOffering.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOffering.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResources.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Domain.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariable.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Host.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelper.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariables.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Resource.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Role.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Storage.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/activationrule/presetvariables/Value.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VmTemplateDao.java
create mode 100644 framework/quota/src/main/java/org/apache/cloudstack/quota/dao/VmTemplateDaoImpl.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/AccountTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/BackupOfferingTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputeOfferingTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ComputingResourcesTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/DomainTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/GenericPresetVariableTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/HostTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/PresetVariableHelperTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ResourceTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/RoleTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/StorageTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/activationrule/presetvariables/ValueTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/dao/QuotaAccountDaoImplTest.java
create mode 100644 framework/quota/src/test/java/org/apache/cloudstack/quota/vo/QuotaTariffVOTest.java
copy packaging/{suse15 => el9} (100%)
create mode 100644 plugins/acl/project-role-based/src/main/test/java/org/apache/cloudstack/acl/ProjectRoleBasedApiAccessCheckerTest.java
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/pom.xml
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessor.java
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/module.properties
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-affinity/spring-non-strict-host-affinity-context.xml
create mode 100644 plugins/affinity-group-processors/non-strict-host-affinity/src/test/java/org/apache/cloudstack/affinity/NonStrictHostAffinityProcessorTest.java
create mode 100644 plugins/affinity-group-processors/non-strict-host-anti-affinity/pom.xml
create mode 100644 plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/java/org/apache/cloudstack/affinity/NonStrictHostAntiAffinityProcessor.java
create mode 100644 plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/module.properties
create mode 100644 plugins/affinity-group-processors/non-strict-host-anti-affinity/src/main/resources/META-INF/cloudstack/non-strict-host-anti-affinity/spring-non-strict-host-anti-affinity-context.xml
create mode 100644 plugins/affinity-group-processors/non-strict-host-anti-affinity/src/test/java/org/apache/cloudstack/affinity/NonStrictHostAntiAffinityProcessorTest.java
create mode 100644 plugins/backup/networker/pom.xml
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/NetworkerBackupProvider.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerBackupOffering.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerClient.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/NetworkerObject.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Action.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ActionSpecificData.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Attribute.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/BackupSpecificData.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/CompletionNotification.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Expire.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Instance.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Link.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/NetworkerBackup.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/NetworkerBackups.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ProtectionPolicies.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ProtectionPolicy.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ResourceId.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/ServerBackup.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Size.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/SummaryNotification.java
create mode 100644 plugins/backup/networker/src/main/java/org/apache/cloudstack/backup/networker/api/Traditional.java
create mode 100644 plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/module.properties
create mode 100644 plugins/backup/networker/src/main/resources/META-INF/cloudstack/networker/spring-backup-networker-context.xml
create mode 100644 plugins/backup/networker/src/test/java/org/apache/backup/networker/NetworkerClientTest.java
create mode 100644 plugins/backup/veeam/src/test/java/org/apache/cloudstack/backup/VeeamBackupProviderTest.java
create mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffCreateCmd.java
create mode 100644 plugins/database/quota/src/main/java/org/apache/cloudstack/api/command/QuotaTariffDeleteCmd.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetAutoScaleMetricsCommandWrapper.java
delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
delete mode 100644 plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStoragePool.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/cryptsetup/CryptSetup.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/cryptsetup/CryptSetupException.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/cryptsetup/KeyFile.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuImageOptions.java
create mode 100644 plugins/hypervisors/kvm/src/main/java/org/apache/cloudstack/utils/qemu/QemuObject.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtStoragePoolXMLParserTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtGetAutoScaleMetricsCommandWrapperTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/storage/ScaleIOStorageAdaptorTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/cryptsetup/CryptSetupTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/cryptsetup/KeyFileTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuImageOptionsTest.java
create mode 100644 plugins/hypervisors/kvm/src/test/java/org/apache/cloudstack/utils/qemu/QemuObjectTest.java
create mode 100644 plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xcp/XcpServerGetAutoScaleMetricsCommandWrapper.java
create mode 100644 plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xen56/XenServer56GetAutoScaleMetricsCommandWrapper.java
delete mode 100644 plugins/network-elements/f5/pom.xml
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddExternalLoadBalancerCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/AddF5LoadBalancerCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ConfigureF5LoadBalancerCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteExternalLoadBalancerCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/DeleteF5LoadBalancerCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListExternalLoadBalancersCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancerNetworksCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/commands/ListF5LoadBalancersCmd.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/api/response/F5LoadBalancerResponse.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElement.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/element/F5ExternalLoadBalancerElementService.java
delete mode 100644 plugins/network-elements/f5/src/main/java/com/cloud/network/resource/F5BigIpResource.java
delete mode 100644 plugins/network-elements/f5/src/main/resources/META-INF/cloudstack/f5/module.properties
delete mode 100644 plugins/network-elements/f5/src/main/resources/META-INF/cloudstack/f5/spring-f5-context.xml
delete mode 100644 plugins/network-elements/juniper-srx/pom.xml
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddExternalFirewallCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/AddSrxFirewallCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ConfigureSrxFirewallCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteExternalFirewallCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/DeleteSrxFirewallCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallNetworksCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListSrxFirewallsCmd.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/response/SrxFirewallResponse.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXExternalFirewallElement.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/element/JuniperSRXFirewallElementService.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/java/com/cloud/network/resource/JuniperSrxResource.java
delete mode 100644 plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/module.properties
delete mode 100644 plugins/network-elements/juniper-srx/src/main/resources/META-INF/cloudstack/srx/spring-srx-context.xml
create mode 100644 plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStorageAdaptor.java
create mode 100644 plugins/storage/volume/linstor/src/main/java/com/cloud/hypervisor/kvm/storage/LinstorStoragePool.java
create mode 100644 plugins/storage/volume/storpool/src/test/java/org/apache/cloudstack/storage/datastore/driver/StorPoolPrimaryDataStoreDriverTest.java
create mode 100755 scripts/vm/hypervisor/kvm/nsrkvmbackup.sh
create mode 100755 scripts/vm/hypervisor/kvm/nsrkvmrestore.sh
mode change 100755 => 100644 server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java
delete mode 100644 server/src/main/java/com/cloud/network/element/CloudZonesNetworkElement.java
create mode 100644 server/src/main/java/com/cloud/resourcelimit/CheckedReservation.java
create mode 100644 server/src/main/java/com/cloud/user/PasswordPolicy.java
create mode 100644 server/src/main/java/com/cloud/user/PasswordPolicyImpl.java
create mode 100644 server/src/main/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImpl.java
create mode 100644 server/src/test/java/com/cloud/configuration/ConfigTest.java
create mode 100644 server/src/test/java/com/cloud/configuration/ConfigurationManagerImplTest.java
create mode 100644 server/src/test/java/com/cloud/network/NetworkModelImplTest.java
create mode 100644 server/src/test/java/com/cloud/network/as/AutoScaleManagerImplTest.java
create mode 100644 server/src/test/java/com/cloud/network/as/AutoScaleManagerTest.java
create mode 100644 server/src/test/java/com/cloud/network/guru/ExternalGuestNetworkGuruTest.java
create mode 100644 server/src/test/java/com/cloud/network/lb/LoadBalancingRulesManagerImplTest.java
create mode 100644 server/src/test/java/com/cloud/network/router/CommandSetupHelperTest.java
create mode 100644 server/src/test/java/com/cloud/resourcelimit/CheckedReservationTest.java
create mode 100644 server/src/test/java/com/cloud/user/PasswordPolicyImplTest.java
create mode 100644 server/src/test/java/org/apache/cloudstack/consoleproxy/ConsoleAccessManagerImplTest.java
create mode 100644 services/console-proxy/server/src/test/java/com/cloud/consoleproxy/ConsoleProxyHttpHandlerHelperTest.java
create mode 100755 systemvm/debian/opt/cloud/bin/get_haproxy_stats.sh
create mode 100644 systemvm/debian/opt/cloud/bin/update_interface_config.sh
create mode 100644 test/integration/component/test_multiple_physical_network_creation.py
create mode 100644 test/integration/component/test_network_mtu.py
create mode 100644 test/integration/component/test_network_vpc_custom_dns.py
create mode 100644 test/integration/smoke/test_console_endpoint.py
create mode 100644 test/integration/smoke/test_deploy_vms_in_parallel.py
create mode 100644 test/integration/smoke/test_host_control_state.py
create mode 100644 test/integration/smoke/test_nonstrict_affinity_group.py
create mode 100644 test/integration/smoke/test_register_userdata.py
create mode 100644 test/integration/smoke/test_vm_autoscaling.py
delete mode 100644 test/metadata/func/srxstresswithportfwd.xml
delete mode 100644 tools/cli/README
rename tools/{travis => marvin}/xunit-reader.py (100%)
delete mode 100755 tools/travis/after_failure.sh
delete mode 100755 tools/travis/after_script.sh
delete mode 100755 tools/travis/after_success.sh
delete mode 100755 tools/travis/before_install.sh
delete mode 100755 tools/travis/before_script.sh
delete mode 100755 tools/travis/install.sh
delete mode 100755 tools/travis/script.sh
create mode 100644 ui/public/assets/mini-logo.svg
create mode 100644 ui/src/components/header/ExternalLink.vue
create mode 100644 ui/src/components/view/StatsTab.vue
create mode 100644 ui/src/components/view/VolumesTab.vue
create mode 100644 ui/src/components/view/chart/LineChart.vue
create mode 100644 ui/src/components/view/stats/FilterStats.vue
create mode 100644 ui/src/components/view/stats/ResourceStatsInfo.vue
rename ui/src/style/{component => components}/dashboard.less (100%)
create mode 100644 ui/src/style/components/view/StatsTab.scss
create mode 100644 ui/src/views/compute/AutoScaleDownPolicyTab.vue
create mode 100644 ui/src/views/compute/AutoScaleLoadBalancing.vue
create mode 100644 ui/src/views/compute/AutoScaleUpPolicyTab.vue
create mode 100644 ui/src/views/compute/AutoScaleVmProfile.vue
create mode 100644 ui/src/views/compute/CreateAutoScaleVmGroup.vue
create mode 100644 ui/src/views/compute/RegisterUserData.vue
create mode 100644 ui/src/views/compute/ResetUserData.vue
create mode 100644 ui/src/views/compute/wizard/LoadBalancerSelection.vue
create mode 100644 ui/src/views/compute/wizard/UserDataSelection.vue
create mode 100644 ui/src/views/image/UpdateISO.vue
delete mode 100644 ui/src/views/infra/network/providers/AddSrxFirewall.vue
create mode 100644 utils/src/main/java/org/apache/cloudstack/utils/consoleproxy/ConsoleAccessUtils.java
create mode 100644 utils/src/main/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreter.java
create mode 100644 utils/src/test/java/org/apache/cloudstack/utils/jsinterpreter/JsInterpreterTest.java