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 57ef00f Add global setting value to the enable or disable the flag on
UI
discard 6f3b4e4 Greyout Scale VM Icon on a running VM, if the VM is not
configured to be dynamically scalable
discard d5a9a62 Grey out enable dynamic scaling option on deploy VM wizard
when service offering and template are not dynamically scalable
discard 82868b1 Updated marvin tests and removed redundant translations
discard ae86e73 Changes added to UI to show Scale VM icon to only VMs which
are marked as dynamically scalable.
discard e14a48c Set default value to true for dynamic scaling enabled column
on ServiceOfferingVO
discard ec9f529 Formatting Changes
discard 4d6ff34 Fixed Boolean to boolean Added UI response parameter to
system VMs
discard d3e9860 Added version number on new API parameters Used single method
for multiple checks
discard 9696a51 Added marvin tests required for these changes
discard e705f9e Reverted 414 to 415 schema file empty line changes
discard edd3c63 Changed name from dynamically scalable to dynamic scaling
enabled for service offering VO and its usages
discard 082fc97 Naming corrections for service offering response
discard 848f90b Added dynamic scalable flag on template while updating
stopped VM. Fixed some log messages
discard f0c0c71 Added tool tip during VM deployment
discard 7b703c0 Filter service offerings based on dynamic scalable flag while
listing offerings for scaling VM
discard eca8982 Added response param in UI for system service offering
discard ca2066f UI changes, added new labels
discard d01ac0d UI changes
discard adb2760 Dynamic Scaling option granularity
add cdd1b43 setup: Fixed error when passing shell reserved characters to
setup databases (#4976)
add 9349d20 vmware: Make deploy-as-is optional (#4901)
add 92f9c99 ui: Fix Settings Tab view (#4964)
add 72f6612 server: Increase max length for VMInstanceVO.backupVolumes
(#4967)
add ab790c1 server: Allow to upgrade service offerings from local <>
shared storage pools (#4915)
add 2d176db centos: Install libgcrypt v1.8.5 required by libvirt 6.0 on
CentOS8 (#4970)
add 603a830 ui: rename acl reason to description (#4980)
add 0c47d4e ui: show domain paths for offering domain selection (#4979)
add 1556369 ui: Close Create network form from Zones -> Physical Network
(Guest) -> Traffic Types view (#4993)
add d92022e ui: Hide reset password button for a running VM (#4991)
add 5b6ab3d ui: fix for filtering network offering for VPC tiers (#4989)
add eb2e5f7 ui: show VR offering when provider is VR (#4988)
add 1cb8ca6 ui: Adding success message for DomainActionForm (#4987)
add 4df8d7a ui: Prevent reset of port-forward rules on cancelling a form
(#4981)
add 1abd101 Merge remote-tracking branch 'origin/4.15'
add a1f825e python3: Migrate Marvin and smoketests to python3 (#4727)
add 7a7fd27 setup: Fixed error when passing shell reserved characters to
setup databases (#4995)
add bc80815 server: Adding VPN options for IKE version and IKE split
connections (#4953)
add fce84e6 Merge remote-tracking branch 'origin/4.15'
add 645ceec Updated since and validations attributes for the ikeversion
and splitconnections parameters of vpn customer gateway cmd(s) (#4996)
add 1654391 ui: update treeview when clicking the refresh button (#4999)
add 21b0b0f allow zero as cpu speed value in service offerings (#4986)
add ee5f92e Merge remote-tracking branch 'origin/4.15'
add f5e665c server: NPE may cause management server to not start (#5001)
add 1eea9c5 ui: add tooltips for actions in tab (#4842)
add 32e3bbd VMware Datastore Cluster primary storage pool synchronisation
(#4871)
add cb16707 Merge remote-tracking branch 'origin/4.15'
add 3674e80 Improve logs on SecondaryStorageManagerImpl and few refactors
(#4955)
add cc2c6e9 Improve logs on HAManagerImpl (#4707)
add 99f2919 Improve logs on kvmvmactivity.sh (#4704)
add 6b9f3fb Improve logs on KVMHAVMActivityChecker (#4705)
add 493d6a0 ui: Display Zone Name instead of Zone UUID in list view
(#5011)
add 4ecef4b ui: prevent same string docHelp override (#5014)
add aa28954 vmware: Fix deploy-as-is not honoured on upload from local
(#5015)
add 1b28ea1 network: fix dhcp/password/metadata issues on shared networks
with multiple subnets (#5013)
add 57c8286 ui: pass podid for basic zone createvlaniprange (#5022)
add cc7f426 ui: Allow IP range creation for Physical Network - Guest
Traffic in Basic Zones (#5020)
add 7557910 api/server: cpu, memory values with overprovisioning in
metrics response (#4795)
add dc91a1f server: destroy ssvm, cpvm on last host maintenance (#4644)
add e2183ed forceha: fix two issues when (1)stop vm from inside (2) force
remove host (#4647)
add 2286c8d Merge remote-tracking branch 'origin/4.14' into 4.15
add 06454ff tests: Fix in Marvin migrate_vm_with_volume (#5023)
add 426f14b Merge remote-tracking branch 'apache/4.15'
add 65672b7 setup: pass password in quotes for cloudstack-setup-databases
(#5025)
add 270fc19 Merge remote-tracking branch 'apache/4.15'
add 3f0388c Dynamic Scaling option granularity
add 48ca05e UI changes
add 7eec637 UI changes, added new labels
add cb6fd32 Added response param in UI for system service offering
add 42c3322 Filter service offerings based on dynamic scalable flag while
listing offerings for scaling VM
add cf0eed9 Added tool tip during VM deployment
add 54ac484 Added dynamic scalable flag on template while updating
stopped VM. Fixed some log messages
add 7465263 Naming corrections for service offering response
add fecf366 Changed name from dynamically scalable to dynamic scaling
enabled for service offering VO and its usages
add 9247ed4 Reverted 414 to 415 schema file empty line changes
add b23c34f Added marvin tests required for these changes
add 9ce41fd Added version number on new API parameters Used single method
for multiple checks
add 2b8c3b1 Fixed Boolean to boolean Added UI response parameter to
system VMs
add cd75aaf Formatting Changes
add 223d166 Set default value to true for dynamic scaling enabled column
on ServiceOfferingVO
add 40ef714 Changes added to UI to show Scale VM icon to only VMs which
are marked as dynamically scalable.
add dc36125 Updated marvin tests and removed redundant translations
add 6f40469 Grey out enable dynamic scaling option on deploy VM wizard
when service offering and template are not dynamically scalable
add 02d5b4f Greyout Scale VM Icon on a running VM, if the VM is not
configured to be dynamically scalable
add 28dc22d Add global setting value to the enable or disable the flag on
UI
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 (57ef00f)
\
N -- N -- N refs/heads/VMDynamicScalabilityGranularity (28dc22d)
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:
.python-version | 2 +-
.travis.yml | 2 +-
api/src/main/java/com/cloud/agent/api/Command.java | 9 +
api/src/main/java/com/cloud/event/EventTypes.java | 1 +
.../cloud/network/Site2SiteCustomerGateway.java | 4 +
.../java/com/cloud/resource/ResourceState.java | 1 +
.../java/com/cloud/storage/StorageService.java | 3 +
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
...MaintenanceCmd.java => SyncStoragePoolCmd.java} | 97 +-
.../template/GetUploadParamsForTemplateCmd.java | 10 +
.../command/user/template/RegisterTemplateCmd.java | 14 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 17 +
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 17 +
.../cloudstack/api/response/HostResponse.java | 8 +-
.../response/Site2SiteCustomerGatewayResponse.java | 16 +
.../response/Site2SiteVpnConnectionResponse.java | 16 +
.../user/template/RegisterTemplateCmdTest.java | 33 +-
.../agent/api/routing/Site2SiteVpnCfgCommand.java | 23 +-
.../facade/Site2SiteVpnConfigItem.java | 2 +-
.../virtualnetwork/model/Site2SiteVpn.java | 24 +-
.../cloud/storage/resource/StorageProcessor.java | 5 +-
.../StorageSubsystemCommandHandlerBase.java | 5 +-
...ettachAnswer.java => SyncVolumePathAnswer.java} | 9 +-
...ttachAnswer.java => SyncVolumePathCommand.java} | 29 +-
.../virtualnetwork/VirtualRoutingResourceTest.java | 6 +-
debian/cloudstack-marvin.postinst | 4 +-
debian/control | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 6 +
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../java/com/cloud/network/IpAddressManager.java | 3 +-
.../java/com/cloud/storage/StorageManager.java | 3 +
.../java/com/cloud/agent/manager/AgentAttache.java | 8 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 60 +-
.../cloud/vm/VirtualMachineManagerImplTest.java | 56 +
.../src/main/java/com/cloud/dc/DataCenterVO.java | 6 +
.../network/dao/Site2SiteCustomerGatewayVO.java | 28 +-
.../cloud/storage/dao/StoragePoolHostDaoImpl.java | 1 -
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 9 +-
.../storage/datastore/db/PrimaryDataStoreDao.java | 2 +
.../datastore/db/PrimaryDataStoreDaoImpl.java | 8 +
.../resources/META-INF/db/schema-41500to41510.sql | 4 +-
.../datastore/provider/DefaultHostListener.java | 46 +-
packaging/centos7/cloud.spec | 11 +
packaging/centos8/cloud.spec | 2 +
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 2 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 4 +-
.../kvm/resource/KVMHAVMActivityChecker.java | 15 +-
.../kvm/storage/KVMStorageProcessor.java | 9 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 11 +-
.../cloud/resource/SimulatorStorageProcessor.java | 8 +-
.../hypervisor/vmware/resource/VmwareResource.java | 6 +-
.../storage/resource/VmwareStorageProcessor.java | 81 +-
.../resource/XenServerStorageProcessor.java | 9 +-
.../resource/Xenserver625StorageProcessor.java | 9 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 15 +-
.../cloudstack/response/HostMetricsResponse.java | 47 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 +-
pom.xml | 1 +
scripts/vm/hypervisor/kvm/kvmvmactivity.sh | 8 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 10 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 14 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 7 +
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 108 +-
.../com/cloud/network/IpAddressManagerImpl.java | 28 +-
.../cloud/network/router/CommandSetupHelper.java | 4 +-
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 62 +-
.../com/cloud/resource/ResourceManagerImpl.java | 78 +-
.../com/cloud/server/ManagementServerImpl.java | 4 +-
.../java/com/cloud/storage/StorageManagerImpl.java | 267 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 11 +
.../upload/params/TemplateUploadParams.java | 4 +-
.../storage/upload/params/UploadParamsBase.java | 6 +-
.../com/cloud/template/TemplateAdapterBase.java | 6 +-
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 2 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 80 +-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 +
.../VirtualNetworkApplianceManagerImplTest.java | 2 +-
.../SecondaryStorageManagerImpl.java | 483 +--
.../SecondaryStorageManagerTest.java | 29 +
setup/bindir/cloud-setup-databases.in | 4 +-
systemvm/debian/opt/cloud/bin/configure.py | 36 +-
systemvm/debian/opt/cloud/bin/ipsectunnel.sh | 35 +-
systemvm/test/runtests.sh | 15 +-
test/integration/component/cpu_limits/__init__.py | 2 +-
.../component/find_hosts_for_migration.py | 5 +-
test/integration/component/maint/__init__.py | 2 +-
test/integration/component/maint/test_bugs.py | 3 +-
.../component/maint/test_capacity_host_delete.py | 3 +-
.../maint/test_dedicate_guest_vlan_ranges.py | 3 +-
.../maint/test_dedicate_public_ip_range.py | 3 +-
.../component/maint/test_escalation_templates.py | 25 +-
.../component/maint/test_escalations_hosts.py | 3 +-
.../component/maint/test_high_availability.py | 3 +-
.../component/maint/test_host_high_availability.py | 3 +-
.../maint/test_ip_resource_count_for_vpc.py | 3 +-
.../component/maint/test_multiple_ip_ranges.py | 15 +-
.../component/maint/test_vpc_host_maintenance.py | 3 +-
.../maint/test_vpc_on_host_maintenance.py | 3 +-
.../component/maint/testpath_disablestoragepool.py | 3 +-
.../component/maint/testpath_vMotion_vmware.py | 3 +-
.../component/test_acl_isolatednetwork.py | 1554 ++++---
.../component/test_acl_isolatednetwork_delete.py | 333 +-
.../integration/component/test_acl_listsnapshot.py | 4125 +++++++++----------
test/integration/component/test_acl_listvm.py | 4349 ++++++++++----------
test/integration/component/test_acl_listvolume.py | 4091 +++++++++---------
...est_acl_sharednetwork_deployVM-impersonation.py | 2354 ++++++-----
.../component/test_acquire_specified_public_ip.py | 3 +-
.../component/test_add_remove_network.py | 792 ++--
.../component/test_advancedsg_networks.py | 7 +-
test/integration/component/test_affinity_groups.py | 15 +-
.../component/test_affinity_groups_projects.py | 23 +-
.../component/test_base_image_updation.py | 5 +-
test/integration/component/test_blocker_bugs.py | 3 +-
test/integration/component/test_brocade_vcs.py | 3 +-
.../integration/component/test_browse_templates.py | 17 +-
.../component/test_browse_templates2.py | 5 +-
test/integration/component/test_browse_volumes.py | 35 +-
.../component/test_concurrent_snapshots_limit.py | 48 +-
test/integration/component/test_configdrive.py | 69 +-
.../component/test_cpu_domain_limits.py | 8 +-
test/integration/component/test_cpu_limits.py | 8 +-
.../component/test_cpu_project_limits.py | 3 +-
test/integration/component/test_custom_hostname.py | 3 +-
test/integration/component/test_deploy_vgpu_vm.py | 3 +-
.../component/test_deploy_vm_userdata_multi_nic.py | 8 +-
.../component/test_deploy_vm_userdata_reg.py | 9 +-
.../integration/component/test_dhcp_dns_offload.py | 5 +-
.../component/test_dynamic_compute_offering.py | 3 +-
test/integration/component/test_egress_fw_rules.py | 3 +-
test/integration/component/test_eip_elb.py | 5 +-
.../test_escalation_listTemplateDomainAdmin.py | 2 +-
.../component/test_escalations_instances.py | 347 +-
.../component/test_escalations_ipaddresses.py | 263 +-
.../integration/component/test_escalations_isos.py | 54 +-
.../component/test_escalations_networks.py | 198 +-
.../component/test_escalations_securitygroups.py | 62 +-
.../component/test_escalations_snapshots.py | 57 +-
.../component/test_escalations_templates.py | 51 +-
.../component/test_escalations_vmware.py | 8 +-
.../component/test_escalations_volumes.py | 67 +-
.../test_escalations_vpncustomergateways.py | 22 +-
test/integration/component/test_haproxy.py | 8 +-
test/integration/component/test_host.py | 1 -
test/integration/component/test_host_ha.py | 7 +-
test/integration/component/test_interop_xd_ccp.py | 12 +-
test/integration/component/test_ip_reservation.py | 5 +-
test/integration/component/test_lb_secondary_ip.py | 3 +-
test/integration/component/test_ldap.py | 8 +-
.../integration/component/test_ldap_auto_import.py | 34 +-
test/integration/component/test_list_nics.py | 2 +-
test/integration/component/test_list_pod.py | 3 +-
test/integration/component/test_memory_limits.py | 319 +-
.../integration/component/test_mm_domain_limits.py | 11 +-
test/integration/component/test_mm_max_limits.py | 3 +-
.../component/test_mm_project_limits.py | 3 +-
.../component/test_multiple_nic_support.py | 3 +-
.../component/test_multiple_public_interfaces.py | 4 +-
.../test_multiple_subnets_in_isolated_network.py | 3 +-
...est_multiple_subnets_in_isolated_network_rvr.py | 3 +-
.../component/test_multiple_subnets_in_vpc.py | 3 +-
.../component/test_multiple_subnets_in_vpc_rvr.py | 3 +-
.../integration/component/test_network_offering.py | 8 +-
.../component/test_non_contiguous_vlan.py | 10 +-
.../component/test_organization_states.py | 833 ++--
test/integration/component/test_overcommit.py | 6 +-
.../component/test_persistent_networks.py | 3 +-
test/integration/component/test_project_limits.py | 3 +-
.../component/test_project_resources.py | 3 +-
test/integration/component/test_project_usage.py | 5 +-
.../test_protocol_number_security_group.py | 3 +-
.../integration/component/test_ps_domain_limits.py | 11 +-
test/integration/component/test_ps_limits.py | 295 +-
test/integration/component/test_ps_max_limits.py | 3 +-
.../component/test_ps_project_limits.py | 3 +-
.../integration/component/test_ps_resize_volume.py | 3 +-
.../component/test_reset_ssh_keypair.py | 3 +-
.../component/test_rootvolume_resize.py | 9 +-
test/integration/component/test_secsr_mount.py | 3 +-
test/integration/component/test_shared_networks.py | 47 +-
.../component/test_simultaneous_volume_attach.py | 5 +-
test/integration/component/test_snapshot_gc.py | 5 +-
test/integration/component/test_snapshot_limits.py | 5 +-
.../integration/component/test_ss_domain_limits.py | 4 +-
test/integration/component/test_ss_limits.py | 3 +-
.../component/test_ss_project_limits.py | 3 +-
test/integration/component/test_stopped_vm.py | 4 +-
test/integration/component/test_storage_motion.py | 4 +-
test/integration/component/test_tags.py | 10 +-
...template_from_snapshot_with_template_details.py | 3 +-
test/integration/component/test_templates.py | 3 +-
.../component/test_updateResourceCount.py | 2 +-
.../integration/component/test_vm_passwdenabled.py | 3 +-
test/integration/component/test_vmware_drs.py | 3 +-
test/integration/component/test_volumes.py | 2 +-
test/integration/component/test_vpc_network.py | 3 +-
.../component/test_vpc_network_internal_lbrules.py | 2 +-
.../component/test_vpc_network_lbrules.py | 15 +-
.../component/test_vpc_network_pfrules.py | 478 ++-
.../component/test_vpc_network_staticnatrule.py | 9 +-
test/integration/component/test_vpc_offerings.py | 1276 +++---
test/integration/component/test_vpc_routers.py | 118 +-
.../component/test_vpc_vm_life_cycle.py | 3 +-
.../component/test_vpc_vms_deployment.py | 5 +-
test/integration/component/test_vpn_users.py | 298 +-
test/integration/plugins/datera/TestVolumes.py | 6 +-
test/integration/plugins/ldap/ldap_test_data.py | 2 +-
test/integration/plugins/ldap/test_ldap.py | 2 +-
.../plugins/solidfire/TestAddRemoveHosts.py | 4 +-
.../plugins/solidfire/TestManagedSystemVMs.py | 2 +-
.../plugins/solidfire/TestUploadDownload.py | 6 +-
.../solidfire/TestVMMigrationWithStorage.py | 8 +-
test/integration/plugins/solidfire/TestVolumes.py | 2 +-
test/integration/plugins/test_nicira_controller.py | 2 +-
test/integration/smoke/test_accounts.py | 87 +-
test/integration/smoke/test_async_job.py | 1 -
test/integration/smoke/test_certauthority_root.py | 22 +-
test/integration/smoke/test_create_network.py | 3 +-
.../smoke/test_deploy_vgpu_enabled_vm.py | 8 +-
.../smoke/test_deploy_virtio_scsi_vm.py | 6 +-
.../smoke/test_deploy_vm_extra_config_data.py | 22 +-
.../smoke/test_deploy_vm_root_resize.py | 14 +-
.../smoke/test_deploy_vm_with_userdata.py | 12 +-
...st_deploy_vms_with_varied_deploymentplanners.py | 12 +-
test/integration/smoke/test_diagnostics.py | 10 +-
.../smoke/test_domain_disk_offerings.py | 6 +-
.../smoke/test_domain_network_offerings.py | 6 +-
.../smoke/test_domain_service_offerings.py | 6 +-
.../integration/smoke/test_domain_vpc_offerings.py | 8 +-
test/integration/smoke/test_dynamicroles.py | 16 +-
test/integration/smoke/test_host_annotations.py | 2 +-
test/integration/smoke/test_hostha_kvm.py | 4 +-
test/integration/smoke/test_hostha_simulator.py | 10 +-
test/integration/smoke/test_internal_lb.py | 126 +-
test/integration/smoke/test_iso.py | 29 +-
test/integration/smoke/test_kubernetes_clusters.py | 9 +-
.../smoke/test_kubernetes_supported_versions.py | 3 +-
test/integration/smoke/test_login.py | 2 +-
test/integration/smoke/test_migration.py | 9 +-
.../smoke/test_nested_virtualization.py | 8 +-
test/integration/smoke/test_network.py | 2 +-
test/integration/smoke/test_network_acl.py | 12 +-
test/integration/smoke/test_nic.py | 4 +-
test/integration/smoke/test_nic_adapter_type.py | 3 +-
test/integration/smoke/test_non_contigiousvlan.py | 14 +-
test/integration/smoke/test_outofbandmanagement.py | 6 +-
.../smoke/test_outofbandmanagement_nestedplugin.py | 8 +-
test/integration/smoke/test_over_provisioning.py | 4 +-
test/integration/smoke/test_portable_publicip.py | 50 +-
test/integration/smoke/test_portforwardingrules.py | 12 +-
test/integration/smoke/test_primary_storage.py | 24 +-
test/integration/smoke/test_privategw_acl.py | 18 +-
test/integration/smoke/test_projects.py | 4 +-
test/integration/smoke/test_public_ip_range.py | 30 +-
test/integration/smoke/test_pvlan.py | 8 +-
test/integration/smoke/test_regions.py | 4 +-
.../smoke/test_routers_iptables_default_policy.py | 2 +-
test/integration/smoke/test_secondary_storage.py | 2 +-
test/integration/smoke/test_ssvm.py | 53 +-
test/integration/smoke/test_staticroles.py | 6 +-
test/integration/smoke/test_storage_policy.py | 1 +
test/integration/smoke/test_templates.py | 24 +-
.../smoke/test_update_security_group.py | 3 +-
test/integration/smoke/test_usage.py | 3 +-
test/integration/smoke/test_usage_events.py | 13 +-
test/integration/smoke/test_vm_life_cycle.py | 80 +-
test/integration/smoke/test_volumes.py | 14 +-
test/integration/smoke/test_vpc_redundant.py | 2 +-
test/integration/smoke/test_vpc_router_nics.py | 2 +-
test/integration/smoke/test_vpc_vpn.py | 88 +-
.../testpaths/testpath_snapshot_hadrning.py | 5 +-
.../testpaths/testpath_storage_migration.py | 5 +-
test/integration/testpaths/testpath_usage.py | 26 +-
.../testpath_volume_cuncurrent_snapshots.py | 3 +-
.../testpaths/testpath_volume_recurring_snap.py | 3 +-
.../testpaths/testpath_volume_snapshot.py | 3 +-
.../testpaths/testpath_volumelifecycle.py | 13 +-
tools/apidoc/gen_toc.py | 1 +
tools/marvin/marvin/asyncJobMgr.py | 16 +-
tools/marvin/marvin/cloudstackConnection.py | 20 +-
tools/marvin/marvin/cloudstackTestCase.py | 10 +-
tools/marvin/marvin/cloudstackTestClient.py | 4 +-
tools/marvin/marvin/codegenerator.py | 32 +-
tools/marvin/marvin/configGenerator.py | 36 +-
tools/marvin/marvin/dbConnection.py | 11 +-
tools/marvin/marvin/deployAndRun.py | 46 +-
tools/marvin/marvin/deployDataCenter.py | 141 +-
tools/marvin/marvin/jsonHelper.py | 45 +-
tools/marvin/marvin/lib/base.py | 489 ++-
tools/marvin/marvin/lib/common.py | 149 +-
tools/marvin/marvin/lib/ncc.py | 2 +-
tools/marvin/marvin/lib/utils.py | 19 +-
tools/marvin/marvin/lib/vcenter.py | 32 +-
tools/marvin/marvin/marvinInit.py | 44 +-
tools/marvin/marvin/marvinLog.py | 18 +-
tools/marvin/marvin/marvinPlugin.py | 20 +-
tools/marvin/marvin/misc/build/advanced_env.py | 4 +-
tools/marvin/marvin/misc/build/bashUtils.py | 6 +-
tools/marvin/marvin/misc/build/buildGenerator.py | 8 +-
tools/marvin/marvin/misc/build/configure.py | 34 +-
tools/marvin/marvin/misc/build/openport.py | 4 +-
tools/marvin/marvin/misc/build/restartMgmt.py | 2 +-
.../marvin/misc/build/xunitmp/xunitmultiprocess.py | 8 +-
.../marvin/marvin/sandbox/advanced/advanced_env.py | 4 +-
.../marvin/sandbox/advancedsg/advancedsg_env.py | 4 +-
tools/marvin/marvin/sandbox/basic/basic_env.py | 4 +-
.../sandbox/demo/simulator/simulator_setup.py | 4 +-
.../sandbox/demo/simulator/testcase/libs/base.py | 52 +-
.../sandbox/demo/simulator/testcase/libs/common.py | 62 +-
tools/marvin/marvin/sshClient.py | 2 +-
tools/marvin/marvin/tcExecuteEngine.py | 4 +-
tools/marvin/pom.xml | 4 +-
tools/marvin/setup.py | 3 +-
tools/travis/before_install.sh | 23 +-
tools/travis/before_script.sh | 2 +-
tools/travis/install.sh | 18 +-
tools/travis/script.sh | 2 +-
tools/travis/xunit-reader.py | 4 +-
ui/package.json | 2 +
.../scripts/consoleproxy.sh => ui/postbuild.sh | 25 +-
.../scripts/consoleproxy.sh => ui/prebuild.sh | 36 +-
ui/public/config.json | 6 +-
ui/public/locales/ca.json | 2 +
ui/public/locales/en.json | 6 +-
ui/public/locales/it_IT.json | 2 +
ui/public/locales/nb_NO.json | 2 +
ui/public/locales/nl_NL.json | 2 +
ui/public/locales/pl.json | 2 +
ui/src/components/CheckBoxSelectPair.vue | 17 +-
ui/src/components/view/DetailSettings.vue | 30 +-
ui/src/components/view/InfoCard.vue | 66 +-
ui/src/components/view/ListView.vue | 37 +-
ui/src/components/view/SearchView.vue | 4 +-
ui/src/components/view/SettingsTab.vue | 33 +-
ui/src/components/view/TooltipButton.vue | 100 +
ui/src/components/view/TreeView.vue | 124 +-
ui/src/config/section/compute.js | 2 +-
ui/src/config/section/network.js | 11 +-
ui/src/config/section/offering.js | 2 +-
ui/src/utils/plugins.js | 2 +-
ui/src/views/compute/InstanceTab.vue | 105 +-
ui/src/views/compute/backup/BackupSchedule.vue | 24 +-
ui/src/views/iam/DomainActionForm.vue | 20 +-
ui/src/views/iam/DomainView.vue | 8 +-
ui/src/views/iam/RolePermissionTab.vue | 25 +-
ui/src/views/iam/RuleDelete.vue | 24 +-
ui/src/views/iam/SSLCertificateTab.vue | 37 +-
ui/src/views/image/IsoZones.vue | 14 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 22 +-
ui/src/views/image/TemplateZones.vue | 34 +-
ui/src/views/infra/network/DedicatedVLANTab.vue | 6 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 8 +-
.../views/infra/network/IpRangesTabManagement.vue | 20 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 137 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 19 +-
ui/src/views/infra/network/TrafficTypesTab.vue | 55 +-
.../infra/network/providers/ProviderListView.vue | 12 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 7 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 19 +-
ui/src/views/network/AclListRulesTab.vue | 14 +-
ui/src/views/network/CreateVlanIpRange.vue | 49 +
ui/src/views/network/CreateVpnCustomerGateway.vue | 47 +-
ui/src/views/network/EgressRulesTab.vue | 6 +-
ui/src/views/network/FirewallRules.vue | 12 +-
ui/src/views/network/GuestIpRanges.vue | 30 +-
.../views/network/IngressEgressRuleConfigure.vue | 13 +-
ui/src/views/network/InternalLBAssignedVmTab.vue | 8 +-
ui/src/views/network/IpAddressesTab.vue | 8 +-
ui/src/views/network/LoadBalancing.vue | 16 +-
ui/src/views/network/PortForwarding.vue | 13 +-
ui/src/views/network/StaticRoutesTab.vue | 8 +-
ui/src/views/network/VpcTiersTab.vue | 52 +-
ui/src/views/offering/AddComputeOffering.vue | 4 +-
ui/src/views/offering/AddDiskOffering.vue | 2 +-
ui/src/views/offering/AddNetworkOffering.vue | 6 +-
ui/src/views/offering/AddVpcOffering.vue | 2 +-
ui/src/views/offering/UpdateOfferingAccess.vue | 2 +-
ui/src/views/project/AccountsTab.vue | 65 +-
ui/src/views/project/InvitationsTemplate.vue | 40 +-
.../views/project/iam/ProjectRolePermissionTab.vue | 23 +-
ui/src/views/project/iam/ProjectRoleTab.vue | 78 +-
ui/src/views/storage/FormSchedule.vue | 12 +-
ui/src/views/storage/ScheduledSnapshots.vue | 24 +-
ui/src/views/storage/TakeSnapshot.vue | 12 +-
385 files changed, 15153 insertions(+), 14160 deletions(-)
copy
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/{PreparePrimaryStorageForMaintenanceCmd.java
=> SyncStoragePoolCmd.java} (58%)
copy
core/src/main/java/org/apache/cloudstack/storage/command/{DettachAnswer.java =>
SyncVolumePathAnswer.java} (86%)
copy
core/src/main/java/org/apache/cloudstack/storage/command/{AttachAnswer.java =>
SyncVolumePathCommand.java} (74%)
copy systemvm/agent/scripts/consoleproxy.sh => ui/postbuild.sh (68%)
copy systemvm/agent/scripts/consoleproxy.sh => ui/prebuild.sh (54%)
create mode 100644 ui/src/components/view/TooltipButton.vue
