5645137f9c
reslove conflicts api/src/com/cloud/api/ApiConstants.java
2011-04-11 14:26:48 -07:00
105db3b15a
Merge branch 'baremetal' to master
...
modifies:
api/src/com/cloud/api/ApiConstants.java
api/src/com/cloud/api/commands/AddHostCmd.java
api/src/com/cloud/api/commands/CreatePodCmd.java
api/src/com/cloud/api/commands/DeployVMCmd.java
api/src/com/cloud/dc/Pod.java
api/src/com/cloud/network/NetworkService.java
server/src/com/cloud/agent/manager/AgentManagerImpl.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/dc/HostPodVO.java
server/src/com/cloud/network/NetworkManager.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/vm/UserVmManagerImpl.java
setup/db/create-schema.sql
utils/src/com/cloud/utils/SerialVersionUID.java
2011-04-11 14:21:41 -07:00
c3d2bab81b
Some more changes for Bug 8932 - add md5 sum to list templates call:
...
Also changed 'RegisterTemplate' to take in a new optional parameter 'checksum'.
The value set to it is stored as-is in the DB in vm_template table, 'checksum' column.
2011-04-11 13:17:23 -07:00
0810831fd2
Bug 8208 - bare metal provisioning
...
set useexternalDHCP to false when creating pod
2011-04-11 10:41:45 -07:00
4460d1cf2c
Fixed api xml doc writer
2011-04-11 09:33:36 -07:00
debe236a8d
bug 8710: CONTD....Introducing a new user role in cloudstack called RESOURCE_DOMAIN_ADMIN. The role would have all the domain_admin rights and the rights to list zone,pods,clusters and so on. More info in the bug
2011-04-11 19:40:37 +05:30
782a22d95f
Usage upgrade changes
2011-04-11 18:49:52 +05:30
290c799b2c
Bug 9273 : [Stress Test] 'Count' in resource_count table has negative values
...
pushing 2.2.4 changes in to master
2011-04-11 15:37:53 +05:30
8b30507841
bug 9312: deleteAccount API does not decrement User VM resource count when VM is destroyed
...
pushing 2.2.4 changes to master branch
2011-04-11 14:35:06 +05:30
77ac511225
Bug 8932 - add md5 sum to list templates call
...
Modified TemplateResponse to contain a new field 'checksum' of the template. The value is pulled from the vm_template table, 'checksum' column.
2011-04-08 15:01:12 -07:00
b0b2d594a0
Bug 8018 - return cloud identifier in some instance metadata
...
There's an API call "getCloudIdentifier". it returns some UUID that uniquely identifies a cloud.
This bug is to set the value of the instace metadata field cloud-identifier to "CloudStack-{result of getCloudIdentifier}. This metadata is programmed into
the virtual router by the management server.
2011-04-08 10:50:12 -07:00
598503f094
bug 9129:can't create vm if an instance limit is set at root domain
...
pushing 2.2.4 fixes
2011-04-08 13:25:51 +05:30
5bf6df3d6c
bug 9328: always add explict route to domR
2011-04-05 17:21:24 -07:00
aa094868fc
bug 8353: set dateFormat to "yyyy-MM-dd'T'HH:mm:ssZ" when initiate gson builder
...
status 8353: resolved fixed
2011-04-05 16:51:05 -07:00
191d689912
Bug 9045: No 'Starting job for VM.MIGRATE' & 'Successfully completed VM.MIGRATE' events shown for VM manual migration
...
Changes:
- Added the required 'ActionEvent' annotation to the API, so that the events get added.
2011-04-05 16:28:01 -07:00
2bcd7a13d4
hostid and poolid may overlap, fixed deletePoolStats
2011-04-05 15:43:21 -07:00
0fdcba3f4f
bug 8855: introduced search by zoneId to listLoadBalancerRules api. Also added "zoneId" parameter to the response
...
status 8855: resolved fixed
2011-04-05 14:38:47 -07:00
92c0b3b82f
Bug 9309 - In Manual migration, do not consider 'reserved_capacity' when computing available memory in destination
...
Changes:
- Now while listing hosts for migration, capacity is calculated as total_capacity -used_capacity
instead of total_capacity -(used_capacity + reserved_capacity)
- Also, the capacity columns in op_host_capacity are now 'signed' type so that the subtractions in queries does not overflow.
- Added this to DB upgrade 222 to 224 change as well.
2011-04-05 14:06:32 -07:00
288a36d09f
Merge branch '2.2.4'
...
Conflicts:
api/src/com/cloud/configuration/ConfigurationService.java
core/src/com/cloud/agent/resource/virtualnetwork/VirtualRoutingResource.java
server/src/com/cloud/api/ApiDBUtils.java
server/src/com/cloud/configuration/ConfigurationManagerImpl.java
server/src/com/cloud/network/NetworkManagerImpl.java
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
setup/db/db/schema-21to22.sql
setup/db/db/schema-222to224.sql
utils/src/com/cloud/utils/exception/ExceptionUtil.java
2011-04-05 12:04:09 -07:00
b86828bbbe
some formatting changes for agentmanager
2011-04-05 11:04:35 -07:00
5f41eef6d1
Brought over edison's changes
2011-04-05 11:04:34 -07:00
5d488b106d
bring changes to master from 2.2.4
2011-04-05 11:01:36 -07:00
2230c24ab3
check in changes from 2.2.4
2011-04-05 11:01:35 -07:00
075fba5899
stackmaid is now taskmanager
2011-04-05 10:17:22 -07:00
61f968592b
bug 9306: set isolationUri/broadcastUri for SSVM/domR/CPVM public nics
...
status 9306: resolved fixed
2011-04-05 09:18:43 -07:00
04099a4950
bug 9311: changed instance_id to nic_id
2011-04-05 09:12:55 -07:00
49cbcac29f
bug 8959: fixed mac address generation for public ip addresses
2011-04-04 18:31:19 -07:00
534623706d
bug 9305: set Mode field for domR/CPVM/SSVM nics
...
status 9305: resolved fixed
2011-04-04 18:31:07 -07:00
9b4b0abcce
bug 8959: fixed mac address generation for public ip addresses
2011-04-04 18:26:11 -07:00
c6b8c0ecfa
bug 9305: set Mode field for domR/CPVM/SSVM nics
...
status 9305: resolved fixed
2011-04-04 17:51:53 -07:00
204aa86686
Bug 9043 - VM manual migration - when destination host is out of memory for migration, VMs being migrated remained in 'migrating' state
...
Changes:
- When migration fails we try to do cleanup on the destination host agent. The AgentUnavailableException in this cleanup was not caught.
-Due to that other cleanup like reverting capacity allocated and vm state were skipped.
-Fix is to catch the AgentUnavailableException so that rest of the cleanup can happen.
- Also corrected the exceptions in various cases of migration failure.
- In case the VM is still starting, HA should schedule a retry. Introduced a special migration exception for handling this.
2011-04-04 17:39:27 -07:00
53f8ebf6f0
Bug 9043 - VM manual migration - when destination host is out of memory for migration, VMs being migrated remained in 'migrating' state
...
Changes:
- When migration fails we try to do cleanup on the destination host agent. The AgentUnavailableException in this cleanup was not caught.
-Due to that other cleanup like reverting capacity allocated and vm state were skipped.
-Fix is to catch the AgentUnavailableException so that rest of the cleanup can happen.
- Also corrected the exceptions in various cases of migration failure.
- In case the VM is still starting, HA should schedule a retry. Introduced a special migration exception for handling this.
2011-04-04 17:30:08 -07:00
b2cab48e0c
bug 9308: changed instance_id to nic_id
2011-04-04 16:59:16 -07:00
6736569d22
bug 9274: listPublicIpAddresses - don't list Direct ip addresses by default; list them only when "forVirtualNetwork=false" is specified in the request.
...
status 9274: resolved fixed
2011-04-04 15:47:23 -07:00
a47a4c8cfe
bug 9272: fixed the race condition bug when we tried to remove vm from SG after it was expunged (expunge interval was really small, 60 sec).
...
status 9272: resolved fixed
When do search for vm, do includingRemoved search.
2011-04-04 15:47:14 -07:00
f8fce16cac
bug 9274: listPublicIpAddresses - don't list Direct ip addresses by default; list them only when "forVirtualNetwork=false" is specified in the request.
...
status 9274: resolved fixed
2011-04-04 15:43:04 -07:00
f2921b7f15
bug 9272: fixed the race condition bug when we tried to remove vm from SG after it was expunged (expunge interval was really small, 60 sec).
...
status 9272: resolved fixed
When do search for vm, do includingRemoved search.
2011-04-04 15:43:04 -07:00
1692caabe8
Make sure hooking of answer command callback be called for both sync/Async commands
2011-04-04 14:46:19 -07:00
918df1a838
missing one more place to notify answer commands
2011-04-04 14:44:24 -07:00
545aa50388
bug 9282: set cluster guid if it is null
...
status 9282: resolved fixed
2011-04-04 14:33:18 -07:00
e8720cc1f7
bug 9300: changed the network id to management from storage for ssvm
2011-04-04 13:53:51 -07:00
af4459f24f
Fixed list* api commands.
2011-04-04 11:36:49 -07:00
2759eefcf5
Add weight to command to help future load management, fix issues found in system vm pooling
2011-04-04 09:33:42 -07:00
fc7f526090
bug 9282: changed the broadcast domain type for control and public network
2011-04-04 09:56:56 -07:00
5a6d3dc55c
bug 9280: added gateway and cidr for control network
2011-04-04 09:50:16 -07:00
1e180de60b
Skip event migration when usage db doesn't exist
2011-04-04 18:36:39 +05:30
4f97d4652d
Skip event migration when usage db doesn't exist
2011-04-04 18:31:48 +05:30
2aeacd5a4c
bug 3179: added "count" parameter to the response to all List* api commands
2011-04-01 19:29:08 -07:00
29bfde9da4
Revert "bug 8898: allow service offering upgrade for Running vm"
...
This reverts commit 7668e1878a
2011-04-01 18:16:14 -07:00
097d415589
Revert "bug 8898: allow service offering upgrade for Running vm"
...
This reverts commit 7668e1878a
2011-04-01 17:54:17 -07:00
7ce3e22d36
bug 9259: added upgrade test suite
2011-04-01 17:01:53 -04:00
b876ad2530
224 to 225 upgrade - use schema*.sql instead of data*.sql
2011-04-01 16:25:56 -07:00
1359e88a6f
bug 9244: don't insert config value if it's already present in the DB.
...
status 9244: resolved fixed
2011-04-01 16:17:05 -07:00
bf588166ed
bug 7704: network limits cleanup.
...
status 7704: resolved fixed
For user vm:
* for default network, take limit from the corresponding service offering
* for all additional networks, take limit from the network offerings
For domainRouter/SSVM/CPVM:
* get info from the network offering
Added new config parameter: "vm.network.throttling.rate". If nw_rate is NULL for serviceOffering, this parameter would be used for default vm's network
2011-04-01 15:48:32 -07:00
8b34065623
bug 9259: added upgrade test suite
2011-04-01 10:32:23 -07:00
3c07db7e2d
bug 9239: Ignore optional zone Id for Snapshot delete events
...
status 9239: resolved fixed
2011-04-01 15:19:43 +05:30
7b55b41556
bug 9239: Ignore optional zone Id for Snapshot delete events
...
status 9239: resolved fixed
2011-04-01 15:15:00 +05:30
7f08061e72
Added missing semi-colon and corrected usage unit test error messages
2011-04-01 12:06:52 +05:30
492dd78f1c
Bug 9180 - Default local SR on XenServer won't be used
...
- Update the diskoffering for system VMs to change the value of use_local_storage, when the global config 'system.vm.use.local.storage' is changed.
2011-03-31 23:11:11 -07:00
e139cff9f0
Bug 9180 - Default local SR on XenServer won't be used
...
- Update the diskoffering for system VMs to change the value of use_local_storage, when the global config 'system.vm.use.local.storage' is changed.
2011-03-31 23:05:50 -07:00
513236b100
bug 9161: better fix
2011-03-31 18:23:32 -07:00
f3fbe7b9fe
bug 9161: findByOutstandingWork means find all works with step not equal Done
2011-03-31 18:01:42 -07:00
ea95ac1808
bug 8713 : finalize the implementation of supporting system vm pooling
2011-03-31 17:14:09 -07:00
5f4054325a
bug 9248: generate events on service/diskOffering create/update/delete
...
status 9248: resolved fixed
2011-03-31 16:32:07 -07:00
2c85092316
bug 9161: better fix
2011-03-31 18:24:57 -07:00
afd7adc775
bug 9161: findByOutstandingWork means find all works with step not equal Done
2011-03-31 18:03:59 -07:00
703537d222
bug 9248: generate events on service/diskOffering create/update/delete
...
status 9248: resolved fixed
2011-03-31 16:30:11 -07:00
7e7c647dea
bug 9245: save ownerAccountId (instead of callerAccountId) to account_id field in async_job table. We already save caller info to user_id field
...
status 9245: resolved fixed
2011-03-31 15:31:27 -07:00
2af8b32d31
bug 9245: save ownerAccountId (instead of callerAccountId) to account_id field in async_job table. We already save caller info to user_id field
...
status 9245: resolved fixed
2011-03-31 15:27:35 -07:00
db351f8cba
bug 9249: use interval type , not snapshot type
...
status 9249: resolved fixed
2011-03-31 13:55:34 -07:00
47eb018975
bug 9249: use interval type , not snapshot type
...
status 9249: resolved fixed
2011-03-31 13:51:09 -07:00
9a29e1d926
Added missing semi-colon and corrected usage unit test error messages
2011-03-31 18:16:44 +05:30
eb696ab0ce
bug 9195: don't return domR/SSVM/CPVM volumes in listVolumes api response
...
status 9195: resolved fixed
2011-03-30 16:33:45 -07:00
6d7f3da46a
For VirtualRouter apply networkThrottling rate of the GuestNetworkOffering to both Guest and Public networks.
2011-03-30 14:53:04 -07:00
bb31bc779f
For VirtualRouter apply networkThrottling rate of the GuestNetworkOffering to both Guest and Public networks.
2011-03-30 14:49:15 -07:00
a1a2717811
bug 9192: don't query for securityGroups when Vm's zone is security group disabled.
...
status 9192: resolved fixed
2011-03-30 09:40:45 -07:00
eccef7022c
bug 9192: don't query for securityGroups when Vm's zone is security group disabled.
...
status 9192: resolved fixed
2011-03-30 09:39:29 -07:00
41e7642825
don't do a cidr check for the simulator
2011-03-30 19:41:13 +05:30
1b251a5fc8
Bug 4061: support for Microsoft Hyper-V changes- part 1
2011-03-30 18:48:51 +05:30
d431f70447
moving simulator classes to premium
2011-03-30 14:00:50 +05:30
29ef62f795
refactoring the simulator for 2.2
2011-03-30 14:00:50 +05:30
e276d3b7fb
bug 7631: Convert unprocessed events to usage_events
...
status 7631: resolved fixed
2011-03-30 11:19:04 +05:30
f06972b180
bug 7631: Convert unprocessed events to usage_events
...
status 7631: resolved fixed
2011-03-30 11:09:21 +05:30
c1db5aea31
Fixed NPE in listVirtualMachines command - when search for ROOT volume's storagePool type, assume that corresponding storagePool might be removed.
2011-03-29 20:21:26 -07:00
dadab81721
Fixed NPE in listVirtualMachines command - when search for ROOT volume's storagePool type, assume that corresponding storagePool might be removed.
2011-03-29 20:17:49 -07:00
90ec1dcd33
Allow to add Untagged network ranges to public virtual network in Basic zone
2011-03-29 19:44:12 -07:00
efd4cfa297
bug 9201: listNetworkOfferings - return -1 when network_rate is Unlimited; if value is NULL - return global configuration value
...
status 9201: resolved fixed
2011-03-29 19:26:20 -07:00
aab78874c7
bug 9201: listNetworkOfferings - return -1 when network_rate is Unlimited; if value is NULL - return global configuration value
...
status 9201: resolved fixed
2011-03-29 19:21:25 -07:00
f04f2ab10c
bug 9192: More improvements to listVm performance - cache dataCenter/serviceOffering/Network/Template/Iso information on Api level
...
status 9192: resolved fixed
2011-03-29 19:18:30 -07:00
2af46789cb
bug 9192: multiple improvementes to listVms command.
...
1) No longer do multiple searches involving "domain" table; only one join with domain is being done.
2) Do join with domain table only when command is executed by domainAdmin
3) Added index for "path" field in "domain" table
4) No longer do joins with account table as account_id is already present in vm_instance table.
2011-03-29 19:18:30 -07:00
64148f46f4
bug 8713: supporting structures for SSVM load management
2011-03-29 18:52:54 -07:00
9f3f99f27f
bug 9192: More improvements to listVm performance - cache dataCenter/serviceOffering/Network/Template/Iso information on Api level
...
status 9192: resolved fixed
2011-03-29 18:42:44 -07:00
46a80a599a
bug 9192: multiple improvementes to listVms command.
...
1) No longer do multiple searches involving "domain" table; only one join with domain is being done.
2) Do join with domain table only when command is executed by domainAdmin
3) Added index for "path" field in "domain" table
4) No longer do joins with account table as account_id is already present in vm_instance table.
2011-03-29 18:42:44 -07:00
f71986125a
bug 9210: remove storage pool entry if adding storage pool fails
...
status 9210: resolved fixed
2011-03-29 17:44:55 -07:00
0788d4a834
bug 8713 : cleanups
2011-03-29 15:10:34 -07:00
2e24a68f7f
bug 8713: use SystemVmLoadScanner for SSVM
2011-03-29 15:10:34 -07:00
ee3d6f5cea
bug 9205: resolved fixed
...
status 9205: fix NPE in usageEvent
2011-03-29 15:00:35 -04:00
7ce9845fb7
No need to check if user vm exists during static nat port range creation. We already do it when enableStaticNat for the ip address
2011-03-29 13:46:18 -07:00
a7953c1e7a
bug 9205: resolved fixed
...
status 9205: fix NPE in usageEvent
2011-03-29 14:57:16 -04:00
8e727230ce
Use SystemVmLoadScanner for console proxy VMs
2011-03-29 11:19:01 -07:00
Frank
prachi
alena
nit
kishan
Murali Reddy
Kelven Yang
anthony
Alex Huang
Prasanna Santhanam
Edison Su