This is an automated email from the ASF dual-hosted git repository. dahn pushed a change to branch 4.13 in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit a574cb2 Merge branch 'master' into 4.13 omit cc093c6 README: put the original logo back omit d8a2f5d Fix typo: the past tense of shutdown is shutdown, not shutdowned (#3659) omit 1771727 Revert "Extract systemvm.iso using bsdtar (#3536)" (#3800) omit 70fcf75 Allow additional configuration metadata to VMs (#3510) omit dfd950c Add protocol number support for security group rules (#3736) omit f2708d6 Merge release branch 4.13 to master omit 7ceb82c Revert "Simulator: Better VR Redundant Status Behaviour (#3313)" (#3796) omit 6e19c17 Merge release branch 4.13 to master omit 8a55c93 Extract systemvm.iso using bsdtar (#3536) omit d868cd1 Simulator: Better VR Redundant Status Behaviour (#3313) omit 74f5632 Merge release branch 4.13 to master omit 809561a Merge release branch 4.13 to master omit d55a2af Bug fix: Dont display empty item in free ip list (#3790) omit 4fa7fad Merge release branch 4.13 to master omit 482e7eb New feature: Acquire specific public IP for network (#3775) omit 06e1212 Merge release branch 4.13 to master omit 482d0fd 4.13 (#3782) omit 0606039 Honour promiscuous mode from networkOffering (#3765) (#3781) omit 45503e1 Revert "Revert "Fix virtual template size for managed storage for KVM / refactor cloud-install-sys-tmplt (#3371)" (#3771)" (#3772) omit 4b43c26 Better tracking host maintanence and handling of migration jobs (#3425) omit cf6e616 Revert "Add missing HA config keys (#3737)" (#3774) omit e319c8b Revert "Fix virtual template size for managed storage for KVM / refactor cloud-install-sys-tmplt (#3371)" (#3771) omit a0efbf9 Fix virtual template size for managed storage for KVM / refactor cloud-install-sys-tmplt (#3371) omit 16527f1 Add missing HA config keys (#3737) omit 2e8c069 Load Average for KVM (#3738) omit da62cec README: that time of the year! 🎄 (#3769) omit 0d92b92 Fix OS category for some OS-es added in 4.13 (#3746) omit 93aad24 storage: Handle RBD snapshot deletion (#3615) omit 29e1bbc server: rethrow takeVMSnapshot() exception instead of returning null (#3546) omit 7a86ca7 ui: show memory usage in VM statistics (#3474) omit 6f3694c server: save SSH.PublicKey into user_vm_details regardless of password management (#3745) omit e56fa31 ssh: Add support for ecdsa and ed25519 public keys (#3740) omit 828405d Merge branch '4.13' omit f30b5ce Fix resource count of expunged volume (#3669) omit 2427114 a conditional to prevent creation of a field (#3723) omit b8676ae Merge release branch 4.13 to master omit e93f6bf utils: use iproute to get default network interface (#3704) omit a65a931 ui: increase width of name field in UI (#3703) omit 3220705 setup: env config for dual zone simulator (#3696) omit e1ccbfb debian: fix symlink issue post install/upgrade (#3695) omit 24db4d8 security_group.py: check cidr unstrictly to accept cidrs like 1.1.1.1/24 (#3701) omit 114df3d Forward merge apache/4.13 to master omit 80abb5a Fix VR creation issue while creating VM on shared network using PVLAN (#3653) omit fc9a525 New BuildRequires for CentOS 7: python-setuptools (#3630) omit 4cce43f Add support for vSphere Web SDK 6.7 installation in install-non-oss.sh (#3650) omit c863cc2 add class cleanup method (#3632) omit c8681f5 ui: fix migrate host form no host popup (#3682) omit 96d98de Merge remote-tracking branch 'origin/4.13' omit 7f5096a storage: don't select an SSVM that is removed (#3668) omit a9b4da6 server: reduce verbosity of Async Job Manager log messages (#3616) omit 524b995 IoT/ARM64 support: allow cloudstack-agent on Raspberry Pi 4 (armv8) to use kvm acceleration (#3644) omit b0e3fbe Merge remote-tracking branch 'origin/4.13' omit 4d7e95e kvm: Use 'ip' instead of 'brctl' (#3623) omit afab9fb client: jetty session timeout set after server is started (#3658) omit 3b82aba .gitignore: ignore patches and unzipped logs (#3665) omit d3f199f Increase DHCP lease time to infinite (#3662) omit 2394fda Merge remote-tracking branch 'origin/4.13' omit 848860d security_group.py: fix NameError: name 'd' is not defined (#3641) omit 9258c7c Revert "9ee129ae6a08935645734ad520bec72bf5f22217" omit 9ee129a NioServer: retain links by address string to minimize resource leak (#3525) omit 294813e Merge remote-tracking branch 'origin/4.13' omit 666ec69 Merge remote-tracking branch 'origin/4.13' omit 899eab6 kvm/security_group: Make Security Group Python 3 compatible (#3589) omit 6cec7c7 allocator: in case of null guest OS don't fail prioritisation completely (#3607) omit 7f91964 refactoring: Remove duplicate code (by Frank/Nuage) (#3538) omit 8170ec5 kvm: Logrotate should not touch agent.log (#3597) omit 89053c7 packaging: deprecate el6 and add 4.13-4.14 upgrade path (#3591) omit c01ce7b2 Merge remote-tracking branch 'origin/4.13' omit 8da0556 kvm/cloudstack-guest-tool: Tool to query Qemu Guest Agent (#3519) omit fbec3b3 Merge remote-tracking branch 'origin/4.13' omit 12f0ac6 Merge branch '4.13' into master omit 50fc045 Updating pom.xml version numbers for release 4.14.0.0-SNAPSHOT This update removed existing revisions from the reference, leaving the reference pointing at a previous point in the repository history. * -- * -- N refs/heads/4.13 (54cc73a) \ O -- O -- O (a574cb2) 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: .gitignore | 3 +- agent/bindir/cloud-guest-tool.in | 129 ----- agent/conf/agent.properties | 6 - agent/pom.xml | 2 +- api/pom.xml | 2 +- api/src/main/java/com/cloud/host/HostStats.java | 2 +- .../java/com/cloud/network/NetworkService.java | 2 +- .../java/com/cloud/resource/ResourceState.java | 41 +- .../com/cloud/template/VirtualMachineTemplate.java | 2 + api/src/main/java/com/cloud/vm/VirtualMachine.java | 2 +- .../org/apache/cloudstack/api/ApiConstants.java | 1 - .../cloudstack/api/BaseListTaggedResourcesCmd.java | 22 +- .../api/BaseListTemplateOrIsoPermissionsCmd.java | 8 +- .../org/apache/cloudstack/api/TaggedResources.java | 72 --- .../api/command/ResponseViewProvider.java | 26 - .../cloudstack/api/command/admin/AdminCmd.java | 29 -- .../admin/address/AssociateIPAddrCmdByAdmin.java | 39 +- .../address/ListPublicIpAddressesCmdByAdmin.java | 29 +- .../UpdateVMAffinityGroupCmdByAdmin.java | 34 +- .../api/command/admin/domain/ListDomainsCmd.java | 3 +- .../admin/domain/ListDomainsCmdByAdmin.java | 4 +- .../admin/host/PrepareForMaintenanceCmd.java | 22 +- .../api/command/admin/iso/AttachIsoCmdByAdmin.java | 31 +- .../api/command/admin/iso/DetachIsoCmdByAdmin.java | 25 +- .../admin/iso/ListIsoPermissionsCmdByAdmin.java | 14 +- .../api/command/admin/iso/ListIsosCmdByAdmin.java | 3 +- .../command/admin/iso/RegisterIsoCmdByAdmin.java | 30 +- .../api/command/admin/iso/UpdateIsoCmdByAdmin.java | 22 +- .../ListLoadBalancerRuleInstancesCmdByAdmin.java | 69 ++- .../admin/network/CreateNetworkCmdByAdmin.java | 25 +- .../admin/network/ListNetworksCmdByAdmin.java | 26 +- .../admin/network/UpdateNetworkCmdByAdmin.java | 29 +- .../admin/template/CopyTemplateCmdByAdmin.java | 48 +- .../admin/template/CreateTemplateCmdByAdmin.java | 41 +- .../ListTemplatePermissionsCmdByAdmin.java | 10 +- .../admin/template/ListTemplatesCmdByAdmin.java | 3 +- .../admin/template/RegisterTemplateCmdByAdmin.java | 37 +- .../admin/template/UpdateTemplateCmdByAdmin.java | 25 +- .../api/command/admin/vm/AddNicToVMCmdByAdmin.java | 32 +- .../api/command/admin/vm/DeployVMCmdByAdmin.java | 51 +- .../api/command/admin/vm/DestroyVMCmdByAdmin.java | 34 +- .../api/command/admin/vm/ListVMsCmdByAdmin.java | 3 +- .../api/command/admin/vm/RebootVMCmdByAdmin.java | 28 +- .../admin/vm/RemoveNicFromVMCmdByAdmin.java | 32 +- .../admin/vm/ResetVMPasswordCmdByAdmin.java | 29 +- .../command/admin/vm/ResetVMSSHKeyCmdByAdmin.java | 32 +- .../api/command/admin/vm/RestoreVMCmdByAdmin.java | 31 +- .../api/command/admin/vm/ScaleVMCmdByAdmin.java | 45 +- .../api/command/admin/vm/StartVMCmdByAdmin.java | 57 ++- .../api/command/admin/vm/StopVMCmdByAdmin.java | 30 +- .../admin/vm/UpdateDefaultNicForVMCmdByAdmin.java | 33 +- .../api/command/admin/vm/UpdateVMCmdByAdmin.java | 27 +- .../api/command/admin/vm/UpgradeVMCmdByAdmin.java | 34 +- .../vmsnapshot/RevertToVMSnapshotCmdByAdmin.java | 36 +- .../admin/volume/AttachVolumeCmdByAdmin.java | 24 +- .../admin/volume/CreateVolumeCmdByAdmin.java | 37 +- .../admin/volume/DetachVolumeCmdByAdmin.java | 25 +- .../admin/volume/ListVolumesCmdByAdmin.java | 5 +- .../admin/volume/MigrateVolumeCmdByAdmin.java | 19 +- .../admin/volume/ResizeVolumeCmdByAdmin.java | 30 +- .../admin/volume/UpdateVolumeCmdByAdmin.java | 21 +- .../admin/volume/UploadVolumeCmdByAdmin.java | 33 +- .../api/command/admin/vpc/CreateVPCCmdByAdmin.java | 44 +- .../api/command/admin/vpc/ListVPCsCmdByAdmin.java | 30 +- .../api/command/admin/vpc/UpdateVPCCmdByAdmin.java | 23 +- .../command/admin/zone/ListZonesCmdByAdmin.java | 3 +- .../cloudstack/api/command/user/UserCmd.java | 29 -- .../api/command/user/account/ListAccountsCmd.java | 3 +- .../command/user/address/AssociateIPAddrCmd.java | 14 +- .../user/address/ListPublicIpAddressesCmd.java | 5 +- .../affinitygroup/UpdateVMAffinityGroupCmd.java | 7 +- .../api/command/user/iso/AttachIsoCmd.java | 5 +- .../api/command/user/iso/DetachIsoCmd.java | 5 +- .../command/user/iso/ListIsoPermissionsCmd.java | 8 +- .../api/command/user/iso/ListIsosCmd.java | 3 +- .../api/command/user/iso/RegisterIsoCmd.java | 5 +- .../api/command/user/iso/UpdateIsoCmd.java | 5 +- .../ListLoadBalancerRuleInstancesCmd.java | 6 +- .../api/command/user/network/CreateNetworkCmd.java | 5 +- .../api/command/user/network/ListNetworksCmd.java | 5 +- .../api/command/user/network/UpdateNetworkCmd.java | 5 +- .../api/command/user/project/ListProjectsCmd.java | 21 +- .../AuthorizeSecurityGroupIngressCmd.java | 2 +- .../api/command/user/tag/CreateTagsCmd.java | 18 +- .../api/command/user/template/CopyTemplateCmd.java | 5 +- .../command/user/template/CreateTemplateCmd.java | 10 +- .../user/template/ListTemplatePermissionsCmd.java | 8 +- .../command/user/template/ListTemplatesCmd.java | 3 +- .../command/user/template/RegisterTemplateCmd.java | 5 +- .../command/user/template/UpdateTemplateCmd.java | 5 +- .../api/command/user/vm/AddNicToVMCmd.java | 5 +- .../api/command/user/vm/DeployVMCmd.java | 75 ++- .../api/command/user/vm/DestroyVMCmd.java | 5 +- .../cloudstack/api/command/user/vm/ListVMsCmd.java | 3 +- .../api/command/user/vm/RebootVMCmd.java | 5 +- .../api/command/user/vm/RemoveNicFromVMCmd.java | 5 +- .../api/command/user/vm/ResetVMPasswordCmd.java | 5 +- .../api/command/user/vm/ResetVMSSHKeyCmd.java | 5 +- .../api/command/user/vm/RestoreVMCmd.java | 5 +- .../cloudstack/api/command/user/vm/ScaleVMCmd.java | 5 +- .../cloudstack/api/command/user/vm/StartVMCmd.java | 5 +- .../cloudstack/api/command/user/vm/StopVMCmd.java | 5 +- .../command/user/vm/UpdateDefaultNicForVMCmd.java | 5 +- .../api/command/user/vm/UpdateVMCmd.java | 7 +- .../api/command/user/vm/UpgradeVMCmd.java | 5 +- .../user/vmsnapshot/RevertToVMSnapshotCmd.java | 5 +- .../command/user/volume/AddResourceDetailCmd.java | 21 +- .../api/command/user/volume/AttachVolumeCmd.java | 5 +- .../api/command/user/volume/CreateVolumeCmd.java | 5 +- .../api/command/user/volume/DetachVolumeCmd.java | 5 +- .../api/command/user/volume/ListVolumesCmd.java | 3 +- .../api/command/user/volume/MigrateVolumeCmd.java | 5 +- .../api/command/user/volume/ResizeVolumeCmd.java | 5 +- .../api/command/user/volume/UpdateVolumeCmd.java | 5 +- .../api/command/user/volume/UploadVolumeCmd.java | 5 +- .../api/command/user/vpc/CreateVPCCmd.java | 5 +- .../api/command/user/vpc/ListVPCsCmd.java | 5 +- .../api/command/user/vpc/UpdateVPCCmd.java | 5 +- .../api/command/user/zone/ListZonesCmd.java | 26 +- .../cloudstack/api/response/HostResponse.java | 12 +- .../api/command/test/AddIpToVmNicTest.java | 2 + .../api/command/test/ListCfgCmdTest.java | 2 + .../api/command/test/UpdateCfgCmdTest.java | 2 + client/pom.xml | 2 +- core/pom.xml | 2 +- .../com/cloud/agent/api/GetHostStatsAnswer.java | 5 - .../java/com/cloud/agent/api/HostStatsEntry.java | 11 - .../api/agent/test/CheckOnHostCommandTest.java | 2 + debian/changelog | 14 +- debian/cloudstack-usage.postinst | 13 +- debian/control | 8 +- debian/rules | 1 - deps/install-non-oss.sh | 3 - developer/pom.xml | 2 +- engine/api/pom.xml | 2 +- engine/components-api/pom.xml | 2 +- .../java/com/cloud/ha/HighAvailabilityManager.java | 1 - .../java/com/cloud/network/IpAddressManager.java | 2 +- .../java/com/cloud/resource/ResourceManager.java | 7 +- engine/network/pom.xml | 2 +- engine/orchestration/pom.xml | 2 +- .../com/cloud/agent/manager/AgentManagerImpl.java | 6 +- .../com/cloud/vm/VirtualMachineManagerImpl.java | 22 +- .../datacenter/entity/api/db/EngineHostVO.java | 32 +- .../engine/orchestration/NetworkOrchestrator.java | 2 +- engine/pom.xml | 2 +- engine/schema/pom.xml | 2 +- .../src/main/java/com/cloud/host/HostVO.java | 26 +- .../java/com/cloud/storage/dao/VolumeDaoImpl.java | 13 +- .../com/cloud/upgrade/DatabaseUpgradeChecker.java | 2 - .../com/cloud/upgrade/dao/Upgrade41300to41400.java | 71 --- .../META-INF/db/schema-41300to41400-cleanup.sql | 22 - .../resources/META-INF/db/schema-41300to41400.sql | 38 -- engine/service/pom.xml | 2 +- engine/storage/cache/pom.xml | 2 +- engine/storage/configdrive/pom.xml | 2 +- engine/storage/datamotion/pom.xml | 2 +- engine/storage/image/pom.xml | 2 +- engine/storage/integration-test/pom.xml | 2 +- engine/storage/pom.xml | 2 +- engine/storage/snapshot/pom.xml | 2 +- .../storage/snapshot/CephSnapshotStrategy.java | 11 +- .../storage/snapshot/CephSnapshotStrategyTest.java | 2 - .../storage/endpoint/DefaultEndPointSelector.java | 1 - engine/storage/volume/pom.xml | 2 +- framework/agent-lb/pom.xml | 2 +- framework/ca/pom.xml | 2 +- framework/cluster/pom.xml | 2 +- framework/config/pom.xml | 2 +- framework/db/pom.xml | 2 +- framework/direct-download/pom.xml | 2 +- framework/events/pom.xml | 2 +- framework/ipc/pom.xml | 2 +- framework/jobs/pom.xml | 2 +- .../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +- framework/managed-context/pom.xml | 2 +- framework/pom.xml | 2 +- framework/quota/pom.xml | 2 +- framework/rest/pom.xml | 2 +- framework/security/pom.xml | 2 +- framework/spring/lifecycle/pom.xml | 2 +- framework/spring/module/pom.xml | 2 +- packaging/README.md | 4 +- packaging/centos63/cloud-agent.rc | 122 +++++ .../{centos7 => centos63}/cloud-ipallocator.rc | 0 .../centos63/cloud-management.rc | 73 +-- .../centos63/cloud-usage.rc | 62 ++- packaging/{centos7 => centos63}/cloud.spec | 185 ++++--- .../{centos7 => centos63}/cloudstack-agent.te | 0 packaging/{centos7 => centos63}/cloudstack-sccs | 0 packaging/{centos7 => centos63}/replace.properties | 2 +- .../centos63/rhel7/cloudstack-management.conf | 5 +- packaging/centos7/cloud.spec | 8 - packaging/package.sh | 2 +- plugins/acl/dynamic-role-based/pom.xml | 2 +- plugins/acl/static-role-based/pom.xml | 2 +- .../explicit-dedication/pom.xml | 2 +- .../host-affinity/pom.xml | 2 +- .../host-anti-affinity/pom.xml | 2 +- plugins/alert-handlers/snmp-alerts/pom.xml | 2 +- plugins/alert-handlers/syslog-alerts/pom.xml | 2 +- plugins/api/discovery/pom.xml | 2 +- plugins/api/rate-limit/pom.xml | 2 +- plugins/api/solidfire-intg-test/pom.xml | 2 +- plugins/api/vmware-sioc/pom.xml | 2 +- plugins/ca/root-ca/pom.xml | 2 +- plugins/database/mysql-ha/pom.xml | 2 +- plugins/database/quota/pom.xml | 2 +- plugins/dedicated-resources/pom.xml | 2 +- .../implicit-dedication/pom.xml | 2 +- .../user-concentrated-pod/pom.xml | 2 +- .../deployment-planners/user-dispersing/pom.xml | 2 +- plugins/event-bus/inmemory/pom.xml | 2 +- plugins/event-bus/kafka/pom.xml | 2 +- plugins/event-bus/rabbitmq/pom.xml | 2 +- plugins/ha-planners/skip-heurestics/pom.xml | 2 +- plugins/host-allocators/random/pom.xml | 2 +- plugins/hypervisors/baremetal/pom.xml | 2 +- plugins/hypervisors/hyperv/pom.xml | 2 +- .../test/HypervDirectConnectResourceTest.java | 2 + plugins/hypervisors/kvm/pom.xml | 2 +- .../hypervisor/kvm/resource/BridgeVifDriver.java | 4 +- .../hypervisor/kvm/resource/IvsVifDriver.java | 2 +- .../kvm/resource/LibvirtCapXMLParser.java | 3 +- .../kvm/resource/LibvirtComputingResource.java | 41 +- .../hypervisor/kvm/resource/LibvirtVMDef.java | 42 +- .../wrapper/LibvirtGetHostStatsCommandWrapper.java | 3 +- .../org/apache/cloudstack/utils/linux/CPUStat.java | 12 - .../kvm/resource/LibvirtComputingResourceTest.java | 3 - plugins/hypervisors/ovm/pom.xml | 2 +- plugins/hypervisors/ovm3/pom.xml | 2 +- plugins/hypervisors/simulator/pom.xml | 2 +- plugins/hypervisors/ucs/pom.xml | 2 +- plugins/hypervisors/vmware/pom.xml | 2 +- plugins/hypervisors/xenserver/pom.xml | 2 +- .../xenserver/resource/CitrixResourceBase.java | 12 +- .../xenserver/ExtraConfigurationUtility.java | 180 ------- plugins/integrations/cloudian/pom.xml | 2 +- plugins/integrations/prometheus/pom.xml | 2 +- plugins/metrics/pom.xml | 2 +- .../cloudstack/metrics/MetricsServiceImpl.java | 1 - .../cloudstack/response/HostMetricsResponse.java | 10 - plugins/network-elements/bigswitch/pom.xml | 2 +- plugins/network-elements/brocade-vcs/pom.xml | 2 +- plugins/network-elements/cisco-vnmc/pom.xml | 2 +- .../cloud/network/element/CiscoVnmcElement.java | 2 +- plugins/network-elements/dns-notifier/pom.xml | 2 +- .../network-elements/elastic-loadbalancer/pom.xml | 2 +- plugins/network-elements/f5/pom.xml | 2 +- plugins/network-elements/globodns/pom.xml | 2 +- .../network-elements/internal-loadbalancer/pom.xml | 2 +- plugins/network-elements/juniper-contrail/pom.xml | 2 +- .../contrail/model/VirtualMachineModel.java | 2 +- plugins/network-elements/juniper-srx/pom.xml | 2 +- plugins/network-elements/netscaler/pom.xml | 2 +- plugins/network-elements/nicira-nvp/pom.xml | 2 +- plugins/network-elements/opendaylight/pom.xml | 2 +- plugins/network-elements/ovs/pom.xml | 2 +- plugins/network-elements/palo-alto/pom.xml | 2 +- plugins/network-elements/stratosphere-ssp/pom.xml | 2 +- plugins/network-elements/vxlan/pom.xml | 2 +- .../outofbandmanagement-drivers/ipmitool/pom.xml | 2 +- .../nested-cloudstack/pom.xml | 2 +- plugins/pom.xml | 2 +- plugins/storage-allocators/random/pom.xml | 2 +- plugins/storage/image/default/pom.xml | 2 +- plugins/storage/image/s3/pom.xml | 2 +- plugins/storage/image/sample/pom.xml | 2 +- plugins/storage/image/swift/pom.xml | 2 +- plugins/storage/volume/cloudbyte/pom.xml | 2 +- plugins/storage/volume/datera/pom.xml | 2 +- plugins/storage/volume/default/pom.xml | 2 +- .../CloudStackPrimaryDataStoreDriverImpl.java | 2 +- plugins/storage/volume/nexenta/pom.xml | 2 +- plugins/storage/volume/sample/pom.xml | 2 +- plugins/storage/volume/solidfire/pom.xml | 2 +- plugins/user-authenticators/ldap/pom.xml | 2 +- plugins/user-authenticators/md5/pom.xml | 2 +- plugins/user-authenticators/pbkdf2/pom.xml | 2 +- plugins/user-authenticators/plain-text/pom.xml | 2 +- plugins/user-authenticators/saml2/pom.xml | 2 +- plugins/user-authenticators/sha256salted/pom.xml | 2 +- pom.xml | 2 +- quickcloud/pom.xml | 2 +- scripts/storage/secondary/cloud-install-sys-tmplt | 280 ++++++----- scripts/storage/secondary/createtmplt.sh | 1 + scripts/vm/network/security_group.py | 47 +- scripts/vm/network/vnet/modifyvlan.sh | 9 +- server/pom.xml | 2 +- .../manager/allocator/impl/FirstFitAllocator.java | 8 +- .../java/com/cloud/api/query/QueryManagerImpl.java | 6 +- .../com/cloud/api/query/dao/HostJoinDaoImpl.java | 1 - .../consoleproxy/ConsoleProxyManagerImpl.java | 2 +- .../com/cloud/ha/HighAvailabilityManagerImpl.java | 97 +--- .../java/com/cloud/ha/dao/HighAvailabilityDao.java | 2 - .../com/cloud/ha/dao/HighAvailabilityDaoImpl.java | 17 - .../kvm/discoverer/LibvirtServerDiscoverer.java | 2 +- .../com/cloud/network/IpAddressManagerImpl.java | 6 +- .../java/com/cloud/network/NetworkServiceImpl.java | 6 +- .../router/VirtualNetworkApplianceManagerImpl.java | 13 +- .../network/security/SecurityGroupManagerImpl.java | 33 +- .../com/cloud/resource/ResourceManagerImpl.java | 208 +++----- .../main/java/com/cloud/server/StatsCollector.java | 6 +- .../com/cloud/servlet/ConsoleProxyServlet.java | 30 +- .../storage/snapshot/SnapshotManagerImpl.java | 2 +- .../main/java/com/cloud/vm/UserVmManagerImpl.java | 246 ++-------- .../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 2 +- .../cloud/resource/MockResourceManagerImpl.java | 6 +- .../cloud/resource/ResourceManagerImplTest.java | 248 +++------- .../java/com/cloud/vm/UserVmManagerImplTest.java | 19 +- .../java/com/cloud/vpc/MockNetworkManagerImpl.java | 2 +- services/console-proxy/pom.xml | 2 +- services/console-proxy/rdpconsole/pom.xml | 2 +- services/console-proxy/server/pom.xml | 2 +- services/pom.xml | 2 +- services/secondary-storage/controller/pom.xml | 2 +- services/secondary-storage/pom.xml | 2 +- services/secondary-storage/server/pom.xml | 2 +- .../resource/NfsSecondaryStorageResource.java | 14 +- setup/dev/advdualzone.cfg | 377 -------------- systemvm/pom.xml | 2 +- .../component/test_acquire_specified_public_ip.py | 486 ------------------ .../test_protocol_number_security_group.py | 460 ----------------- test/integration/plugins/test_quota.py | 8 - .../smoke/test_deploy_vm_extra_config_data.py | 542 --------------------- test/integration/smoke/test_host_maintenance.py | 392 ++++++--------- test/pom.xml | 2 +- tools/apidoc/pom.xml | 2 +- tools/build/setnextversion.sh | 5 + tools/checkstyle/pom.xml | 2 +- tools/devcloud-kvm/pom.xml | 2 +- tools/devcloud4/pom.xml | 2 +- tools/docker/Dockerfile | 2 +- tools/docker/Dockerfile.centos6 | 56 +++ tools/docker/Dockerfile.marvin | 4 +- tools/docker/init.sh_centos6 | 87 ++++ tools/marvin/marvin/lib/base.py | 11 +- tools/marvin/pom.xml | 2 +- tools/marvin/setup.py | 2 +- tools/pom.xml | 2 +- ui/css/cloudstack3.css | 2 +- ui/scripts/instances.js | 6 +- ui/scripts/metrics.js | 3 +- ui/scripts/network.js | 160 +----- ui/scripts/system.js | 8 +- usage/pom.xml | 2 +- utils/pom.xml | 2 +- utils/src/main/java/com/cloud/utils/UriUtils.java | 127 ++--- .../main/java/com/cloud/utils/net/NetUtils.java | 14 +- utils/src/main/java/com/cloud/utils/nio/Link.java | 2 +- .../main/java/com/cloud/utils/nio/NioServer.java | 2 +- .../java/com/cloud/utils/ssh/SSHKeysHelper.java | 8 +- .../utils/imagestore/ImageStoreUtil.java | 30 +- .../com/cloud/utils/UriUtilsParametrizedTest.java | 158 ------ vmware-base/pom.xml | 2 +- 355 files changed, 2896 insertions(+), 4927 deletions(-) delete mode 100755 agent/bindir/cloud-guest-tool.in delete mode 100644 api/src/main/java/org/apache/cloudstack/api/TaggedResources.java delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/ResponseViewProvider.java delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/admin/AdminCmd.java delete mode 100644 api/src/main/java/org/apache/cloudstack/api/command/user/UserCmd.java delete mode 100644 engine/schema/src/main/java/com/cloud/upgrade/dao/Upgrade41300to41400.java delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41300to41400-cleanup.sql delete mode 100644 engine/schema/src/main/resources/META-INF/db/schema-41300to41400.sql create mode 100755 packaging/centos63/cloud-agent.rc copy packaging/{centos7 => centos63}/cloud-ipallocator.rc (100%) copy usage/distro/rhel/SYSCONFDIR/rc.d/init.d/cloud-usage.in => packaging/centos63/cloud-management.rc (62%) mode change 100644 => 100755 copy usage/distro/fedora/SYSCONFDIR/rc.d/init.d/cloud-usage.in => packaging/centos63/cloud-usage.rc (68%) copy packaging/{centos7 => centos63}/cloud.spec (82%) copy packaging/{centos7 => centos63}/cloudstack-agent.te (100%) copy packaging/{centos7 => centos63}/cloudstack-sccs (100%) copy packaging/{centos7 => centos63}/replace.properties (97%) copy core/src/main/resources/META-INF/cloudstack/api/module.properties => packaging/centos63/rhel7/cloudstack-management.conf (93%) delete mode 100644 plugins/hypervisors/xenserver/src/main/java/org/apache/cloudstack/hypervisor/xenserver/ExtraConfigurationUtility.java delete mode 100644 setup/dev/advdualzone.cfg delete mode 100644 test/integration/component/test_acquire_specified_public_ip.py delete mode 100644 test/integration/component/test_protocol_number_security_group.py delete mode 100644 test/integration/smoke/test_deploy_vm_extra_config_data.py create mode 100644 tools/docker/Dockerfile.centos6 create mode 100755 tools/docker/init.sh_centos6 delete mode 100644 utils/src/test/java/com/cloud/utils/UriUtilsParametrizedTest.java