637 Commits

Author SHA1 Message Date
Frank
cbe368ef69 Fix a stupid string comparsion in OVS 2011-05-06 10:15:12 -07:00
Alex Huang
0ee7e7678a Propagate fixes from 2.2.4 2011-05-05 16:13:46 -07:00
anthony
2d52813ff2 fixed build /start management server 2011-05-05 16:12:19 -07:00
anthony
10c4c14ad5 swift integration checkin 2011-05-05 13:55:29 -07:00
Chiradeep Vittal
b42ebf4872 Build fixes after first pass at merge 2011-05-03 10:41:31 -07:00
Chiradeep Vittal
303e2a7481 Start of zonesfeature / mycloud/cloudkit 2011-05-03 10:40:17 -07:00
Alex Huang
8c8354a00e bug 8745: we decided on not implementing revert on the agent because it really requires business logic above. Stop if the checkSsh doesn't work 2011-05-02 14:47:49 -07:00
Murali Reddy
4fbcb02573 Bug 9534 : implement CPU cap
Changes specific for Xen hypervisor, and DB upgrade. Changes for vmware chcked-in already in commit 1c310a0d2ae81108386f0dd5c2e899ff00fee9e9, e71112e2f587f5d6c9c6d5337cfeb1f239f29633. KVM will not support this feature.
2011-05-02 13:06:02 +05:30
Murali Reddy
aae67e5d8d bug 9322: snapshot count has exceeded the keep limit set
fix to change hourly snapshots to be treated as recurring snapshot
2011-05-02 12:55:40 +05:30
prachi
b2b01bfcd2 Bug 8830 - Return parent template ID from templates created off of a snapshot
Changes:
- Added a new column `source_template_id` to vm_template table to carry the parent/source template ID from which the tempalte was created
- Added the column in db upgrade 224 to 225
- Changed code to save the source_template_id if there is one associated to the volume/ volume from which the snapshot was taken
- API response returns the sourcetemplateid field, if set, in all template usecases.
2011-04-29 15:40:59 -07:00
anthony
bbc470ed4f bug 9619: handle two types of domr name
status 9619: resolved fixed
2011-04-29 14:13:25 -07:00
alena
671ec62358 bug 9623: set ha_enable to false for consoleProxy vms and service_offering.
status 9623: resolved fixed

Also set ram_size to 1024 for console proxy offering during the upgrade

Conflicts:

	core/src/com/cloud/vm/SecondaryStorageVmVO.java
	server/src/com/cloud/agent/manager/allocator/impl/UserConcentratedAllocator.java
	server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java
	server/src/com/cloud/storage/allocator/LocalStoragePoolAllocator.java
	server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java
2011-04-29 11:53:07 -07:00
Alex Huang
99bc15f64a changed getName to getHostname 2011-04-29 08:34:10 -07:00
will
633d024b7c - Merge all CloudZones Registration feature into master 2011-04-28 16:05:36 -07:00
Murali Reddy
c12ccbd06f Bug 9534 : implement CPU cap
Introducing new boolean flag in service offering to restrict the user VM's CPU utilization to what service offering it is entitled for.
2011-04-27 13:54:45 +05:30
prachi
18b773650f Bug 9447 - ModifySshKeyCommand contents are logged...
- Local fix to not log the content for ModifySshKeyCommand.
- For commands that do not want to log the parameters, added the facility to indicate this.
- For such commands, we remove the parameters from the log.
2011-04-25 14:22:50 -07:00
alena
41e5e38fef bug 9336: securityGroups can be used by other securityGroups in the same domain only; no cross domain SG authentication
status 9336: resolved fixed

Following changes were made:

* deleteSecurityGroup/authorizeSecurityGroupIngress - removed account/domainId parameters as SG is uniquely identified by id now
* removed account_name field from securityGroup DB table; removed allowed_security_group/allowed_sec_grp_acct from security_ingress_rule.
These values were used for api response generation only for performance purposes; added caching on API level to improve performance
* Added missing security checks for securityGroups/ingressRules
2011-04-22 11:35:29 -07:00
prachi
09b4b06b63 Bug 9447 - ModifySshKeyCommand contents are logged...
Since private and public keys are logged, this is a Security concern

Changes: Added capability to 'Command' instances to support excluding certain fields from getting logged using GSON @Expose annotation.
2011-04-22 10:43:26 -07:00
Abhinandan Prateek
ea14ff5f6c bug 9470: line breaks not escaped for events
status: resolved fixed
2011-04-21 12:20:50 +05:30
abhishek
7adb5c71e5 bug 9175: fixing the cpu util being over 100% on the dashboard
status 9175: resolved fixed
2011-04-15 14:54:21 -07:00
Abhinandan Prateek
efa0417881 bug 5242: adding a host does not return useful error
status 5242: closed fixed
2011-04-15 17:28:46 +05:30
anthony
2a68def576 on reconnect, heartbeatfile is cleared , MS needs to fill heartbeatfile in ModifyStoragePoolCommand 2011-04-14 20:40:12 -07:00
anthony
af68342982 don't need to remove heartbeat tag when reconnect, it breaks HA , because when host reconnects, it tries to create heartbeat, but at this time, master may be able to access storage pool 2011-04-14 20:40:02 -07:00
Edison Su
d6b5acb852 bug 8532,8755: don't create multiple HA work if there already has one of HAwork of this VM is created, but not finished
status 8532: resolved fixed
status 8755: resolved fixed
2011-04-14 17:46:54 -04:00
anthony
86f32e4735 bug 9455: when host is disconnected, also remove entry in storage_pool_host_ref
status 9455: resolved fixed
2011-04-14 14:31:16 -07:00
Frank
92155522f2 Add license header to files 2011-04-14 11:23:14 -07:00
anthony
60768d0014 bug 9411:
1. adding storage pool fails, remove the entry in DB
2. in introduce SR, create pbd for master host

status 9411: resolved fixed
2011-04-14 11:17:24 -07:00
prachi
80fe0b584d More changes for Bug 9387:
- Update system vm_instance's template_id if it does not match the system vm template.
- Use _templateDao.findSystemVMTemplate to find the latest system vm template.
2011-04-12 18:20:01 -07:00
alena
4d8df029d3 bug 8245: mark storage pool status as Removed before performing actual cleanup
status 8245: resolved fixed
2011-04-12 14:44:55 -07:00
alena
1966b4f449 SecurityGroupDao: do join with "nics" table instead of "user_vm" as we keep ip address information in nics. 2011-04-12 11:18:50 -07:00
alena
52bf157387 bug 9398: removed resource_type from volumes table as we no longer use it. Corresponding db upgrade scripts are updated
status 9398: resolved fixed

Conflicts:

	server/src/com/cloud/storage/StorageManagerImpl.java
2011-04-11 18:14:35 -07:00
anthony
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
anthony
545aa50388 bug 9282: set cluster guid if it is null
status 9282: resolved fixed
2011-04-04 14:33:18 -07:00
Edison Su
ab862026d6 fix link local setup; 2011-04-01 17:15:05 -04:00
Edison Su
c42b928b7d bug 8459: add nic hotplug support 2011-03-31 19:11:02 -04:00
Kelven Yang
ea95ac1808 bug 8713 : finalize the implementation of supporting system vm pooling 2011-03-31 17:14:09 -07:00
Edison Su
344d1924a6 bug 8459: add nic hotplug support 2011-03-30 19:09:53 -04:00
Alex Huang
bf13d2cbec added missing changes from schema changes previously 2011-03-30 13:23:56 -07:00
Alex Huang
971915a26a added missing changes from schema changes previously 2011-03-30 12:17:20 -07:00
anthony
4992ee756f kbps means kilotype per secondary, 2011-03-29 19:42:23 -07:00
alena
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
alena
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
anthony
2a4d0cf4c5 kbps means kilotype per secondary, 2011-03-29 18:42:19 -07:00
Frank
b0edad07c5 Fix the incorrect "," in CitrixResourceBase.java 2011-03-29 15:16:36 -07:00
Frank
0a66b176aa Fix the incorrect "," in CitrixResourceBase.java 2011-03-29 15:15:49 -07:00
Alex Huang
6bd978abfe bug 9192: fixes the caches that are gone due to configuration server uses the same dao without cache 2011-03-29 11:31:59 -07:00
Alex Huang
f2e692099e bug 9192: fixes the caches that are gone due to configuration server uses the same dao without cache 2011-03-29 11:31:23 -07:00
anthony
436dccb6d7 bug 9189: fixed it in master, modifystoragepool doesn't try to create/import any more, will port it to 2.1.x 2011-03-28 19:11:20 -07:00
alena
fdf0f589af bug 8902: added Removed field to "cluster" table
status 8902: resolved fixed
2011-03-28 10:50:09 -07:00
Alex Huang
9d158dc060 Removed the async create status for volume now that our customers don't use it 2011-03-24 20:04:23 -07:00