Commit Graph

23311 Commits

Author SHA1 Message Date
Brian Federle 7646063735 CLOUDSTACK-3803: Fix duplicate label causing validation error 2013-10-08 15:48:19 -07:00
Min Chen f59e47b263 Clean up ListVMsCmd implementation to not using Criteria class. 2013-10-08 15:11:56 -07:00
Min Chen 8428f49e46 Change method name. 2013-10-08 15:11:07 -07:00
Min Chen 9cd1a95327 Fix search criteria to support searching both specific entityType and *. 2013-10-08 14:50:46 -07:00
David Nalley 5586a221fc Removing docs from master 2013-10-08 15:25:05 -04:00
Jessica Wang 3f1aba894f CLOUDSTACK-3888: UI > service offerings > compute offerings > add new field "Planner Mode". 2013-10-08 11:48:42 -07:00
Min Chen 11fe1f527a Add role permission for normal user role. 2013-10-08 11:08:54 -07:00
Daan Hoogland 10938612cc [CLOUDSTACK-4832] no cert verification on https 2013-10-08 17:35:46 +02:00
sanjeevneelarapu f6c6f03fad CLOUDSTACK-702: 1. Moved common code to setupClass method 2. Added a test to deply vm in new CIDR and verify dns service on alias IP
Conflicts:

	test/integration/component/maint/test_multiple_ip_ranges.py

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 1efd544ee27fd0c7c9eac4649568647c0dcbc85b)
2013-10-08 16:26:18 +05:30
Min Chen 88e12c9b8e Fix a bug in populating acl_role_permission. 2013-10-07 17:26:46 -07:00
Min Chen b87b9e5c64 Add Scope to acl_role_permission, remove parent_role_id from acl_role
table, and create PermissionScope and AclEntityType enum types.
2013-10-07 16:09:26 -07:00
Nitin Mehta 6e80bb001c CLOUDSTACK-4824:
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-07 15:48:43 -07:00
Min Chen 4499a7bfa0 Merge branch 'rbac' of https://git-wip-us.apache.org/repos/asf/cloudstack into rbac 2013-10-07 14:32:29 -07:00
Prachi Damle 579806440b Add permission flag to acl_entity_permission 2013-10-07 14:30:15 -07:00
Jessica Wang 4f932d048e CLOUDSTACK4515: UI > Settings tab of zone/cluster/account/primaryStorage detailView > add Description field. 2013-10-07 13:35:26 -07:00
Min Chen 7342c97fa9 Populate acl_group_account_map table in creating an account. 2013-10-07 13:20:49 -07:00
Laszlo Hornyak 977a75f1be UsageManagerInternal fix
aed5e9dc2a seems to inroduce some typo to run

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-07 13:13:40 -07:00
Prachi Damle 385dfc230f Schema and VO/Dao for Role Permission 2013-10-07 12:33:28 -07:00
Prachi Damle 2bbe6f5937 APIChecker helper methods implemented 2013-10-07 12:33:24 -07:00
Min Chen ddd4f80911 Revert "Revert "Fix a bug in generating account response, passed wrong parameter to get""
This reverts commit 283ec27934.
2013-10-07 12:00:51 -07:00
Min Chen 440f03e548 Revert "Fix a listAccount regression due to root admin role refactoring."
This reverts commit d79cb380e1.
2013-10-07 12:00:38 -07:00
Darren Shepherd d769a73cfc Fix DatabaseUpgradeChecker in standalone context
When running DatabaseUpgradeChecker as a standalone program _dao will not
be injected.  Still create an instance of VersionDaoImpl in constructor
and when DatabaseUpgradeChecker is ran in the mgmt server it will be
overwritten by the injected value.
2013-10-07 11:57:55 -07:00
Min Chen d79cb380e1 Fix a listAccount regression due to root admin role refactoring. 2013-10-07 11:53:38 -07:00
Chris Suich 4c2e40ac37 Added storage_provider_name to storage_pool_view
Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-07 11:51:32 -07:00
Min Chen 283ec27934 Revert "Fix a bug in generating account response, passed wrong parameter to get"
This reverts commit b633950a68.
2013-10-07 11:47:01 -07:00
Min Chen ded2785bb1 Add interface method to remove account group association from
acl_group_account_map.
2013-10-07 11:46:40 -07:00
Jessica Wang d1a536a4e3 CLOUDSTACK-4672: UI > Network > details tab > add new field "broadcasturi" to show Primary VLAN, Secondary Isolated VLAN. 2013-10-07 11:32:56 -07:00
Jessica Wang da814c658b CLOUDSTACK-4796: UI > Instances > detailView > add new action "Assign Instance to Another Account". 2013-10-07 10:22:24 -07:00
Alena Prokharchyk 66185076df Addded back Agent Load Balancing functionality (was temporarely disabled in master by vmSync merge) 2013-10-07 09:46:52 -07:00
Darren Shepherd 614922ff3a Fix vmware code inclusion into systemvm.iso and other random nonoss->noredist 2013-10-07 09:21:15 -07:00
Darren Shepherd 23ddf29532 Fix vmware code inclusion into systemvm.iso and other random nonoss->noredist 2013-10-07 09:20:41 -07:00
Gaurav Aradhye 98daad9300 CLOUDSTACK:4537 - Fixed shared network and vpc test cases
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
2013-10-07 21:42:45 +05:30
Girish Shilamkar fbf057a323 CLOUDSTACK-4262: Fix TestVPCNetworkGc.test_01_wait_network_gc
As per the test plan, after waiting for network gc
LB rules should be cleared. Added that check instead of router
being in stopped state.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit abdb84bb05abc9f2bd102bca1c1b34865f34d771)
2013-10-07 21:41:06 +05:30
Darren Shepherd cf4a612cdb Add license header 2013-10-05 12:18:34 -07:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -07:00
Nitin Mehta a6852a340d CLOUDSTACK-3101:
fix listDiskOffering to not display offerings to the normal users with forDisplay=false. But display them to ROOT Admin irrespective of the flag.
Added display flag in the updateVolume/offeirng commands
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 18:19:07 -07:00
Darren Shepherd b3c178480b Check for null just in case
This code was recently switched from using HashMap to ConcurrentHashMap.
ConcurrentHashMap does not accept null keys and will through a NPE.  Adding
a null check just in case somebody passes null.
2013-10-04 17:05:15 -07:00
Darren Shepherd 7c72aa96da ConcurrentHashMap will through NPE on null key 2013-10-04 16:56:48 -07:00
Nitin Mehta f8976a41ce CLOUDSTACK-3101:
fix listVolumes to not display volumes to the normal users with forDisplay=false. But display volumes to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 16:16:28 -07:00
Kelven Yang 16b022b1b1 CLOUDSTACK-4802: Change VM start flow to better support VM snapshot on certian version of vSphere, (vSphere 5.0 Update 2). If we detect that VM has pending VM snapshot, we will fully honor VM disk info from vCenter, since in some version of vSphere (vSphere 5.0 U2) does not allow disk-editting when VM has pending snapshot. 2013-10-04 16:13:56 -07:00
Hugo Trippaers ff336c3e9c Fix typo 2013-10-05 01:12:16 +02:00
Mike Tutkowski bced4c7e8b Add support for hypervisor snapshots to CloudStack-managed storage (for XenServer and VMware) 2013-10-04 15:41:20 -06:00
Darren Shepherd 66b853789c Fix typo in pom name 2013-10-04 14:37:23 -07:00
Edison Su a129fe4e66 add missing files 2013-10-04 14:17:49 -07:00
Chris Suich 180cfa19e8 Refactor Storage Related Resource Code
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
Laszlo Hornyak c9f41d4046 unit test for KVMFencer
A few cases covered with unit tests.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:38:33 -07:00
Laszlo Hornyak 826c69fd29 ConstantTimeBackoff test and cleanup
- javadoc changed - the old one was copy-pasted from AgentShell
- start and stop method removed - they did the same as the overridden methods
- _counter removed as it was only written, but never read
- remove from _asleep map was moved to a finally block, to make sure it is removed even in case of the thread gets interrupted
- Tests created for the above scenarios.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:24:43 -07:00
Laszlo Hornyak bd8536739c remove txn attribute from DB
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00
Nitin Mehta cb7ae26f35 =Comment the test for now to unblock everyone. Will file a bug and fix it 2013-10-04 09:43:37 -07:00
Hugo Trippaers 2b47611c5d Fix for -SNAPSHOT problem in debian rules. Use -snapshot in the changelog to force the packaging to use the -SNAPSHOT extension for maven targets 2013-10-04 18:12:57 +02:00