This is an automated email from the ASF dual-hosted git repository.
bhaisaab pushed a change to branch CLOUDSTACK-10012
in repository https://gitbox.apache.org/repos/asf/cloudstack.git.
omit 42d9297 CLOUDSTACK-10012: ServerDaemon customization (#2272)
omit 7652cab packaging: fix debian init script
omit e6da056 packging: fix server starts in centos6/7
omit 7fb2b0b cloudstack-setup-mgmt: remove references of tomcat
omit 30567ee packaing: removing tomcat junk files
omit df16dfe fix centos pkging
omit 34d0ac5 centos: fix linkings
omit 846d959 packaging: fix centos pkging
omit fe4ae85 debian: fix pkg
omit 41821b8 packging: fix centos6/7 pkging
omit 7d5f15e centos63: make it work
omit d21b703 client: rename tomcatconf to conf directory
omit 132ba26 client: remove a lot of ancient crap
omit 83378fa centos63: remove stuff
omit f0c0d5c centos63: wip
omit 79c302d packaging: read/load jars from /lib directory
omit 7ff8bb1 centos7: remove dirs not created
omit d46f506 centos7: fix missing paths
omit 4f29cf1 packaging: refactor systemd scripts
omit d5bf6c0 centos7: fix centos7 spec
omit 9a5df11 packaging: remove fedora packaging
omit 4e9dcd1 client: fix classpaths
omit a448241 apidoc: Fix regressions, use fatjar instead of path
omit c5d8167 Add jetty dependencies version 9.2 (java 7+)
omit 4b5531f Remove dependency on tomcat, modify installation script for
debian
omit f7cc630 Modify cloudtack-amanement init with uber jar startup
omit 8abc75f Inception for backport jetty embedded with shaded jar
add 18ffd7b CLOUDSTACK-10036: Decreasing timeout of failing unit test
(#2228)
add 86b6050 CLOUDSTACK-10042: Properly show ICMP SecGroup Rules (#2233)
add cf6c949 Merge branch '4.9' into 4.10
add d17728d Merge branch '4.10'
add aee3dbb CLOUDSTACK-10000: Fix remote access vpn does not work due to
'#' in password (#2182)
add 92b07d4 CLOUDSTACK-10000: Fix vpn_users component test
add 5645164 CLOUDSTACK-8958: release dedicated ip range in domain removal
add 542b7e6 CLOUDSTACK-8958: Fix typos introduced
add d9b7b8c Merge branch '4.9' into 4.10
add f84728d Merge branch '4.10'
add c13af1e README: Repo has moved (#2235)
add 3f330a2 CLOUDSTACK-10044: Update role permission (#2236)
add 17bc6af CLOUDSTACK-10031: change default configuration for
router.aggregation.command.each.timeout from 3 to 600 seconds (#2223)
add 6745f98 CLOUDSTACK-9999: vpc tiers do not work if vpc has more than 8
tiers (#2180)
add f243f70 CLOUDSTACK-10026 Page for Internal LB VM stucking while
loading (#2215)
add dc361e1 CLOUDSTACK-10031: change default configuration for
router.aggregation.command.each.timeout from 3 to 600 seconds (#2223)
add cd2176f CLOUDSTACK-10031: change default configuration for
router.aggregation.command.each.timeout from 3 to 600 seconds (#2223)
add a502c00 Merge branch '4.9' into 4.10
add fa2c5a0 Merge remote-tracking branch 'origin/4.10'
add d450e1a CLOUDSTACK-9992 : Failed to change cluster to managed state
add 4e4d7c7 CLOUDSTACK-9773: Don't break API output with non-printable
characters (#1936)
add ea52a13 CLOUDSTACK-9763: set ssh public key when creating vm data
(#1919)
add a40e0f0 CLOUDSTACK-9939: Volumes stuck in Creating state while
restarting the Management Server when the volume creation is in progress (#2163)
add 250c47e CLOUDSTACK-9964: Snapahots are getting deleted if VM is
assigned to another user (#2159)
add b947eca CLOUDSTACK-9734: Destroy VM Fails sometimes (#2013)
add 0c6cf69 CLOUDSTACK-9717: [VMware] RVRs have mismatching MAC addresses
for extra public NICs. (#1878)
add 40d7746 CLOUDSTACK-9967: Fixed static nat iptables rules order issue
on additional public subnet ip (#2154)
add deb92d3 CLOUDSTACK-10030: Make sure that public IPs assigned to VPC
are reacheable from inside the VPC (#2221)
add f62a8d7 CLOUDSTACK-10022: Allow domain admin to create and delete
subdomains (#2222)
add 310195c CLOUDSTACK-10052: Simplify dynamic roles enable checking
(#2241)
add 0f27bc9 Merge branch '4.9' into 4.10
add cc749cc Merge branch '4.10'
add 7f987ac CLOUDSTACK-9165: unable to use reserved IP range in a network
for external VMs (#1246)
add 1f29313 CLOUDSTACK-10002: Restart network with cleanup spawns
Redundant Routers(In Default Network Offering) (#2186)
add 57255ac CLOUDSTACK-9914: Update Quota plugin to support currency
values up to 5 decimal places (#2123)
add 4b38d36 CLOUDSTACK-9915 ListSnapshots API does not provide virtual
size information of the snapshots (#2101)
add a8c09f2 CLOUDSTACK-9996: Fix juniper vlan untagged jedgement and xml
element replacment (#2174)
add 4268944 CE-110 move config to public fields
add 693d63e CE-110 remove duplicate-unused functionality
add c10c342 CE-110 task for marking cleaning fully cloned templates
implemented by marking them for GC
add 16b34c9 CE-110 default interval of 0 minutes means do not mark for
cleaning
add 94718c0 CE-110 markedForGC is ignored so delete the templates in the
task that finds them
add 64e56a2 Merge pull request #2044 from
shapeblue/cleanup-unlinked-templates
add 7ce54bf CLOUDSTACK-9993: Securing Agents Communications (#2239)
add a444077 docker: increased jetty timeout (#2245)
add 8502a66 CLOUDSTACK-10027: Repeating the same list for Internal LB in
VPC (#2216)
add 3fc696e CLOUDSTACK-9954 Unable to create service offering with
networkrate=0
add 31f27da Merge branch 'master' of https://github.com/apache/cloudstack
add f66bbb9 CLOUDSTACK-9922 Unable to use 8081 port for Load balancing
add 6e832b5 Merge pull request #2109 from Accelerite/CLOUDSTACK-9922
add 212e5cc CLOUDSTACK-9782: Host HA and KVM HA provider
add c0b33db CLOUDSTACK-9782: Nested-oobm CloudStack plugin
add d2c3408 CLOUDSTACK-9782: Improve scheduling of jobs
add f917ab6 CLOUDSTACK-9782: Improve host HA tests
add 01b040d CLOUDSTACK-9314: Remove unused code from
XenServerStorageProcessor (#1443)
add bf35aef CLOUDSTACK-10032 : Database entries for templates created
from snapshots disappear after management-server service restart (#2224)
add d1e61eb CLOUDSTACK-9812: Update 'updatePortForwardingRule' api to
include additional parameter end port (#1985)
add dfd01c99 CLOUDSTACK-10059: Dashboard ignores resource value that is
less than 1%
add 0d81e88 CLOUDSTACK-8939: VM Snapshot size with memory correctly
calculated in cloud.usage_event (XenServer) (#914)
add 74fe9e3 CLOUDSTACK-10004 : On deletion, Vmware volume snapshots are
left behind with message 'the snapshot has child, can't delete it on the
storage' (#2188)
add 4dd8b5d CLOUDSTACK-9563: ExtractTemplate returns malformed URL after
migrating NFS to s3 (#1733)
add a52ce36 CLOUDSTACK-10058: Error while opening the Settings tab in
Secondary storage (#2254)
add f5cebeb CLOUDSTACK-10061: When starting a VM, make sure it is
attached to correct VAG when using managed storage (#2253)
add 6f157cc CLOUDSTACK-9782: Fix intermittent host-ha KVM test failures
(#2256)
add d145944 Updating pom.xml version numbers for release 4.9.3.0
add 774998d Updating pom.xml version numbers for release 4.9.4.0-SNAPSHOT
add 854d9e0 Merge branch '4.9' into 4.10
add f2cb218 Merge branch '4.10'
add 85e57d1 CLOUDSTACK-10069: Add sha512 suffix to SHA 512 checksum
(#2262)
add a90b600 Merge branch '4.9' into 4.10
add a6b41c1 Merge branch '4.10'
add 48fa206 CLOUDSTACK-9963 Root Disk controller value is changing while
migrating VM
add c4ca420 CLOUDSTACK-8969: VPN customer gateway can't be registered
with hostname (#955)
add e894022 CLOUDSTACK-9886 : After restarting cloudstack-management , It
takes time to connect hosts
add b655f9b Merge pull request #2054 from Accelerite/cs-51009
add d84585f CLOUDSTACK-10068: Fixing test_iso.py assertions are equating
srt and bool instead of the same types (#2261)
add c7a55eb CLOUDSTACK-10019: template.properties has hardcoded id (#2243)
add 2ccea13 CLOUDSTACK-10056: Fix vm details usage (#2248)
add 2bad9a6 CLOUDSTACK-9949: add ability to specify mac address (#2143)
add a4036f7 CLOUDSTACK-10067: Fix a case where a user 'ro' or 'roo'
exists on the system, or other variants. (#2252)
add 3bc2341 CLOUDSTACK-9902: add consoleproxy.sslEnable global setting
(#2078)
add 3f69c83 CLOUDSTACK-9956: File search on the vmware datastore may
select wrong file if there are multiple files with same name (#2153)
add f2584bb CLOUDSTACK-9182: Some running VMs turned off on manual
migration when auto migration failed while host preparing for maintenance.
(#1252)
add c670691 CLOUDSTACK-8865: Adding SR doesn't create
Storage_pool_host_ref entry for disabled host (#876)
add e1cff7d CLOUDSTACK-10083: Allow ModifySshKeys to be forwarded to the
agent in maintenance mode (#2269)
add b130e55 CLOUDSTACK-9397: Add Watchdog timer to KVM Instance (#1707)
add a06530d CLOUDSTACK-10007 Isolation method claim (#2249)
add 3381c38 CLOUDSTACK-10073: KVM host RAM overprovisioning (#2266)
add 19706b9 CLOUDSTACK-10099: Fix migrateVirtualMachineWithVolume UI
failure (#2277)
add 74ec9ce CLOUDSTACK-9584: Re-arrange failing project_limits test
(#2279)
add 0dfdbe0 CLOUDSTACK-9993: With auth strictness stop SSL handshake for
rogue clients (#2278)
add b044f1b CLOUDSTACK-9859: Retirement of midonet plugin (final removal)
(#2285)
add f1c01a5 CLOUDSTACK-10101: Present the full domain name when listing
user's domains in SAML2 plugin (#2280)
add 5636c9b CLOUDSTACK-8308 automation test for Delta Snapshot
add 7ca5b53 CLOUDSTACK-9899 Url validation disabling (#2074)
add ed7811a CLOUDSTACK-10046 checksum validation for any java supported
Digests-type (#2246)
add 0fedbdd CLOUDSTACK-9998: Prometheus Exporter for CloudStack (#2287)
add c3ed1b3 CLOUDSTACK-9993: Have basic constraint in CA certificate
(#2286)
add 189b0e4 CLOUDSTACK-10060: ListUsage API always displays the Virtual
size as '0' for Usage type=9 (snapshot) (#2257)
add a379230 CLOUDSTACK-9957 Annotations (#2181)
add 3985c68 CLOUDSTACK-10007 no isolationmethod check for directpodbase
basic zone nets (#2296)
new 2369b74 CLOUDSTACK-10012: Introduce Embedded Jetty with shaded jar
new 55bf188 WIP: pgkging
new 5291c51 upgrade dependency versions, migrate to spring5
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 (42d9297)
\
N -- N -- N refs/heads/CLOUDSTACK-10012 (5291c51)
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.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.travis.yml | 22 +-
README.md | 2 +-
agent/conf/agent.properties | 18 +-
agent/src/com/cloud/agent/Agent.java | 127 +-
agent/src/com/cloud/agent/AgentShell.java | 13 +-
.../cloud/agent/dao/impl/PropertiesStorage.java | 29 +-
.../consoleproxy/ConsoleProxyResource.java | 12 +-
agent/test/com/cloud/agent/AgentShellTest.java | 15 +
api/pom.xml | 5 +
api/src/com/cloud/dc/DataCenter.java | 5 +-
api/src/com/cloud/event/EventTypes.java | 32 +-
api/src/com/cloud/host/Host.java | 14 +-
api/src/com/cloud/host/Status.java | 2 +
api/src/com/cloud/network/Network.java | 14 +
api/src/com/cloud/network/NetworkModel.java | 5 +-
api/src/com/cloud/network/rules/RulesService.java | 2 +-
api/src/com/cloud/org/Cluster.java | 6 +-
api/src/com/cloud/resource/ResourceState.java | 3 +
api/src/com/cloud/storage/ImageStore.java | 7 +
api/src/com/cloud/vm/NicProfile.java | 5 +
api/src/com/cloud/vm/VirtualMachine.java | 18 +-
api/src/com/cloud/vm/VmDetailConstants.java | 3 +
api/src/org/apache/cloudstack/acl/RoleService.java | 4 +-
.../org/apache/cloudstack/alert/AlertService.java | 8 +-
.../apache/cloudstack/annotation/Annotation.java} | 31 +-
.../cloudstack/annotation/AnnotationService.java | 49 +
api/src/org/apache/cloudstack/api/APICommand.java | 5 +-
.../cloudstack/api/AbstractGetUploadParamsCmd.java | 8 +-
.../org/apache/cloudstack/api/ApiConstants.java | 25 +
api/src/org/apache/cloudstack/api/BaseCmd.java | 53 +-
.../command/admin/acl/UpdateRolePermissionCmd.java | 56 +-
.../command/admin/annotation/AddAnnotationCmd.java | 80 +
.../admin/annotation/ListAnnotationsCmd.java | 81 +
.../admin/annotation/RemoveAnnotationCmd.java | 64 +
.../api/command/admin/ca/IssueCertificateCmd.java | 162 ++
.../api/command/admin/ca/ListCAProvidersCmd.java | 102 ++
.../api/command/admin/ca/ListCaCertificateCmd.java | 90 ++
.../command/admin/ca/ProvisionCertificateCmd.java | 125 ++
.../api/command/admin/ca/RevokeCertificateCmd.java | 116 ++
.../api/command/admin/domain/CreateDomainCmd.java | 11 +-
.../api/command/admin/domain/DeleteDomainCmd.java | 11 +-
.../command/admin/ha/ConfigureHAForHostCmd.java | 127 ++
.../command/admin/ha/DisableHAForClusterCmd.java | 114 ++
.../api/command/admin/ha/DisableHAForHostCmd.java | 116 ++
.../api/command/admin/ha/DisableHAForZoneCmd.java | 115 ++
.../command/admin/ha/EnableHAForClusterCmd.java | 114 ++
.../api/command/admin/ha/EnableHAForHostCmd.java | 116 ++
.../api/command/admin/ha/EnableHAForZoneCmd.java | 115 ++
.../command/admin/ha/ListHostHAProvidersCmd.java | 106 ++
.../command/admin/ha/ListHostHAResourcesCmd.java | 109 ++
.../api/command/admin/host/UpdateHostCmd.java | 22 +-
.../user/firewall/UpdatePortForwardingRuleCmd.java | 12 +-
.../api/command/user/iso/RegisterIsoCmd.java | 2 +-
.../command/user/template/RegisterTemplateCmd.java | 2 +-
.../api/command/user/vm/AddNicToVMCmd.java | 17 +
.../api/command/user/vm/DeployVMCmd.java | 29 +-
.../api/command/user/volume/UploadVolumeCmd.java | 2 +-
.../api/response/AnnotationResponse.java | 121 ++
.../api/response/CAProviderResponse.java | 52 +
.../api/response/CertificateResponse.java | 58 +
.../api/response/HAProviderResponse.java | 58 +
.../cloudstack/api/response/HostHAResponse.java | 104 ++
.../cloudstack/api/response/HostResponse.java | 36 +
.../api/response/OutOfBandManagementResponse.java | 2 +-
.../cloudstack/api/response/SnapshotResponse.java | 8 +
api/src/org/apache/cloudstack/ca/CAManager.java | 163 ++
api/src/org/apache/cloudstack/ha/HAConfig.java | 146 ++
.../org/apache/cloudstack/ha/HAConfigManager.java | 96 ++
.../BackgroundPollTask.java => ha/HAResource.java} | 20 +-
.../Partition.java} | 11 +-
.../outofbandmanagement/OutOfBandManagement.java | 4 +-
.../apache/cloudstack/poll/BackgroundPollTask.java | 6 +
client/WEB-INF/web.xml | 47 +-
client/conf/cloudmanagementserver.keystore | Bin 1316 -> 0 bytes
client/conf/commons-logging.properties.in | 4 +-
client/conf/db.properties.in | 4 +-
client/conf/ehcache.xml.in | 26 +-
client/conf/environment.properties.in | 4 +-
client/conf/log4j-cloud.xml.in | 16 +-
client/pom.xml | 70 +-
core/pom.xml | 2 +-
.../META-INF/cloudstack/ca}/module.properties | 7 +-
...ring-core-lifecycle-ca-context-inheritable.xml} | 23 +-
...-core-lifecycle-compute-context-inheritable.xml | 5 +
.../core/spring-core-registry-core-context.xml | 11 +-
.../api/CheckVMActivityOnStoragePoolCommand.java | 70 +
.../cloud/agent/api/ComputeChecksumCommand.java | 14 +-
.../agent/api/routing/NetworkElementCommand.java | 13 +
.../virtualnetwork/VirtualRoutingResource.java | 44 +
.../storage/template/HttpTemplateDownloader.java | 424 +++--
.../cloudstack/ca/SetupCertificateAnswer.java | 12 +-
.../cloudstack/ca/SetupCertificateCommand.java | 99 ++
.../apache/cloudstack/ca/SetupKeyStoreCommand.java | 75 +
.../apache/cloudstack/ca/SetupKeystoreAnswer.java | 20 +-
.../api/agent/test/CheckOnHostCommandTest.java | 19 +-
debian/cloudstack-management.postinst | 3 -
developer/developer-prefill.sql | 5 +
engine/api/pom.xml | 15 -
.../service/NetworkOrchestrationService.java | 2 +
.../src/com/cloud/agent/AgentManager.java | 2 +
.../cloud/configuration/ConfigurationManager.java | 14 +
.../src/com/cloud/resource/ResourceManager.java | 2 +
.../src/com/cloud/storage/StorageManager.java | 2 +
.../src/com/cloud/template/TemplateManager.java | 2 +-
.../src/com/cloud/agent/manager/AgentAttache.java | 3 +-
.../com/cloud/agent/manager/AgentManagerImpl.java | 6 +-
.../agent/manager/ClusteredAgentManagerImpl.java | 25 +-
.../com/cloud/vm/VirtualMachineManagerImpl.java | 57 +-
.../datacenter/entity/api/db/EngineClusterVO.java | 31 +-
.../entity/api/db/EngineDataCenterVO.java | 29 +-
.../datacenter/entity/api/db/EngineHostVO.java | 45 +-
.../engine/orchestration/NetworkOrchestrator.java | 35 +
.../engine/orchestration/VolumeOrchestrator.java | 20 +-
.../spring-engine-schema-core-daos-context.xml | 5 +-
engine/schema/src/com/cloud/certificate/CrlVO.java | 85 +
.../src/com/cloud/certificate/dao/CrlDao.java | 13 +-
.../src/com/cloud/certificate/dao/CrlDaoImpl.java | 57 +
engine/schema/src/com/cloud/dc/ClusterVO.java | 22 +-
engine/schema/src/com/cloud/dc/DataCenterVO.java | 20 +-
engine/schema/src/com/cloud/domain/DomainVO.java | 8 +
engine/schema/src/com/cloud/host/HostVO.java | 38 +-
engine/schema/src/com/cloud/host/dao/HostDao.java | 2 +
.../schema/src/com/cloud/host/dao/HostDaoImpl.java | 27 +-
.../src/com/cloud/network/dao/NetworkVO.java | 17 +-
.../src/com/cloud/upgrade/dao/Upgrade481to490.java | 45 +-
engine/schema/src/com/cloud/vm/VMInstanceVO.java | 33 +-
engine/schema/src/com/cloud/vm/dao/NicDao.java | 4 +
engine/schema/src/com/cloud/vm/dao/NicDaoImpl.java | 29 +
.../schema/src/com/cloud/vm/dao/VMInstanceDao.java | 2 +
.../src/com/cloud/vm/dao/VMInstanceDaoImpl.java | 15 +
.../cloudstack/acl/dao/RolePermissionsDao.java | 10 +
.../cloudstack/acl/dao/RolePermissionsDaoImpl.java | 14 +
.../apache/cloudstack/annotation/AnnotationVO.java | 154 ++
.../cloudstack/annotation/dao/AnnotationDao.java | 13 +-
.../annotation/dao/AnnotationDaoImpl.java | 59 +
.../engine/cloud/entity/api/db/VMEntityVO.java | 5 +
.../HAConfigVO.java} | 127 +-
.../org/apache/cloudstack/ha/dao/HAConfigDao.java | 36 +-
.../apache/cloudstack/ha/dao/HAConfigDaoImpl.java | 149 ++
.../outofbandmanagement/OutOfBandManagementVO.java | 6 +-
engine/service/src/main/webapp/WEB-INF/web.xml | 3 -
.../storage/image/store/ImageStoreImpl.java | 5 +
.../test/resource/fakeDriverTestContext.xml | 1 -
.../test/resources/storageContext.xml | 1 -
.../storage/image/db/SnapshotDataStoreDaoImpl.java | 68 +-
.../volume/db/TemplatePrimaryDataStoreDao.java | 31 -
.../volume/db/TemplatePrimaryDataStoreDaoImpl.java | 123 --
.../volume/db/TemplatePrimaryDataStoreVO.java | 262 ----
.../globodns => framework/ca}/pom.xml | 18 +-
.../apache/cloudstack/framework/ca/CAProvider.java | 93 ++
.../apache/cloudstack/framework/ca/CAService.java | 34 +-
.../cloudstack/framework/ca/Certificate.java | 40 +-
.../cloudstack/framework/config/ConfigKey.java | 3 +-
.../framework/jobs/impl/AsyncJobManagerImpl.java | 4 +
framework/pom.xml | 1 +
packaging/centos63/cloud.spec | 6 -
packaging/systemd/cloudstack-management.default | 5 +-
.../midonet => ca/root-ca}/pom.xml | 32 +-
.../META-INF/cloudstack/root-ca}/module.properties | 4 +-
.../cloudstack/root-ca/spring-root-ca-context.xml} | 18 +-
.../ca/provider/RootCACustomTrustManager.java | 146 ++
.../cloudstack/ca/provider/RootCAProvider.java | 459 ++++++
.../ca/provider/RootCACustomTrustManagerTest.java | 110 ++
.../cloudstack/ca/provider/RootCAProviderTest.java | 155 ++
plugins/event-bus/kafka/pom.xml | 2 +-
plugins/event-bus/rabbitmq/pom.xml | 2 +-
.../kvm-compute/spring-kvm-compute-context.xml | 7 +
.../kvm/src/com/cloud/ha/KVMInvestigator.java | 21 +-
.../cloud/hypervisor/kvm/resource/KVMHABase.java | 5 +
.../hypervisor/kvm/resource/KVMHAChecker.java | 10 +-
.../hypervisor/kvm/resource/KVMHAMonitor.java | 24 +-
.../kvm/resource/KVMHAVMActivityChecker.java | 70 +
.../kvm/resource/LibvirtComputingResource.java | 38 +-
.../kvm/resource/LibvirtDomainXMLParser.java | 29 +
.../hypervisor/kvm/resource/LibvirtVMDef.java | 61 +
.../wrapper/LibvirtCheckOnHostCommandWrapper.java | 6 +-
...CheckVMActivityOnStoragePoolCommandWrapper.java | 65 +
.../org/apache/cloudstack/kvm/ha/KVMHAConfig.java | 56 +
.../apache/cloudstack/kvm/ha/KVMHAProvider.java | 157 ++
.../cloudstack/kvm/ha/KVMHostActivityChecker.java | 205 +++
.../kvm/resource/LibvirtComputingResourceTest.java | 3 +
.../kvm/resource/LibvirtDomainXMLParserTest.java | 6 +
.../hypervisor/kvm/resource/LibvirtVMDefTest.java | 9 +
.../apache/cloudstack/kvm/ha/KVMHostHATest.java | 84 +
plugins/hypervisors/ovm3/pom.xml | 5 -
plugins/hypervisors/simulator/pom.xml | 5 +
.../spring-simulator-compute-context.xml | 4 +
.../com/cloud/agent/manager/MockAgentManager.java | 7 +
.../cloud/agent/manager/MockAgentManagerImpl.java | 24 +-
.../cloud/agent/manager/SimulatorManagerImpl.java | 10 +
.../ConfigureSimulatorHAProviderState.java | 120 ++
.../commands/ListSimulatorHAStateTransitions.java | 104 ++
.../api/response/SimulatorHAStateResponse.java | 65 +
.../src/com/cloud/ha/SimulatorInvestigator.java | 10 +
.../apache/cloudstack/ha/SimulatorHAProvider.java | 160 ++
.../org/apache/cloudstack/ha/SimulatorHAState.java | 89 ++
.../src/com/cloud/hypervisor/guru/VMwareGuru.java | 18 +
.../manager/CleanupFullyClonedTemplatesTask.java | 158 ++
.../hypervisor/vmware/manager/VmwareManager.java | 22 +-
.../vmware/manager/VmwareManagerImpl.java | 186 ++-
.../vmware/manager/VmwareStorageManagerImpl.java | 11 +-
.../hypervisor/vmware/resource/VmwareResource.java | 81 +-
.../resource/VmwareStorageLayoutHelper.java | 35 +-
.../storage/resource/VmwareStorageProcessor.java | 23 +-
.../vmware/VmwareDatacenterApiUnitTest.java | 115 +-
.../vmware/resource/VmwareResourceTest.java | 34 +
.../xenserver/resource/CitrixResourceBase.java | 42 +-
.../resource/XenServerStorageProcessor.java | 183 +--
.../CitrixCreateVMSnapshotCommandWrapper.java | 8 +-
.../CitrixDeleteVMSnapshotCommandWrapper.java | 9 +-
.../kafka => integrations/prometheus}/pom.xml | 25 +-
.../cloudstack/prometheus}/module.properties | 4 +-
.../prometheus/spring-prometheus-context.xml} | 15 +-
.../cloudstack/metrics/PrometheusExporter.java | 7 +-
.../cloudstack/metrics/PrometheusExporterImpl.java | 612 ++++++++
.../metrics/PrometheusExporterServer.java | 33 +
.../metrics/PrometheusExporterServerImpl.java | 118 ++
plugins/network-elements/globodns/pom.xml | 2 +-
.../element/InternalLoadBalancerElement.java | 8 +-
.../ElementChildTestConfiguration.java | 6 +
.../cloud/network/resource/JuniperSrxResource.java | 4 +-
.../com/cloud/network/element/MidoNetElement.java | 1635 --------------------
.../cloud/network/element/SimpleFirewallRule.java | 219 ---
.../network/guru/MidoNetGuestNetworkGuru.java | 160 --
.../network/guru/MidoNetPublicNetworkGuru.java | 252 ---
.../cloud/network/resource/MidoNetVifDriver.java | 169 --
.../cloud/network/element/MidoNetElementTest.java | 199 ---
.../nested-cloudstack}/pom.xml | 25 +-
.../nested-cloudstack}/module.properties | 4 +-
.../spring-nested-cloudstack-context.xml} | 15 +-
.../NestedCloudStackOutOfBandManagementDriver.java | 147 ++
...tedCloudStackOutOfBandManagementDriverTest.java | 75 +
plugins/pom.xml | 9 +-
.../ElastistorPrimaryDataStoreLifeCycle.java | 2 +-
.../CloudStackPrimaryDataStoreLifeCycleImpl.java | 2 +-
...loudStackPrimaryDataStoreLifeCycleImplTest.java | 170 ++
.../SolidFireSharedPrimaryDataStoreLifeCycle.java | 2 +-
.../api/command/ListAndSwitchSAMLAccountCmd.java | 1 +
.../api/response/SamlUserAccountResponse.java | 13 +
.../cloudstack/saml/SAML2AuthManagerImpl.java | 99 +-
.../src/org/apache/cloudstack/saml/SAMLUtils.java | 158 +-
.../GetServiceProviderMetaDataCmdTest.java | 30 +-
.../test/org/apache/cloudstack/SAMLUtilsTest.java | 20 +-
.../command/SAML2LoginAPIAuthenticatorCmdTest.java | 35 +-
.../SAML2LogoutAPIAuthenticatorCmdTest.java | 19 +-
pom.xml | 64 +-
scripts/common/keys/ssl-keys.py | 58 -
scripts/installer/createtmplt.sh | 1 +
scripts/installer/createvolume.sh | 1 +
scripts/installer/windows/acs.wxs | 3 -
scripts/installer/windows/client.wxs | 9 -
scripts/network/domr/router_proxy.sh | 10 +-
scripts/storage/qcow2/createtmplt.sh | 24 +-
scripts/storage/qcow2/createvolume.sh | 24 +-
scripts/storage/secondary/createtmplt.sh | 34 +-
scripts/storage/secondary/createvolume.sh | 1 +
scripts/util/keystore-cert-import | 100 ++
scripts/util/keystore-setup | 51 +
scripts/vm/hypervisor/kvm/kvmvmactivity.sh | 135 ++
server/pom.xml | 5 +
.../core/spring-server-core-managers-context.xml | 16 +
server/src/com/cloud/alert/AlertManagerImpl.java | 4 +-
server/src/com/cloud/api/ApiResponseHelper.java | 1 +
server/src/com/cloud/api/ApiServer.java | 3 +-
.../com/cloud/api/query/dao/HostJoinDaoImpl.java | 9 +
server/src/com/cloud/api/query/vo/HostJoinVO.java | 53 +-
server/src/com/cloud/configuration/Config.java | 45 +-
.../configuration/ConfigurationManagerImpl.java | 40 +-
.../consoleproxy/ConsoleProxyManagerImpl.java | 3 +-
.../kvm/discoverer/LibvirtServerDiscoverer.java | 116 +-
.../com/cloud/network/IpAddressManagerImpl.java | 13 +-
server/src/com/cloud/network/NetworkModelImpl.java | 21 +-
.../src/com/cloud/network/NetworkServiceImpl.java | 2 +-
.../network/element/VirtualRouterElement.java | 111 +-
.../com/cloud/network/guru/DirectNetworkGuru.java | 24 +-
.../network/guru/DirectPodBasedNetworkGuru.java | 5 +-
.../com/cloud/network/guru/GuestNetworkGuru.java | 2 +-
.../cloud/network/router/CommandSetupHelper.java | 4 +-
.../com/cloud/network/router/NetworkHelper.java | 5 +-
.../cloud/network/router/NetworkHelperImpl.java | 109 +-
.../cloud/network/router/NicProfileHelperImpl.java | 2 +-
.../router/VirtualNetworkApplianceManagerImpl.java | 2 +-
.../com/cloud/network/rules/RulesManagerImpl.java | 32 +-
.../network/vpn/RemoteAccessVpnManagerImpl.java | 4 +-
.../cloud/network/vpn/Site2SiteVpnManagerImpl.java | 8 +-
.../com/cloud/resource/ResourceManagerImpl.java | 20 +-
.../com/cloud/server/ConfigurationServerImpl.java | 126 +-
.../src/com/cloud/server/ManagementServerImpl.java | 2 +-
.../src/com/cloud/storage/StorageManagerImpl.java | 13 +-
.../com/cloud/storage/VolumeApiServiceImpl.java | 10 +-
.../com/cloud/template/TemplateManagerImpl.java | 6 +-
server/src/com/cloud/test/DatabaseConfig.java | 38 +-
server/src/com/cloud/user/DomainManagerImpl.java | 16 +-
server/src/com/cloud/vm/UserVmManagerImpl.java | 55 +-
.../cloud/vm/snapshot/VMSnapshotManagerImpl.java | 3 +-
.../org/apache/cloudstack/acl/RoleManagerImpl.java | 49 +-
.../annotation/AnnotationManagerImpl.java | 149 ++
.../org/apache/cloudstack/ca/CAManagerImpl.java | 428 +++++
server/src/org/apache/cloudstack/ha/HAManager.java | 77 +
.../org/apache/cloudstack/ha/HAManagerImpl.java | 714 +++++++++
.../apache/cloudstack/ha/HAResourceCounter.java | 131 ++
.../ha/provider/ActivityCheckerInterface.java | 18 +-
.../cloudstack/ha/provider/HACheckerException.java | 12 +-
.../cloudstack/ha/provider/HAFenceException.java | 12 +-
.../apache/cloudstack/ha/provider/HAProvider.java | 66 +
.../ha/provider/HARecoveryException.java | 11 +-
.../ha/provider/HealthCheckerInterface.java | 17 +-
.../cloudstack/ha/provider/HostHAProvider.java | 6 +-
.../ha/provider/host/HAAbstractHostProvider.java | 109 ++
.../cloudstack/ha/task/ActivityCheckTask.java | 83 +
.../org/apache/cloudstack/ha/task/BaseHATask.java | 111 ++
.../org/apache/cloudstack/ha/task/FenceTask.java | 56 +
.../apache/cloudstack/ha/task/HealthCheckTask.java | 63 +
.../apache/cloudstack/ha/task/RecoveryTask.java | 58 +
.../OutOfBandManagementServiceImpl.java | 14 +-
.../cloudstack/poll/BackgroundPollManagerImpl.java | 6 +-
.../com/cloud/network/MockNetworkModelImpl.java | 8 +-
.../cloud/resource/MockResourceManagerImpl.java | 5 +
.../cloud/server/ConfigurationServerImplTest.java | 61 +-
.../test/com/cloud/user/DomainManagerImplTest.java | 107 +-
.../cloud/vpc/MockConfigurationManagerImpl.java | 11 +-
.../test/com/cloud/vpc/MockNetworkManagerImpl.java | 5 +
.../test/com/cloud/vpc/MockNetworkModelImpl.java | 8 +-
.../apache/cloudstack/ca/CABackgroundTaskTest.java | 151 ++
.../apache/cloudstack/ca/CAManagerImplTest.java | 121 ++
.../OutOfBandManagementServiceTest.java | 2 +-
.../poll/BackgroundPollManagerImplTest.java | 6 +
.../SecondaryStorageManagerImpl.java | 3 +-
.../resource/NfsSecondaryStorageResource.java | 92 +-
.../storage/template/DownloadManagerImpl.java | 76 +-
setup/bindir/cloud-set-guest-sshkey-configdrive.in | 2 +-
setup/bindir/cloud-set-guest-sshkey.in | 4 +-
setup/db/db/schema-41000to41100-cleanup.sql | 3 +
setup/db/db/schema-41000to41100.sql | 175 +++
setup/db/db/schema-481to490-cleanup.sql | 76 -
setup/db/db/schema-481to490.sql | 78 +-
setup/db/db/schema-4920to4930.sql | 2 +
setup/db/db/schema-4930to41000.sql | 2 +-
setup/db/server-setup.sql | 3 +
setup/db/server-setup.xml | 7 +
.../debian/config/opt/cloud/bin/configure.py | 11 +-
.../patches/debian/config/opt/cloud/bin/merge.py | 2 +-
.../debian/config/opt/cloud/bin/patchsystemvm.sh | 15 +-
systemvm/pom.xml | 5 +
systemvm/systemvm-descriptor.xml | 9 +
test/integration/component/test_host.py | 205 +++
test/integration/component/test_host_ha.py | 289 ++--
test/integration/component/test_host_ha.sh | 86 +-
test/integration/component/test_vpn_users.py | 2 +-
test/integration/smoke/test_certauthority_root.py | 229 +++
test/integration/smoke/test_dynamicroles.py | 40 +
test/integration/smoke/test_host_annotations.py | 178 +++
test/integration/smoke/test_hostha_kvm.py | 626 ++++++++
test/integration/smoke/test_hostha_simulator.py | 776 ++++++++++
test/integration/smoke/test_iso.py | 178 ++-
test/integration/smoke/test_nic.py | 38 +
.../smoke/test_outofbandmanagement_nestedplugin.py | 256 +++
test/integration/smoke/test_portforwardingrules.py | 428 +++++
test/integration/smoke/test_primary_storage.py | 113 +-
test/integration/smoke/test_templates.py | 199 +++
.../testpaths/testpath_delta_snapshots.py | 540 +++++++
tools/apidoc/gen_toc.py | 4 +
tools/build/build_asf.sh | 8 +-
tools/cli/README | 2 +-
tools/docker/supervisord.conf | 2 +-
tools/eclipse/eclipse.epf | 2 +-
tools/marvin/marvin/codes.py | 1 +
tools/marvin/marvin/config/test_data.py | 13 +-
tools/marvin/marvin/lib/base.py | 36 +-
tools/travis/before_install.sh | 7 +-
tools/travis/install.sh | 2 +-
tools/travis/script.sh | 1 +
ui/css/cloudstack3.css | 59 +
ui/images/sprites.png | Bin 198421 -> 207062
bytes
ui/index.html | 1 +
ui/l10n/ar.js | 1 +
ui/l10n/ca.js | 1 +
ui/l10n/de_DE.js | 1 +
ui/l10n/en.js | 10 +
ui/l10n/es.js | 1 +
ui/l10n/fr_FR.js | 1 +
ui/l10n/hu.js | 1 +
ui/l10n/it_IT.js | 1 +
ui/l10n/ja_JP.js | 1 +
ui/l10n/ko_KR.js | 1 +
ui/l10n/nb_NO.js | 1 +
ui/l10n/nl_NL.js | 1 +
ui/l10n/pl.js | 1 +
ui/l10n/pt_BR.js | 1 +
ui/l10n/ru_RU.js | 1 +
ui/l10n/zh_CN.js | 1 +
ui/scripts/dashboard.js | 2 +-
ui/scripts/domains.js | 2 +
ui/scripts/instances.js | 1 +
ui/scripts/network.js | 14 +-
ui/scripts/roles.js | 23 +
ui/scripts/system.js | 553 +++++--
ui/scripts/ui-custom/ca.js | 53 +
ui/scripts/ui-custom/saml.js | 5 +-
ui/scripts/ui/widgets/multiEdit.js | 35 +-
ui/scripts/vpc.js | 15 +-
usage/src/com/cloud/usage/UsageServer.java | 31 +-
.../com/cloud/usage/parser/StorageUsageParser.java | 7 +-
utils/pom.xml | 16 +-
.../main/java/com/cloud/utils/PropertiesUtil.java | 4 -
.../src/main/java/com/cloud/utils/StringUtils.java | 8 +
.../utils/exception/TaskExecutionException.java | 2 +-
.../main/java/com/cloud/utils/net/NetUtils.java | 27 +
utils/src/main/java/com/cloud/utils/nio/Link.java | 175 +--
.../main/java/com/cloud/utils/nio/NioClient.java | 2 +-
.../java/com/cloud/utils/nio/NioConnection.java | 27 +-
.../main/java/com/cloud/utils/nio/NioServer.java | 4 +-
.../main/java/com/cloud/utils/script/Script.java | 3 +-
.../java/com/cloud/utils/ssh/SSHCmdHelper.java | 93 +-
.../cloudstack/utils/security/CertUtils.java | 252 +++
.../cloudstack/utils/security/ChecksumValue.java | 86 +
.../cloudstack/utils/security/DigestHelper.java | 96 ++
.../cloudstack/utils/security/KeyStoreUtils.java | 70 +
.../test/java/com/cloud/utils/StringUtilsTest.java | 13 +
.../java/com/cloud/utils/net/NetUtilsTest.java | 18 +
.../java/com/cloud/utils/testcase/NioTest.java | 2 +-
.../utils/hypervisor/HypervisorUtilsTest.java | 2 +-
.../cloudstack/utils/security/CertUtilsTest.java | 118 ++
.../utils/security/DigestHelperTest.java | 102 ++
.../cloud/hypervisor/vmware/mo/DatastoreMO.java | 28 +-
.../hypervisor/vmware/mo/VirtualMachineMO.java | 43 +-
.../hypervisor/vmware/mo/DatastoreMOTest.java | 114 ++
.../hypervisor/vmware/mo/VirtualMachineMOTest.java | 120 ++
428 files changed, 19355 insertions(+), 5889 deletions(-)
copy api/src/{com/cloud/storage/ImageStore.java =>
org/apache/cloudstack/annotation/Annotation.java} (68%)
create mode 100644
api/src/org/apache/cloudstack/annotation/AnnotationService.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/annotation/AddAnnotationCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/annotation/ListAnnotationsCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/annotation/RemoveAnnotationCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ca/IssueCertificateCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ca/ListCAProvidersCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ca/ListCaCertificateCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ca/ProvisionCertificateCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ca/RevokeCertificateCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/ConfigureHAForHostCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForClusterCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForHostCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/DisableHAForZoneCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForClusterCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForHostCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/EnableHAForZoneCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAProvidersCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/command/admin/ha/ListHostHAResourcesCmd.java
create mode 100644
api/src/org/apache/cloudstack/api/response/AnnotationResponse.java
create mode 100644
api/src/org/apache/cloudstack/api/response/CAProviderResponse.java
create mode 100644
api/src/org/apache/cloudstack/api/response/CertificateResponse.java
create mode 100644
api/src/org/apache/cloudstack/api/response/HAProviderResponse.java
create mode 100644
api/src/org/apache/cloudstack/api/response/HostHAResponse.java
create mode 100644 api/src/org/apache/cloudstack/ca/CAManager.java
create mode 100644 api/src/org/apache/cloudstack/ha/HAConfig.java
create mode 100644 api/src/org/apache/cloudstack/ha/HAConfigManager.java
copy api/src/org/apache/cloudstack/{poll/BackgroundPollTask.java =>
ha/HAResource.java} (68%)
copy api/src/org/apache/cloudstack/{poll/BackgroundPollTask.java =>
kernel/Partition.java} (72%)
delete mode 100644 client/conf/cloudmanagementserver.keystore
copy {plugins/network-elements/midonet/resources/META-INF/cloudstack/midonet
=> core/resources/META-INF/cloudstack/ca}/module.properties (96%)
copy
core/resources/META-INF/cloudstack/{compute/spring-core-lifecycle-compute-context-inheritable.xml
=> ca/spring-core-lifecycle-ca-context-inheritable.xml} (52%)
create mode 100644
core/src/com/cloud/agent/api/CheckVMActivityOnStoragePoolCommand.java
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
core/src/org/apache/cloudstack/ca/SetupCertificateAnswer.java (76%)
create mode 100644
core/src/org/apache/cloudstack/ca/SetupCertificateCommand.java
create mode 100644 core/src/org/apache/cloudstack/ca/SetupKeyStoreCommand.java
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
core/src/org/apache/cloudstack/ca/SetupKeystoreAnswer.java (64%)
create mode 100644 engine/schema/src/com/cloud/certificate/CrlVO.java
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
engine/schema/src/com/cloud/certificate/dao/CrlDao.java (70%)
create mode 100644 engine/schema/src/com/cloud/certificate/dao/CrlDaoImpl.java
create mode 100644
engine/schema/src/org/apache/cloudstack/annotation/AnnotationVO.java
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDao.java (66%)
create mode 100644
engine/schema/src/org/apache/cloudstack/annotation/dao/AnnotationDaoImpl.java
copy
engine/schema/src/org/apache/cloudstack/{outofbandmanagement/OutOfBandManagementVO.java
=> ha/HAConfigVO.java} (55%)
copy api/src/com/cloud/storage/ImageStore.java =>
engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDao.java (56%)
create mode 100644
engine/schema/src/org/apache/cloudstack/ha/dao/HAConfigDaoImpl.java
delete mode 100644
engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDao.java
delete mode 100644
engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreDaoImpl.java
delete mode 100644
engine/storage/src/org/apache/cloudstack/storage/volume/db/TemplatePrimaryDataStoreVO.java
copy {plugins/network-elements/globodns => framework/ca}/pom.xml (65%)
create mode 100644
framework/ca/src/org/apache/cloudstack/framework/ca/CAProvider.java
copy api/src/com/cloud/storage/ImageStore.java =>
framework/ca/src/org/apache/cloudstack/framework/ca/CAService.java (60%)
copy core/src/com/cloud/agent/api/ComputeChecksumCommand.java =>
framework/ca/src/org/apache/cloudstack/framework/ca/Certificate.java (50%)
rename plugins/{network-elements/midonet => ca/root-ca}/pom.xml (62%)
copy plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet
=> ca/root-ca/resources/META-INF/cloudstack/root-ca}/module.properties (96%)
rename
plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet/spring-midonet-context.xml
=>
ca/root-ca/resources/META-INF/cloudstack/root-ca/spring-root-ca-context.xml}
(58%)
create mode 100644
plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCACustomTrustManager.java
create mode 100644
plugins/ca/root-ca/src/org/apache/cloudstack/ca/provider/RootCAProvider.java
create mode 100644
plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCACustomTrustManagerTest.java
create mode 100644
plugins/ca/root-ca/test/org/apache/cloudstack/ca/provider/RootCAProviderTest.java
create mode 100644
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAVMActivityChecker.java
create mode 100644
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/wrapper/LibvirtCheckVMActivityOnStoragePoolCommandWrapper.java
create mode 100644
plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAConfig.java
create mode 100644
plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHAProvider.java
create mode 100644
plugins/hypervisors/kvm/src/org/apache/cloudstack/kvm/ha/KVMHostActivityChecker.java
create mode 100644
plugins/hypervisors/kvm/test/org/apache/cloudstack/kvm/ha/KVMHostHATest.java
create mode 100644
plugins/hypervisors/simulator/src/com/cloud/api/commands/ConfigureSimulatorHAProviderState.java
create mode 100644
plugins/hypervisors/simulator/src/com/cloud/api/commands/ListSimulatorHAStateTransitions.java
create mode 100644
plugins/hypervisors/simulator/src/com/cloud/api/response/SimulatorHAStateResponse.java
create mode 100644
plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAProvider.java
create mode 100644
plugins/hypervisors/simulator/src/org/apache/cloudstack/ha/SimulatorHAState.java
create mode 100644
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/CleanupFullyClonedTemplatesTask.java
copy plugins/{event-bus/kafka => integrations/prometheus}/pom.xml (66%)
copy plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet
=>
integrations/prometheus/resources/META-INF/cloudstack/prometheus}/module.properties
(96%)
copy
plugins/{hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml
=>
integrations/prometheus/resources/META-INF/cloudstack/prometheus/spring-prometheus-context.xml}
(63%)
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporter.java
(86%)
create mode 100644
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterImpl.java
create mode 100644
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServer.java
create mode 100644
plugins/integrations/prometheus/src/org/apache/cloudstack/metrics/PrometheusExporterServerImpl.java
delete mode 100644
plugins/network-elements/midonet/src/com/cloud/network/element/MidoNetElement.java
delete mode 100644
plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java
delete mode 100644
plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetGuestNetworkGuru.java
delete mode 100644
plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java
delete mode 100644
plugins/network-elements/midonet/src/com/cloud/network/resource/MidoNetVifDriver.java
delete mode 100644
plugins/network-elements/midonet/test/com/cloud/network/element/MidoNetElementTest.java
copy plugins/{event-bus/kafka =>
outofbandmanagement-drivers/nested-cloudstack}/pom.xml (63%)
rename plugins/{network-elements/midonet/resources/META-INF/cloudstack/midonet
=>
outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack}/module.properties
(94%)
copy
plugins/{hypervisors/kvm/resources/META-INF/cloudstack/kvm-compute/spring-kvm-compute-context.xml
=>
outofbandmanagement-drivers/nested-cloudstack/resources/META-INF/cloudstack/nested-cloudstack/spring-nested-cloudstack-context.xml}
(64%)
create mode 100644
plugins/outofbandmanagement-drivers/nested-cloudstack/src/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriver.java
create mode 100644
plugins/outofbandmanagement-drivers/nested-cloudstack/test/org/apache/cloudstack/outofbandmanagement/driver/nestedcloudstack/NestedCloudStackOutOfBandManagementDriverTest.java
create mode 100644
plugins/storage/volume/default/test/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImplTest.java
delete mode 100644 scripts/common/keys/ssl-keys.py
create mode 100755 scripts/util/keystore-cert-import
create mode 100755 scripts/util/keystore-setup
create mode 100755 scripts/vm/hypervisor/kvm/kvmvmactivity.sh
mode change 100755 => 100644 server/src/com/cloud/vm/UserVmManagerImpl.java
create mode 100644
server/src/org/apache/cloudstack/annotation/AnnotationManagerImpl.java
create mode 100644 server/src/org/apache/cloudstack/ca/CAManagerImpl.java
create mode 100644 server/src/org/apache/cloudstack/ha/HAManager.java
create mode 100644 server/src/org/apache/cloudstack/ha/HAManagerImpl.java
create mode 100644 server/src/org/apache/cloudstack/ha/HAResourceCounter.java
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
server/src/org/apache/cloudstack/ha/provider/ActivityCheckerInterface.java (64%)
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
server/src/org/apache/cloudstack/ha/provider/HACheckerException.java (76%)
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
server/src/org/apache/cloudstack/ha/provider/HAFenceException.java (77%)
create mode 100644 server/src/org/apache/cloudstack/ha/provider/HAProvider.java
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
server/src/org/apache/cloudstack/ha/provider/HARecoveryException.java (76%)
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
server/src/org/apache/cloudstack/ha/provider/HealthCheckerInterface.java (67%)
copy api/src/org/apache/cloudstack/poll/BackgroundPollTask.java =>
server/src/org/apache/cloudstack/ha/provider/HostHAProvider.java (86%)
create mode 100644
server/src/org/apache/cloudstack/ha/provider/host/HAAbstractHostProvider.java
create mode 100644
server/src/org/apache/cloudstack/ha/task/ActivityCheckTask.java
create mode 100644 server/src/org/apache/cloudstack/ha/task/BaseHATask.java
create mode 100644 server/src/org/apache/cloudstack/ha/task/FenceTask.java
create mode 100644
server/src/org/apache/cloudstack/ha/task/HealthCheckTask.java
create mode 100644 server/src/org/apache/cloudstack/ha/task/RecoveryTask.java
create mode 100644
server/test/org/apache/cloudstack/ca/CABackgroundTaskTest.java
create mode 100644 server/test/org/apache/cloudstack/ca/CAManagerImplTest.java
create mode 100644 test/integration/component/test_host.py
create mode 100644 test/integration/smoke/test_certauthority_root.py
create mode 100644 test/integration/smoke/test_host_annotations.py
create mode 100644 test/integration/smoke/test_hostha_kvm.py
create mode 100644 test/integration/smoke/test_hostha_simulator.py
create mode 100644
test/integration/smoke/test_outofbandmanagement_nestedplugin.py
create mode 100644 test/integration/smoke/test_portforwardingrules.py
create mode 100644 test/integration/testpaths/testpath_delta_snapshots.py
create mode 100644 ui/scripts/ui-custom/ca.js
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/security/CertUtils.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/security/ChecksumValue.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/security/DigestHelper.java
create mode 100644
utils/src/main/java/org/apache/cloudstack/utils/security/KeyStoreUtils.java
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/security/CertUtilsTest.java
create mode 100644
utils/src/test/java/org/apache/cloudstack/utils/security/DigestHelperTest.java
create mode 100644
vmware-base/test/com/cloud/hypervisor/vmware/mo/DatastoreMOTest.java
create mode 100644
vmware-base/test/com/cloud/hypervisor/vmware/mo/VirtualMachineMOTest.java
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
