Commit Graph

13003 Commits

Author SHA1 Message Date
Koushik Das 6bc1d1247a Fix for CS-15631
Support for up to 16 VDIs per VM on XS 6.0 and above (16 VDIs => root + cd + 14 data volumes). Currently in CS number of data disk that can be attached to VM is hard-coded to 6. Made this setting configurable by moving it to hypervisor capabilities. Although XS 6.0 and above supports upto 16 VDIs but while testing on XS 6.0.2 found that only 13 data volumes can be attached to a VM. So for XS 6.0 and 6.0.2 max_data_volumes_limit is set to 13 currently.
Reviewed-by: Nitin
2012-07-31 19:13:05 +05:30
Murali Reddy 0aadda26e9 Bug CS-15639: Upgrade 2.2.14-> Burbank fails with db upgrade error " Exception while adding F5 load balancer due to..."
pushing changes commited for bug CS-15495 in 3.0.3 to 3.0.x branch
2012-07-31 18:11:28 +05:30
Prasanna Santhanam 50d5a17c7a Fail with non-zero exit code when toc category missing 2012-07-31 17:21:57 +05:30
Ewan Mellor 04c04aa2d4 FailOnError for deploydb and doc targets
Use failonerror=true for the exec calls used in the
deploy-cloudstack-db, deploydb-simulator, and build-apidocs targets.
2012-07-31 17:21:57 +05:30
Prasanna Santhanam 81c3f62099 failonerror for some marvin targets 2012-07-31 17:21:57 +05:30
Prasanna Santhanam 386779ca2e Simplifying the process of running the simulator.
* ant run-simulator - will seed the simulator jar and start CS
    * ant run-marvin -Dmarvin.config="/path/config/file" - will
    * configure a
    cloudstack as per the given configuration. marvin.config - defaults
to a
    two host simulator in an advanced zone

    You can then connect your debugger over localhost:8787 or use the CS
ui
    at localhost:8080/client for testing.

Conflicts:

	build/build-marvin.xml
	build/build-tests.xml
2012-07-31 17:21:57 +05:30
Pranav Saxena c1b746a4f1 CS-15770:Dedicated option should not be displayed when Basic EIP/ELB is chosen as Network Offering 2012-07-31 16:38:33 +05:30
Pranav Saxena a8c6855229 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-31 16:22:32 +05:30
Pranav Saxena 2785e4e7e8 CS-15724:S2S vpn- Customer vpn gateway page does not display all the configured parameters 2012-07-31 16:21:09 +05:30
Deepak Garg eae9ddfe1f CS-15735 removed system vm ips from search builder 2012-07-31 14:46:31 +05:30
Sanjay Tripathi d253d2e84d CS-15698: No option to update customer vpn gateway details through UI 2012-07-31 14:22:43 +05:30
Sanjay Tripathi 1c1ecff0f0 CS-15698: No option to update customer vpn gateway details through UI 2012-07-31 13:28:35 +05:30
Jessica Wang fcb1a817a5 cloudstack 3.0 UI - autoscale - set disk offering dropdown, security group dropdown when popping up autoscale dialog from an exisitng LB rule. 2012-07-30 20:03:20 -07:00
Vijayendra Bhamidipati f987b8e501 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-30 19:17:40 -07:00
Vijayendra Bhamidipati 53968f8ae4 CS-15765: InterVlan - VMWare - Failed to create Static Route on the Private Network's NIC - Unsupported command issued:com.cloud.agent.api.routing.SetStaticRouteCommand
Description:

	Putting in new command to set static routes in VR. This
	is used to configure static routes in the VPC VR.
2012-07-30 19:16:18 -07:00
Jessica Wang 849ac1be3f cloudstack 3.0 UI - autoscale - set user dropdown when popping up autoscale dialog from an exisitng LB rule. 2012-07-30 18:49:23 -07:00
Jessica Wang 2bbbb60d8f cloudstack 3.0 UI - autoscale - populate autoscale dialog if it opens from an existing LB rule. 2012-07-30 18:01:38 -07:00
Sheng Yang 2ed8c250d0 S2S VPN: Update the supported crypto list
We would support 3DES, AES128, AES192, AES256.
2012-07-30 16:43:20 -07:00
Vijayendra Bhamidipati d3ffb292d2 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-30 16:21:02 -07:00
Vijayendra Bhamidipati f456b51f4f CS-15763: InterVlan - VMWare - Failed to assign PortForwarding rule to guest VM - SSH execution of command /opt/cloud/bin/vpc_portforwarding.sh -A -P tcp -l 10.223.139.21 -p 22-22 -r 192.168.11.186 -d 22-22 has an error status code in return.
Description:

	Fixed incorrect destination port range specification
	in VmwareResource.
2012-07-30 16:18:49 -07:00
Brian Federle 441600f409 multiEdit widget: Support field pre-filter
If adding a 'fieldPreFilter' option to a multiEdit, the returned array
specifies field IDs to be hidden.
2012-07-30 16:08:41 -07:00
Sheng Yang 768be1a69b S2S VPN: CS-15724: Show more parameter for listVpnCustomerGateways API 2012-07-30 15:48:31 -07:00
Brian Federle 33d0e943eb CS-15620
Fix edit instance 'displayname' parameter not being sent over, even if
content was updated.
2012-07-30 15:16:43 -07:00
Sheng Yang 6948902b75 S2S VPN: CS-15748: Deleting customer vpn gateway when delete account 2012-07-30 15:16:17 -07:00
Brian Federle 431b8fe708 CS-15753:
Re-enable 'view all ip addresses' link on tier details.

--this was disabled previously due to a bug in the VPC widget, which
  is also fixed with this commit.
2012-07-30 15:10:48 -07:00
Brian Federle c10850e434 Add license header to tagger widget 2012-07-30 14:32:14 -07:00
Brian Federle 587189e302 CS-15726: Use custom validation for tagger widget
Show a generic dialog box for tagger validation, instead of using
jQuery validate

--it conflicted with the detail view's edit fields and prevented
submission unless the key and value fields were filled out.
2012-07-30 14:29:55 -07:00
Alena Prokharchyk ba2c05cc55 Allow EIP/ELB network creation only in Basic zone 2012-07-30 14:26:19 -07:00
Pranav Saxena 07344c7643 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-31 02:06:04 +05:30
Pranav Saxena 2388bd8f82 CS-15044:API changes to provide UI option to view the list of instances which are part of the guestnetwork is not availble 2012-07-31 02:02:17 +05:30
anthony a17c542fd6 CS-15680 : set broadcast IP 2012-07-30 12:24:07 -07:00
anthony 9500080488 CS-15708 : fix network cleanup 2012-07-30 12:06:43 -07:00
Vijayendra Bhamidipati cd562aba33 CS-15752: InterVlan - VMWare - Failed to assign PortForwarding rule to guest VM
Description:

	Fixing vpc_portforwarding.sh invocation
	in VmwareResource.
2012-07-30 11:25:25 -07:00
Sheng Yang 82020668a6 S2S VPN: Remove obelete guest_ip from updateCustomerGateway 2012-07-30 11:10:42 -07:00
Brian Federle 665829703f Clean up indentation/whitespace for autoscaler UI code 2012-07-30 11:08:04 -07:00
Brian Federle c11aab3c7e Merge Autoscaler UI implemetation
This change includes the new dialog box for the CloudStack Autoscaler
implementation. It is accessible by a button ('Autoscaler') that
appears under each LB rule.

This also contains changes to the multiEdit widget to support features
required for Autoscaler:

-Fixes context/data passing to custom button widgets
-Fixes data retrieval for select fields
2012-07-30 11:08:04 -07:00
Alena Prokharchyk d467ff8a49 CS-15743: disable static nat as a part of network resources cleanup 2012-07-30 10:53:01 -07:00
Brian Federle bd63d4b4bb Fix positioning of tags error labels 2012-07-30 10:43:17 -07:00
Pranav Saxena 691dc9066f Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-30 17:54:08 +05:30
Pranav Saxena ac3dca4f6a CS-15746: S2S VPN: vpn connection details page does not show the vpn connection state 2012-07-30 17:51:31 +05:30
Vijay d2a7186228 Merge remote-tracking branch 'origin/3.0.x' into 3.0.x 2012-07-30 15:21:04 +05:30
Vijay e1639e8e8a AutoScale. Added clean-up of AutoScale config in NetScaler if an
operation is errored half way through. Also re-organized
NetScalerResource to keep AutoScale things together.
2012-07-30 15:19:03 +05:30
Koushik Das bb17d09e01 Support for local data disk (part 2)
- Zone level config to enable/disable local storage usage for service and disk offerings.
- Local storage gets discovered when a host is added/reconnected if zone level config is enabled. When disabled existing local storages are not removed but any new local storage is not added.
- Deploy VM command validates service and disk offerings based on local storage config.
- Upgrade uses the global config 'use.local.storage' to set the zone level config for local storage.

Reviewed-by: Abhi, Nitin
2012-07-30 13:59:14 +05:30
Likitha Shetty ddcb3d7b30 CS-14770. ec2-run-instances and ec2-describe-instances don't return keypair information.
Changing CS deployVirtualMachine and listVirtualMachine api response to include ssh keypair information.
Component: AWSAPI.
2012-07-30 11:50:04 +05:30
Pranav Saxena 05f4690807 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-30 10:34:34 +05:30
Pranav Saxena 8ac846dcb3 CS-15720:S2S VPN: Adding vpn conenction is on customer gateway rather than in vpn connection page 2012-07-30 10:31:51 +05:30
Sheng Yang 30d9411078 CS-15731: Make S2S VPN no-nat rule the top of POSTROUTING 2012-07-27 18:38:28 -07:00
Sheng Yang 65ef8b24c1 CS-15730: Prohibit create VPN connection from different gateway to same customer gateway 2012-07-27 17:41:22 -07:00
Kelven Yang 4b0f317074 Add waiting loop to avoid potential race condition when doing NIC hot-plugin 2012-07-27 16:40:13 -07:00
Kelven Yang b31aea83b3 VPC vmware fixes 2012-07-27 16:40:13 -07:00