Commit Graph

5371 Commits

Author SHA1 Message Date
Sheng Yang c971d3c2a6 CS-15697: Fix wrong class for finalizeStop() 2012-07-26 16:04:10 -07:00
Vijayendra Bhamidipati 1e9c5c54df Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-26 18:27:55 -04:00
Alena Prokharchyk ecd8450ab6 Added missing action events for enable/disable static nat 2012-07-26 15:26:53 -07:00
Vijayendra Bhamidipati 06e974ef92 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-26 18:06:06 -04:00
Vijayendra Bhamidipati 2e18ffec20 CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
Description:

	Removing more DB IDs from exception messages.
2012-07-26 18:05:43 -04:00
Alena Prokharchyk 5eb87e99ff VPC: added global configuration for limiting number of networks per vpc (vpc.max.networks) 2012-07-26 14:05:56 -07:00
prachi 5f433ff7bc Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-26 11:37:36 -07:00
prachi 6fe394231b CS-15299: Typo in use.external.dns setting description
Changes:
- fixed the typo in the setting description
2012-07-26 11:37:04 -07:00
Alena Prokharchyk 20b6b36302 VPC:
1) CS-15692 - ipAddress is always null for NetworkACL rule
2) CS-15699 - redundant router = true when provider is VirtualRouter
3) CS-15701 - fixed error message
2012-07-26 10:15:35 -07:00
Sheng Yang cc35ea2be3 S2S VPN: CS-15650: Add connection status update to s2s vpn 2012-07-25 22:00:40 -07:00
Sheng Yang 517c9af7c9 S2S VPN: Add list function for normal users 2012-07-25 18:59:49 -07:00
Vijayendra Bhamidipati 3b13c47e38 Merge branch '3.0.x' of ssh://git.cloud.com/var/lib/git/cloudstack-oss into 3.0.x 2012-07-25 18:43:21 -04:00
Vijayendra Bhamidipati a0fa53ecd8 CS-15217: Security: Malicious user is able to get the size of the cloud by enumerating IDs
Description:

	Removing more DB IDs from exception messages.
2012-07-25 18:39:48 -04:00
Alena Prokharchyk 8cfc3c4775 Bug 14875: fixed listNetworks by domainId/aclType=Domain 2012-07-25 14:48:08 -07:00
Alena Prokharchyk f6041de179 VPC: added vif info to ipassoc command 2012-07-25 13:03:40 -07:00
Vijay d4e43846f8 AutoScale. Adding default counters 2012-07-25 18:17:32 +05:30
Koushik Das 266b8e5ee8 Support for local data disk (part 1)
Following changes are made:
- Create disk offering API now takes an extra parameter to denote storage type (local or shared). This is similar to storage type in service offering.
- Create/delete of data volume on local storage
- Attach/detach for local data volumes. Re-attach is allowed as long as vm host and data volume storage pool host is same.
- Migration of VM instance is not supported if it uses local root or data volumes.
- Migrate is not supported for local volumes.

Reviewed-by: Abhi
2012-07-25 15:16:42 +05:30
Sheng Yang c4dff1e204 CS-15670: Allow normal users to configure S2S VPN 2012-07-24 19:44:27 -07:00
Alena Prokharchyk 2c24b7446e VPC: CS-15681 - execute VPC related methods only when router is a vpc router 2012-07-24 16:06:47 -07:00
Sheng Yang 793715d8f2 Fix DB upgrade test
Now you can run:

ant test -Dtest=Upgrade304to305Test

For 3.0.4 to 3.0.5 DB upgrade sanity test.
2012-07-24 14:12:10 -07:00
Sheng Yang d88f8abed4 S2S VPN: Fix build 2012-07-24 13:24:22 -07:00
Sheng Yang eeaee286a1 S2S VPN: Fix incorrect conn returned by resetVpnConnection cmd 2012-07-24 13:02:29 -07:00
Sheng Yang f1dbdedfa9 S2S VPN: Add name field for customer gateway
Easier for user to identify the correct gateway
2012-07-24 13:02:24 -07:00
Alena Prokharchyk f68a1a7d44 listPublicIpAddresses: when do join with nics table, count only non-removed nics 2012-07-24 12:39:26 -07:00
Sheng Yang 9da29e7f77 CS-15676: Fix NPE when stop non-VPC router 2012-07-24 11:42:36 -07:00
Alena Prokharchyk 87e1359826 Fixed unittest 2012-07-24 10:23:46 -07:00
Vijay 04b51bb6ba AutoScale.
NetScaler changes for deleteAutoScaleVmGroup and min/max member
    policies - Tested
    Introducing apikey/sharedsecret/csurl empty checks as well
    Introducing the autoscale change sheet that got deleted during the merge
2012-07-24 19:25:22 +05:30
Vijay 62082b0de6 Resetting unwanted files similar to 3.0.x 2012-07-24 10:45:25 +05:30
Vijay 629053d2f1 AutoScale. Catching an odd case to get rid of null pointer exception 2012-07-24 10:02:45 +05:30
Deepak Garg edcd8e7394 Checking success in deleteCounter 2012-07-24 10:02:39 +05:30
Vijay 30cb0e74d2 AutoScale. ALenas Final Review Comments. 2nd Cut. Remove csurl from profile, 2012-07-24 10:02:29 +05:30
Vijay f9bcf3186c AutoScale. Enabling AutoScale to go to the Resource.
Tested the reachability for Basic Network.
Fixing compile error introduced due to a89919ce2ffd9a0a99f1810aeaa0488b0805f665
2012-07-24 10:01:22 +05:30
Deepak Garg a96df19b68 Improved logging in AutoScale APIs 2012-07-24 10:01:19 +05:30
Deepak Garg 349ab92ffc Added more logging to AutoScale Vm Group 2012-07-24 10:01:13 +05:30
Deepak Garg 05e46cfd31 Added more params to UpdateAutoScaleVmProfileCmd 2012-07-24 10:00:42 +05:30
Vijay 09adc78196 AutoScale. Removed checks for no parameters in update command. 2012-07-24 10:00:40 +05:30
Vijay deb70ad200 AutoScale. Enabled Update commands with UnitTesting. Introduced and tested capability for NetScaler 2012-07-24 10:00:37 +05:30
Deepak Garg a4a15aa737 Work around for CS-15556 2012-07-24 10:00:26 +05:30
Vijay df84f88296 CS-15593: Conditions are checked in database before used 2012-07-24 10:00:03 +05:30
Vijay c755172a3a CS-15590 : Conditions are corrected to be similar to other search wrapper usecases 2012-07-24 10:00:00 +05:30
Vijay c826fa295b AutoScale. AutoScaleVmGroup Response corrected. Responses tested for list commands of autoscale entities 2012-07-24 09:59:57 +05:30
Deepak Garg 3bee3fd4fd Added CSurl in the vm profile response 2012-07-24 09:59:44 +05:30
Vijay 19a2f4ab66 AutoScale. Introducing caller in getEntityInDatabase 2012-07-24 09:59:12 +05:30
Deepak Garg 8bbc8ee0ec Added csurl as param in CreateAutoScaleVmProfileCmd 2012-07-24 09:58:56 +05:30
Vijay fa9282add1 AutoScale. Alena's final review comments. 1st Cut. 2012-07-24 09:58:17 +05:30
Deepak Garg 1c960c0b34 Fixed event type in deleteCondition 2012-07-24 09:57:30 +05:30
Deepak Garg 10a58fdef2 CS-15592 Fixed the quiettime parameter check 2012-07-24 09:57:28 +05:30
Deepak Garg 4ee6ed6afb CS-15589 Fixed the invalid counter exception 2012-07-24 09:57:26 +05:30
Vijay 998f9aa051 AutoScale. Unit Test Add/Delete/List of all AutoScale entities. 2012-07-24 09:57:24 +05:30
Vijay a6a206d3fc AutoScale. Bringing in update commands and enable/disable. Not Tested. 2012-07-24 09:57:21 +05:30