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 a71b123 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
discard f0cef35 Add diskofferingstrictness to serviceoffering vo under quota
discard 86cf61c Added new API params to compute offering creation
discard 3ddb2fb Fix deployVM flow
discard 6e606f8 diskoffering getsize() is only for strict disk offerings
discard 296a507 Decouple service offering and disk offering states
discard 5dc5cc7 Remove diskofferingid from vminstance VO
discard 027f92b Decoupled service offering and disk offering
discard 6067856 Few more changes
discard fcb0299 Schema changes and disk offering column change from "type" to
"compute_only"
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 2eae0f5 SystemVM: Set agent state to disconnected on Stopping the
systemVM (#5010)
add 5f734f7 vmware: Disk controller vmware deploy as is (#5006)
add 5cbc1d9 Fixed invalid ostypeid when not using deployasis (#5033)
add c6ba3d1 ui: Make 'ACL' field as mandatory and add warning message for
default_allow and default_deny (#5003)
add d47e273 server: Prevent NPE if hypervisor's capabilities are null
(#5029)
add 4b7fa4e Merge remote-tracking branch 'apache/4.15'
add 1e13855 Add startdate formate to documents. (#5026)
add 06744c1 Externalize OOBM background task's interval (#4881)
add a0d9ace fix: create template with Marvin (#4631)
add 42e3b11 systemvmtemplate: update to Debian 10.9 (#5038)
add f1c83a0 maven: Use https for jenkins repo, to fix build with newer
maven (#5039)
add 6531ee5 Externalize config to set min memory/cpu with division by
overprovisi… (#4722)
add a3cdd1f Allow deploy Admin VMs and VRs in disabled
zones/pods/clusters (#3600)
add 4ec337f ui: pass requireshvm param for register/upload template API
(#5050)
add dafa377 secondary-storage: fix account template directory size (#5048)
add b104aca Merge remote-tracking branch 'apache/4.15'
add b0cb087 server: fixes NPE on empty vmware.root.disk.controller config
(#5045)
add 86508b7 vmware: Fix worker VM numeric invalid value (#5032)
add a78f676 engine: fix network with SG disabled still has security group
script adding rules on KVM (#5049)
add fbc8610 Merge remote-tracking branch 'origin/4.14' into 4.15
add 57e4e3b Merge remote-tracking branch 'origin/4.15'
add 065ee9e ui: Removed download icon when iso is not extractable for
users (#5028)
add b2fd548 ui: Remove 'CONTRIBUTING.md' from ui directory (not relevant
now as the repo already has a 'CONTRIBUTING.md' in its root directory) (#5054)
add d04fa02 server: usage generated for destroyed VMs with no backups
(#5017)
add d184e28 Merge remote-tracking branch 'origin/4.15'
add 704b24e server: Fix string format error (#5061)
add 5a84115 vmware: Create fcd folder on local storage in VMware vSphere
(#5057)
add 8c7e39e xenserver: attempt eject and destroying patch VBD separately
(#5053)
add b258232 vr: remove old ips with same mac address in dhcpentry databag
(#5059)
add 937def5 ui: fix adduser form (#5063)
add 5aefd3e Merge remote-tracking branch 'origin/4.15'
add 3ee5639 kvm: Check for VLAN or VXLAN in
NetworkDaoImpl.listByPhysicalNetworkPvlan (#5074)
add d0e3745 ui: Fix error when no ipv6 address (#5081)
add d10cdb4 Merge remote-tracking branch 'origin/4.15'
add 9581824 cloudstack: make code more inclusive
add 8fe0ff8 ui: remove redundant columns in list VMs view (#5084)
add 1286ffd Merge remote-tracking branch 'origin/4.15'
add 083646b server: VM dynamic scaling option granularity (#4643)
add 1afcd82 server: Root disk size should be listed in GB at
listServiceOffering (#5085)
add b0f2112 kvm: Fix of some UEFI related issues (#5072)
add da38299 ui: fix focus in deployvm form (#5089)
add 2777391 maven: Use https for jenkins repo, to fix build with newer
maven (#5039)
add 9d9da01 vmware: Fix lsilogcsas controller for deploy-as-is (#5076)
add a0788f5 Merge remote-tracking branch 'origin/4.15'
add a5a368e Improve logs on ProcessRunner (#4703)
add bf62661 Improve logs on RemoteAccessVpnManagerImpl (#4960)
add e962f0f Unify SMTP mail sending (#4954)
add 1c36ea9 Enhance Documentation for changeServiceForVirtualMachine and
scaleVirtualMachine (#5101)
add 8dbd310 Schema changes and disk offering column change from "type" to
"compute_only"
add 1be125b Few more changes
add 76b85c6 Decoupled service offering and disk offering
add fc69826 Remove diskofferingid from vminstance VO
add 4eee23b Decouple service offering and disk offering states
add 77f6791 diskoffering getsize() is only for strict disk offerings
add 9c6dc15 Fix deployVM flow
add 728a4c8 Added new API params to compute offering creation
add 4dab69a Add diskofferingstrictness to serviceoffering vo under quota
add 1b05122 Added overrideDiskOfferingId parameter in deploy VM API which
will override disk offering for the root disk both in template and ISO case
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 (a71b123)
\
N -- N -- N refs/heads/decoupleServiceOfferingDiskOffering
(1b05122)
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:
CONTRIBUTING.md | 42 +-
ISSUE_TEMPLATE.md | 4 +-
PULL_REQUEST_TEMPLATE.md | 2 +-
README.md | 2 +-
api/src/main/java/com/cloud/agent/api/Command.java | 9 +
api/src/main/java/com/cloud/host/Status.java | 3 +
.../com/cloud/network/router/VirtualRouter.java | 2 +-
.../java/com/cloud/offering/ServiceOffering.java | 2 +
.../java/com/cloud/resource/ResourceState.java | 1 +
api/src/main/java/com/cloud/vm/UserVmService.java | 6 +-
api/src/main/java/com/cloud/vm/VirtualMachine.java | 5 +
.../org/apache/cloudstack/api/ApiConstants.java | 2 +
.../admin/offering/CreateServiceOfferingCmd.java | 8 +
.../api/command/admin/vm/ScaleVMCmdByAdmin.java | 4 +-
.../api/command/admin/vm/UpgradeVMCmdByAdmin.java | 3 +-
.../api/command/user/job/ListAsyncJobsCmd.java | 2 +-
.../user/resource/ListResourceLimitsCmd.java | 8 +-
.../template/GetUploadParamsForTemplateCmd.java | 12 +-
.../api/command/user/vm/DeployVMCmd.java | 8 +
.../api/command/user/vm/UpdateVMCmd.java | 2 +-
.../cloudstack/api/response/HostResponse.java | 8 +-
.../api/response/ServiceOfferingResponse.java | 13 +-
.../cloudstack/api/response/SystemVmResponse.java | 12 +
.../OutOfBandManagementService.java | 3 +
.../org/apache/cloudstack/query/QueryService.java | 4 +-
client/conf/db.properties.in | 12 +-
.../com/cloud/agent/api/CheckRouterAnswer.java | 4 +-
.../cloud/deploy/DeploymentPlanningManager.java | 8 +
.../java/com/cloud/ha/HighAvailabilityManager.java | 2 +-
.../java/com/cloud/network/IpAddressManager.java | 3 +-
.../java/com/cloud/agent/manager/AgentAttache.java | 8 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 80 ++-
.../src/main/java/com/cloud/host/dao/HostDao.java | 13 +
.../main/java/com/cloud/host/dao/HostDaoImpl.java | 20 +-
.../src/main/java/com/cloud/network/VpnUserVO.java | 2 +-
.../java/com/cloud/network/dao/NetworkDaoImpl.java | 11 +-
.../java/com/cloud/service/ServiceOfferingVO.java | 18 +-
.../src/main/java/com/cloud/user/AccountVO.java | 2 +-
.../src/main/java/com/cloud/vm/VMInstanceVO.java | 4 +-
.../main/java/com/cloud/vm/dao/VMInstanceDao.java | 1 +
.../java/com/cloud/vm/dao/VMInstanceDaoImpl.java | 1 +
.../engine/cloud/entity/api/db/VMEntityVO.java | 8 +
.../resources/META-INF/db/schema-41510to41600.sql | 101 ++++
.../storage/test/EndpointSelectorTest.java | 14 +-
.../storage/test/SnapshotTestWithFakeData.java | 16 +-
.../main/java/com/cloud/utils/db/Merovingian2.java | 8 +-
.../java/com/cloud/utils/db/TransactionLegacy.java | 32 +-
.../java/com/cloud/utils/db/Merovingian2Test.java | 24 +-
.../cloudstack/quota/QuotaAlertManagerImpl.java | 149 +----
.../cloudstack/quota/vo/ServiceOfferingVO.java | 8 +
.../quota/QuotaAlertManagerImplTest.java | 14 +-
.../acl/DynamicRoleBasedAPIAccessChecker.java | 2 +-
.../acl/ProjectRoleBasedApiAccessChecker.java | 2 +-
.../acl/StaticRoleBasedAPIAccessChecker.java | 2 +-
.../java/com/cloud/utils/db/StaticStrategy.java | 34 +-
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 2 +-
.../hypervisor/kvm/resource/KVMHAChecker.java | 4 +-
.../kvm/resource/KVMHAVMActivityChecker.java | 15 +-
.../kvm/resource/LibvirtComputingResource.java | 13 +-
.../com/cloud/ovm/hypervisor/OvmResourceBase.java | 8 +-
.../main/java/com/cloud/ovm/object/OvmHost.java | 6 +-
.../src/main/java/com/cloud/ovm/object/Test.java | 4 -
.../scripts/vm/hypervisor/ovm/OvmFaultConstants.py | 2 +-
.../scripts/vm/hypervisor/ovm/OvmHostModule.py | 8 +-
.../com/cloud/hypervisor/ovm3/objects/Cluster.java | 2 +-
.../com/cloud/hypervisor/ovm3/objects/Linux.java | 6 +-
.../com/cloud/hypervisor/ovm3/objects/Pool.java | 10 +-
.../ovm3/resources/Ovm3HypervisorResource.java | 4 +-
.../ovm3/resources/helpers/Ovm3Configuration.java | 20 +-
.../resources/helpers/Ovm3HypervisorSupport.java | 44 +-
.../ovm3/resources/helpers/Ovm3StoragePool.java | 22 +-
.../cloud/hypervisor/ovm3/objects/LinuxTest.java | 4 +-
.../cloud/hypervisor/ovm3/objects/PoolTest.java | 6 +-
.../resources/helpers/Ovm3ConfigurationTest.java | 4 +-
.../helpers/Ovm3HypervisorSupportTest.java | 4 +-
.../scripts/{clean_master.sh => clean_primary.sh} | 0
.../scripts/{clean_slave.sh => clean_secondary.sh} | 0
.../test/resources/scripts/create_pool_cluster.py | 2 +-
.../ovm3/src/test/resources/scripts/info.py | 8 +-
.../ovm3/src/test/resources/scripts/password.py | 2 +-
.../ovm3/src/test/resources/scripts/repo_pool.py | 18 +-
.../ovm3/src/test/resources/scripts/simple_pool.py | 18 +-
.../com/cloud/agent/manager/MockVmManagerImpl.java | 6 +-
.../hypervisor/vmware/resource/VmwareResource.java | 52 +-
.../resource/VmwareStorageLayoutHelper.java | 3 +
.../storage/resource/VmwareStorageProcessor.java | 1 +
.../xenserver/resource/CitrixResourceBase.java | 24 +-
.../kubernetes/cluster/KubernetesCluster.java | 2 +-
.../cluster/KubernetesClusterManagerImpl.java | 35 +-
.../kubernetes/cluster/KubernetesClusterVO.java | 18 +-
.../KubernetesClusterActionWorker.java | 20 +-
...ernetesClusterResourceModifierActionWorker.java | 2 +-
.../KubernetesClusterScaleWorker.java | 6 +-
.../KubernetesClusterStartWorker.java | 188 +++----
.../KubernetesClusterUpgradeWorker.java | 4 +-
.../cluster/utils/KubernetesClusterUtil.java | 16 +-
.../cluster/CreateKubernetesClusterCmd.java | 14 +-
.../api/response/KubernetesClusterResponse.java | 13 +
.../KubernetesSupportedVersionResponse.java | 2 +-
...k8s-master-add.yml => k8s-control-node-add.yml} | 0
.../conf/{k8s-master.yml => k8s-control-node.yml} | 0
.../main/resources/script/upgrade-kubernetes.sh | 10 +-
.../cloudstack/metrics/MetricsServiceImpl.java | 15 +-
.../cloudstack/response/HostMetricsResponse.java | 47 +-
.../cloud/agent/api/GetControllerDataAnswer.java | 12 +-
.../cloud/agent/api/GetControllerHostsAnswer.java | 20 +-
.../cloud/network/bigswitch/BigSwitchBcfApi.java | 12 +-
.../cloud/network/bigswitch/BigSwitchBcfUtils.java | 18 +-
.../network/bigswitch/ControlClusterData.java | 20 +-
.../cloud/network/bigswitch/ControllerData.java | 10 +-
.../network/resource/BigSwitchBcfResource.java | 2 +-
.../cloud/network/bigswitch/BigSwitchApiTest.java | 18 +-
.../contrail/management/ServiceManagerImpl.java | 2 +-
.../network/contrail/model/ModelObject.java | 2 +-
.../contrail/model/ServiceInstanceModel.java | 2 +-
.../contrail/management/NetworkProviderTest.java | 8 +-
.../contrail/management/PublicNetworkTest.java | 8 +-
.../CloudStackPrimaryDataStoreDriverImpl.java | 24 +-
pom.xml | 4 +-
python/lib/cloud_utils.py | 2 +-
scripts/vm/hypervisor/kvm/kvmvmactivity.sh | 8 +-
.../allocator/impl/RecreateHostAllocator.java | 15 -
.../java/com/cloud/alert/AlertManagerImpl.java | 275 +++------
.../main/java/com/cloud/api/ApiResponseHelper.java | 5 +-
.../java/com/cloud/api/query/QueryManagerImpl.java | 9 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 14 +-
.../api/query/dao/ServiceOfferingJoinDaoImpl.java | 11 +-
.../com/cloud/api/query/dao/UserVmJoinDaoImpl.java | 4 +-
.../cloud/api/query/vo/ServiceOfferingJoinVO.java | 11 +
.../configuration/ConfigurationManagerImpl.java | 12 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 7 +
.../deploy/DeploymentPlanningManagerImpl.java | 153 +++--
.../java/com/cloud/deploy/FirstFitPlanner.java | 41 +-
.../com/cloud/ha/HighAvailabilityManagerImpl.java | 110 ++--
.../com/cloud/hypervisor/HypervisorGuruBase.java | 41 +-
.../com/cloud/network/IpAddressManagerImpl.java | 28 +-
.../com/cloud/network/as/AutoScaleManagerImpl.java | 6 +-
.../network/element/VirtualRouterElement.java | 10 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 46 +-
.../com/cloud/network/rules/DhcpSubNetRules.java | 6 +-
.../java/com/cloud/network/vpc/VpcManagerImpl.java | 16 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 137 +++--
.../com/cloud/projects/ProjectManagerImpl.java | 152 ++---
.../com/cloud/resource/ResourceManagerImpl.java | 78 +--
.../resourcelimit/ResourceLimitManagerImpl.java | 4 +-
...erListener.java => LockControllerListener.java} | 10 +-
.../com/cloud/server/ManagementServerImpl.java | 20 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 2 +-
.../upload/params/TemplateUploadParams.java | 4 +-
.../storage/upload/params/UploadParamsBase.java | 6 +-
.../com/cloud/template/TemplateAdapterBase.java | 4 +-
.../com/cloud/template/TemplateManagerImpl.java | 4 +-
.../java/com/cloud/user/AccountManagerImpl.java | 2 +-
.../src/main/java/com/cloud/vm/UserVmManager.java | 5 +
.../main/java/com/cloud/vm/UserVmManagerImpl.java | 134 +++--
.../cloudstack/backup/BackupManagerImpl.java | 28 +-
.../OutOfBandManagementServiceImpl.java | 4 +-
.../core/spring-server-core-managers-context.xml | 2 +-
.../system/spring-server-system-context.xml | 2 +-
.../DeploymentPlanningManagerImplTest.java | 227 +++++++-
.../cloud/ha/HighAvailabilityManagerImplTest.java | 6 +
.../network/element/VirtualRouterElementTest.java | 14 +-
.../VirtualNetworkApplianceManagerImplTest.java | 2 +-
.../vpn/RemoteAccessVpnManagerImplTest.java | 222 ++++++++
.../SecondaryStorageManagerImpl.java | 7 +
.../resource/NfsSecondaryStorageResource.java | 2 +-
setup/bindir/cloud-setup-databases.in | 7 +-
systemvm/agent/noVNC/vendor/pako/lib/zlib/trees.js | 18 +-
systemvm/debian/opt/cloud/bin/checkrouter.sh | 4 +-
systemvm/debian/opt/cloud/bin/configure.py | 1 +
.../cloud/bin/{master.py => configure_router.py} | 14 +-
systemvm/debian/opt/cloud/bin/cs/CsAddress.py | 4 +-
systemvm/debian/opt/cloud/bin/cs/CsDatabag.py | 12 +-
systemvm/debian/opt/cloud/bin/cs/CsDhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/cs/CsHelper.py | 8 +-
systemvm/debian/opt/cloud/bin/cs/CsRedundant.py | 26 +-
systemvm/debian/opt/cloud/bin/cs_dhcp.py | 2 +-
systemvm/debian/opt/cloud/bin/ipassoc.sh | 8 +-
.../opt/cloud/templates/check_heartbeat.sh.templ | 2 +-
.../opt/cloud/templates/checkrouter.sh.templ | 4 +-
.../opt/cloud/templates/keepalived.conf.templ | 6 +-
.../component/maint/test_redundant_router.py | 352 ++++++------
.../test_redundant_router_deployment_planning.py | 24 +-
.../maint/test_redundant_router_network_rules.py | 92 +--
.../component/test_acl_isolatednetwork.py | 146 ++---
.../component/test_acl_isolatednetwork_delete.py | 40 +-
.../integration/component/test_acl_listsnapshot.py | 48 +-
test/integration/component/test_acl_listvm.py | 38 +-
test/integration/component/test_acl_listvolume.py | 38 +-
...est_acl_sharednetwork_deployVM-impersonation.py | 6 +-
.../component/test_add_remove_network.py | 2 +-
test/integration/component/test_affinity_groups.py | 2 +-
test/integration/component/test_egress_fw_rules.py | 52 +-
test/integration/component/test_ip_reservation.py | 24 +-
.../test_multiple_subnets_in_isolated_network.py | 2 +-
...est_multiple_subnets_in_isolated_network_rvr.py | 2 +-
.../component/test_multiple_subnets_in_vpc.py | 2 +-
.../component/test_multiple_subnets_in_vpc_rvr.py | 2 +-
.../component/test_persistent_networks.py | 4 +-
test/integration/component/test_public_ip.py | 8 +-
.../component/test_redundant_router_cleanups.py | 78 +--
.../component/test_redundant_router_services.py | 6 +-
.../component/test_redundant_router_upgrades.py | 8 +-
test/integration/component/test_volumes.py | 2 +-
test/integration/plugins/test_nicira_controller.py | 54 +-
test/integration/smoke/test_kubernetes_clusters.py | 30 +-
test/integration/smoke/test_privategw_acl.py | 6 +-
test/integration/smoke/test_routers_network_ops.py | 18 +-
test/integration/smoke/test_scale_vm.py | 226 +++++++-
test/integration/smoke/test_vpc_redundant.py | 16 +-
tools/apidoc/generatecommand.xsl | 4 +-
tools/apidoc/generatecommands.xsl | 4 +-
tools/apidoc/generatetoc_footer.xsl | 2 +-
tools/apidoc/generatetoc_header.xsl | 2 +-
tools/apidoc/includes/main.css | 6 +-
.../scripts/install_systemvm_packages.sh | 4 +-
tools/appliance/systemvmtemplate/template.json | 4 +-
tools/build/build_asf.sh | 4 +-
tools/build/setnextversion.sh | 4 +-
.../checkstyle/src/main/resources/cloud-style.xml | 2 +-
tools/devcloud4/advanced/README.md | 2 +-
tools/devcloud4/basic/README.md | 2 +-
tools/docker/README.md | 2 +-
tools/docker/systemtpl.sh | 12 +-
tools/marvin/marvin/cloudstackTestClient.py | 6 +-
tools/marvin/marvin/codes.py | 2 +-
tools/marvin/marvin/configGenerator.py | 2 +-
tools/marvin/marvin/lib/base.py | 36 +-
tools/ngui/static/js/lib/angular.js | 18 +-
ui/CONTRIBUTING.md | 125 -----
ui/Dockerfile | 2 +-
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/ar.json | 4 +-
ui/public/locales/ca.json | 4 +-
ui/public/locales/de_DE.json | 7 +-
ui/public/locales/en.json | 10 +-
ui/public/locales/es.json | 5 +-
ui/public/locales/hu.json | 5 +-
ui/public/locales/it_IT.json | 4 +-
ui/public/locales/ko_KR.json | 4 +-
ui/public/locales/nl_NL.json | 5 +-
ui/public/locales/pl.json | 4 +-
ui/public/locales/ru_RU.json | 4 +-
ui/src/components/view/ActionButton.vue | 4 +-
ui/src/components/view/DetailSettings.vue | 11 +-
ui/src/components/view/DetailsTab.vue | 4 +-
ui/src/config/section/compute.js | 5 +-
ui/src/config/section/image.js | 2 +-
ui/src/config/section/infra/systemVms.js | 2 +-
ui/src/config/section/offering.js | 6 +-
ui/src/permission.js | 4 +-
ui/src/store/modules/app.js | 2 +-
ui/src/utils/plugins.js | 2 +-
ui/src/views/compute/CreateKubernetesCluster.vue | 12 +-
ui/src/views/compute/DeployVM.vue | 43 +-
ui/src/views/compute/DestroyVM.vue | 2 +-
ui/src/views/compute/EditVM.vue | 44 +-
.../compute/wizard/ComputeOfferingSelection.vue | 3 +-
.../views/compute/wizard/NetworkConfiguration.vue | 4 +-
ui/src/views/iam/AddUser.vue | 8 +-
ui/src/views/image/RegisterOrUploadTemplate.vue | 3 +
ui/src/views/infra/network/IpRangesTabGuest.vue | 1 -
ui/src/views/infra/network/IpRangesTabPublic.vue | 87 ++-
ui/src/views/infra/network/TrafficTypesTab.vue | 55 +-
ui/src/views/network/CreateVlanIpRange.vue | 49 ++
ui/src/views/network/VpcTab.vue | 2 +-
ui/src/views/network/VpcTiersTab.vue | 26 +-
ui/src/views/offering/AddComputeOffering.vue | 15 +-
ui/vue.config.js | 2 +-
.../com/cloud/usage/UsageAlertManagerImpl.java | 228 ++------
utils/pom.xml | 13 +
.../cloudstack/utils/mailing/MailAddress.java | 63 +++
.../utils/mailing/SMTPMailProperties.java | 89 +++
.../cloudstack/utils/mailing/SMTPMailSender.java | 231 ++++++++
.../utils/mailing/SMTPSessionProperties.java | 113 ++++
.../cloudstack/utils/process/ProcessRunner.java | 28 +-
.../utils/mailing/SMTPMailSenderTest.java | 617 +++++++++++++++++++++
.../cloudstack/utils/process/ProcessTest.java | 4 +-
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 4 +
.../hypervisor/vmware/mo/DiskControllerType.java | 4 +-
.../com/cloud/hypervisor/vmware/mo/HostMO.java | 2 +-
.../hypervisor/vmware/mo/HypervisorHostHelper.java | 12 +-
.../vmware/mo/ScsiDiskControllerType.java | 10 +-
286 files changed, 4612 insertions(+), 2574 deletions(-)
rename plugins/hypervisors/ovm3/src/test/resources/scripts/{clean_master.sh =>
clean_primary.sh} (100%)
rename plugins/hypervisors/ovm3/src/test/resources/scripts/{clean_slave.sh =>
clean_secondary.sh} (100%)
rename
plugins/integrations/kubernetes-service/src/main/resources/conf/{k8s-master-add.yml
=> k8s-control-node-add.yml} (100%)
rename
plugins/integrations/kubernetes-service/src/main/resources/conf/{k8s-master.yml
=> k8s-control-node.yml} (100%)
rename server/src/main/java/com/cloud/server/{LockMasterListener.java =>
LockControllerListener.java} (83%)
rename server/src/test/java/com/cloud/{vm =>
deploy}/DeploymentPlanningManagerImplTest.java (63%)
create mode 100644
server/src/test/java/com/cloud/network/vpn/RemoteAccessVpnManagerImplTest.java
rename systemvm/debian/opt/cloud/bin/{master.py => configure_router.py} (87%)
delete mode 100644 ui/CONTRIBUTING.md
copy systemvm/agent/scripts/consoleproxy.sh => ui/postbuild.sh (68%)
copy systemvm/agent/scripts/consoleproxy.sh => ui/prebuild.sh (54%)
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/mailing/MailAddress.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/mailing/SMTPMailProperties.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/mailing/SMTPMailSender.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/mailing/SMTPSessionProperties.java
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/mailing/SMTPMailSenderTest.java
