3b58a45e04
Merge branch 'master' into rbac.
2014-02-07 13:43:36 -08:00
6af6ce7e9e
1) Added External UUID control support for network.
...
2) Moved UUIDManager interface to cloud-util package
2014-02-04 15:47:12 -08:00
f84375442e
Merge branch 'master' into rbac
...
Conflicts:
api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
server/src/com/cloud/api/ApiServer.java
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/com/cloud/template/TemplateAdapterBase.java
setup/db/db/schema-430to440.sql
tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
9cb37ec349
CLOUDSTACK-6007. Restore VM command fails with NPE.
...
If a VM instance is deployed with startVm=false, then calling restoreVm on the instance fails with NPE
because CS tries to expunge a volume that has not been created in primary store.
2014-02-03 12:32:14 +05:30
20fd2769a9
CLOUDSTACK-5660: Migrate vm live migration succeeds but throws error as ""Failed to migrate the system vm"".
2014-01-30 16:29:18 +05:30
53777c9523
findbugs: removed obfuscating fields(cherry picked from commit
...
9495c68c13
2014-01-28 17:42:17 +01:00
5d8e8fd3a2
findbugs: nullpointer guards and wrappertype comparisons(cherry picked
...
from commit 791b7f8f7f
2014-01-28 16:46:05 +01:00
1b89ae7acb
CLOUDSTACK-5478:
...
Publish uuid for deployvm action event.
2014-01-22 16:50:50 -08:00
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
a9733b5df2
CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations
2014-01-17 11:55:14 -08:00
bd79fb33a6
CLOUDSTACK-5870: API support for retrieving user data
2014-01-16 15:31:18 -08:00
47fd67b7fa
CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is made by ROOT admin
2014-01-16 13:34:45 -08:00
aa6dddc778
CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs to ROOT admin
2014-01-16 10:59:38 -08:00
bae498c89e
Handle search of those entities without db view created using new ACL
...
model.
2014-01-13 21:55:56 -08:00
7053c222f9
CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
server/src/com/cloud/server/ManagementServerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2014-01-10 10:01:43 -08:00
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
87381d4236
CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging
2014-01-09 14:29:12 -08:00
ad6454d2bf
CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic.
2014-01-09 14:29:12 -08:00
0587382265
CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement
2014-01-09 14:29:12 -08:00
8c93bd6080
CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations
2014-01-09 14:29:12 -08:00
bf9a554522
CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations
2014-01-09 14:29:12 -08:00
3e45dfb942
CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
2014-01-08 19:10:40 +05:30
776b5059fb
CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/UserVmStateListener.java
2014-01-08 19:10:39 +05:30
c3d8e207c8
CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.
2014-01-07 15:07:02 +05:30
fd0fabd3e2
CLOUDSTACK-5551: Search not working for Configuration parameters in (Account/zone/cluster/storage) settings page
...
Added filters while listing scoped configuration parameters.
Fixed: Some parameters are missing from UI settings tab because of missing scope entry in configuration table.
Signed-off-by: Koushik Das <koushik@apache.org>
2014-01-02 16:18:21 +05:30
16763be77f
Fixed issue in setting vm ip,mac in vm_instance table
...
This issue is not seen in 4.2, It is observed only in 4.3.
2013-12-26 16:58:04 +05:30
f083f91b0b
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
227567cf6c
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value
2013-12-19 22:56:34 +05:30
707da55fe3
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
...
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2
2013-12-18 16:01:37 -08:00
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
f355359b23
fix issues
2013-12-10 10:37:28 +07:00
e79350d256
CLOUDSTACK-3664:
...
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check
2013-12-09 15:40:17 -08:00
aa72b76aec
CLOUDSTACK-669: put system vm work under new vmsync model
2013-12-06 16:53:11 -08:00
98ee087d31
CLOUDSTACK-4880:
...
check for host cpu capability while dynamic scaling a vm on the same host
2013-12-05 14:31:27 -08:00
bd6f706b72
CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
...
Conflicts:
engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
server/src/com/cloud/alert/AlertManagerImpl.java
server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
usage/src/com/cloud/usage/UsageManagerImpl.java
listAlerts: introduced new parameter "name" to the alertResponse
Conflicts:
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
server/src/com/cloud/alert/AlertManagerImpl.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
Added new Admin API - generateAlert. Available to ROOT admin only
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/BaseCmd.java
usage/src/com/cloud/usage/UsageAlertManagerImpl.java
listAlerts: implemented search by alert name
Conflicts:
api/src/org/apache/cloudstack/alert/AlertService.java
api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
e5cfe94818
CLOUDSTACK-5160 add a map to specify the custom compute parameters in the deployvm api.
...
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-04 11:28:45 +05:30
5a96307fbf
Changes for allowing migration of a vm on hyperv. Migration was blocked in cloudstack for hyperv.
...
Enabled it. Also updated the agent code to allow hyperv migration.
2013-12-04 10:29:36 +05:30
d5e497859f
CLOUDSTACK-4881:
...
changeServiceForVirtualMachine API should be used to scale up a stopped vm only
2013-12-02 17:27:13 -08:00
68406ba29d
CLOUDSTACK-5161 enable scaling of a vm using custom offering
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
f17f35eeb8
CLOUDSTACK-5293: fix issue when collect vm disk statistics from iso
2013-11-27 14:38:25 +01:00
6bea532efa
CLOUDSTACK-5206: Ability to control the external id of first
...
class objects. Putting in the generic methods and trying it
for objects like vm, volume. This is the first cut
2013-11-26 09:52:17 -08:00
ef40e156ed
CLOUDSTACK-5162 Usage details are not getting populated when using dynamic offerings.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-26 14:32:30 +05:30
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
f00bfea61e
Fix CID 1127030, 1127029 Questionable Boxing of primitive value
...
Fix CID 1127028 Fix Inefficient Map Iterator
Fix bug.
2013-11-07 14:59:03 +01:00
9631df8d0e
Fix CID 1127021 Operands don't affect results
...
int can never be bigger than maxint.
Auto unboxing of Integer, not need for intValue()
2013-11-07 13:34:48 +01:00
f611c24dd5
Fix CID 1127027 Dereference before null check
...
template can't be null at this point as it has already been dereferenced
2013-11-07 13:34:48 +01:00
7095ea2b5e
CLOUDSTACK-4738 Dynamic compute offering.
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
6d7674982a
CLOUDSTACK-4979: fix hostName for VmWare vms to follow the same logic
2013-11-06 16:16:25 -08:00
fac22936f6
CLOUDSTACK-4979: if no hostName is passed to deployVm call, automatically generated hostName follows the pattern <instance.id global config>-<randomly generated uuid>.
...
Example: VM-a6c6457e-e4d0-486f-a392-9239be9b36f5
2013-11-06 15:46:57 -08:00
ce3638bb03
Merge branch 'master' into rbac.
2013-11-04 15:49:29 -08:00
2ef4d5200c
Merge branch 'master' into rbac.
2013-10-31 17:16:33 -07:00
c5bec6b336
add quiescevm in createvmsnapshotcmd
2013-10-31 16:45:05 -07:00
382391f270
CLOUDSTACK-4987: only shared network and isolated network with same account can be assigned to a VM
...
(cherry picked from commit 743eed8771
2013-10-31 11:37:31 +01:00
591dcd1d1c
ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user
2013-10-29 09:18:11 -07:00
cc4b612bf6
CLOUDSTACK-4985. NPE while deleting old root volumes of a restored VM during storage garbage collection.
...
In case of VMware, once the state of the old root volume has been updated to destroyed force expunge it from primary storage to avoid the garbage collector from trying to delete the new root volume
2013-10-29 11:31:45 +05:30
70b2c0150d
rebase to spring changes
2013-10-25 18:15:36 -07:00
51a8086cf6
Merge branch 'pluggable_vm_snapshot'
...
Conflicts:
client/tomcatconf/applicationContext.xml.in
engine/storage/integration-test/test/org/apache/cloudstack/storage/test/SnapshotTest.java
engine/storage/integration-test/test/resources/storageContext.xml
server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
2013-10-25 16:47:17 -07:00
a6ce66e55a
move a lot of code into vmsnapshot strategy
...
fix compile
fix compile
add vm_snapshot_details table in db
add vmsnapshot test cases
2013-10-25 15:09:04 -07:00
059e3beb28
CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand
2013-10-24 11:52:00 +02:00
205a77a5bb
Merge remote-tracking branch 'origin/txn-refactor'
...
Conflicts:
engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
edeaf98117
Cleaner and more type safe Transaction API for checked exceptions
2013-10-23 10:02:43 -07:00
e33ae74067
CLOUDSTACK-4649:
...
xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
this patch tracks PV driver versions in vm details and template details.
Anthony
2013-10-22 17:54:51 -07:00
25d6e6ec66
CLOUDSTACK-4894: DestroyVirtualMachine API - added "expunge" admin-only parameter. When passed as true, the vm gets expunged immediately (false by default to preserve the initial command behavior)
...
Conflicts:
api/src/org/apache/cloudstack/api/ApiConstants.java
api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
2013-10-21 11:11:42 -07:00
f62e28c1ec
New Transaction API
...
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment. The existing Transaction class was renamed
to TransactionLegacy. All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
f59e47b263
Clean up ListVMsCmd implementation to not using Criteria class.
2013-10-08 15:11:56 -07:00
aed5e9dc2a
Add Manage Context framework
...
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system. As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context. This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
b253d95de9
UpdateVirtualMachine: code cleanup - got rid of warnings and unused code from the method; extracted part of the code to its separate method.
2013-09-30 15:34:56 -07:00
aba54356d5
Account_Type Refactoring for Root Admin Role
...
- change the AccountService::isRootAdmin(short) to isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
2013-09-24 15:31:09 -07:00
88954053c3
do not instantiate Long just for toString
...
replaced Long object instantiation with static call to Long.toString in case it was only to generate a string
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-19 16:58:59 +02:00
832db1b398
Apply https://reviews.apache.org/r/14084/
2013-09-17 16:29:48 -07:00
1f5699b29f
Fixed unit tests
2013-09-06 15:40:39 -07:00
8f556e6d88
Made changes to configuration. Eliminated ConfigValue and only use ConfigKey
2013-09-06 15:40:38 -07:00
b8e79c30a8
Compile complete
2013-09-06 15:40:37 -07:00
435e74e914
Commit to try something on removing getZone
2013-09-06 15:40:33 -07:00
2e5bb63f77
Moved NetworkManagerImpl to NetworkOrchestrator
2013-09-06 15:40:32 -07:00
8e5249df62
Moved NetworkManager to NetworkOrchestrationService
2013-09-06 15:40:31 -07:00
9a2148ffc3
CLOUDSTACK-3886: check in for review request https://reviews.apache.org/r/13008/
2013-09-04 14:49:45 -07:00
ef22b42b38
CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
...
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.
Conflicts:
plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -07:00
a06bd9fa2b
CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
...
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.
Conflicts:
server/src/com/cloud/api/query/QueryManagerImpl.java
server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
bf967eb622
Updating datetime format of events to include the timezone
2013-09-03 12:45:01 -04:00
14ee684ce3
Adding eventDateTime to all event generation locations
2013-09-03 11:34:56 -04:00
65c1c986da
CLOUDSTACK-1192: fix collectVmDiskStatistics issue when stopping a vm
2013-09-03 11:45:34 +02:00
a16fd4781c
CLOUDSTACK-4566: fix incorrect values in resource_count table for resource limitation
...
There are three issues in resource_count table
(1) expunge a vm, the public_ip decreases and becomes -1 in basic zone.
(2) recover a vm, the volume increase.
(3) restore a vm, the volume decrease.
2013-09-02 16:56:34 +02:00
af175d8c65
CLOUDSTACK-4528 [Vmware] new mapping vmware datacenter cloudstack zone - Virtual Router host migration across cluster FAIL
...
Change:
- Also add a check in migrateSystemVM API to check that source and destination host are in the same cluster
2013-08-28 17:03:24 -07:00
abbae2aa87
Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items.
2013-08-26 17:31:10 -07:00
494ea5052f
Made IpAddressManager a manager
2013-08-19 14:13:31 -07:00
564502abd7
Moved the virtualmachine implementation into engine/orchestration
2013-08-19 14:13:28 -07:00
4ba359c3fe
Moved VirtualMachineManager into engine
2013-08-19 14:13:28 -07:00
15c93ba9b7
=CLOUDSTACK-4068 scaling up user vm and system vm is failing with NPE if current service offering is deleted
...
Nitin Mehta <nitin.mehta@citrix.com>
2013-08-16 17:27:00 +05:30
088ce975c6
CLOUDSTACK-4313
...
Wrong error message is throwing on failure of dynamic scale up operation. Fix it.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-08-16 13:03:42 +05:30
b727001f48
CLOUDSTACK-4315: VPC - when fail to add nic to the VR, a) remove the nic b) remove the reference to nic from router_network_ref table. Before the fix b) was missing, and it caused NPEs when tried to apply the rules on the routers not having nic in the network
...
Conflicts:
server/src/com/cloud/network/element/VirtualRouterElement.java
server/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-08-14 11:44:34 -07:00
c58f15d867
CLOUDSTACK-4222: use new volume object in case of migrate volume
2013-08-13 15:16:45 -07:00
227509be46
Remove .java.orig file
...
Left over from somebodies editor?
2013-08-13 16:25:09 +02:00
Min Chen
Alena Prokharchyk
Prachi Damle
Likitha Shetty
Sanjay Tripathi
Daan Hoogland
Nitin Mehta
Kelven Yang
Bharat Kumar
Kishan Kavala
Harikrishna Patnala
Jayapal
Alex Huang
tuna
Devdeep Singh
Wei Zhou
Hugo Trippaers
Edison Su
Darren Shepherd
Anthony Xu
Laszlo Hornyak
Chip Childers
Wido den Hollander