7603 Commits

Author SHA1 Message Date
Nitin Mehta
2229e3e242 CLOUDSTACK-4803:
fix listVirtualMachines to not display vms to the normal users with forDisplay=false. But displayvms to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-03 15:10:55 -07:00
Min Chen
b633950a68 Fix a bug in generating account response, passed wrong parameter to get
account resource limit.
2013-10-02 17:46:00 -07:00
Min Chen
d84d62a1e0 Separate Admin and User command and response for ListVMsCmd. 2013-10-02 17:45:14 -07:00
Nitin Mehta
765f56a02c =Comment the test for now to unblock everyone. Will file a bug and fix it 2013-10-02 15:48:36 -07:00
Darren Shepherd
8cf00de51d Configuration to enable Spring Modularization
All of the code changes for the Spring Modularization will work in
a modularized context or a non-modularized context.  This commit
is the final commit to turn modularization on.  Revert this commit
to disable the modularization and go back to monolithic Spring
configuration.
2013-10-02 15:43:11 -07:00
Darren Shepherd
67186429e1 Spring Modularization
ACS is now comprised of a hierarchy of spring application contexts.
Each plugin can contribute configuration files to add to an existing
module or create it's own module.

Additionally, for the mgmt server, ACS custom AOP is no longer used
and instead we use Spring AOP to manage interceptors.
2013-10-02 15:41:04 -07:00
Nitin Mehta
8466fad6ca CLOUDSTACK-4785:
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:53:07 -07:00
Nitin Mehta
85b5c6e353 CLOUDSTACK-4785:
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:16:45 -07:00
Darren Shepherd
aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Prachi Damle
bb271926fb WIP AccessChecker plugin 2013-10-01 18:11:30 -07:00
Alena Prokharchyk
3e7d0efb90 AddResourceDetail: enabled support for adding details for user vm (user_vm_details db table) 2013-10-01 09:28:35 -07:00
Min Chen
5583506c0c Add entity permission grant and revoke API. 2013-09-30 17:03:34 -07:00
Alena Prokharchyk
b253d95de9 UpdateVirtualMachine: code cleanup - got rid of warnings and unused code from the method; extracted part of the code to its separate method. 2013-09-30 15:34:56 -07:00
Min Chen
de0904ba63 Modify AccountResponse to return groups that account belongs to. 2013-09-30 14:14:38 -07:00
Darren Shepherd
cba8e40e4b Add license headers to fix build 2013-09-30 09:51:45 -07:00
Darren Shepherd
efbfae723e Switch to setter injection for extensibility
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
2013-09-30 09:45:07 -07:00
Darren Shepherd
692535f928 Cleanup DefaultUserAuthenticator and removed masking _name variable
DefaultUserAuthenticator maskes the _name varible in ComponentLifecycleBase
making the setName() method not work as expected.  This patch cleans up the
code such that getName() will be getClass().getSimpleName() unless
overridden in the Spring configuration.
2013-09-30 09:33:33 -07:00
Laszlo Hornyak
c61997f022 basic test for ApiDispatcher
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-30 13:08:15 +02:00
Alena Prokharchyk
43770e0cb2 CLOUDSTACK-4744: enhanced root admin API updateVolume with state/storageId parameters as a part of "Better control over first party objects" feature.
Also fixed existing bugs for the API:

* corrected action event to be VOLUME.UPDATE (was VOLUME.ATTACH)
* all parameters to update, should be optional - fixed that. If nothing is specified, the db object will remain with its original fields
2013-09-28 21:44:47 -07:00
Alex Huang
b60eef3e82 Added comments and finished off the work 2013-09-28 07:53:28 -07:00
Alex Huang
e8cac2c5d8 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:26 -07:00
Alex Huang
e2988902c9 Changed SearchCriteria2 to GenericQueryBuilder to reflect the same placement 2013-09-28 07:53:25 -07:00
Alex Huang
a964cf549e Continue to merge SearchCriteria2 and GenericSearchBuilder 2013-09-28 07:53:24 -07:00
Alex Huang
af8832f6bd Unified both the SearchBuilder and SearchCriteriaService 2013-09-28 07:53:24 -07:00
Min Chen
0be374a796 Add All Apis for ACL Group. 2013-09-27 18:16:18 -07:00
Min Chen
ed22dfef1b Add transaction handling in AclServiceImpl, and parent role support in
createAclRole.
2013-09-27 10:14:13 -07:00
Min Chen
97fd99b09a Add all Apis for AclRole. 2013-09-26 17:48:29 -07:00
Sheng Yang
dad47682cb CLOUDSTACK-4745: Add StaticNatRule through firewall manager
This would fix CreateIpForwardingCmd API on 4.2+.
2013-09-26 14:00:32 -07:00
Min Chen
fce2aad23d WIP For APIs related to ACL Roles. 2013-09-26 11:22:43 -07:00
ynojima
a45ee749ac CLOUDSTACK-2328: Linux native VXLAN support on KVM hypervisor
Initial patch for VXLAN support.
Fully functional, hopefully, for GuestNetwork - AdvancedZone.

Patch Note:
 in cloudstack-server
- Add isolation method VXLAN
- Add VxlanGuestNetworkGuru as plugin for VXLAN isolation
- Modify NetworkServiceImpl to handle extended vNet range for VXLAN isolation
- Add VXLAN isolation option in zoneWizard UI

 in cloudstack-agent (kvm)
- Add modifyvxlan.sh script that handle bridge/vxlan interface manipulation script
-- Usage is exactly same to modifyvlan.sh
- BridgeVifDriver will call modifyvxlan.sh instead of modifyvlan.sh when VXLAN is used for isolation

Database changes:
- No change in database structure.
- VXLAN isolation uses same tables that VLAN uses to store vNet allocation status.

Known Issue and/or TODO:
- Some resource still says 'VLAN' in log even if VXLAN is used
- in UI, "Network - GuestNetworks" dosen't display VNI
-- VLAN ID field displays "N/A"
- Documentation!

Signed-off-by : Toshiaki Hatano <haeena@haeena.net>
2013-09-26 23:37:18 +09:00
Daan Hoogland
6f970c6ff9 static nat capabilities parsing cleanup and testing 2013-09-26 15:18:52 +02:00
Edison Su
81ff4795df fix compile errors 2013-09-25 17:59:54 -07:00
Edison Su
a9aad4f388 add sourcetemplateid for template created from volume/snapshot
Conflicts:

	server/src/com/cloud/template/TemplateManagerImpl.java
2013-09-25 16:35:31 -07:00
Edison Su
d1a14fbf95 disk resize NPE, if the new disk offering doesn't have tags, then NPE 2013-09-25 16:29:01 -07:00
Edison Su
49d8e44491 CLOUDSTACK-4459: one more try, bypass libvirt to find volume if libvirt call failed
Conflicts:

	server/src/com/cloud/template/TemplateManagerImpl.java
2013-09-25 16:16:10 -07:00
Edison Su
a82b179878 add table lock on snapshot, during taking snapshot
Conflicts:

	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
2013-09-25 16:03:59 -07:00
Edison Su
7b6aebc102 add test
Conflicts:

	engine/storage/integration-test/test/org/apache/cloudstack/storage/test/FakeDriverTestConfiguration.java
2013-09-25 15:58:46 -07:00
Edison Su
b3ac12e171 delete snapshot_store_ref if the snapshot is in error state 2013-09-25 15:51:55 -07:00
Abhinandan Prateek
77bec4f2ad Cloudstack-2997: the maxconn setting is masked by wrong conditions 2013-09-25 21:09:24 +05:30
Prachi Damle
4294005142 Check if an Account belongs to RootAdmin group 2013-09-24 17:01:43 -07:00
Prachi Damle
aba54356d5 Account_Type Refactoring for Root Admin Role
- change the AccountService::isRootAdmin(short) to  isRootAdmin(long accountId);
- Change all callers
- Change all places that check the account.getType() directly to call the AccountManagerImpl.
2013-09-24 15:31:09 -07:00
Wei Zhou
98c79cc313 CLOUDSTACK-4732: search network name for virtual router when listRouters by keyword 2013-09-24 15:01:14 +02:00
Wei Zhou
e61f1bb158 fix issue: listHosts with hahost throws exception
(cherry picked from commit a206f423a3851a4d090f58b05e2936dd68c528d0)
2013-09-24 11:59:35 +02:00
Alena Prokharchyk
2fa5a5ae97 CLOUDSTACK-4704: 41-42 db upgrade - populate vpc_service_map table with the services/providers supported by VPC
(cherry picked from commit 798f34a49cbfbb3a475f3dadf62d1ac1b8dfa510)

Signed-off-by: Wei Zhou <w.zhou@leaseweb.com>
2013-09-23 14:18:41 +02:00
Abhinandan Prateek
c7cc79181b Revert "Cleanup DefaultUserAuthenticator and removed masking _name variable"
This reverts commit 4d01ce8fc766423d795955bd5784b56969ce11a8.
2013-09-20 19:33:50 +05:30
Darren Shepherd
4d01ce8fc7 Cleanup DefaultUserAuthenticator and removed masking _name variable 2013-09-20 17:40:00 +05:30
Alena Prokharchyk
94e744fe0c CLOUDSTACK-4573: fixed decrement resource count for VPC networks 2013-09-19 17:20:22 -07:00
Laszlo Hornyak
88954053c3 do not instantiate Long just for toString
replaced Long object instantiation with static call to Long.toString in case it was only to generate a string

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-19 16:58:59 +02:00
Daan Hoogland
284742ad11 add networkofferid to search network for 2013-09-19 16:26:46 +02:00
Kelven Yang
b6d448d1fd apply https://reviews.apache.org/r/14189/ - UserVmDomRInvestigator and ManagementIPSystemVMInvestigator mask adapter name 2013-09-18 17:58:31 -07:00