etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
16,996 Commits 323 Branches 325 Tags 813 MiB
Commit Graph

705 Commits

Author SHA1 Message Date
Alena Prokharchyk 6ff3dc3951 Return password as a result of startVm command if the vm was originally deployed with startVm=false parameter 2012-04-06 13:46:49 -07:00
Alena Prokharchyk 2d1a6b0b35 bug 14615: deployVm can work 2 diff ways now: 1) Default way - create and start the vm. 2) Create the vm without starting it. Note that vm's volumes stay in Allocated state -not created on the backend till the point where vm starts 
status 14615: resolved fixed
 2012-04-06 11:30:48 -07:00
Alena Prokharchyk c0130a5c41 Code cleanup for createVlanRange api 2012-04-04 15:03:04 -07:00
frank 2f634c0913 Switch to Apache license 2012-04-03 04:50:05 -07:00
Alena Prokharchyk d6cf594ef7 bug 14292: don't try to reboot vm as part of resetVmPassword if the vm is in Stopped state 
status 14292: resolved fixed
 2012-03-28 13:51:14 -07:00
Vijayendra Bhamidipati 005ba5e2b5 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Adding overloaded addProxyObject() function to CloudException
	and RuntimeCloudException classes and using this function
	to stuff exceptions with IDs, to reduce code footprint.
 2012-03-15 16:27:52 -07:00
Vijayendra Bhamidipati b1bb0afad4 Bug 13127: API error text refer to database ids instead of uuids 
Description:

	Modifying the API functions' exception handling to call
	addProxyObject() wherever applicable, and removing some
	wrong calls to addProxyObject() that were put in in an
	earlier commit for this bug.

	With this commit, we cover many API functions to use the
	new exception handling code, but some pieces may still be
	left out. These will be covered as work in progress, when
	making changes to the CS API code.
 2012-03-12 18:05:45 -07:00
prachi 5148145d18 Bug 14028 - Add hostid parameter to StartVmCmd to enable admins to start VM on a particular host 
Changes:
- Added hostid to StartVMCmd. Only root admin can use it.
 2012-03-05 17:50:23 -08:00
Alena Prokharchyk c052d96428 bug 13966: cleanup the vm (stop it on the backend) when work step is Release. Also never retry when finalizeStart failed 
status 13966: resolved fixed
reviewed-by: Alex Huang
 2012-02-23 15:13:47 -08:00
Alena Prokharchyk 2e9511e2ae Changed isElastic to isSystem for the publicIpAddress assigned during the vm deployment in EIP enabled network 
Reviewed-by: Chiradeep
 2012-02-21 15:39:49 -08:00
Alena Prokharchyk cad392cd68 bug 13335: fixed listProjectInvitations by projectId 
status 13335: resolved fixed
 2012-02-07 13:16:27 -08:00
abhi ae609f6801 bug 13408: added more loggin to assignVM 2012-02-01 18:45:25 +05:30
abhi b6e5419370 bug 12899: checking if static nat rule is in place, throw error if there. Let the caller clear it first before assigning VM to another account 2012-02-01 18:08:32 +05:30
Kelven Yang c1fb754de7 VM display name can be NULL in schema, leave it as NULL instead of empty string when user does not provide a optional VM display name 2012-01-26 11:30:40 -08:00
Kelven Yang e751dad940 VM display name will stay empty if user does not provide, VM host name is default to UUID for now 2012-01-26 11:10:00 -08:00
Kelven Yang 8083b29235 bug 13306: remove sensive DB id info from VM display name 2012-01-25 17:16:21 -08:00
Alena Prokharchyk 4dec3c890a bug 13282: release elastic IP of the vm on vmStop 
status 13282: resolved fixed
 2012-01-25 15:03:46 -08:00
Alena Prokharchyk 5307d21210 DisableStaticNat: if elasticIP service is enabled for the network offering, always allocate new elastic ip and create static nat rule for it when disableStaticNat is called 2012-01-24 14:06:01 -08:00
Alena Prokharchyk 57ddf63676 Special permission check for networks 2012-01-20 11:01:38 -08:00
Alena Prokharchyk d4d345a587 Don't retry to re-create the vm when failed to allocate public ip 2012-01-19 14:00:07 -08:00
Alena Prokharchyk 4f46c3b160 Mark ip as not elastic when disable static nat is called on it 2012-01-19 13:58:36 -08:00
Alena Prokharchyk 212c22b256 Added isElastic flag to ip address 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 6325d21c50 Get new elasticIp when releaseIpAddress is called for elasticIP of the vm 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 0e8104cca1 Disassociate ip address - always allocate a new IP and enable static nat for it when elactic IP is enabled 2012-01-19 13:58:35 -08:00
Alena Prokharchyk 359185f567 System is the owner of the first elastic ip address for the vm 2012-01-19 13:58:35 -08:00
Alena Prokharchyk d5752eca61 Error deployVm when elasticIp/staticNat failed to assign to the vm 2012-01-19 13:58:34 -08:00
Alena Prokharchyk 0f6f231ee6 Elastic IP - when deployVm, get ip address and enable static nat on it. On vm destroy release the Ip 2012-01-19 13:58:34 -08:00
Kelven Yang 3612fc12c8 bug 11428: remove the constraint based on customer's feedback, we will allow creating volume from a snapshot that was originally taken from root volume. Customers should be aware that when the volume is attached as a data volume, some partitions that were originally created as a root volume may not be recognized by the guest OS 2012-01-17 16:10:20 -08:00
Alena Prokharchyk 83400cd15f bug 12776: if there are multiple objects involved in resource creation, verify that they belong to the same account 
status 12776: resolved fixed
 2012-01-17 13:40:37 -08:00
Alena Prokharchyk bda032b874 bug 12760: generate vm.destroy event when vm goes from Stopped to Expuning state 
status 12760: resolved fixed
 2012-01-17 10:38:52 -08:00
Alena Prokharchyk f0c4980dff bug 13110: use Ternary data structure when build search criteria 
status 13110: resolved fixed
 2012-01-16 14:15:28 -08:00
Abhinandan Prateek 0374e42931 bug 13068: clearing sec grp has a dependency on nic's existing, move the call a bit 2012-01-16 13:50:15 +05:30
Abhinandan Prateek eb4cfe063a bug 12916: warning user if he tried to move the VM across zones 2012-01-10 10:49:18 +05:30
Abhinandan Prateek 3a2d0b1ec6 bug 12918: don't allow movement within same account 2012-01-10 10:39:03 +05:30
Alena Prokharchyk c581506103 bug 12306: list* command revamp 2012-01-09 10:07:42 -08:00
kishan 5dc4a70b90 Bug 12850: Allow accounts in child domains to create Vms in zones owned by parent domain 
Status 12850: resolved fixed
Reviewed-By: Abhi
 2012-01-09 19:32:26 +05:30
Edison Su 1648bd800c bug 12899: mgt server needs to pass down the storage pool uuid when creating template from volume 
status 12899: resolved fixed
 2012-01-05 16:42:45 -08:00
Abhinandan Prateek 2778deacb6 bug 8962: usage related changes 2012-01-04 16:41:18 +05:30
kishan 9b3f78254d Bug 12845: When moving Vm to another account, add volume create usage event with size and template/offering id 
Status 12845: resolved fixed
Reviewed-By: Abhi
 2012-01-04 16:34:52 +05:30
Abhinandan Prateek 8173474a42 bug 8962: done some testing on basic networks 2011-12-29 12:37:28 +05:30
Abhinandan Prateek b2079346d6 bug 8962: added params networkids and securitygroups in case the moved VM needs to be part for additional networks and sec grps respectively 2011-12-28 11:39:28 +05:30
Abhinandan Prateek df83487be9 bug 8962: adding code for basic networks 2011-12-21 17:18:31 +05:30
Edison Su 009fa8c079 bug 12158: only allow storage migration through migratevm api, iff no data disks attached to the vm. As data disks may have different service offering with the specified storage pool 
status 12158: resolved fixed
 2011-12-20 17:12:09 -08:00
kishan e2cb4f94d6 bug 12337: Encrypt only password in host_detail table. Removed unused and duplicate references of HostDetailDao 
status 12337: resolved fixed
reviewed-by: Abhi
 2011-12-20 19:28:41 +05:30
Abhinandan Prateek 462ad5cfc2 bug 8962: network related improvements 2011-12-20 18:31:37 +05:30
Alena Prokharchyk ceb0a918a1 createTemplate/createSnapshot for project - allow to execute for Projects in Active state only 2011-12-19 16:20:40 -08:00
Edison Su 49fb9049fb bug 12446: fix typo 
status 12446: resolved fixed
 2011-12-14 16:51:38 -08:00
Sheng Yang 3263fd596e bug 10904: add a global config to enable/disable automatically add the vm to the default security group 
status 10904: resolved fixed
 2011-12-13 14:48:44 -08:00
Nitin Mehta 353bc396e3 bug 11838: Create Private Template from Snapshot - Lift the restriction of creating duplicate names keeping it consistent with register template 
Reviewed by : Kishan.
 2011-12-13 14:42:08 +05:30
Alena Prokharchyk bde5e16a26 bug 12453: when networkId is specified, don't check if the network created from Required network offering is present 
status 12453: resolved fixed
 2011-12-08 14:38:21 -08:00
Alena Prokharchyk 2c2dfdc507 bug 12237: fixed listSnapshots to work correctly with projectId 
status 12237: resolved fixed
 2011-12-06 16:43:58 -08:00
Alena Prokharchyk 7b8287d323 bug 10804: Api and middle layer support for default route feature 2011-12-05 14:53:45 -08:00
Alena Prokharchyk a4773b7080 bug 12291: listVms - show non-project resources only if no projectId specified 
status 12291: resolved fixed
 2011-12-02 15:17:50 -08:00
Abhinandan Prateek 660891b405 bug 8962: adding a check for disabled accounts 2011-11-29 12:40:58 +05:30
Alena Prokharchyk afb56d2112 bug 11492: check volume resource limit when deployVm 
status 11492: resolved fixed
 2011-11-28 13:38:32 -08:00
Alena Prokharchyk 586febd4c1 bug 11965: check the user state on the Services layer, not in the VmManager as VmManager can be called not only from the API, but also by internal methods - HA for instance - and in this case we shouldn't care about the account state 
11965 status: resolved fixed

Also fixed gson serialization error in account response
 2011-11-28 10:05:19 -08:00
Abhinandan Prateek 88f9b1ab7c bug 8962: review changes incorporated 2011-11-25 15:03:45 +05:30
prachi 0dc7fb48a1 Bug 11962 - MigrateVirtualMachine fails with AgentUnavailableException when the targeted host for migration is under Maintenance 
Bug 11964 - You are allowed to migrate a virtual machine on to the host that it already exists o

Changes:
Validations were missing in th MigrateVmCmd API, since from UI the validations are always done while listing hosts for migration as first step.
 2011-11-21 17:12:36 -08:00
Nitin Mehta ec3a00a230 bug 10281: Template/ISO APIs should throw an exception in failure case for the events to be registered as failure. 
Reviewed by : Kishan.

status 10281: resolved fixed
 2011-11-21 18:58:06 +05:30
Alex Huang 84d5f0514e Changed network tags to network name as we no longer need to send the entire network tags down to the resource. 2011-11-18 14:28:16 -08:00
Alena Prokharchyk 5571afa471 Virtual router elements: prepare nics only when VirtualRouter is a provider for at least one service in the network 2011-11-17 14:33:22 -08:00
Alena Prokharchyk 790b33bdfc More validation to network and network offering creation/upgrade 2011-11-16 14:53:38 -08:00
Kelven Yang 277c60e4f6 bug 11814: Allow template to have details info in key/value pairs. 2011-11-15 15:01:46 -08:00
Alena Prokharchyk bb2a8cf7ea NaaS: added "subdomainAccess" parameter to domain level network object. The parameter defines whether the network can be accessed from the subdomains. If the parameter is not specified, it would be defaulted to allow.subdomain.network.access Global Config param 2011-11-14 18:13:47 -08:00
Alena Prokharchyk 039e09ce93 * Introduced aclType parameter for createNetwork command (can hold 2 values now: Account and Domain). This parameter defines the access control type to the network object. If it's account - 
only owner of the network can access it; if it's domain - all accounts in the domain and domain children can have an access.
* aclType replaces 2 old fields: isShared and isDomainSpecific.
* All 2.2.x account specific networks will have aclType=Account; 2.2.x Domain specific networks - aclType=domain; 2.2.x Zone level networks - aclType=Domain with domainId = Root domain id
 2011-11-10 18:34:56 -08:00
Alex Huang f6fcaa49ec Merge complete except for virtualnetworkappliancemanager 2011-11-10 15:18:16 -08:00
Nitin e2e7da3ff4 bug 11428: Under VMware with current version, for snapshot related related operations, 
1) if snapshot is originally created from root volume, allow only CreateTemplateCommand from snapshot 2) if snapshot is originally created from data volume, allow only CreateVolumeCommand from snapshot Reviewed by - Kishan
status 11428: resolved fixed
 2011-11-09 16:33:09 +05:30
alena 3a845d2d75 Keep Service/Provider map per network as well as per networkOffering (to handle the case when there are multiple providers defined for the same service in the network offering, and only one is picked when the network is created) 2011-11-07 16:16:03 -08:00
Abhinandan Prateek 267b12d015 bug 11709: saving encrypted password in db 
status 11709: resolved fixed
 2011-11-03 15:40:20 +05:30
alena 3e20c60d6d Fixed vm deployment in Basic zone 2011-11-02 17:02:44 -07:00
alena f42c9e434f Basic zone: the System Guest network offering can be created from any Shared Guest network offering. 
Limitation:
* in order to make the networkOffering choice, only one Shared network has to be Enabled at the moment when Basic zone is being created
 2011-11-02 15:44:53 -07:00
alena 2250dff349 1) Removed tags from the network object 
2) Get hypervisor tags from the physical network instead.
 2011-11-01 17:42:06 -07:00
alena 9560e92015 physicalNetworkId is optional in createNetwork api. Works as follows: 
* can be specified for Shared network only
* if not specified for the Shared networks, try to locate it based on the zoneId and tags. If tags is not null, pick up first physicalNetwork from the zone that has matching tags. If tags is null, and there are none/more than 1 physical netwroks in the zone, error out.
 2011-11-01 15:49:39 -07:00
alena be21a5e37c Don't allow enabling securityGroup service for Isolated networks 2011-11-01 13:09:14 -07:00
alena 80dc2c0b1a Don't send security group commands to the backend when 1) securtiy group service is disabled in the network offering and 2) security group service provider is supported on the physical network 2011-11-01 12:07:32 -07:00
anthony 46dac852fa Merge branch 'swift' 
Conflicts:
	server/src/com/cloud/agent/AgentManager.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
 2011-10-31 15:04:48 -07:00
Abhinandan Prateek abb37acbdd bug 8962: added usage related and resource count related code, changed the API name as suggested. Incorporated relevant review comments 2011-10-31 16:35:42 +05:30
root a572205e3c Revert "bug 11311: vm summary command initial impl" 
This reverts commit 0abc7e2ea8b9e222f1927aea72d46240bfe8c534.
 2011-10-30 15:13:58 +05:30
Abhinandan Prateek f456462443 bug 11311: vm summary command initial impl 2011-10-28 14:07:19 +05:30
alena b413a625f4 1) replaced joinProject API with updateProjectInvitation api. You can accept/decline the invitataion with this command 
2) Added deleteProjectInviation command. Can be executed by project admin only
 2011-10-27 18:32:00 -07:00
alena d315e57b0e Renamed "type" to "guestType" 2011-10-27 16:51:42 -07:00
alena fe0b685e95 Security group is a service now 2011-10-27 16:49:20 -07:00
Sheng Yang e1e96c0bb3 NaaS: Add ServiceProviders 
Added PortForwardingServiceProvider, StaticNatServiceProvider, rename
PasswordServiceProvider to UserDataServiceProvider(may rename to a better name
later).

Add related function for service providers.
 2011-10-27 11:55:10 -07:00
frank cef30956e9 Merge branch 'newagentmgr' 
Conflicts:
	agent-simulator/src/com/cloud/api/commands/ConfigureSimulator.java
	ovm/src/com/cloud/ovm/hypervisor/OvmDiscoverer.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/capacity/CapacityManagerImpl.java
	server/src/com/cloud/network/F5BigIpManagerImpl.java
	server/src/com/cloud/network/JuniperSrxManagerImpl.java
	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/db/GenericDao.java
 2011-10-27 11:09:56 -07:00
alena 525a0a7675 1)Changed implementation for restart network: call shutdown/implement methods as a part of it 
2)Re-apply all existing firewall rules as a part of implement call. TODO: Cleanup all existing rules from the backend (leave them in the DB) as a part of shutdown call
 2011-10-25 18:24:24 -07:00
frank 1460f3950e Bug 9949 - revert VM to template 
1. able to restore VM from its original template
2. Only allow to restore when VM is running or stopped
3. after restoring, VM state will not change, e.g. running is still running

status 9949: resolved fixed
 2011-10-25 13:52:39 -07:00
prachi 780e0efe79 Removing references to DataCenter - providers, using the networkoffering -> providers map instead. 
TODO:
- Still leaving the provider columns in data_center schema as-is for CloudKit and BareMetal
- ExternalNetworkDeviceMgrImpl still needs to fix the dataCenter.setProviders calls and externalNetworkApplicance usage checks to see if zone has external networking.
 2011-10-24 18:06:33 -07:00
alena 75c8e33226 Removed guestIpType from network/networkOffering 2011-10-24 17:05:00 -07:00
Edison Su 92eaf49f29 Add storage migration 2011-10-24 15:59:47 -07:00
anthony 19df7ed8af Swift; create template from snapshot 2011-10-21 17:32:48 -07:00
anthony 6c5c24dd6b swift: create volume from template works 2011-10-21 12:53:58 -07:00
alena 219978a9be Create network using physical network id 2011-10-20 18:25:13 -07:00
alena ceda05298e Deprecate guestIpType in networkOffering api. Use type (Shared/Isolated) instead 2011-10-19 16:38:39 -07:00
frank 65f3bb1df5 Bug 11647 - OVM - no support for migrate instance 
return available hosts when hypervisor type is Ovm
status 11647: resovled fixed
 2011-10-17 16:26:32 -07:00
alena c00058adc2 Added type (Shared/Isolated) to the networkOffering/networks 2011-10-13 17:33:41 -07:00
frank cd6b872f8d Bug 11670 - OVM - HA failed when host is disconnected from network 
status 11670: resolved fixed
 2011-10-13 14:46:36 -07:00
Sheng Yang 0121c0516d Network: Add Service providers 
In the past, the NetworkElement would cover almost all the functionality that
e.g.  virtual router can cover: firewall, source NAT, static NAT, password,
VPN... So anyone want to implement the NetworkElement would have to implement
these service's specific methods, even it wouldn't support it. Also, if we want
to find a e.g. FirewallServiceProvider, we have to proceed all the current
network service providers, to call a method to know if it support such service.
That's neither elegant nor scaling way to do it.

As the first step, this patch separates each ServiceProvider from NetworkElement
(there are some interface already out of NetworkElement, so this patch slightly
modifies them too), and only the class would implement the correlated interface, would
have the ability to do these services.
 2011-10-10 11:45:39 -07:00
Edison Su 962bbcd5a0 bug 11634: add manual vm migration support for kvm 
status 11634: resolved fixed
 2011-10-10 11:31:18 -07:00
frank 0f5384d086 Bug 11522 - New agent manager 
move findxxx interface from HostDao to Managers
 2011-10-06 11:56:17 -07:00
alena 25c2734e03 More stuff to Projects feature - added support for adding resources (vms, templates, isos) to the project 2011-10-05 13:24:25 -07:00
prachi 9bd5e5871b Bug 11481 - get manual live migration working with all VMs 
Changes:
- Added a new API  'migrateSystemVm'  backed by MigrateSystemVMCmd.java to migrate system VMs (SSVM, consoleproxy, domain routers(router, LB, DHCP))
- This is Admin only action
- The existing API 'migratevirtualmachine' is only for user VMs
 2011-09-29 17:47:46 -07:00
alena 12e25fb988 Implemented vm* api commands to be executed against the project 2011-09-29 10:20:51 -07:00
alena ccd47c1b21 Implemented Project Invitations 2011-09-26 17:47:20 -07:00
alena a1cab92ae1 bug 11537: revoke related FirewallRules when do vmExpunge and ipAddress release. 
status 11537: resolved fixed

Reviewed-by: edison@cloud.com

Conflicts:

	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-09-22 14:01:02 -07:00
alena 9f9b60a287 1) Added resource limits for the Projects - the same as for the account 
2) Added "Project" limit type for the Domain object
 2011-09-21 17:09:49 -07:00
alena a1331d1cfc Intermidiate checkin to Project feature: 
1) Introduce new managers - ProjectManager and DomainManager. Moved all domain related code from AccountManager to DomainManager.
2) Moved some code from ManagementServerImpl to the correct managers.
3) New resource limit for Domain - Project
 2011-09-20 18:35:28 -07:00
prachi df17ce5648 Bug 11457 - NullPointerException while synching VM state from Starting -> Running between management server and agent 
reviewed-by: Alex/Kelven

Changes:
1.	UserVmManagerImpl :: finalizeStart()
Added null check for the cmds.getAnswers() object. Return ‘true’ if null.

2.	VirtualMachineManagerImpl :: advanceStart()
Move the line to set PodId to the vm being started above the state transition where hostId gets set, so that podId is not null in case management server goes down when vm starts on the agent. On restart, podId is not updated during fullsync. So this will prevent podId remaining null.

vm.setPodId(dest.getPod().getId());
 2011-09-15 16:16:15 -07:00
alena b7f45cfbd6 bug 11434: don't execute destroy call when vm is already in Destroyed/Expunging state 
status 11434: resolved fixed
 2011-09-14 10:33:45 -07:00
Chiradeep Vittal cfbbe4c031 fix perf. issue in deploy vm. also remove dead code in dao 2011-09-12 18:20:23 -07:00
Kelven Yang 41926cb038 bug 11377: remove the restriction on VMware in API layer to let it support VM manual migration 2011-09-12 14:28:32 -07:00
prachi d854923ac5 Bug 11200 - maximum number of guests per host 
Manual Migration should fail if the destination host chosen by Admin already has max guest VMs running.
 2011-09-08 18:33:55 -07:00
anthony 4423da06a2 1. added timeout in Command Class, then each command can configure itself timeout, if timeout is not configed, use the default timeout , which is 30 minute 
2. added following configurable timeout
       PrimaryStorageDownloadWait("Storage", TemplateManager.class, Integer.class, "primary.storage.download.wait", "10800", "In second, timeout for download template to primary storage", null),
       CreateVolumeFromSnapshotWait("Storage", StorageManager.class, Integer.class, "create.volume.from.snapshot.wait", "10800", "In second, timeout for create template from snapshot", null),
       CopyVolumeWait("Storage", StorageManager.class, Integer.class, "copy.volume.wait", "10800", "In second, timeout for copy volume command", null),
       CreatePrivateTemplateFromVolumeWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.volume.wait", "10800", "In second, timeout for CreatePrivateTemplateFromVolumeCommand", null),
       CreatePrivateTemplateFromSnapshotWait("Storage", UserVmManager.class, Integer.class, "create.private.template.from.snapshot.wait", "10800", "In second, timeout for CreatePrivateTemplateFromSnapshotCommand", null),
       BackupSnapshotWait("Storage", StorageManager.class, Integer.class, "backup.snapshot.wait", "10800", "In second, timeout for BackupSnapshotCommand", null),
 2011-09-07 19:17:54 -07:00
Kelven Yang 905df61aac bug 11362: Make VM network adapter device type be selectable based on VM-specific details 2011-09-07 17:58:42 -07:00
prachi 05440f0905 Bug 9921 - template tags 
Changes:
- CreateTemplate and RegisterTemplate now support adding a template tag. It is a string value. This is root-admin only action - only admin can add template tags.
- ListTemplates will return the template tag in response.
- HostAllocator changed to use template tag along with the existing tag on service offering. If both tags are present, allocator now finds hosts satisfying both tags. If no hosts have both tags, allocation will fail.
- DB changes to add new column to vm_template table.
- DB upgrade changes for upgrade from 2.2.10 to 2.2.11
 2011-08-25 12:03:59 -07:00
alena ee9fbf10b6 Method signature change 2011-08-24 14:56:37 -07:00
alena e3f179844e bug 11236: domainAdmin/regularUser can edit/delete/copy/extract Public template/iso only if it was created by them. They still can use/see public template/iso when execute list/deploy/attachIso commands. Root admin can operate with other people templates w/o any restrictions. 
status 11236: resolved fixed
 2011-08-24 14:48:35 -07:00
alena 8a7feb8ec1 Merge branch '2.2.y' 
Conflicts:
	agent/src/com/cloud/agent/resource/computing/LibvirtComputingResource.java
	api/src/com/cloud/agent/api/routing/LoadBalancerConfigCommand.java
	api/src/com/cloud/agent/api/to/FirewallRuleTO.java
	api/src/com/cloud/agent/api/to/IpAddressTO.java
	api/src/com/cloud/agent/api/to/PortForwardingRuleTO.java
	api/src/com/cloud/api/ApiConstants.java
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/api/ResponseGenerator.java
	api/src/com/cloud/api/commands/CreateFirewallRuleCmd.java
	api/src/com/cloud/api/commands/CreateIpForwardingRuleCmd.java
	api/src/com/cloud/api/commands/CreateLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/CreatePortForwardingRuleCmd.java
	api/src/com/cloud/api/commands/DeleteLoadBalancerRuleCmd.java
	api/src/com/cloud/api/commands/ListCapabilitiesCmd.java
	api/src/com/cloud/api/commands/UpdateNetworkCmd.java
	api/src/com/cloud/api/response/CapabilitiesResponse.java
	api/src/com/cloud/network/Network.java
	api/src/com/cloud/network/NetworkService.java
	api/src/com/cloud/network/firewall/FirewallService.java
	api/src/com/cloud/network/lb/LoadBalancingRule.java
	api/src/com/cloud/network/lb/LoadBalancingRulesService.java
	api/src/com/cloud/network/rules/FirewallRule.java
	api/src/com/cloud/network/rules/RulesService.java
	api/src/com/cloud/offering/NetworkOffering.java
	client/tomcatconf/commands.properties.in
	cloud.spec
	core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixHelper.java
	core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	core/src/com/cloud/vm/DomainRouterVO.java
	debian/cloud-deps.install
	patches/systemvm/debian/config/etc/init.d/cloud-early-config
	patches/systemvm/debian/config/root/ipassoc.sh
	patches/systemvm/debian/config/root/loadbalancer.sh
	scripts/vm/hypervisor/kvm/rundomrpre.sh
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/agent/manager/AgentAttache.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/agent/manager/AgentMonitor.java
	server/src/com/cloud/agent/manager/ClusteredAgentManagerImpl.java
	server/src/com/cloud/alert/ClusterAlertAdapter.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/cluster/ClusterManagerImpl.java
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/host/dao/HostDaoImpl.java
	server/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/network/LoadBalancerVO.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/dao/FirewallRulesDao.java
	server/src/com/cloud/network/dao/FirewallRulesDaoImpl.java
	server/src/com/cloud/network/element/DhcpElement.java
	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/network/rules/FirewallManager.java
	server/src/com/cloud/network/rules/FirewallRuleVO.java
	server/src/com/cloud/network/rules/PortForwardingRuleVO.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
	server/src/com/cloud/network/rules/StaticNatRuleImpl.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/network/security/SecurityGroupManagerImpl.java
	server/src/com/cloud/offerings/NetworkOfferingVO.java
	server/src/com/cloud/server/ConfigurationServerImpl.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/storage/StorageManager.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/dao/VMTemplateHostDaoImpl.java
	server/src/com/cloud/storage/download/DownloadMonitorImpl.java
	server/src/com/cloud/upgrade/DatabaseUpgradeChecker.java
	server/src/com/cloud/upgrade/dao/Upgrade228to229.java
	server/src/com/cloud/upgrade/dao/Upgrade229to2210.java
	server/src/com/cloud/user/AccountManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	server/src/com/cloud/vm/dao/DomainRouterDao.java
	server/src/com/cloud/vm/dao/DomainRouterDaoImpl.java
	setup/db/create-index-fk.sql
	setup/db/create-schema.sql
	setup/db/db/schema-222to224.sql
	setup/db/db/schema-227to228.sql
	setup/db/db/schema-228to229.sql
	setup/db/db/schema-229to2210.sql
	tools/testClient/README
	ui/scripts/cloud.core.instance.js
	utils/src/com/cloud/utils/SerialVersionUID.java
	utils/src/com/cloud/utils/db/ConnectionConcierge.java
	utils/src/com/cloud/utils/db/Merovingian2.java
	utils/src/com/cloud/utils/db/Transaction.java
	utils/src/com/cloud/utils/nio/Link.java
	utils/src/com/cloud/utils/nio/NioConnection.java
	utils/src/com/cloud/utils/time/InaccurateClock.java
 2011-08-22 20:28:30 -07:00
frank b607e4aa1c Merge branch '2.2.y' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 2.2.y 2011-08-19 17:29:57 -07:00
Edison Su 7a7662b01b fix typo 2011-08-19 16:15:52 -07:00
Edison Su eb72d340e2 fix typo 2011-08-19 16:15:17 -07:00
frank 18f87c2108 Merge branch 'cvm' into 2.2.y 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/network/security/SecurityGroupListener.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/storage/listener/StoragePoolMonitor.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 2011-08-19 16:08:35 -07:00
Edison Su 56244c7c47 release the check 2011-08-19 16:07:55 -07:00
Edison Su de25a63ba8 release the check 2011-08-19 16:06:13 -07:00
Edison Su 5696543359 disable attach volume to a vm if volume state is not in allocated or ready state 2011-08-19 14:27:13 -07:00
Edison Su 1c49481305 disable attach volume to a vm if volume state is not in allocated or ready state 2011-08-19 14:26:47 -07:00
alena 2c1df02ba1 Removed unused imports 2011-08-18 15:02:04 -07:00
alena 356728ae19 Fixed spelling mistake 2011-08-16 09:52:00 -07:00
alena 278f2a401f bug 10561: intermediate checkin for enable/disableStaticNat. 
1) On enableStaticNat command we actually send the command to the backend (we used to just upgrade the DB in the past). The backend command carries sourceIp and destIp, and creates IP to IP mapping on the domR.
2) On disableStaticNat for the Ip address in addition to cleaning up port ranges, we also delete IP to IP mapping on the domR.
 2011-08-11 10:19:22 -07:00
anthony 455f9f642c bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:31:14 -07:00
anthony 1a070f4c1b bug 11014: 
1. if there is no storage pool, don't try to start system VM
2. not use "consoleproxy.restart" as other meaning

status 11014: resolved fixed
 2011-08-08 18:28:34 -07:00
frank 6aaf3d5ae0 Merge branch 'cvm' 
Conflicts:
	api/src/com/cloud/api/BaseCmd.java
	api/src/com/cloud/storage/Storage.java
	cloud.spec
	core/src/com/cloud/storage/template/DownloadManagerImpl.java
	server/src/com/cloud/agent/manager/AgentManagerImpl.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/deploy/FirstFitPlanner.java
	server/src/com/cloud/host/dao/HostDao.java
	server/src/com/cloud/storage/StorageManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
	utils/src/com/cloud/utils/SerialVersionUID.java
 2011-08-08 14:14:09 -07:00
Kelven Yang d10c8e2a1d bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:30:50 -07:00
Kelven Yang 19567df49b bug 10765: fix step 2 - programming VNC server to let it chose the right keyboard mapping to load into 2011-08-04 18:27:45 -07:00
anthony 7958ab566e bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed. 
status 10964: resolved fixed
 2011-08-04 16:09:22 -07:00
anthony 41759c153d bug 10964: if snapshot's volume's templateId is NULL, change snapshot version from 2.1 to 2.2 directly, not upgrade snapshot is needed. 
status 10964: resolved fixed
 2011-08-04 16:08:50 -07:00
Kelven Yang 04528c821b bug 10929: allow only OperationFailedToError event to trigger transition to Error state. 2011-08-01 18:40:29 -07:00
Kelven Yang 40f42a784f bug 10929: allow only OperationFailedToError event to trigger transition to Error state. 2011-08-01 18:33:02 -07:00
Edison Su 8bcad6960c add rhel6.1 support 2011-07-29 20:05:01 -07:00
Edison Su 22483a9c13 add RHEL 6.1 support 2011-07-29 19:14:15 -07:00
Murali Reddy 5322accbc8 bug 10764: changing service offering drops cpu cap 
status 10764: resolved fixed
 2011-07-25 18:23:11 +05:30
Murali Reddy 9e90999aab bug 10764: changing service offering drops cpu cap 
status 10764: resolved fixed
 2011-07-25 18:15:31 +05:30
alena d6112b1632 Revert "bug 10373: Intermediate checkin for Domain level guest Virtual networks" 
This reverts commit e5c25f3868965e36c4bff1c78ca4552a8c852241.

Conflicts:

	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/NetworkManagerImpl.java
 2011-07-21 16:04:55 -07:00
alena 36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
kishan 6b4c61a348 bug 10382: Move volume delete events to destroyVolume method 
status 10382: resolved fixed
 2011-07-20 11:22:31 +05:30
kishan ddd416a492 bug 10382: wrapped usage events in txn 2011-07-20 11:19:39 +05:30
kishan 427b73a2b9 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-20 11:13:56 +05:30
alena 8c9fe2ec71 bug 9871: deployVm - check network's zone when do vm deployment 
status 9871: resolved fixed

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-07-19 11:10:53 -07:00
alena c663217b00 bug 9642: listVms by regular user using domainId parameter will work only when domainId specified is the domainId the caller belongs to. 
status 9642: resolved fixed
 2011-07-19 11:10:52 -07:00
alena 5300dd52a9 bug 4706: added one more parameter - "ipaddress" to deployVm api. This parameter will apply to default network of vm 
status 4706: resolved fixed

Merge from master to 2.2.8 branch

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-07-15 14:23:28 -07:00
alena 0d2787e2db bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well. 
status 4706: resolved fixed

Merge from master to 2.2.8 branch

Conflicts:

	api/src/com/cloud/api/ApiConstants.java
	server/src/com/cloud/network/NetworkManager.java
	server/src/com/cloud/network/NetworkManagerImpl.java
	server/src/com/cloud/network/guru/GuestNetworkGuru.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-07-15 14:20:52 -07:00
alena 1979d1d065 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed

Conflicts:

	server/src/com/cloud/server/ManagementServerImpl.java
 2011-07-13 18:25:13 -07:00
alena 25206e6257 bug 10681: for serviceOfferings, diskOfferings, templates/isos return records with not null Removed field on findById method call 
status 10681: resolved fixed
 2011-07-13 17:16:07 -07:00
alena 506ca6cff3 bug 10686: generate volume.delete usage event (along with vm.destroy) when vm fails to create/start. 
status 10686: resolved fixed

Also updated 227 to 228 db upgrade to insert missing usage_event records

Conflicts:

	server/src/com/cloud/vm/UserVmManagerImpl.java
 2011-07-11 16:13:22 -07:00
alena cc9a629cea bug 10686: generate volume.delete usage event (along with vm.destroy) when vm fails to create/start. 
status 10686: resolved fixed

Also updated 227 to 228 db upgrade to insert missing usage_event records
 2011-07-11 16:11:05 -07:00
Kelven Yang d0de1a5b94 bug 10620: allow ISO attachment failure to propogate up 2011-07-07 17:02:51 -07:00
Kelven Yang 25d2c893e6 bug 10620: allow ISO attachment failure to propogate up 2011-07-07 17:00:51 -07:00
Edison Su 79f5ece7dc fix NPE in put primary storage into maintainance mode 2011-07-06 16:05:22 -07:00
kishan 561f415d5a bug 10382: Move volume delete events to destroyVolume method 
status 10382: resolved fixed
 2011-07-06 18:08:48 +05:30
alena deca4337c5 Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller 2011-07-05 13:37:39 -07:00
alena ba95181dc4 Fixed deployVm with sshKeyPair via 8096 port - take account info from the vm's owner, not from the caller 2011-07-05 13:35:29 -07:00
Abhinandan Prateek 5f12ea73a8 bug 8962: Completed moving VM from one account to another. 2011-07-04 13:15:40 +05:30
Nitin 62aab14e05 bug 8915: Adding events for TEMPLATE.CREATE, TEMPLATE.DELETE, ISO.DELETE, ISO.ATTACH, ISO.DETACH. 
Status 8915: resolved fixed
 2011-07-04 12:01:04 +05:30
Kelven Yang 7512689dc8 bug 10546: move sending agent command out of transaction 2011-07-01 15:49:48 -07:00
kishan 9a6c567269 bug 10503: Skip usage events when StopAnswer details is Vm does not exist 
status 10503: resolved fixed
 2011-07-01 18:27:27 +05:30
kishan fd6900a3d8 bug 10382: wrapped usage events in txn 2011-07-01 18:11:56 +05:30
kishan 36d7ee5634 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-01 16:37:53 +05:30
Nitin 62078ffef2 bug 8915: Adding events for TEMPLATE.CREATE, TEMPLATE.DELETE, ISO.DELETE, ISO.ATTACH, ISO.DETACH. 
Status 8915: resolved fixed
 2011-06-30 16:31:02 +05:30
anthony b6eafd7102 bug 10512: lock on snapshot entry instead of volume entry 
status 10512: resolved fixed
 2011-06-29 18:54:53 -07:00
anthony 253ae79876 bug 10512: lock on snapshot entry instead of volume entry 
status 10512: resolved fixed
 2011-06-29 18:53:41 -07:00
anthony e186369c51 use correct secondary storage when creating template from snapshot 2011-06-28 19:16:34 -07:00
anthony b058a0226d use correct secondary storage when creating template from snapshot 2011-06-28 16:58:15 -07:00
root d46d1da86c bug 10455: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in. 
status 10455: resolved fixed
 2011-06-28 19:55:09 +05:30
Nitin 35d4c304a9 bug 10455: CreatePrivateTemplate - If the volume's template id is null and it is ROOT (meaning that the vm was created out of a blank template) then take the source template id from the user vm table. 
Status 10455: resolved fixed
 2011-06-28 19:54:54 +05:30
root dbc0abfa69 bug 10455: accidentally removed the code for sourceTemplate id when the the volume is created out of template. Checking it in. 
status 10455: resolved fixed
 2011-06-28 14:29:11 +05:30
alena e716245218 bug 10447: don't allow to use system networks for vm deployment in Advance zone 
status 10447: resolved fixed
 2011-06-27 12:32:32 -07:00
alena 4e20cfd0ef bug 10447: don't allow to use system networks for vm deployment in Advance zone 
status 10447: resolved fixed
 2011-06-27 12:31:00 -07:00
alena f9d6685d18 bug 10456: get accountId info from the volume record when create template from volume 
status 10456: resolved fixed
 2011-06-27 10:37:00 -07:00
alena 52fab0e35e bug 10456: get accountId info from the volume record when create template from volume 
status 10456: resolved fixed
 2011-06-27 10:20:40 -07:00
Alex Huang 791dd9777b logging changes 2011-06-27 10:19:53 -07:00
Alex Huang 97b562fc2a logging changes 2011-06-27 10:18:40 -07:00
Nitin 5810b838ed bug 10455: CreatePrivateTemplate - If the volume's template id is null and it is ROOT (meaning that the vm was created out of a blank template) then take the source template id from the user vm table. 
Status 10455: resolved fixed
 2011-06-27 17:20:42 +05:30
alena f42f7d8945 Always add default security group when deploy vm in basic zone 2011-06-23 20:00:49 -07:00
alena 9d76f6d719 Always add default security group when deploy vm in basic zone 2011-06-23 19:59:14 -07:00
alena d380ce0897 bug 4706: added one more parameter - "ipaddress" to deployVm api. This parameter will apply to default network of vm 
status 4706: resolved fixed
 2011-06-23 11:31:39 -07:00
Murali Reddy 8eb9ee6a8b Bug 10377 - API listAccounts return vmtotal=-14 2011-06-23 17:31:38 +05:30
Murali Reddy 1bfe6d8d72 Bug 10377 - API listAccounts return vmtotal=-14 2011-06-23 17:28:09 +05:30
Murali Reddy 1d4bee51e7 Bug 10012: Vague error event created when user attempted to exceed limit set for a given resource 
status 10012: resolved fixed
 2011-06-22 13:06:59 +05:30
Murali Reddy 34a36b7009 Bug 10012: Vague error event created when user attempted to exceed limit set for a given resource 
status 10012: resolved fixed
 2011-06-22 13:00:59 +05:30
alena 4fcb406f2b bug 4706: allow to specify which ip address from the network to take when do vm deployment. The model is supported for multiple network case as well. 
status 4706: resolved fixed
 2011-06-21 16:41:43 -07:00
alena 62516b00cf bug 9642: listVms by regular user using domainId parameter will work only when domainId specified is the domainId the caller belongs to. 
status 9642: resolved fixed
 2011-06-20 10:32:19 -07:00
alena 3098db2b31 bug 9871: deployVm - check network's zone when do vm deployment 
status 9871: resolved fixed
 2011-06-16 16:00:45 -07:00
Abhinandan Prateek afdb2f0871 bug 8962: moving vm: checked for basic networks 2011-06-16 15:11:42 +05:30
Abhinandan Prateek 3429b6cde4 bug 8962: tested vm move from one account to another, successfully restarted 2011-06-15 17:55:03 +05:30
kishan 8d87cf3506 bug 6770: Alert will be sent when deploying User VM fails 
status 6770: resolved fixed
 2011-06-15 12:40:23 +05:30
Frank c400253b54 Ignore hvm field in template 2011-06-14 14:41:34 -07:00
kishan fe4329389f bug 6770: Alert will be sent when deploying User VM fails 
status 6770: resolved fixed
 2011-06-14 15:02:27 +05:30
Alex Huang d39048faca bug 10260: propagate ha and deployment planner fixes 2011-06-13 17:33:09 -07:00
Alex Huang 1d7e70acd1 bug 10260: propagate ha and deployment planner fixes 2011-06-13 17:35:20 -07:00
Abhinandan Prateek a4bdeffd61 bug 8962: changes for vms using virtual network 2011-06-13 14:56:00 +05:30
Frank 5f5509ac00 use isHvm of template to decide to boot a HVM vm 2011-06-10 14:35:46 -07:00