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

1042 Commits

Author SHA1 Message Date
Chiradeep Vittal 82fcfe8edc make signature calculation consistent across management servers 2011-09-12 18:20:23 -07:00
Chiradeep Vittal d03c5af720 make instance_id unique to allow usage of ON DUPLICATE KEY 
useful logging

Reduce batch size to 16 to avoid sql errors

try using multi inserts to overcome deadlock during batch update
 2011-09-12 18:20:23 -07:00
Chiradeep Vittal e216686029 Revert "bug 10617: Intermediate checking" 
revert pending review

This reverts commit 561b27565512d438db3d8896df6f97b644b0b498.
 2011-09-12 14:45:58 -07:00
Naredula Janardhana Reddy f9b0962ad9 bug 10617: Intermediate checking 
Changes :
         - Fixing API doc +response name + errorMessage
         - Adding seperate events to Egress rules
         - Egress rules Using the same database table as that of ingress with new column type.

   Pending Tasks:
         - db upgrade
         - database table rename from security_ingress_rule to generic name, renaming some of the jave class from ingress to generic name.
         - Retesting on kvm
 2011-09-09 18:14:19 +05:30
prachi 4ad9ac5e71 Bug 11200 - maximum number of guests per host 
Changes:

To make sure migration does not attempt to pick a host that has running VMs more than the max guest VM's limit:

- Changed manual migration to call host allocators to return a list of hosts suitable for migration. Host allocators check for the max guest VM limit.
- Earlier we returned hosts with enough capacity but now Host Allocators make other checks along with capacity. So the list of hosts returned are hosts that have enough capacity AND satisfy all other conditions like host tags, max guests limit etc. Or in other words Allocators dont return the hosts that dont satisfy all conditions even if they have capacity.
-Therefore, now we mark the list of hosts returned for manual migration as 'suitable' hosts instead of 'hasenoughCapacity' in the HostResponse.
- HA migration already calls allocators, so no change is needed there.
 2011-09-08 18:08:31 -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 84868b7f9c Bug 11200 - maximum number of guests per host 
Changes:
- Adding a new table 'hypervisor_capabilities' that will record capabilities for each hypervisor version. Added db schema changes for this.
- Currently a few capabilities have been added, namely, 'max_guests_limit' and 'security_group_enabled'
- Added a new column 'hypervisor_version' to host table. StartupRouting command now takes in this parameter. It should be set when a host connects.
- If a host's hypervisor version is not present, we find all the capabilities rows for that hypervisor type and use the first record.
- 'max_guests_limit' is the maximum number of running guest Vms that a host can have for the given hypervisor.
- Host Allocators use this limit and skip a host if the number of running VMs on that host exceeds this limit.
 2011-09-07 14:53:05 -07:00
kishan f9d5a46871 Compare current and previous network stats before updating. Ignore stats if the current stats are not same as the prev stats. Set NetworkUsageAnswer log level to debug 2011-09-05 18:41:42 +05:30
Naredula Janardhana Reddy b35e85c571 bug 10712: Display name instead of id 2011-09-05 15:55:07 +05:30
Kelven Yang 4d3d47f01c bug 11304: restore host status after initialization failure 2011-09-02 15:19:36 -07:00
alena 8b5f2c758e Do account permission checks for snapshots the way it's done for all other ControlledEntities 2011-08-31 18:15:08 -07:00
Murali Reddy 9abb544865 bug 6876: netscaler MPX & VPX support 
- adding supprt for Netscaler VPX & MPX load blancers
    - implemented for virtual networking
    - works only with new fetched public IP, inline support is not added yet
 2011-08-30 00:14:05 +05:30
alena 35b551a199 bug 11260: Take networkRate for domR's guest and public interface from the corresponding system service offering 2011-08-25 14:15:12 -07:00
prachi 1fefdd628d Bug 11261 - Allow to update host tags 
Changes:
- Changes to updateHostCmd to accepts hosttags parameter
- Changes to wipe out existing tags and save new ones in host_tags DB.
- UpdateHost is Admin only operation - so only root admin can update host tags
 2011-08-25 13:01:57 -07:00
alena 8c53dbcdd7 bug 11185: support multiple CIDR on overlapping port ranges for firewall rules 
status 11185: resolved fixed

Conflicts:

	server/src/com/cloud/network/firewall/FirewallManagerImpl.java

Conflicts:

	api/src/com/cloud/network/firewall/FirewallService.java
	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2011-08-25 12:21:11 -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
Edison Su 9391938908 fix conflict 2011-08-24 18:47:09 -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 d3eb9db7fa bug 11204: when search for domR/dhcp, include Role to the corresponding search to eliminate getting "LB" network element in the response 
status 11204: resolved fixed

Conflicts:

	server/src/com/cloud/network/element/VirtualRouterElement.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
 2011-08-23 12:05:53 -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
alena c2732850f4 bug 11202: added "networkRate" param to service offering api responses 2011-08-22 13:35:43 -07:00
alena 0b061529b1 bug 11202: added "networkRate" param to service offering api responses 2011-08-22 13:34:47 -07:00
alena 31a022c720 Added networkRate parameter to createServiceOffering api command 
Conflicts:

	server/src/com/cloud/configuration/ConfigurationManager.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
 2011-08-22 12:05:34 -07:00
alena 033765f93f Added networkRate parameter to createServiceOffering api command 2011-08-22 12:02:08 -07:00
frank 32ee2dbe2c Remove baremetal specific parameters from AddHostCmd 2011-08-19 17:12:23 -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
Naredula Janardhana Reddy 4369b0ba96 bug 1067: 
- covered basic impelementation for xen, need to test corner cases.
      - Not implemneted: kvm, vmware , listing of egress rules.
 2011-08-19 11:10:16 +05:30
Edison Su ea102aa045 add host guid in migrate command 2011-08-18 11:03:40 -07:00
Edison Su ed7214c710 add host guid in migrate command 2011-08-16 10:30:52 -07:00
Naredula Janardhana Reddy b9183c0840 bug 10561: merging code from 2.2.10 to master 2011-08-16 14:20:51 +05:30
alena 11d06f3d6a Added missing license headers 2011-08-15 14:24:46 -07:00
alena 5fd0ff5610 Added missing license headers 2011-08-15 14:24:28 -07:00
alena d72200bbfc If one of the static nat rules failed to apply on the backend, the end result should be false 2011-08-15 10:18:44 -07:00
alena 891f02f4d4 Resend firewall rules on domR restart 2011-08-15 10:18:10 -07:00
alena 803255b0ba bug 11029: db upgrade from 2.2.9 to 2.2.10 includes firewall_rule upgrade now 
status 11029: resolved fixed

Commit also includes the following:

* map firewall rule to pf/lb/staticNat/vpn when the firewall rule is created as a part of pf/lb/staticNat/vpn rule creation
* when delete firewall rules, also delete related firewall rule
 2011-08-15 10:18:09 -07:00
Murali Reddy 0969ba8063 bug 10923: changes for snapshot command to carry primary storage pool path 2011-08-12 17:45:02 +05:30
Murali Reddy cc60989a68 bug 10923: changes for snapshot command to carry primary storage pool path 2011-08-12 17:43:18 +05:30
Nitin 5ef0c96e70 bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 14:30:34 +05:30
Nitin f1d13729af bug 11096: ExtractTemplate - For private template choose the correct sec storage host id since its not present in all the sec storage now. 2011-08-12 12:21:02 +05:30
Chiradeep Vittal ba3bb68035 fix merge issues 2011-08-11 16:53:08 -07:00
Chiradeep Vittal 51af0db682 mass merge 2.2.10 2011-08-11 16:41:52 -07:00
keshav df5f48c093 Added parameter to enable the firewall rule UI to the list capabilities API. 2011-08-11 12:03:06 -07:00
keshav 4da9b6bfb4 Added parameter to enable the firewall rule UI to the list capabilities API. 2011-08-11 11:54:41 -07:00
keshav d47eb46faf Added parameter to enable the firewall rule UI to the list capabilities API. 2011-08-11 11:42:02 -07:00
Alex Huang 6e7ad8830f bug 11043: Propagating fix 2011-08-11 10:30:03 -07:00
Alex Huang 1079a77024 bug 11043: rverted the bad fix 2011-08-11 10:27:02 -07:00
Alex Huang 15f86d3d93 bug 11043: rverted the bad fix 2011-08-11 10:25:31 -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
Naredula Janardhana Reddy 7c2395e684 bug 10561: fix: last entry in the firewall rules unable to delete 2011-08-11 19:01:36 +05:30
Nitin 56ce65710d bug 5370: copy Template/Iso - generating the started and completed events. 
status 5370: resolved fixed
 2011-08-11 16:14:27 +05:30
Chiradeep Vittal 375da4da1a bug 11072: icky icky icky 2011-08-10 20:40:13 -07:00
Chiradeep Vittal d29b01ca7f bug 10561: backend rules for firewall 2011-08-10 18:39:52 -07:00
alena dc116d99a8 Get ipAddress info not from the rule, but from the request parameter ipAddressId 2011-08-10 16:47:15 -07:00
Sheng Yang e1de9f5bec bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release 
status 11021: resolved fixed
 2011-08-10 12:52:19 -07:00
Sheng Yang 2d958c5d23 bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release 
status 11021: resolved fixed
 2011-08-10 12:52:10 -07:00
Sheng Yang 58a13c0d5a bug 11021: Add ReservationStrategy.Managed to prevent sourceNat from release 
status 11021: resolved fixed
 2011-08-10 12:51:43 -07:00
alena 32b53351ff Fixed response processing in createFirewallRule command 2011-08-10 11:36:34 -07:00
Naredula Janardhana Reddy a9eb14c42e bug 10561: backend added for CreateFirewallRule and deleteFirewallRule 2011-08-10 17:06:42 +05:30
Abhinandan Prateek 949ad3f4c4 bug 10561: readding source cidr changes to firewall rules 2011-08-10 13:55:37 +05:30
Abhinandan Prateek 9bba09857e bug 10561: readding source cidr changes to firewall rules 2011-08-10 13:52:42 +05:30
keshav 1761024fda Changed RuleTO classes to carry the source VLAN tag. Added guest network gateway to NetworkElementCommand. 2011-08-09 16:38:24 -07:00
alena d79fd2ca03 Fixed merge conflict 2011-08-09 15:51:57 -07:00
alena 51b040e393 Fixed typos in api doc for listFirewalls command 2011-08-09 15:51:57 -07:00
alena 6b9603bc4c bug 10561: intermidiate checkin for FirewallRuleFeature 
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl

Conflicts:

	api/src/com/cloud/api/BaseCmd.java
	client/tomcatconf/commands.properties.in
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/configuration/DefaultComponentLibrary.java
	server/src/com/cloud/network/lb/LoadBalancingRulesManagerImpl.java
	server/src/com/cloud/network/rules/RulesManagerImpl.java
 2011-08-09 15:51:56 -07:00
alena e4967c4631 Fixed typos in api doc for listFirewalls command 2011-08-09 09:58:38 -07:00
Chiradeep Vittal 779ca9ac1a fix associate ip exception 2011-08-09 09:53:22 -07:00
kishan ca39855417 bug 10613,10614,10615: Check if the loadbalancer rule exists before assign/remove/deleting rule 
status 10613,10614,10615: resolved fixed
 2011-08-09 20:25:04 +05:30
Nitin d763d809cc bug 10848: Introducing an api - ListCapacityByType. Add the basic DB layer in the command. 2011-08-09 18:12:37 +05:30
Abhinandan Prateek 311afeae23 bug 10731: reverting back source cidr changes for loadbalancer and portforwarding 2011-08-09 16:01:48 +05:30
Chiradeep Vittal 301bf049d1 fix compile issues 2011-08-08 22:03:08 -07:00
Chiradeep Vittal 924961d898 merge nectarine 2011-08-08 21:45:37 -07:00
alena 06d007337a bug 10561: intermidiate checkin for FirewallRuleFeature 
1) Added new apis: createFirewallRule, deleteFirewallRule, listFirewallRules
2) Modified existing apis - added boolean openFirewall parameter to createPortForwardingRule/createIpForwardingRule/createRemoteAccessVpn. If parameter is set to true, open firewall on the domR before creating an actual PF rule there
Modified backend calls appropriately.
3) Schema changes for firewall_rules table:
* startPort/endPort can be null now
* added icmp_type, icmp_code fields (can be not null only when protocol is icmp)
4) Added new manager - FirewallManagerImpl
 2011-08-08 20:59:40 -07:00
Kelven Yang 02e64f90de Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:45:47 -07:00
Kelven Yang 39a3d82f11 Add prepareTemplate command(admin only) to allow pre-loading template into primary storage 2011-08-08 18:37:26 -07:00
Chiradeep Vittal 8277584b8a merge ELB / nectarine branch 2011-08-08 15:20:56 -07:00
frank e8c2fa4e8e Remove baremetal specific parameters from AddHostCmd 2011-08-08 15:01:26 -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
frank c89425325b Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- add files
 2011-08-08 13:32:27 -07:00
Nitin 01582fcd40 bug 10848: Introducing an api - ListCapacityByType. 2011-08-06 20:09:07 +05:30
frank c6fba0fd42 Bug 8966 - Oracle VM (OVM) support 
OCFS2 support -- prepare OCFS2 nodes
 2011-08-05 17:46:29 -07:00
Nitin c009b56a60 bug 6653: Extract Api's - No need to encode the url's forward slash with %2F as we have the latest version of gson which doesnt err out on forward slash anymore. 
status 6653: resolved fixed
 2011-08-05 18:44:41 +05:30
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
alena 2b35974f9b Fixed doc bug in createVolume api 2011-08-04 15:48:31 -07:00
alena 9b8c6278e0 Fixed doc bug in createVolume api 2011-08-04 15:47:55 -07:00
alena 40f24b56d0 bug 10757: override default page size only in listCfg api command 
status 10757: resolved fixed
 2011-08-04 12:57:58 -07:00
alena 0826066f7f bug 10757: override default page size only in listCfg api command 
status 10757: resolved fixed
 2011-08-04 12:56:00 -07:00
Sheng Yang a6bb0a855d Fix KVM agent connection issue, and build 
non-static inner class can't be serialized, also it lacks no-args
constructor.
 2011-08-04 11:57:21 -07:00
Sheng Yang f1d3e73d08 Fix KVM agent connection issue, and build 
non-static inner class can't be serialized, also it lacks no-args
constructor.
 2011-08-04 11:56:37 -07:00
Sheng Yang f7ef238e7c Revert "Fix KVM agent connection issue" 
This reverts commit 4a3296bd5e489997c2c5ffb2368f688c3a1b9498.
 2011-08-04 11:45:27 -07:00
Sheng Yang 9ae546e67b Revert "Fix KVM agent connection issue" 
This reverts commit 4a3296bd5e489997c2c5ffb2368f688c3a1b9498.
 2011-08-04 11:43:55 -07:00
Sheng Yang 1828893e73 Fix KVM agent connection issue 
non-static inner class can't be serialized, also it lacks no-args constructor.
 2011-08-04 11:35:57 -07:00
Sheng Yang 75fc541754 Fix KVM agent connection issue 
non-static inner class can't be serialized, also it lacks no-args constructor.
 2011-08-04 11:35:36 -07:00
keshav 34a0c44f4f Added a new table for inline load balancer deployments, to store mappings between public IPs and NICs. 2011-08-03 16:10:20 -07:00
Nitin c73f5da276 bug 10725: add checksum to listIso and registerIso (its an optional parameter for this command). 
status 10725: resolved fixed
 2011-08-03 17:41:29 +05:30
Abhinandan Prateek f6303c13fb bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:42:29 +05:30
Abhinandan Prateek cd78c5cb9b bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:32:28 +05:30
Abhinandan Prateek 6dd519ddd4 bug 10812: putting key in ZoneConfig and other nomenclature changes 2011-08-03 14:16:08 +05:30
alena 8d47c53735 Revert "bug 10435: removed vpn feature" 
This reverts commit ea9e1b5d138950e8de49fce7ffdbb12a1c72c560.

Conflicts:

	api/src/com/cloud/api/ResponseGenerator.java
	scripts/vm/hypervisor/xenserver/vmops
	server/src/com/cloud/configuration/Config.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2011-08-02 18:12:57 -07:00
anthony 37dcec77bb Bug 10197: 
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host

Conflicts:

	server/src/com/cloud/vm/VirtualMachineManagerImpl.java
 2011-08-02 17:31:36 -07:00
anthony bba811a714 Bug 10197: 
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
 2011-08-02 17:29:16 -07:00
anthony dc7ff2b5ad Bug 10197: 
implement pool-wise VM sync,
    For XenServer, VM fullSync is pool-wise now, VM deltaSync is still per host
 2011-08-02 16:52:24 -07:00
anthony 5f9884d97a Bug 10197: 
1. don't try HA vms if host hypervisor version changes
    2. fixed a bug related to VM full sync with hosttrack enabled
 2011-08-02 16:48:27 -07:00
Alex Huang f043f63eaa Merged changes from 2.2.8.zucchini 2011-08-02 15:33:48 -07:00
Abhinandan Prateek 4f3dec5f1c bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:34:38 +05:30
Abhinandan Prateek 5cb3882349 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:23:33 +05:30
Abhinandan Prateek 46be774ce8 bug 10812: adding domain suffixes to zone's router conf 2011-08-02 11:08:24 +05:30
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 a6a2383561 bug 10929: allow only OperationFailedToError event to trigger transition to Error state. 2011-08-01 18:38:14 -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 0bc6026d6b fix description of addcluster api, and a typo in one script 2011-08-01 14:28:39 -07:00
alena f4f51f0451 Revert "bug 10812: modifying dhcp option 119 on domR as per zone config" 
This reverts commit 606ec843475911680adb743d7975bf7d584ab240.
 2011-08-01 13:00:53 -07:00
Abhinandan Prateek 826a3d6ad0 bug 10812: modifying dhcp option 119 on domR as per zone config 
status 10812: resolved fixed.
 2011-08-01 14:44:31 +05:30
Chiradeep Vittal 68f9ab5c5c DeleteLoadBalancer on invalid id throws NPE 2011-07-29 23:21:27 -07:00
anthony 93244b5b62 Bug 10197: if VM is already running, just return the host it is running on 2011-07-29 16:33:57 -07:00
anthony 31100824d7 Bug 10197: if VM is already running, just return the host it is running on 2011-07-29 16:33:33 -07:00
frank b0b3f16dae Two things: 
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer

Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)

changes in line with UI
 2011-07-29 11:28:09 -07:00
frank 055ec48ae8 Two things: 
Load non-routing resource in ClusteredAgentManager includes External DHCP, PxeServer, ExternalFirewall, ExternalLoadBalancer

Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit)

changes in line with UI
 2011-07-29 11:25:35 -07:00
anthony 055e5c82c7 bug 9997: 
put copy scripts in SetupCommand,
1. initiate returns host version,
2. if it doesn't match with DB, update DB, and reconnect the host.

status 9997: resolved fixed
 2011-07-29 10:45:11 -07:00
Jessica Wang c074b2d63f cloudStack - Elastic Load Balancer - fix a server-side bug "unhandled exception executing api command: listLoadBalancerRules" 2011-07-28 19:11:00 -07:00
Chiradeep Vittal 1471b0a97a Add parameter to ListPublicIpAddressCmd : forloadbalancing 2011-07-28 14:38:14 -07:00
Chiradeep Vittal a6b1453254 minor cleanup 2011-07-28 14:38:14 -07:00
Alex Huang c948ff3611 moved security ingress command to trace 2011-07-28 11:07:54 -07:00
Naredula Janardhana Reddy 15d57cef9f bug 10557: implemented the TODO - opening the stats port using iptable 2011-07-28 17:28:20 +05:30
Naredula Janardhana Reddy 2fc7be14de bug 10557: implemented the TODO - opening the stats port using iptable 2011-07-28 17:24:10 +05:30
Chiradeep Vittal 2971e77401 change supportELB to report on which ips the ELB runs guest or public 2011-07-28 00:39:05 -07:00
Chiradeep Vittal 2162cdf283 WIP2: make creating an ELB bullet proof 2011-07-27 21:11:26 -07:00
Chiradeep Vittal b240c4a645 WIP: make creating an ELB bullet proof 2011-07-27 21:11:26 -07:00
Chiradeep Vittal 0ee45261e7 set a flag so that api clients know whether to use the elb api 2011-07-27 16:00:59 -07:00
Chiradeep Vittal 042c06fbb6 Make createLoadBalancer async 2011-07-27 12:00:08 -07:00
Chiradeep Vittal cd8e069f80 Acquire an ip and launch an ELB vm 2011-07-27 12:00:07 -07:00
Naredula Janardhana Reddy 3c66075b8b bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config 2011-07-27 14:06:26 +05:30
Naredula Janardhana Reddy 93680fdc9e Bug:10557 2011-07-27 14:05:47 +05:30
Naredula Janardhana Reddy f0b1f3d229 bug 10557: made more feature enhancement instead of bug- added more stats parametes as global config 2011-07-27 13:42:14 +05:30
frank b7f5dbe2b8 Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit) 
Use createTemplate API instead a new one
 2011-07-26 18:07:16 -07:00
frank 95535f9266 Bug 9887 - baremetal: support for image operation (create template from guest disk) (edit) 
Use createTemplate API instead a new one
 2011-07-26 18:05:42 -07:00
Naredula Janardhana Reddy 96bacb85f8 Bug:10557 2011-07-25 17:40:33 +05:30
Nitin 6d85c9952c bug 9452: Remove the overridden getPageSizeVal function in listCapacity and use it from BaseListCmd which has the changes for default pagination to unlimited. 2011-07-22 13:12:35 +05:30
anthony e666cf5e77 bug 10743: default local storage is ext in XenServer 6.0, add ext local storage support 2011-07-21 17:31:43 -07:00
keshav 4ce137ef2e Added account ID to IpAddressTO and NetworkElementCommand. 2011-07-21 16:44:13 -07:00
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
Alex Huang abd3321077 bug 10799: propagate to 2.2.9 2011-07-21 11:30:03 -07:00
Alex Huang f82aa97273 bug 10799: propagate to main 2011-07-21 11:27:10 -07:00
Alex Huang 45074e7cba bug 10799: There are two problems. The deadlock was ate up but then the savepublicip call return true, causing the problem with the pod_vlan_map hitting a constraint problem. HostPodDao was used as the scope for the insufficient capacity exception which causes the virtualmachinemanager to not to retry starting the vm. It should have been HostPod instead of HostPodDao. 2011-07-21 11:22:55 -07:00
Abhinandan Prateek dff712f2a9 bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables 
status 10731: resolved fixed
 2011-07-21 13:48:42 +05:30
Abhinandan Prateek de34d6089d bug 10731: sending source cidrs to the required router element, on domR allowing these source cidrs thru iptables 
status 10731: resolved fixed
 2011-07-21 13:40:06 +05:30
alena 36edf298e7 bug 10373: Intermediate checkin for Domain level guest Virtual networks 2011-07-20 13:44:26 -07:00
kishan 427b73a2b9 bug 10372: Added Vm State Machine listener for usage events 
status 10372: resolved fixed
 2011-07-20 11:13:56 +05:30
anthony 0d23c9a6f4 bug 10197: 
missing one file
 2011-07-19 15:49:48 -07:00