This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch VMDynamicScalabilityGranularity
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
discard 9873148 Changes added to UI to show Scale VM icon to only VMs which
are marked as dynamically scalable.
discard 5e2ea83 Set default value to true for dynamic scaling enabled column
on ServiceOfferingVO
discard 19f4853 Formatting Changes
discard 3b931d6 Fixed Boolean to boolean Added UI response parameter to
system VMs
discard ebe66d8 Added version number on new API parameters Used single method
for multiple checks
discard ce55d6f Added marvin tests required for these changes
discard e847266 Reverted 414 to 415 schema file empty line changes
discard 67fc8d7 Changed name from dynamically scalable to dynamic scaling
enabled for service offering VO and its usages
discard 023256c Naming corrections for service offering response
discard 97f7e37 Added dynamic scalable flag on template while updating
stopped VM. Fixed some log messages
discard 386b34e Added tool tip during VM deployment
discard 7ed3b14 Filter service offerings based on dynamic scalable flag while
listing offerings for scaling VM
discard 75beede Added response param in UI for system service offering
discard 6ce0fb2 UI changes, added new labels
discard c5da28c UI changes
discard 1983c2e3 Dynamic Scaling option granularity
add 5895435 tests: Extend wait time after interrupt (#4815)
add 6262366 ui: Fix add primary store during Zone Deployment for PreSetup
protocol (#4845)
add 83b568e ui: fix add cluster form for vmware (#4841)
add a53ecac ui: Fill out the search filter form field after performing a
filter (#4855)
add eaefc2a ui: Fix the styles action button (#4856)
add bd79e1a ui: Consider overprovisioning factor when displaying
allocated progress bar (#4850)
add 64f792b Merge release branch 4.15 to master
add 40d93af vpc: dnsmasq is not started if use.external.dns is true
(#4806)
add dab7d29 systemvm: Load modules to support NAT traversal in VR (#4777)
add 61de237 ui: Disable login button until redirected (#4857)
add 96dd728 plugins: Add 'break' at RedifshClient request re-try loop
(#4846)
add 546bf3d server: Update vm_template table to set template as removed
on deletion (#4748)
add 9f730ea Merge remote-tracking branch 'origin/4.15'
add 90bd4ba Revert "plugins: Add 'break' at RedifshClient request re-try
loop (#4846)" (#4861)
add 5d6f746 Merge remote-tracking branch 'origin/4.15'
add 5df1337 ui: fix update template permission (#4744)
add 9b1d1e6 systemvmtemplate: new template for 4.15.1 (#4793)
add 952b242 kvm: Do not set backing file format of DATADISK in vm
start/migration (#4800)
add 0094cf4 tests: Extend wait time after interrupt (#4815) (#4866)
add 918c3bd Merge release branch 4.14 to 4.15
add 8903647 Merge branch '4.15'
add d763169 Restore VMware VM naming convention option (#4581)
add 9717669 server: Fix issue with volume resize on VMWare (deploy as-is
templates) (#4829)
add 6428780 ui: Auto-focus input, form (#4762)
add 3e8dbc05 ui: add cancel button missing on dialog (#4763)
add caa55a5 ui: fix page size on mobile view (#4765)
add b8884ef server: create DB entry for storage pool capacity when create
storage pool (#4805)
add 8911111 server: Remove the rule(s) validation with api names while
importing role, to be in sync with the create role permission behavior (#4840)
add d6a7427 plugins: Add 'break' at RedifshClient request re-try loop
(fixed issue from 4846) (#4864)
add c1a02e1 Merge remote-tracking branch 'origin/4.15'
add 61977fa README: Remove IRC references and update bug reporting link
(#4879)
add 03ad702 server: Set free memory to zero if greater than total memory
(#4571)
add 5b986be ui: fix the style of zone wizard on mobile view (#4764)
add fd4bc61 ui: assignVM: Set isrecursive to false when fetching accounts
(#4867)
add 69825f6 ui: Display root disk size in Compute offering details (#4862)
add 02abb87 server: allow copy cross-zone templates to other zone (#4804)
add 76ba5c6 server: Fix displaying public IP address of shared networks
(#4675)
add 63c91c1 server: Fix network statistics for vpc (#3944)
add dc5b9ec systemvm: remove logrotate config for wtmp and btmp (#4872)
add 2513683 ui: allow docHelp override using config.json (#4745)
add d4ba004 VR: fix rsyslog compresses log files but not release disk
space in VR (#4869)
add 575e18c ui: Restored the Basic Networking (#4882)
add 95cd937 server: fix hahost value in listHosts (#4789)
add 2cdde87 Merge remote-tracking branch 'origin/4.14' into 4.15
add d4635e3 Merge remote-tracking branch 'origin/4.15'
add 0942838 kvm: remove unnecessary new String (#4870)
add def65ec Merge remote-tracking branch 'origin/4.15'
add 154734c ui: Remove .env.local (#4893)
add 47b7288 server: Disable VR health check for VPC without tiers (#4888)
add c75c6ba ui: Display public ip addresses for shared network (#4676)
add ca4669c systemvm: Add localized "data-server" records in /etc/hosts
for VPC routers (#4873)
add 43257f8 Merge remote-tracking branch 'origin/4.14' into 4.15
add 3783fd5 Merge remote-tracking branch 'origin/4.15'
add 0dbeb26 server: Support for persistence mode in L2 networks (#4561)
add 4dcd9a2 ui: Moves fetchdata() to the created() (#4811)
add 6048afb xenserver: retrieve correct name-label for presetup store
(#4816)
add 6c3f4b4 Merge remote-tracking branch 'origin/4.14' into 4.15
add 3066c95 Merge remote-tracking branch 'origin/4.15'
add 467a1e7 travis: fix component test failure - persistent networks
(#4894)
add bc24268 Merge remote-tracking branch 'origin/4.15'
add a92b294 ui: Save and auto-expand list domain when reloading (#4769)
add c2d51cb ui: Fix bug in creating shared network (#4666)
add 1a335e8 server: filter null details during volume to template
creation (#4794)
add cb91a76 Fix npe when migrating vm with volume (#4698) (#4775)
add 7270ca7 Merge remote-tracking branch 'origin/4.14' into 4.15
add ca5c11a Merge remote-tracking branch 'origin/4.15'
add 2621c3d test cleanup (#4473)
add 52c36ca kvm: Fix deploy VM from ISOs with UEFI (#4773)
add 9da8124 maven: version 2.11 is incompatible with java 11 (#4802)
add 49acd1d Merge remote-tracking branch 'origin/4.15'
add 35b20b2 vmware: Fix worker VM hardware version format (#4851)
add 76e9c27 Merge remote-tracking branch 'origin/4.15'
add be78180 ui: fix physical network setup in zone wizard (#4892)
add 7208fac mvn: using forked version of trilead-ssh2 (from
org.jenkins-ci) (#4099)
add 2622856 kvm: Disable shrinking QCOW2 volumes (#4679)
add ecc1816 Merge remote-tracking branch 'origin/4.15'
add 6d0d701 api,engine/schema,server: vm readonly details rename (#4671)
add cd38519 tests: Fix k8s test failures on VMware (#4896)
add d8c6e00 hypervisor: XCP-ng 8.2 support (#4672)
add cd60b8d host-allocator: check capacity for suitable hosts (#4884)
add ca8920d Merge remote-tracking branch 'origin/4.14' into 4.15
add 22f6c19 Merge remote-tracking branch 'origin/4.15'
add 03c05bc tests: skip livemigration for centos (#4801)
add 99a9063 server: Added recursive fetch of child domains for
listUsageRecords API call (#4717)
add fdefee7 vmware: fix inter-cluster stopped vm and volume migration
(#4895)
add e47dc9c ldap: Fix orphan entry on ldap trust map after account
removal (#4899)
add 4bab06a systemvm: Restricting http access on VR to internal network
(#4847)
add 6b1c94e server: fix root disk size on vm reset (#4638)
add e824fdb Merge remote-tracking branch 'origin/4.14' into 4.15
add a64ad9d server: Prevent vm snapshots being indefinitely stuck in
Expunging state on deletion failure (#4898)
add cce7367 Merge remote-tracking branch 'apache/4.15'
add 9cf1e0e vmware: Fix VMware OVF properties copy from template (#4738)
add 4c16024 ui: fix login when username is email (#4910)
add 8fd9150 Merge remote-tracking branch 'origin/4.15'
add 911376e Improve logs on KVMHostActivityChecker (#4706)
add b28d638 Add support to StartTLS on Quota's mailing (#4573)
add 4dd7db1 server: Fixed hosts not displaying with incompatible locale
(#4900)
add 87d73b9 ui: Korean language support for all features of the new
CloudStack UI. (#4916)
add 6200ac8 ui: Search view - Fixes the color style of the filter icon
(#4917)
add a69bf67 Merge remote-tracking branch 'origin/4.15'
add f00b5fc server: Fix for the issue of recover VM not able to attach
the data disks which are there before destroy in case of VMware (#4493)
add 50da578 test: reduce vr traceroute hops (#4913)
add 8fec222 ui: fix not find tab name due to language other than English
(#4920)
add 0302750 vmware: Add support for VMware 7 (#4300)
add f420247 Merge remote-tracking branch 'origin/4.15'
add de55766 Migrate/Stop VMs with local storage when preparing host for
maintenance (#4212)
add 3c8a504 Improve logs on IpmitoolOutOfBandManagementDriver (#4702)
add 90fc5ac ui: Show diskoffering for create volume from ROOT volume
snaps (#4912)
add 0bbf114 ui: Support to update disk/network offering tags from UI
(#4923)
add 7da7c48 debian: remove duplicate agent jar copy (#4927)
add 8edd709 ui: disabled root disk size customization if Service Offering
has a fixed size (#4933)
add 5051fde server: Stat collector solidfire capacity fix (#4918)
add 585164a server: Add UnavailableCommandException at
ExceptionErrorCodeMap (#4926)
add 40a2ca4 cloudian: Set cloudian.connector.enabled as not dynamic
(#4938)
add a5e53dc ui: fix autogen form exec with action mapping options (#4909)
add e107f9a Merge remote-tracking branch 'origin/4.15'
add 49baa900 Readme: Fix broken API documentation link on Readme (#4942)
add b4ee4ac server: Fix volume state on migrate with
migrateVirtualMachineWithVolume API call (#4934)
add a30d518 vmware: fix stopped VM volume migration (#4758)
add f728287 server: Fix template garbage collection cleanup (#4944)
add bc2a6e8 ui: Fix error in adduser (#4950)
add f9ca881 ui: Show domain path instead of name (#4949)
add f8ba33d server: Some APIs should have access check (#4859)
add 42c83b0 Merge remote-tracking branch 'apache/4.15'
add c7db4f4 changed variable name to avoid collision in python3 (#4903)
add 96ccd6d ui: Show traffic type in physical networks tab (#4952)
add 04cdb50 debian: Adding net tools as a dependency (#4951)
add d4db101 marvin: fix test_scale_vm for xenserver/Xcp-ng (#4929)
add d68b098 UI: Show IPv6 address of Instance (#4948)
add 8e31d1e api: fix disk/service offering keys (#4946)
add 1e859a0 Merge remote-tracking branch 'origin/4.15'
add 73f82ae ui: Save the tab and re-activate it after submitting the
form. (#4962)
add 98e2ed3 vmware: Add force parameter to iso attach/detach operations
(#4907)
add 39cb2bf ui: Display 'Add LDAP Account' button when LDAP configuration
is added (#4971)
add be255e4 server: protect against stray snapshot-details without
snapshot (#4924)
add de30f3b vmware cks: Guard k8s cluster root disk resize if no root
disk size passed (#4957)
add 4742ac1 Merge remote-tracking branch 'origin/4.15'
add adb2760 Dynamic Scaling option granularity
add d01ac0d UI changes
add ca2066f UI changes, added new labels
add eca8982 Added response param in UI for system service offering
add 7b703c0 Filter service offerings based on dynamic scalable flag while
listing offerings for scaling VM
add f0c0c71 Added tool tip during VM deployment
add 848f90b Added dynamic scalable flag on template while updating
stopped VM. Fixed some log messages
add 082fc97 Naming corrections for service offering response
add edd3c63 Changed name from dynamically scalable to dynamic scaling
enabled for service offering VO and its usages
add e705f9e Reverted 414 to 415 schema file empty line changes
add 9696a51 Added marvin tests required for these changes
add d3e9860 Added version number on new API parameters Used single method
for multiple checks
add 4d6ff34 Fixed Boolean to boolean Added UI response parameter to
system VMs
add ec9f529 Formatting Changes
add e14a48c Set default value to true for dynamic scaling enabled column
on ServiceOfferingVO
add ae86e73 Changes added to UI to show Scale VM icon to only VMs which
are marked as dynamically scalable.
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (9873148)
\
N -- N -- N refs/heads/VMDynamicScalabilityGranularity (ae86e73)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
No new revisions were added by this update.
Summary of changes:
.travis.yml | 1 +
README.md | 8 +-
.../network/VirtualNetworkApplianceService.java | 3 +
.../com/cloud/template/TemplateApiService.java | 4 +-
.../main/java/com/cloud/vm/VmDetailConstants.java | 1 +
.../java/com/cloud/vm/snapshot/VMSnapshot.java | 1 +
.../apache/cloudstack/api/ApiServerService.java | 2 -
.../api/command/admin/acl/ImportRoleCmd.java | 3 -
.../command/admin/usage/ListUsageRecordsCmd.java | 9 +
.../api/command/user/iso/AttachIsoCmd.java | 10 +-
.../api/command/user/iso/DetachIsoCmd.java | 14 +-
.../api/response/HostForMigrationResponse.java | 7 +-
.../cloudstack/api/response/UserVmResponse.java | 16 +-
.../org/apache/cloudstack/query/QueryService.java | 6 +-
...=> CleanupPersistentNetworkResourceAnswer.java} | 10 +-
...> CleanupPersistentNetworkResourceCommand.java} | 28 +-
...ontrolAnswer.java => GetVmVncTicketAnswer.java} | 17 +-
...uterCommand.java => GetVmVncTicketCommand.java} | 19 +-
.../java/com/cloud/agent/api/MigrateCommand.java | 9 +
...swer.java => SetupPersistentNetworkAnswer.java} | 9 +-
...and.java => SetupPersistentNetworkCommand.java} | 27 +-
.../main/java/com/cloud/agent/api/StopCommand.java | 9 +
.../java/com/cloud/agent/api/UnPlugNicCommand.java | 11 +
.../agent/api/storage/MigrateVolumeCommand.java | 18 +-
.../cloudstack/storage/command/AttachCommand.java | 9 +
.../cloudstack/storage/command/DettachCommand.java | 27 +
debian/control | 2 +-
debian/rules | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 3 +
.../java/com/cloud/capacity/CapacityManager.java | 4 +
.../java/com/cloud/network/IpAddressManager.java | 17 +
.../java/com/cloud/resource/ResourceManager.java | 8 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 193 +-
.../engine/orchestration/DataMigrationUtility.java | 4 +-
.../engine/orchestration/NetworkOrchestrator.java | 139 +-
.../engine/orchestration/VolumeOrchestrator.java | 7 +
.../src/main/java/com/cloud/host/HostVO.java | 2 +-
.../java/com/cloud/network/dao/NetworkDao.java | 2 +
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 23 +
.../java/com/cloud/storage/dao/VMTemplateDao.java | 2 +
.../com/cloud/storage/dao/VMTemplateDaoImpl.java | 13 +
.../com/cloud/upgrade/dao/Upgrade41500to41510.java | 179 +-
.../java/com/cloud/vm/dao/DomainRouterDaoImpl.java | 14 +-
.../src/main/java/com/cloud/vm/dao/UserVmDao.java | 2 +
.../main/java/com/cloud/vm/dao/UserVmDaoImpl.java | 9 +-
.../resources/META-INF/db/schema-41500to41510.sql | 111 +-
.../resources/META-INF/db/schema-41510to41600.sql | 3 +
.../storage/motion/DataMotionServiceImpl.java | 28 +-
.../storage/image/TemplateDataFactoryImpl.java | 6 +-
.../storage/snapshot/SnapshotDataFactoryImpl.java | 3 +
.../storage/snapshot/SnapshotObject.java | 5 +-
.../vmsnapshot/DefaultVMSnapshotStrategy.java | 15 +-
.../volume/datastore/PrimaryDataStoreHelper.java | 2 +
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +
.../cloudstack/quota/QuotaAlertManagerImpl.java | 15 +-
.../cloudstack/quota/constant/QuotaConfig.java | 3 +
.../apache/cloudstack/quota/QuotaServiceImpl.java | 2 +-
.../manager/allocator/impl/RandomAllocator.java | 135 +-
.../hypervisor/kvm/resource/BridgeVifDriver.java | 25 +-
.../hypervisor/kvm/resource/DirectVifDriver.java | 5 +-
.../hypervisor/kvm/resource/IvsVifDriver.java | 6 +-
.../kvm/resource/LibvirtComputingResource.java | 64 +-
.../hypervisor/kvm/resource/LibvirtVMDef.java | 27 +-
.../hypervisor/kvm/resource/OvsVifDriver.java | 6 +-
.../cloud/hypervisor/kvm/resource/VifDriver.java | 4 +-
.../hypervisor/kvm/resource/VifDriverBase.java | 2 +-
...upPersistentNetworkResourceCommandWrapper.java} | 35 +-
.../wrapper/LibvirtMigrateCommandWrapper.java | 4 +-
.../wrapper/LibvirtReplugNicCommandWrapper.java | 2 +-
...bvirtSetupPersistentNetworkCommandWrapper.java} | 33 +-
.../wrapper/LibvirtStopCommandWrapper.java | 6 +-
.../wrapper/LibvirtUnPlugNicCommandWrapper.java | 5 +-
.../kvm/storage/KVMStorageProcessor.java | 12 +-
.../kvm/storage/LibvirtStorageAdaptor.java | 6 +-
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 86 +-
.../org/apache/cloudstack/utils/qemu/QemuImg.java | 6 +
.../kvm/resource/LibvirtComputingResourceTest.java | 2 +-
.../apache/cloudstack/utils/qemu/QemuImgTest.java | 24 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 84 +-
.../vmware/manager/VmwareStorageManagerImpl.java | 6 +-
.../hypervisor/vmware/resource/VmwareResource.java | 194 +-
.../storage/resource/VmwareStorageProcessor.java | 31 +-
.../motion/VmwareStorageMotionStrategy.java | 159 +-
.../motion/VmwareStorageMotionStrategyTest.java | 45 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 10 +-
.../xenserver/resource/CitrixHelper.java | 11 +
.../xenserver/resource/CitrixResourceBase.java | 8 +-
.../xenserver/resource/XenServer56Resource.java | 50 +-
.../resource/XenServerStorageProcessor.java | 12 +-
.../resource/Xenserver625StorageProcessor.java | 8 +-
.../XenServer610MigrateVolumeCommandWrapper.java | 7 +-
...nServer610MigrateWithStorageCommandWrapper.java | 7 +-
...nupPersistentNetworkResourceCommandWrapper.java | 55 +
.../xenbase/CitrixCreateCommandWrapper.java | 4 +-
.../CitrixDeleteStoragePoolCommandWrapper.java | 11 +-
.../CitrixModifyStoragePoolCommandWrapper.java | 9 +-
...itrixSetupPersistentNetworkCommandWrapper.java} | 38 +-
.../wrapper/xenbase/CitrixStopCommandWrapper.java | 20 +-
.../xenbase/CitrixUnPlugNicCommandWrapper.java | 17 +-
.../motion/XenServerStorageMotionStrategy.java | 13 +-
.../cloudstack/cloudian/CloudianConnector.java | 2 +-
.../KubernetesClusterActionWorker.java | 4 +-
...ernetesClusterResourceModifierActionWorker.java | 35 +
.../KubernetesClusterStartWorker.java | 6 +
.../cloudstack/response/HostMetricsResponse.java | 25 +-
.../IpmitoolOutOfBandManagementDriver.java | 38 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 38 +-
pom.xml | 22 +-
scripts/vm/network/vnet/modifyvlan.sh | 62 +-
.../manager/allocator/impl/FirstFitAllocator.java | 25 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 18 +
.../main/java/com/cloud/api/ApiResponseHelper.java | 39 +
server/src/main/java/com/cloud/api/ApiServer.java | 11 -
.../java/com/cloud/api/query/QueryManagerImpl.java | 2 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 57 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 9 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 16 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 18 +
.../com/cloud/network/IpAddressManagerImpl.java | 112 +-
.../java/com/cloud/network/NetworkServiceImpl.java | 4 -
.../com/cloud/network/guru/GuestNetworkGuru.java | 4 +-
.../network/lb/LoadBalancingRulesManagerImpl.java | 4 +
.../cloud/network/router/CommandSetupHelper.java | 13 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 123 +-
.../com/cloud/network/rules/NicPlugInOutRules.java | 8 +
.../rules/VirtualNetworkApplianceFactory.java | 7 +
.../com/cloud/resource/ResourceManagerImpl.java | 92 +-
.../com/cloud/server/ManagementServerImpl.java | 232 +-
.../main/java/com/cloud/server/StatsCollector.java | 20 +-
.../com/cloud/servlet/ConsoleProxyClientParam.java | 9 +
.../com/cloud/servlet/ConsoleProxyServlet.java | 62 +
.../java/com/cloud/storage/StorageManagerImpl.java | 9 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 61 +-
.../cloud/storage/snapshot/SnapshotManager.java | 3 -
.../storage/snapshot/SnapshotManagerImpl.java | 18 +-
.../cloud/template/HypervisorTemplateAdapter.java | 17 +-
.../com/cloud/template/TemplateManagerImpl.java | 45 +-
.../java/com/cloud/usage/UsageServiceImpl.java | 105 +-
.../java/com/cloud/user/AccountManagerImpl.java | 3 +
.../src/main/java/com/cloud/vm/UserVmManager.java | 2 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 83 +-
.../cloud/template/TemplateManagerImplTest.java | 8 +
.../vpc/MockVpcVirtualNetworkApplianceManager.java | 9 +-
.../java/com/cloud/vpc/dao/MockNetworkDaoImpl.java | 5 +
services/console-proxy/server/pom.xml | 5 +
.../java/com/cloud/consoleproxy/ConsoleProxy.java | 6 +
.../consoleproxy/ConsoleProxyClientParam.java | 9 +
.../ConsoleProxyHttpHandlerHelper.java | 4 +
.../consoleproxy/ConsoleProxyNoVNCHandler.java | 2 +
.../consoleproxy/ConsoleProxyNoVncClient.java | 105 +-
.../com/cloud/consoleproxy/vnc/NoVncClient.java | 37 +-
.../websocket/WebSocketReverseProxy.java | 118 +
systemvm/debian/etc/iptables/iptables-dhcpsrvr | 1 -
systemvm/debian/etc/logrotate.conf | 12 -
systemvm/debian/etc/logrotate.d/btmp | 7 +
systemvm/debian/etc/logrotate.d/rsyslog | 4 +-
systemvm/debian/etc/logrotate.d/wtmp | 8 +
systemvm/debian/etc/vpcdnsmasq.conf | 1 +
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 14 +-
systemvm/debian/opt/cloud/bin/cs/CsApp.py | 10 -
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 3 +
systemvm/debian/opt/cloud/bin/setup/router.sh | 3 +
systemvm/debian/opt/cloud/bin/setup/vpcrouter.sh | 3 +
.../component/test_persistent_networks.py | 3 +-
test/integration/component/test_public_ip.py | 870 +++++
test/integration/smoke/test_accounts.py | 35 +-
.../smoke/test_affinity_groups_projects.py | 29 +-
test/integration/smoke/test_async_job.py | 22 +-
test/integration/smoke/test_deploy_vm_iso_uefi.py | 235 ++
test/integration/smoke/test_diagnostics.py | 12 +-
test/integration/smoke/test_hostha_simulator.py | 4 +-
test/integration/smoke/test_kubernetes_clusters.py | 106 +-
test/integration/smoke/test_network.py | 9 +-
test/integration/smoke/test_persistent_network.py | 385 ++
test/integration/smoke/test_scale_vm.py | 101 +-
test/integration/smoke/test_templates.py | 5 +-
test/integration/smoke/test_vm_life_cycle.py | 45 +-
test/pom.xml | 2 +-
tools/apidoc/gen_toc.py | 4 +-
tools/appliance/systemvmtemplate/template.json | 4 +-
tools/marvin/marvin/config/test_data.py | 24 +-
tools/marvin/marvin/lib/base.py | 8 +-
tools/marvin/marvin/lib/common.py | 8 +-
tools/marvin/marvin/lib/vcenter.py | 2 +
ui/public/config.json | 4 +-
ui/public/locales/en.json | 3 +
ui/public/locales/ko_KR.json | 4021 ++++++++++++--------
ui/src/api/index.js | 2 +-
ui/src/components/header/ProjectMenu.vue | 2 +-
ui/src/components/header/SamlDomainSwitcher.vue | 2 +-
ui/src/components/view/ActionButton.vue | 7 +-
ui/src/components/view/DedicateDomain.vue | 4 +-
ui/src/components/view/DetailSettings.vue | 6 +-
ui/src/components/view/DetailsTab.vue | 21 +
ui/src/components/view/InfoCard.vue | 20 +-
ui/src/components/view/ListResourceTable.vue | 5 +-
ui/src/components/view/ListView.vue | 10 +
ui/src/components/view/ResourceLimitTab.vue | 3 +-
ui/src/components/view/ResourceView.vue | 20 +-
ui/src/components/view/SearchView.vue | 38 +-
ui/src/components/view/SettingsTab.vue | 2 +-
ui/src/components/view/TreeView.vue | 55 +-
ui/src/config/router.js | 8 +-
ui/src/config/section/compute.js | 10 +-
ui/src/config/section/network.js | 2 +-
ui/src/config/section/offering.js | 8 +-
ui/src/config/section/storage.js | 8 +-
ui/src/main.js | 4 +-
ui/src/store/getters.js | 3 +-
ui/src/store/modules/user.js | 37 +-
ui/src/store/mutation-types.js | 1 +
ui/src/style/vars.less | 8 +-
ui/src/utils/plugins.js | 18 +
ui/src/views/AutogenView.vue | 37 +-
ui/src/views/auth/Login.vue | 6 +-
ui/src/views/compute/AssignInstance.vue | 41 +-
ui/src/views/compute/AttachIso.vue | 13 +-
ui/src/views/compute/BackupScheduleWizard.vue | 2 +-
ui/src/views/compute/ChangeAffinity.vue | 5 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 5 +-
ui/src/views/compute/CreateSSHKeyPair.vue | 7 +-
ui/src/views/compute/CreateSnapshotWizard.vue | 5 +-
ui/src/views/compute/DeployVM.vue | 29 +-
ui/src/views/compute/DestroyVM.vue | 5 +-
ui/src/views/compute/EditVM.vue | 3 +-
ui/src/views/compute/InstanceTab.vue | 44 +-
ui/src/views/compute/KubernetesServiceTab.vue | 2 +-
ui/src/views/compute/MigrateWizard.vue | 5 +-
ui/src/views/compute/ScaleKubernetesCluster.vue | 5 +-
ui/src/views/compute/ScaleVM.vue | 2 +-
ui/src/views/compute/StartVirtualMachine.vue | 5 +-
ui/src/views/compute/UpgradeKubernetesCluster.vue | 5 +-
ui/src/views/compute/backup/FormSchedule.vue | 3 +-
.../compute/wizard/ComputeOfferingSelection.vue | 13 +-
ui/src/views/compute/wizard/ComputeSelection.vue | 2 +
ui/src/views/compute/wizard/DiskSizeSelection.vue | 1 +
ui/src/views/compute/wizard/MultiDiskSelection.vue | 1 +
.../views/compute/wizard/NetworkConfiguration.vue | 8 +-
ui/src/views/dashboard/CapacityDashboard.vue | 7 +-
ui/src/views/dashboard/Dashboard.vue | 4 +-
ui/src/views/dashboard/UsageDashboard.vue | 2 +-
ui/src/views/iam/AddAccount.vue | 7 +-
ui/src/views/iam/AddLdapAccount.vue | 4 +-
ui/src/views/iam/AddUser.vue | 9 +-
ui/src/views/iam/ChangeUserPassword.vue | 3 +-
ui/src/views/iam/ConfigureSamlSsoAuth.vue | 3 +-
ui/src/views/iam/CreateRole.vue | 5 +-
ui/src/views/iam/DomainActionForm.vue | 17 +-
ui/src/views/iam/DomainView.vue | 17 +-
ui/src/views/iam/EditUser.vue | 5 +-
ui/src/views/iam/ImportRole.vue | 3 +-
ui/src/views/iam/PermissionEditable.vue | 3 +-
ui/src/views/iam/RolePermissionTab.vue | 2 +-
ui/src/views/iam/SSLCertificateTab.vue | 2 -
.../views/image/AddKubernetesSupportedVersion.vue | 5 +-
ui/src/views/image/IsoZones.vue | 5 +-
ui/src/views/image/RegisterOrUploadIso.vue | 5 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 7 +-
ui/src/views/image/TemplateZones.vue | 5 +-
.../image/UpdateKubernetesSupportedVersion.vue | 5 +-
.../views/image/UpdateTemplateIsoPermissions.vue | 10 +-
ui/src/views/infra/AddPrimaryStorage.vue | 7 +-
ui/src/views/infra/AddSecondaryStorage.vue | 4 +-
ui/src/views/infra/ClusterAdd.vue | 29 +-
ui/src/views/infra/CpuSockets.vue | 2 +-
ui/src/views/infra/HostAdd.vue | 4 +-
ui/src/views/infra/HostInfo.vue | 2 +-
ui/src/views/infra/InfraSummary.vue | 2 +-
ui/src/views/infra/MigrateData.vue | 3 +-
ui/src/views/infra/PodAdd.vue | 5 +-
ui/src/views/infra/Resources.vue | 2 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 5 +-
ui/src/views/infra/network/EditTrafficLabel.vue | 3 +-
ui/src/views/infra/network/IpRangesTab.vue | 2 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 2 +-
.../views/infra/network/IpRangesTabManagement.vue | 3 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 9 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 3 +-
ui/src/views/infra/network/ServiceProvidersTab.vue | 12 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 2 +-
.../infra/network/providers/AddF5LoadBalancer.vue | 1 +
.../network/providers/AddNetscalerLoadBalancer.vue | 1 +
.../infra/network/providers/AddNiciraNvpDevice.vue | 1 +
.../network/providers/AddPaloAltoFirewall.vue | 1 +
.../infra/network/providers/AddSrxFirewall.vue | 1 +
.../views/infra/network/providers/ProviderItem.vue | 57 +-
ui/src/views/infra/routers/RouterHealthCheck.vue | 5 +-
.../views/infra/zone/AdvancedGuestTrafficForm.vue | 4 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 145 +-
ui/src/views/infra/zone/PhysicalNetworksTab.vue | 28 +-
ui/src/views/infra/zone/StaticInputsForm.vue | 7 +-
ui/src/views/infra/zone/SystemVmsTab.vue | 2 +-
ui/src/views/infra/zone/ZoneWizard.vue | 37 +-
ui/src/views/infra/zone/ZoneWizardAddResources.vue | 43 +-
ui/src/views/infra/zone/ZoneWizardLaunchZone.vue | 28 +-
.../infra/zone/ZoneWizardNetworkSetupStep.vue | 38 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 62 +-
.../views/infra/zone/ZoneWizardZoneDetailsStep.vue | 74 +-
ui/src/views/infra/zone/ZoneWizardZoneTypeStep.vue | 16 +-
ui/src/views/network/AclListRulesTab.vue | 8 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 7 +-
ui/src/views/network/CreateL2NetworkForm.vue | 7 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 14 +-
ui/src/views/network/CreateVlanIpRange.vue | 1 +
ui/src/views/network/CreateVpc.vue | 5 +-
ui/src/views/network/CreateVpnCustomerGateway.vue | 3 +-
ui/src/views/network/EgressRulesTab.vue | 4 +-
ui/src/views/network/EnableStaticNat.vue | 8 +-
ui/src/views/network/FirewallRules.vue | 6 +-
ui/src/views/network/GuestIpRanges.vue | 2 +-
.../views/network/IngressEgressRuleConfigure.vue | 14 +-
ui/src/views/network/InternalLBAssignVmForm.vue | 8 +-
ui/src/views/network/InternalLBAssignedVmTab.vue | 2 +-
ui/src/views/network/IpAddressesTab.vue | 18 +-
ui/src/views/network/LoadBalancing.vue | 14 +-
ui/src/views/network/PortForwarding.vue | 7 +-
ui/src/views/network/PublicIpResource.vue | 9 +-
ui/src/views/network/RoutersTab.vue | 2 +-
ui/src/views/network/StaticRoutesTab.vue | 8 +-
ui/src/views/network/VpcTab.vue | 10 +-
ui/src/views/network/VpcTiersTab.vue | 40 +-
ui/src/views/network/VpnDetails.vue | 2 +-
ui/src/views/offering/AddComputeOffering.vue | 3 +-
ui/src/views/offering/AddDiskOffering.vue | 3 +-
ui/src/views/offering/AddNetworkOffering.vue | 3 +-
ui/src/views/offering/AddVpcOffering.vue | 3 +-
ui/src/views/offering/ImportBackupOffering.vue | 3 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 4 +-
ui/src/views/plugins/CloudianPlugin.vue | 2 +-
.../views/plugins/quota/EditTariffValueWizard.vue | 1 +
.../views/plugins/quota/EmailTemplateDetails.vue | 2 +-
ui/src/views/plugins/quota/QuotaBalance.vue | 2 +-
.../views/plugins/quota/QuotaSummaryResource.vue | 9 +-
ui/src/views/plugins/quota/QuotaUsage.vue | 2 +-
ui/src/views/project/AccountsTab.vue | 4 +-
ui/src/views/project/AddAccountOrUserToProject.vue | 8 +-
ui/src/views/project/InvitationTokenTemplate.vue | 1 +
ui/src/views/project/InvitationsTemplate.vue | 5 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 8 +-
ui/src/views/storage/AttachVolume.vue | 3 +-
.../views/storage/CreateSnapshotFromVMSnapshot.vue | 3 +-
ui/src/views/storage/CreateVolume.vue | 5 +-
ui/src/views/storage/FormSchedule.vue | 5 +-
ui/src/views/storage/MigrateVolume.vue | 7 +-
ui/src/views/storage/RecurringSnapshotVolume.vue | 2 +-
ui/src/views/storage/ResizeVolume.vue | 6 +-
ui/src/views/storage/RestoreAttachBackupVolume.vue | 5 +-
ui/src/views/storage/TakeSnapshot.vue | 3 +-
ui/src/views/storage/UploadLocalVolume.vue | 5 +-
ui/tests/common/index.js | 3 +-
utils/pom.xml | 3 +-
.../utils/exception/CSExceptionErrorCode.java | 1 +
.../main/java/com/cloud/utils/ssh/SshHelper.java | 2 +-
.../cloudstack/utils/redfish/RedfishClient.java | 3 +-
.../backoff/impl/ConstantTimeBackoffTest.java | 3 +-
.../utils/redfish/RedfishClientTest.java | 22 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 23 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 225 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 25 +-
.../hypervisor/vmware/mo/VirtualMachineMOTest.java | 19 +
360 files changed, 8673 insertions(+), 3479 deletions(-)
copy core/src/main/java/com/cloud/agent/api/{PlugNicAnswer.java =>
CleanupPersistentNetworkResourceAnswer.java} (77%)
copy core/src/main/java/com/cloud/agent/api/{GetVmConfigCommand.java =>
CleanupPersistentNetworkResourceCommand.java} (72%)
copy core/src/main/java/com/cloud/agent/api/{AgentControlAnswer.java =>
GetVmVncTicketAnswer.java} (73%)
copy core/src/main/java/com/cloud/agent/api/{CheckRouterCommand.java =>
GetVmVncTicketCommand.java} (77%)
copy core/src/main/java/com/cloud/agent/api/{PlugNicAnswer.java =>
SetupPersistentNetworkAnswer.java} (80%)
copy core/src/main/java/com/cloud/agent/api/{UnPlugNicCommand.java =>
SetupPersistentNetworkCommand.java} (77%)
copy
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtOvsSetupBridgeCommandWrapper.java
=> LibvirtCleanupPersistentNetworkResourceCommandWrapper.java} (53%)
copy
plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/wrapper/{LibvirtNetworkRulesSystemVmCommandWrapper.java
=> LibvirtSetupPersistentNetworkCommandWrapper.java} (53%)
create mode 100644
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/CitrixCleanupPersistentNetworkResourceCommandWrapper.java
copy
plugins/hypervisors/xenserver/src/main/java/com/cloud/hypervisor/xenserver/resource/wrapper/xenbase/{CitrixGetVncPortCommandWrapper.java
=> CitrixSetupPersistentNetworkCommandWrapper.java} (54%)
create mode 100644
services/console-proxy/server/src/main/java/com/cloud/consoleproxy/websocket/WebSocketReverseProxy.java
create mode 100644 systemvm/debian/etc/logrotate.d/btmp
create mode 100644 systemvm/debian/etc/logrotate.d/wtmp
create mode 100644 test/integration/component/test_public_ip.py
create mode 100644 test/integration/smoke/test_deploy_vm_iso_uefi.py
create mode 100644 test/integration/smoke/test_persistent_network.py
