Commit Graph

499 Commits

Author SHA1 Message Date
Kelven Yang 7a64d8fda4 add VmwareInvestigator and VmwareFencer, use short worker VM name to avoid vCenter truncation 2011-09-14 15:15:26 -07:00
Jessica Wang de9856f1c4 cloudStack - sync UI change from 2.2.y branch to mater branch. 2011-09-13 16:00:46 -07:00
alena f6a79c603f bug 11036: resource count update is refactored
status 11036: resolved fixed

1) Use row locks instead of global lock when update resource_count table. When update resource_count for account, make sure that we lock account+all related domains
2) Insert resource_count records for account/domain at the moment when account/domain is created.
3) As a part of DB upgrade, insert missing resource_count records for all non-removed accounts/domains

Conflicts:

	core/src/com/cloud/alert/AlertManager.java
	server/test/com/cloud/agent/MockAgentManagerImpl.java
2011-09-13 10:47:36 -07:00
Osamu b339b5f9c0 amended. 2011-09-09 04:38:21 +09:00
Osamu d49d6a529f Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-09-08 23:00:07 +09:00
David Nalley 31c8cc8dc7 bug 11361: removing duplicate entries from message.properties
status 11361: resolved fixed
Most of these were truly duplicates. In the one case that was not a duplicate, I checked the behavior in CloudStack and used the string that it presented.
2011-09-07 20:29:42 -04: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 3dce7ebd03 bug 10782: Add SSL properties in db.properties. Modified JDBC URL to use SSL properties when enabled 2011-09-07 19:52:10 +05:30
frank 3b8851ad68 Bug 9479 - provide option for built in https
use our certificate as java trust store
2011-09-02 11:00:04 -07:00
frank c5bbdb12a1 Bug 9479 - provide option for built in https
Listen on 6443 instead of 8443 because tomcat6 will change 8443 to a random one when CATALINA_HOME is not /usr/share/tomcat6
2011-09-01 17:41:52 -07:00
frank c7b3c81485 Bug 9479 - provide option for built in https
small fix on cloud-setup-managment
2011-09-01 17:09:06 -07:00
frank 1ce0ad67c8 Bug 9479 - provide option for built in https
status 9479: resolved fixed
2011-09-01 16:01:28 -07:00
Jessica Wang 55264226b8 cloudStack - add new localization labels. 2011-08-30 15:22:57 -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
Osamu 5225801b22 Merge branch 'master' of ssh://git.cloud.com/var/lib/git/cloudstack-oss 2011-08-29 01:15:38 +09:00
Jessica Wang 2b5e673b0a bug 11261: cloudStack - host page - Edit Host action - (1) make hosttags editable. (2) consolidate update OS category from dialog box to main screen. 2011-08-25 17:28:00 -07:00
Osamu 02127db341 amended 2011-08-26 07:03:05 +09:00
Osamu 95e4f819c0 amended 2011-08-26 07:03:04 +09:00
Jessica Wang 9de41dd600 cloudStack - add new translation labels. 2011-08-24 14:23:10 -07:00
frank b3478c377e Full opensource 2011-08-23 19:52:19 -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
Jessica Wang 24edb0071d cloudStack - merge UI change from 2.2.10 branch to master branch. 2011-08-22 14:09:59 -07:00
Jessica Wang 4e0a12f94e cloudStack - add new localization labels. 2011-08-22 13:55:59 -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 df6bee4061 add template for simulator 2011-08-18 11:37:50 -07:00
Edison Su 0be1510496 add template for simulator 2011-08-16 10:30:51 -07:00
frank 6c98aa9173 Fix typo in cloud-management script 2011-08-12 18:16:40 -07:00
frank aa8e073e09 Fix typo in cloud-management script 2011-08-12 18:15:31 -07:00
Jessica Wang b9dcb51cf2 cloudStack - add new localization labels. 2011-08-10 19:23:08 -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
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
Nitin 01582fcd40 bug 10848: Introducing an api - ListCapacityByType. 2011-08-06 20:09:07 +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
frank eda4a61a96 Add DB integrity checker, it checks:
1. Are there multiple hosts connect to the same local storage pool due to 2.1.x bug
2. Is there any missed premium upgrade

either true answer of above cause mangemnt stopping and asking user to contact Cloud.com support
2011-07-30 17:22:33 -07:00
frank 50b665d713 Add DB integrity checker, it checks:
1. Are there multiple hosts connect to the same local storage pool due to 2.1.x bug
2. Is there any missed premium upgrade

either true answer of above cause mangemnt stopping and asking user to contact Cloud.com support
2011-07-30 17:22:09 -07:00
frank ca78e49cbd Add DB integrity checker, it checks:
1. Are there multiple hosts connect to the same local storage pool due to 2.1.x bug
2. Is there any missed premium upgrade

either true answer of above cause mangemnt stopping and asking user to contact Cloud.com support
2011-07-30 17:21:50 -07:00
Jessica Wang 5e38a47127 cloudStack - Elastic Load Balancer - remove an obsolete localization label. 2011-07-28 16:43:27 -07:00
Jessica Wang 2abb982469 cloudStack - add new localization labels. 2011-07-27 19:41:56 -07:00
frank 37fc68bcd3 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:47:09 -07:00
frank 262e6784e5 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:41:38 -07:00
frank 1381c58fa1 Bug 10860 - PremiumUpgrade is not run when upgrading to 2.2.8
Use a new target "system-integrity-checker" in components.xml/components-premium.xml.
All checkers must be explicitly specified in XML file, they will execute before any components load

status 10860: resolved fixed
2011-07-27 17:32:12 -07:00
Jessica Wang 5a3dd61245 cloudStack - update localization labels. 2011-07-27 14:00:02 -07:00
Jessica Wang 9a5304911b cloudStack - update localization labels. 2011-07-27 12:06:18 -07:00
Chiradeep Vittal cd8e069f80 Acquire an ip and launch an ELB vm 2011-07-27 12:00:07 -07:00
Jessica Wang a27c975fe0 cloudStack - add new localization labels. 2011-07-27 11:53:23 -07:00
Jessica Wang 105edff968 bug 10631: cloudStack - Instance page - Create Template from VM - add Image Directory input field. 2011-07-27 11:31:06 -07:00
Jessica Wang 532e1ca79c bug 10631: cloudStack - add new localization labels. 2011-07-27 10:45:02 -07:00
Jessica Wang 3b1d6475b9 cloudStack - correct localization label. 2011-07-26 10:21:35 -07:00
Jessica Wang d279f566af cloudStack - correct localization label. 2011-07-26 10:17:58 -07:00
Jessica Wang 20958fd613 (1) cloudStack - network page - updateNetwork API has been changed from sync to async. Here is related UI change.
(2) cloudStack - network page - Edit Network action - show spinning wheel in action (Edit Network is async now).
2011-07-22 13:46:23 -07:00
Jessica Wang 75217ec1cc cloudStack - network page - Edit Network action - show spinning wheel in action (Edit Network is async now). 2011-07-22 13:41:19 -07:00
Osamu 52bbc5127a amended slightly 2011-07-22 18:51:25 +09:00
Jessica Wang 7150505290 cloudStack - add new localization labels. 2011-07-20 14:38:17 -07:00
Jessica Wang 2c42c56351 cloudStack - add new localization labels. 2011-07-20 14:37:50 -07:00
Jessica Wang 0ffc59fc62 cloudStack - add new localization labels. 2011-07-20 14:34:12 -07:00
Jessica Wang 0ae56fa0f9 cloudStack - add new localization labels. 2011-07-20 13:45:34 -07:00
Jessica Wang f06ea553c9 cloudStack - add new localization labels. 2011-07-20 11:32:38 -07:00
alena 4d7cc54763 bug 10328: updateAccount is no longer available for domainAdmin
status 10328: resolved fixed
2011-07-15 15:27:23 -07:00
alena 2421236414 bug 10328: updateAccount is no longer available for domainAdmin
status 10328: resolved fixed
2011-07-15 15:26:15 -07:00
Jessica Wang 140d872259 cloudStack - UserVM page - Stop VM action - add option "Force Stop". 2011-07-11 15:50:47 -07:00
frank 5a9233f4ea Bug 10679 - increase file descriptor limit to 4096
Resolved fixed
2011-07-11 15:06:51 -07:00
Alex Huang c537d8a00b more logging for gson 2011-07-11 14:19:35 -07:00
Alex Huang b9d4d65714 more logging to figure out problems with gson 2011-07-11 14:18:12 -07:00
frank 12d6f53898 Bug 10660 - ConfigurationServer loads failed because DB upgrade happens after it
resolved fixed
2011-07-08 15:20:41 -07:00
frank 7b1b56548a Bug 10660 - ConfigurationServer loads failed because DB upgrade happens after it
resolved fixed
2011-07-08 14:49:50 -07:00
will e361a45b4a Capitalized S in source CIDR 2011-07-07 22:52:56 -07:00
alena 17f785f07a Intermidiate checkin for Projects feature; added 3 new apis - create/delete/listProject(s) - as a part of checkin 2011-07-01 13:19:12 -07:00
Jessica Wang 549d2e29ed cloudStack - update translation labels. 2011-06-28 18:36:12 -07:00
Jessica Wang 42c01aad2c cloudStack - update translation labels. 2011-06-28 18:30:51 -07:00
Jessica Wang 657a9799e7 cloudStack - localize new labels. 2011-06-28 18:21:03 -07:00
Jessica Wang d7665756ff cloudStack - localize new labels. 2011-06-28 18:08:48 -07:00
alena 74f34a0e0c bug 10435: removed vpn feature
status 10435: resolved fixed
2011-06-24 09:18:46 -07:00
Sheng Yang 0d750dacc2 bug 10311: Update create network_offering API 2011-06-22 15:30:39 -07:00
Jessica Wang 3967ec3c0f cloudStack - localize new labels. 2011-06-21 16:15:36 -07:00
Jessica Wang 250bd2162f cloudStack UI - localize new translation labels. 2011-06-21 15:34:11 -07:00
Jessica Wang 4919f741ac cloudStack - localize new translation labels. 2011-06-21 15:13:34 -07:00
Jessica Wang 93c63bd2f9 cloudStack UI - localize new translation labels. 2011-06-21 14:49:53 -07:00
Alex Huang 22d5eac400 new log4j 2011-06-21 10:15:21 -07:00
Alex Huang 5771b35a7a new log4j jar files and now the ability to get rid of the stupid cglib stack traces in our logs 2011-06-21 01:12:06 -07:00
Jessica Wang 968f5990be bug 10340: CloudStack UI - IP Address page - Port Forwarding tab - localize new labels. 2011-06-20 11:57:05 -07:00
Jessica Wang 430338682e bug 10340: CloudStack UI - IP Address page - Port Forwarding tab - localize new labels. 2011-06-20 11:34:06 -07:00
Jessica Wang e6be7d5688 bug 9419: CloudStack UI - localize new translation labels. 2011-06-17 10:57:54 -07:00
Jessica Wang d7be360fe9 bug 9419: CloudStack UI - localize new translation labels. 2011-06-17 10:33:49 -07:00
Jessica Wang 8106126278 bug 9579: cloudStack UI - Network page - localize new labels. 2011-06-17 09:32:49 -07:00
Jessica Wang ab99abb45a bug 9579: cloudStack UI - Network page - localize new labels. 2011-06-16 18:10:15 -07:00
Jessica Wang ae6907dd01 bug 9126: cloudStack UI - Add Disk Offering Dialog, Add Service Offering Dialog - rename "tags" to "storage tags". 2011-06-16 11:39:11 -07:00
Murali Reddy aa4f654929 bug 9419: implement api to reset resource count
added a command to reset resource count for account/domain based on real usage of resources
2011-06-16 18:59:38 +05:30
Jessica Wang 1ce37a4712 CloudStack UI - router page - add "redundant router" field (yes/no) which is editable. 2011-06-15 16:17:16 -07:00
Jessica Wang d98f7ebfbd CloudStack UI - router page - add Redundant grid row that indicates whether this router is redundant or not. And if it's, redundant state will be shown on UI. 2011-06-15 15:54:08 -07:00
Jessica Wang f6bc60d0c3 cloudStack UI - Domain page - Delete Domain dialog - localize warning message of Force Delete. 2011-06-15 10:35:26 -07:00
Jessica Wang 1ac1f8a20f cloudStack UI - Domain page - Delete Domain dialog - localize warning message of Force Delete. 2011-06-15 11:12:21 -07:00
Jessica Wang ec81e1ac7b cloudStack UI - Domain page - Delete Domain dialog - add a checkbox "Force Delete" and if it's checked, UI calls "deleteDomain&cleanup=true" that will delete all child domains and all accounts under this domain. 2011-06-15 11:12:20 -07:00
kishan 22577363ca bug 8373: Added new API listEventTypes 2011-06-15 12:40:23 +05:30
Jessica Wang 770c5cd377 cloudStack UI - Domain page - Delete Domain dialog - add a checkbox "Force Delete" and if it's checked, UI calls "deleteDomain&cleanup=true" that will delete all child domains and all accounts under this domain. 2011-06-14 18:30:04 -07:00
Jessica Wang b91a319777 bug 9549: CloudStack UI - deleteHost API now takes in new parameter "forced". Here is related UI change: a checkbox "Force Remove" has been added to Remove Host Confirmation Dialog. 2011-06-14 17:52:57 -07:00
Jessica Wang b4f7080531 cloudStack UI - localize new translation labels. 2011-06-13 17:28:30 -07:00