You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ha...@apache.org on 2021/05/10 11:40:09 UTC
[cloudstack] branch decoupleServiceOfferingDiskOffering updated
(3453738 -> 296a507)
This is an automated email from the ASF dual-hosted git repository.
harikrishna pushed a change to branch decoupleServiceOfferingDiskOffering
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
discard 3453738 Decouple service offering and disk offering states
discard 6986607 Remove diskofferingid from vminstance VO
discard 5709052 Decoupled service offering and disk offering
discard 98498f0 Few more changes
discard c44aef4 Schema changes and disk offering column change from "type" to "compute_only"
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 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 fcb0299 Schema changes and disk offering column change from "type" to "compute_only"
add 6067856 Few more changes
add 027f92b Decoupled service offering and disk offering
add 5dc5cc7 Remove diskofferingid from vminstance VO
add 296a507 Decouple service offering and disk offering states
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 (3453738)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering (296a507)
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 +-
README.md | 2 +-
api/src/main/java/com/cloud/event/EventTypes.java | 1 +
.../cloud/network/Site2SiteCustomerGateway.java | 4 +
.../java/com/cloud/storage/StorageService.java | 3 +
.../com/cloud/template/TemplateApiService.java | 4 +-
.../java/com/cloud/vm/snapshot/VMSnapshot.java | 1 +
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
...MaintenanceCmd.java => SyncStoragePoolCmd.java} | 97 +-
.../command/admin/usage/ListUsageRecordsCmd.java | 9 +
.../api/command/user/iso/AttachIsoCmd.java | 10 +-
.../api/command/user/iso/DetachIsoCmd.java | 14 +-
.../command/user/template/RegisterTemplateCmd.java | 14 +-
.../user/vpn/CreateVpnCustomerGatewayCmd.java | 17 +
.../user/vpn/UpdateVpnCustomerGatewayCmd.java | 17 +
.../response/Site2SiteCustomerGatewayResponse.java | 16 +
.../response/Site2SiteVpnConnectionResponse.java | 16 +
.../cloudstack/api/response/UserVmResponse.java | 14 +-
.../org/apache/cloudstack/query/QueryService.java | 6 +-
.../user/template/RegisterTemplateCmdTest.java | 33 +-
...ontrolAnswer.java => GetVmVncTicketAnswer.java} | 17 +-
...uterCommand.java => GetVmVncTicketCommand.java} | 19 +-
.../agent/api/routing/Site2SiteVpnCfgCommand.java | 23 +-
.../agent/api/storage/MigrateVolumeCommand.java | 18 +-
.../facade/Site2SiteVpnConfigItem.java | 2 +-
.../virtualnetwork/model/Site2SiteVpn.java | 24 +-
.../cloud/storage/resource/StorageProcessor.java | 5 +-
.../StorageSubsystemCommandHandlerBase.java | 5 +-
.../cloudstack/storage/command/AttachCommand.java | 9 +
.../cloudstack/storage/command/DettachCommand.java | 9 +
...ettachAnswer.java => SyncVolumePathAnswer.java} | 9 +-
...ttachAnswer.java => SyncVolumePathCommand.java} | 29 +-
.../virtualnetwork/VirtualRoutingResourceTest.java | 6 +-
debian/cloudstack-marvin.postinst | 4 +-
debian/control | 4 +-
debian/rules | 2 +-
.../java/com/cloud/vm/VirtualMachineManager.java | 9 +
.../java/com/cloud/capacity/CapacityManager.java | 4 +
.../java/com/cloud/resource/ResourceManager.java | 8 +
.../java/com/cloud/storage/StorageManager.java | 3 +
.../com/cloud/vm/VirtualMachineManagerImpl.java | 150 +-
.../engine/orchestration/DataMigrationUtility.java | 4 +-
.../engine/orchestration/VolumeOrchestrator.java | 7 +
.../cloud/vm/VirtualMachineManagerImplTest.java | 56 +
.../src/main/java/com/cloud/dc/DataCenterVO.java | 6 +
.../src/main/java/com/cloud/host/HostVO.java | 2 +-
.../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 | 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 +-
.../datastore/provider/DefaultHostListener.java | 46 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +
.../cloudstack/quota/QuotaAlertManagerImpl.java | 15 +-
.../cloudstack/quota/constant/QuotaConfig.java | 3 +
packaging/centos7/cloud.spec | 11 +
packaging/centos8/cloud.spec | 2 +
.../apache/cloudstack/quota/QuotaServiceImpl.java | 2 +-
.../manager/allocator/impl/RandomAllocator.java | 135 +-
.../kvm/storage/KVMStorageProcessor.java | 9 +-
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 86 +-
.../ovm3/resources/Ovm3StorageProcessor.java | 11 +-
.../cloud/resource/SimulatorStorageProcessor.java | 8 +-
.../java/com/cloud/hypervisor/guru/VMwareGuru.java | 84 +-
.../hypervisor/vmware/resource/VmwareResource.java | 169 +-
.../storage/resource/VmwareStorageProcessor.java | 112 +-
.../motion/VmwareStorageMotionStrategy.java | 159 +-
.../motion/VmwareStorageMotionStrategyTest.java | 45 +-
.../java/com/cloud/hypervisor/XenServerGuru.java | 10 +-
.../xenserver/resource/CitrixResourceBase.java | 2 +-
.../resource/XenServerStorageProcessor.java | 9 +-
.../resource/Xenserver625StorageProcessor.java | 9 +-
.../cloudstack/cloudian/CloudianConnector.java | 2 +-
.../KubernetesClusterActionWorker.java | 4 +-
...ernetesClusterResourceModifierActionWorker.java | 5 +-
.../KubernetesClusterStartWorker.java | 8 +-
.../cloudstack/response/HostMetricsResponse.java | 25 +-
.../IpmitoolOutOfBandManagementDriver.java | 38 +-
.../apache/cloudstack/ldap/LdapManagerImpl.java | 38 +-
pom.xml | 3 +-
.../manager/allocator/impl/FirstFitAllocator.java | 25 +-
server/src/main/java/com/cloud/api/ApiDBUtils.java | 8 +-
.../main/java/com/cloud/api/ApiResponseHelper.java | 4 +
.../java/com/cloud/api/query/QueryManagerImpl.java | 12 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 2 +-
.../com/cloud/api/query/dao/VolumeJoinDaoImpl.java | 16 +-
.../com/cloud/capacity/CapacityManagerImpl.java | 18 +
.../network/lb/LoadBalancingRulesManagerImpl.java | 4 +
.../cloud/network/router/CommandSetupHelper.java | 4 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 62 +-
.../com/cloud/resource/ResourceManagerImpl.java | 92 +-
.../com/cloud/server/ManagementServerImpl.java | 2 +
.../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 | 267 +-
.../cloud/storage/StoragePoolAutomationImpl.java | 11 +
.../com/cloud/storage/VolumeApiServiceImpl.java | 44 +-
.../cloud/storage/snapshot/SnapshotManager.java | 3 -
.../storage/snapshot/SnapshotManagerImpl.java | 18 +-
.../com/cloud/template/TemplateAdapterBase.java | 2 +-
.../com/cloud/template/TemplateManagerImpl.java | 26 +-
.../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 | 42 +-
.../org/apache/cloudstack/ha/HAManagerImpl.java | 80 +-
.../VirtualNetworkApplianceManagerImplTest.java | 2 +-
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 +
.../SecondaryStorageManagerImpl.java | 476 +--
.../SecondaryStorageManagerTest.java | 29 +
setup/bindir/cloud-setup-databases.in | 3 +-
systemvm/debian/etc/iptables/iptables-dhcpsrvr | 1 -
systemvm/debian/opt/cloud/bin/configure.py | 35 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 5 +-
systemvm/debian/opt/cloud/bin/cs/CsApp.py | 10 -
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 | 22 +-
.../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 | 115 +-
.../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_scale_vm.py | 103 +-
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 | 123 +-
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 | 5 +-
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 | 487 ++-
tools/marvin/marvin/lib/common.py | 157 +-
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/public/locales/ca.json | 2 +
ui/public/locales/en.json | 6 +-
ui/public/locales/it_IT.json | 2 +
ui/public/locales/ko_KR.json | 4020 +++++++++++-------
ui/public/locales/nb_NO.json | 2 +
ui/public/locales/nl_NL.json | 2 +
ui/public/locales/pl.json | 2 +
ui/src/api/index.js | 2 +-
ui/src/components/CheckBoxSelectPair.vue | 17 +-
ui/src/components/view/DedicateDomain.vue | 2 +-
ui/src/components/view/DetailSettings.vue | 34 +-
ui/src/components/view/DetailsTab.vue | 16 +
ui/src/components/view/InfoCard.vue | 83 +-
ui/src/components/view/ListView.vue | 47 +-
ui/src/components/view/ResourceView.vue | 20 +-
ui/src/components/view/SearchView.vue | 20 +-
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 | 12 +-
ui/src/config/section/network.js | 11 +-
ui/src/config/section/offering.js | 4 +-
ui/src/config/section/storage.js | 8 +-
ui/src/store/modules/user.js | 11 +-
ui/src/views/AutogenView.vue | 7 +-
ui/src/views/compute/AssignInstance.vue | 2 +-
ui/src/views/compute/AttachIso.vue | 8 +
ui/src/views/compute/CreateSSHKeyPair.vue | 2 +-
ui/src/views/compute/DeployVM.vue | 17 +-
ui/src/views/compute/InstanceTab.vue | 105 +-
ui/src/views/compute/backup/BackupSchedule.vue | 24 +-
ui/src/views/iam/AddAccount.vue | 2 +-
ui/src/views/iam/AddUser.vue | 4 +-
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 | 8 +-
ui/src/views/infra/network/IpRangesTabGuest.vue | 7 +-
.../views/infra/network/IpRangesTabManagement.vue | 20 +-
ui/src/views/infra/network/IpRangesTabPublic.vue | 56 +-
ui/src/views/infra/network/IpRangesTabStorage.vue | 19 +-
.../infra/network/providers/ProviderListView.vue | 12 +-
ui/src/views/infra/zone/IpAddressRangeForm.vue | 7 +-
ui/src/views/infra/zone/PhysicalNetworksTab.vue | 26 +-
.../zone/ZoneWizardPhysicalNetworkSetupStep.vue | 19 +-
ui/src/views/network/AclListRulesTab.vue | 14 +-
ui/src/views/network/CreateIsolatedNetworkForm.vue | 2 +-
ui/src/views/network/CreateL2NetworkForm.vue | 2 +-
ui/src/views/network/CreateSharedNetworkForm.vue | 2 +-
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 | 15 +-
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/PublicIpResource.vue | 7 +-
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 +-
.../views/plugins/quota/QuotaSummaryResource.vue | 7 +-
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 +-
.../utils/exception/CSExceptionErrorCode.java | 1 +
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 17 +
.../hypervisor/vmware/mo/VirtualMachineMO.java | 212 +-
.../cloud/hypervisor/vmware/util/VmwareHelper.java | 25 +-
451 files changed, 19116 insertions(+), 16354 deletions(-)
copy api/src/main/java/org/apache/cloudstack/api/command/admin/storage/{PreparePrimaryStorageForMaintenanceCmd.java => SyncStoragePoolCmd.java} (58%)
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/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%)
create mode 100644 services/console-proxy/server/src/main/java/com/cloud/consoleproxy/websocket/WebSocketReverseProxy.java
create mode 100644 ui/src/components/view/TooltipButton.vue