Commit Graph

1898 Commits

Author SHA1 Message Date
Wei Zhou 4495d456ed CLOUDSTACK-4830: fix build error 2013-10-31 11:50:01 +01:00
Wei Zhou 5109498783 CLOUDSTACK-4830: allow create account and user by domain admin
(cherry picked from commit 0d12e3eb9d)
2013-10-31 11:36:54 +01:00
Sheng Yang 3205cd42b5 CLOUDSTACK-730: Site-to-site VPN between VPC VR to VR
Now VPN connection can be created as "passive", which would enable the ability
of remote peer initiate the connection. So it's possible for VPC VR to
establish the connection to another VPC VR of CloudStack.

Test case also included.

The test case would create 2 vpcs and using VPN to connect them.
2013-10-30 19:30:22 -07:00
ynojima a6b6fa65fa CLOUDSTACK-4932: bugfix : listNetworks API doesn't return VLAN ID (VNI)
Signed-off-by: ynojima <mail@ynojima.net>
Signed-off-by: Toshiaki Hatano <haeena@haeena.net>
2013-10-31 00:37:04 +09:00
Alena Prokharchyk e7685f816a CLOUDSTACK-4988: when listTemplates call is executed by regular user, but templateFilter=community is passed in, return public templates of subdomains 2013-10-29 10:58:53 -07:00
Alena Prokharchyk 591dcd1d1c ResourceDetails: added "display" field to a bunch of VOs - determines whether the detail should be returned to the regular user 2013-10-29 09:18:11 -07:00
Alena Prokharchyk 2cac1aaa0f Moved ResourceDao and ResourceDaoBase to cloud-engine-schema/org/apache/cloudstack (used to be mistakenly placed under com/cloud/cloud) 2013-10-28 15:03:57 -07:00
Alena Prokharchyk 5caeab782d ResourceDetails -
1) added createDetail to ResourceDetailDao interface to provide generic way of creating resourceDetail DB objects
2) added resource details support for firewall rules
2013-10-28 14:45:52 -07:00
Alena Prokharchyk 300f626d42 Renamed ResourceDetailDaoImpl to ResourceDetailDaoBase 2013-10-25 14:21:20 -07:00
Alena Prokharchyk aa9f8e64ae Resource details: added way of generic access of resource DAO based on the resourceType passed in (was hardcoded before) 2013-10-25 11:57:17 -07:00
Alena Prokharchyk 0fb4d9d5a2 Made all resource details DAOs (nic_details, user_vm_details, template_details, volume_details, service_offering_details) extend from the same base class as although details are being stored in diff tables, those tables have the same structure and same accessors. 2013-10-25 10:56:19 -07:00
Alena Prokharchyk 24725f8e21 ResourceDetails:
1) Added support for Zone resource details
2) Renamed DcDetailsDao to DataCenterDetailsDao to follow the CS name convention for DataCenter related classes
2013-10-24 15:54:49 -07:00
Alena Prokharchyk 2bb716efd8 ResourceMetaData (Resource details) fixes:
* changed name for TaggedResourceType enum to ResourceObjectType as this enum is used both by ResourceMetaData and ResourceTags code
* enhanced the enum with extra fields resourceTagsSupport (boolean) and metadataSupport identifying if the resource supports tags and/or metadata.
* cleanup unused @Inject objects from the ResourceMetaDataManager
2013-10-23 17:39:16 -07:00
Alena Prokharchyk e52e7a5634 CLOUDSTACK-4874: rever the previous commits. Service offering details are already being returned in "serviceofferingdetails" field of the service offering response 2013-10-23 17:17:14 -07:00
Darren Shepherd 81d01369d7 Merge commit 'df728fcf41ba0dfddabfaadea8cbcb77d18bfa96'
Conflicts:
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
2013-10-23 12:31:53 -07:00
Chris Suich 0ed7ebd7e7 Squashed & merged commit of the following:
commit c9ee0d12e191e803fb341f3f96e95ca434a36f6c
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Wed Oct 23 16:55:10 2013 +0200

    CLOUDSTACK-4931, CLOUDSTACK-4937: setDetails to user VMs only
    (cherry picked from commit a94acc5a43)

commit fe1586c71377bc6d219db2dcf088c40b65dd1fc4
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Tue Oct 22 11:20:27 2013 -0700

    CLOUDSTACK-4649:
            vm sync tracks the pv driver version for xenserver

     Anthony

commit 56a218f66eda540b4b4b04030ee71fc6863f8532
Author: Anthony Xu <anthony.xu@citrix.com>
Date:   Mon Oct 21 16:10:07 2013 -0700

    CLOUDSTACK-4649:
        xs 6.1/6.2 introduce the new virtual platform, so there are two virtual platforms, windows PV driver version must match virtual platforms,
    this patch tracks PV driver versions in vm details and template details.

    Anthony

commit 4e85d28c678a6f96b5b70d8d33fc60f9d1ea3df6
Author: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Date:   Mon Oct 21 21:17:33 2013 +0200

    removed unused static field

    - s_httpClientManager was not used

    Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>

commit d4121fa26023db236f7396cea455ef090672ae9a
Author: Chris Suich <chris.suich@netapp.com>
Date:   Tue Oct 22 10:45:22 2013 -0400

    Updated DataMotionServiceImpl and ApiResponseHelper based on review feedback.

commit aaf026e1e4204d405bcda2ae4f1a01b1d0f7e7cb
Author: Chris Suich <chris.suich@netapp.com>
Date:   Thu Oct 17 14:27:12 2013 -0400

    Added context to strategy sorting error responses
    Added TODOs for DRYing out pickStrategy() overloading

commit a221f4aa3fb2ddc255bc35cf753f98f88f5bf44e
Author: Chris Suich <chris.suich@netapp.com>
Date:   Wed Oct 16 09:57:28 2013 -0400

    Updated inefficient strategy sorting/selection
    Removed unnecessary canRevertSnapshot from PrimaryDataStoreDriver
    Other general cleaup and fixes from reviews

commit 7d58949c6a1b7e853e891b59387a9620e8cd7a91
Author: Chris Suich <chris.suich@netapp.com>
Date:   Mon Oct 14 14:01:22 2013 -0400

    Added volume snapshot revert capability to SnapshotResponse
    Updated UI to hide/show snapshot revert action per snapshot

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-23 12:21:43 -07:00
Darren Shepherd e3280bdba2 Merge remote-tracking branch 'origin/spring-modularization'
Conflicts:
	client/tomcatconf/applicationContext.xml.in
	client/tomcatconf/nonossComponentContext.xml.in
	client/tomcatconf/simulatorComponentContext.xml.in
	framework/db/src/com/cloud/utils/db/Transaction.java
	plugins/hypervisors/simulator/src/com/cloud/agent/manager/MockAgentManagerImpl.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
2013-10-23 11:14:42 -07:00
Darren Shepherd 205a77a5bb Merge remote-tracking branch 'origin/txn-refactor'
Conflicts:
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2013-10-23 10:40:44 -07:00
Alena Prokharchyk 3ec14c4baf CLOUDSTACK-4649: addResourceDetail - added support for userVm resource. Now "hypervisortoolsversion" get stored in user_vm_details table, and being returned as a part of listVirtualMachines call ("details" parameter)
Conflicts:
	api/src/org/apache/cloudstack/api/response/UserVmResponse.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDao.java
	engine/schema/src/com/cloud/vm/dao/UserVmDetailsDaoImpl.java
	server/src/com/cloud/api/query/vo/UserVmJoinVO.java
	server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
2013-10-22 13:50:43 -07:00
Wei Zhou cd72e2afee fix a bug in listServiceOffering with vmId 2013-10-21 14:05:53 +02:00
Alena Prokharchyk aa570783e8 Added resource tag support for Zone 2013-10-17 15:26:28 -07:00
Darren Shepherd 711ad386d1 Random cleanup 2013-10-16 16:18:49 -07:00
Nitin Mehta fc6c1ec812 CLOUDSTACK-4882:
list Clusters/pods/zones API not accounting for reserved in the used capacity percentage.
Fix listCapacity cmd for reserved as well
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-16 15:02:18 -07:00
Darren Shepherd f62e28c1ec New Transaction API
Introduction of a new Transaction API that is more consistent with the style
of Spring's transaction managment.  The existing Transaction class was renamed
to TransactionLegacy.  All of the non-DAO code in the management server has been
updated to use the new Transaction API.
2013-10-16 09:21:00 -07:00
Alena Prokharchyk 818e6f98fd CLOUDSTACK-4874: added resource tags to the Service offering object. Tags can be created by using createTag API command; you can list service offerings by tags when pass "resourceTag" parameter to the listServiceOfferings call 2013-10-15 17:08:55 -07:00
Chris Suich e514da2c48 Removed setters from *JoinVO classes 2013-10-14 15:20:17 -07:00
Laszlo Hornyak 5f497b9a75 Removed unused methods from ApiResponseSerializer
getGetMethod and getGetMethodName were not used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-12 19:42:50 +02:00
Min Chen 00ad19601b Fix a bug in building acl condition, now we get previous default list
behavior for admin,domain admin and user.
2013-10-10 23:02:49 -07:00
Nitin Mehta fa0c685bcb CLOUDSTACK-4854:
Add support for adding network details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-10 19:18:39 -07:00
Alena Prokharchyk 90cc0d8f01 VolumeResponse: added storageId to the response (returned to admin only) as this parameter is being passed in migrateVolume/updateVolume API requests, so have to return it in the response as well 2013-10-10 16:51:47 -07:00
Alena Prokharchyk c4084a7c34 Fixes for resource details code: 1) Fixed the NPE happening when the resource detail couldn't be located by the key passed through API 2) Added ResourceDetails interface, made all resource details VO objects to implement it. 2013-10-10 11:13:47 -07:00
Min Chen 2b4703b6e6 Change ListVMsCmd to use new role and entity permission information. 2013-10-09 21:56:52 -07:00
Alena Prokharchyk a5a6f58eb8 Resource details:
1) Fixed the way we build the response for resource details
2) Fixed the response name - should be generic "resourcedetail". The type is being carried in resourceType response parameter
3) Throw unsupported excpetion if unsupported resourceType is passed in. Before, user vm was returned
2013-10-09 18:22:49 -07:00
Min Chen f59e47b263 Clean up ListVMsCmd implementation to not using Criteria class. 2013-10-08 15:11:56 -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 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
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
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
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
Nitin Mehta 73f6843840 CLOUDSTACK-4803:
Return "path" parameter as a result of all Volume calls. But to the admin only
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-03 18:00:42 -07:00
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
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
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
Min Chen 5583506c0c Add entity permission grant and revoke API. 2013-09-30 17:03:34 -07:00
Min Chen de0904ba63 Modify AccountResponse to return groups that account belongs to. 2013-09-30 14:14:38 -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
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
Min Chen 0be374a796 Add All Apis for ACL Group. 2013-09-27 18:16:18 -07:00
Min Chen 97fd99b09a Add all Apis for AclRole. 2013-09-26 17:48:29 -07:00
Min Chen fce2aad23d WIP For APIs related to ACL Roles. 2013-09-26 11:22: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 a206f423a3)
2013-09-24 11:59:35 +02:00
Daan Hoogland 2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Min Chen 22c5ea0ebe CLOUDSTACK-4671:ListZone API failed with Assertion error if assertion is
turned on for MS.
2013-09-13 17:21:24 -07:00
Laszlo Hornyak cb3a3da75d simplify setCpuUsed
- variables inlined
- cpu utilization is not cast to float from double

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-09-11 21:33:02 -07:00
Laszlo Hornyak d3237e75b2 simplified casting
double values do not need a Double object to be casted to long

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Min Chen <min.chen@citrix.com>
2013-09-11 18:27:54 -07:00
Alex Huang b8e79c30a8 Compile complete 2013-09-06 15:40:37 -07:00
Alex Huang 435e74e914 Commit to try something on removing getZone 2013-09-06 15:40:33 -07:00
Alex Huang 8e5249df62 Moved NetworkManager to NetworkOrchestrationService 2013-09-06 15:40:31 -07:00
Prachi Damle f31c318158 Changes required to merge to master:
- Replace UserContext by CallContext
2013-09-03 20:03:11 -07:00
Prachi Damle 6a0bda0280 CLOUDSTACK-4337 Dedicated Resources: Zone dedicated to an account should only be visible and accessible to that account
Changes:
- When listing a zone, add clause in the search to check the account_id for a dedicated zone
- When listsing a zone with a domainid, add a similar clause.
- DomainCheck:: checkAccess() for a zone should consider that zone can now be dediacted to a specific account and check access accordingly.

Conflicts:

	server/src/com/cloud/api/query/vo/DataCenterJoinVO.java
	setup/db/db/schema-410to420.sql
2013-09-03 20:02:59 -07:00
Prachi Damle 012afceed2 CLOUDSTACK-4276 Dedicated Resources: Private Zone functionality issues
Changes:
createZone API:
- This API takes in domainid, set it to the zone record in the data_center table

updateZone API:
- This API uses 'isPublic' flag to set a private zone to public - if this flag is set and the zone is dedicated, release the dedication and remove the domainid from the data_center table

listZone API:
- This API already has 'domainid' parameter. We should allow list zones by domain for Root admin.

DedicateZone API:
- set domainid in the data_center table

ReleaseDedicatedZone API:
- remove zoneid from the data_center table
2013-09-03 20:02:56 -07:00
Prachi Damle a06bd9fa2b CLOUDSTACK-4168 Root Admin should be able to create 'ExplicitDedication' affinity group at domain level and make it available for all accounts in the domain
Changes:
- 'ExcplicitDedication' type of group can be created/deleted by Root admin only
- Users can no longer create this type of affinity group
- RootAdmin can create this type of affinitygroup at domain level. Such a domain level group is available for all accounts in that domain for listing and for use during deployVM.
- The domain level affinitygroup should be visible to the users in that domain, domain admins and Root admin.

Conflicts:

	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java
	server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java
2013-09-03 20:02:34 -07:00
Daan Hoogland d9c06e538b CLOUDSTACK-4346 replace URI getHost() and create(String) calls with BroadcastDomainType methods 2013-09-01 22:53:23 +02:00
Ian Duffy bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
frank 64f9f0cee6 CloudStack CLOUDSTACK-4484
Vmware - Not able to fetch userdata from guest Vms using http://<router-address>/latest/user-data
2013-08-26 17:54:39 -07:00
Alex Huang abbae2aa87 Fixed the problem with offerings and templates. These two items due to a previous patch all the way back in 2.1.x versions uses the removed column incorrectly. No one fixed since then. Hence, there's a bunch of findbyidincludingremoved calls in the cloudstack code around these two items. 2013-08-26 17:31:10 -07:00
Marcus Sorensen 62072514f0 CLOUDSTACK-4661: fix vpcid field in response of creating vpn gateway 2013-08-22 15:17:12 -06:00
Alena Prokharchyk d5379b8704 CLOUDSTACK-4392: API volumeresponse - return primary storage information to ROOT and resource domain admin only. 2013-08-21 15:43:06 -07:00
Min Chen 97ff4981c5 CLOUDSTACK-3274: Remove duplicate cleanString calls in logging api for
performance improvement.
2013-08-16 11:10:25 -07:00
Min Chen 081cfa7b6b CLOUDSTACK-4277:listTemplate should return empty list without any zone
configuration.
2013-08-15 16:47:35 -07:00
Wei Zhou 3ab1abc6ba CLOUDSTACK-4296: fix a similar issue
(cherry picked from commit e2f47871d1)
2013-08-13 21:56:21 +02:00
Wei Zhou da7f924cc5 CLOUDSTACK-4296: fix parameter setting error in listVirtualMachines command
(cherry picked from commit 72f013f780)
2013-08-13 21:39:24 +02:00
Kishan Kavala 29a399b9ae CLOUDSTACK-4289, CLOUDSTACK-4290, CLOUDSTACK-4291 : Check for null when populated UUID while listing usage records.
Filed CLOUDSTACK-4299 to make these entities always available.

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java
2013-08-13 18:53:00 +05:30
Alex Huang de2bd96d98 Moved volume related code into cloud-engine-orchestration 2013-08-12 19:06:51 -07:00
Jessica Wang 3c16adf6dc CLOUDSTACK-4142: listNetworkOfferings API has been changed to not return system-owned network offerings to regular-user. So, add networkofferingconservemode property to listNetworks API response. 2013-08-12 17:50:02 -07:00
Murali Reddy 5cff9bd2e6 CLOUDSTACK-4111: Prompt "Acquire New IP - Cross Zones - YES/NO" wizard
only when there is portable IP range added at region level.

region response will now have details if portable IP service is enabled
or not. Portable IP service for a region is turned off by default. when
adming adds a portable ip range portable ip service is enabled for the
region.
2013-08-12 18:12:13 +05:30
Alex Huang 5495f10bce Revert "Reverting the range of commits that broke the build"
This reverts commit b59e3aaefc.
2013-08-08 15:02:40 -07:00
Min Chen 1a194ef725 CLOUDSTACK-1405:ZWPS: listStoragePool API doesn't accept scope parameter
.
2013-08-08 10:10:15 -07:00
Prasanna Santhanam b59e3aaefc Reverting the range of commits that broke the build
This reverts commits 30c33415..f6a2c817bc

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-08-08 14:46:56 +05:30
Alex Huang 942f282a6e Moved config into it's own package 2013-08-07 16:41:02 -07:00
Murali Reddy 323f246765 CLOUDSTACK-2955: [PortableIPrange deletePortableIpRange fails because of
UI firing an incorrect API

adding 'portableiprange' tag to the job result of
CreatePortableIpRangeCmd api job response
2013-08-06 16:01:11 +05:30
Min Chen 151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Alex Huang a673d17171 Added missing file 2013-08-02 11:07:56 -07:00
Alex Huang 8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Alena Prokharchyk 4e53ce0677 CLOUDSTACK-4022: listProjects - do searchIncludingRemoved when getting info of corresponding projectAccount because when the project is being removed, its account is marked as Removed first, but we might still want to retrieve its info 2013-08-02 09:03:57 -07:00
Likitha Shetty 871e3bb279 CLOUDSTACK-3981. ListAccounts always sets 'networkTotal' to 0.
Add vpc resource count to the response. And set the right values for network resource count.
2013-08-01 14:18:33 +05:30
Bharat Kumar b9a2b07ceb Fix for incorect capacity displayed at the dashboard. 2013-08-01 12:31:07 +05:30
Mice Xia 51e4f597e0 fix CLOUDSTACK-3591 add usage recording for VM snapshots
Conflicts:

	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java
	setup/db/db/schema-410to420.sql
2013-08-01 10:47:36 +08:00
Bharat Kumar c7a1dbb176 Cloudstack-2997 unable to update concurrent_conncetions feild in network_offerin.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-31 15:31:42 +05:30
Alena Prokharchyk 244cf3b20a CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command
Fixed the build: use CallerContext instead of UserContext
2013-07-30 13:53:31 -07:00
Alena Prokharchyk 43dc85cea1 Revert "CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command"
This reverts commit 416331ae80.
2013-07-30 12:05:09 -07:00
Alena Prokharchyk 416331ae80 CLOUDSTACK-3958: listProjectAccounts - return account info only; user info can be extracted from listUsers&accountId command 2013-07-30 11:17:17 -07:00
Prachi Damle 790a02f936 CLOUDSTACK-3343 UI/API should also return the mode(Strict/Preferred) when listing the ServiceOffering that uses ImplicitDedicationPlanner
Changes:
- API is fixed to return the service_offering details

Conflicts:

	api/src/org/apache/cloudstack/api/response/ServiceOfferingResponse.java
2013-07-28 22:44:00 -07:00
Min Chen c8cafb91a7 CLOUDSTACK-3818: NFS Cache Improperly Named. 2013-07-26 15:07:45 -07:00
Alex Huang f5e5b39c9b Moved the DB layer code into framework-db and change only the necessary projects to refer to it. Cut down on the dependencies introduced with all the code in utils. 2013-07-26 15:02:10 -07:00
Sanjay Tripathi 13fc4690fc CLOUDSTACK-3488: listStoragePools throws NPE if any of the storage pools are not in the right state.
This issue is reporducible if user adds a primary storage and quickly fires
listStoragePool API command without waiting for the responce of previous
createStoragePool API command. So during this period
(before receiving createStoragePool API resonce), the primary srorage is in
initialized status and the "scope" of storage is not set.
2013-07-26 16:00:06 +05:30
Edison Su 5e427bd2f6 CLOUDSTACK-2536: fix the regression introduced by 4c81ea69c4 2013-07-25 16:36:06 -07:00
Ian Duffy eaa4143371 Merge LDAPPlugin
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-25 17:54:52 +05:30
Alex Huang 555211a080 Moved Configuration from api to utils and moved the package. This was done by eclipse so I only ran the unit test to verify everything is fine 2013-07-25 03:57:12 -07:00
Chiradeep Vittal 1744ed7ad5 CLOUDSTACK-3626 register the correct user and account for api calls made with api keys and secret keys 2013-07-25 14:45:59 +05:30
Saksham Srivastava 135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Likitha Shetty 7e87221372 CLOUDSTACK-3526. When volume upload is in progress the state of the volume is UploadError.
Update volume_view to join volumes table with volume_store_ref table instead of volume_host_ref table.
2013-07-23 18:44:39 +05:30
Alena Prokharchyk d0422904d7 CLOUDSTACK-3711: return descriptive error message to the regular user when his resource limit has exceed. No harm in returning this info as the user aware of the resource limits/number of resources available for allocation, for his account
Conflicts:
	server/src/com/cloud/api/ApiServer.java
2013-07-22 10:28:42 -07:00
Min Chen d423a755f5 CLOUDSTACK-3274: API Refactoring: secretkey and accesskey of the backing
store is found in plaintext in the logs.

Conflicts:
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/ApiServlet.java
2013-07-20 18:01:49 -07:00
Min Chen 6689e83d7f CLOUDSTACK-3513: ListIsos/ListTemplates does not return correct results
when id and zoneid are passed.
2013-07-20 15:18:33 -07:00
Min Chen 598a647105 ListIsos only shows cross-zone ISO in one zone. 2013-07-18 10:56:45 -07:00
Prasanna Santhanam 0c5b698ac8 CLOUDSTACK-3633: AffinityGroupResponse does not include uuid
The uuid->id of the affinity group created is not included as part of
the response. Included the uuid.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit fbf38a35d2)

Conflicts:
	server/src/com/cloud/api/ApiResponseHelper.java

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-18 18:31:23 +05:30
ahuang 11971b5a58 Bring over from vmsync changes in utils package. Simple changes. New files are not being used yet in master 2013-07-17 18:29:42 -07:00
ahuang 11e1e585b1 UserContext switched to CallContext. Added generic storage mechanism for other code to carry information throughout a call. Made the calling User and Account a must have. Added an interface to carry entities in error. Fixed up the code. Part of the vmsync branch 2013-07-16 11:24:21 -07:00
Min Chen 52434dabcc CLOUDSTACK-2595: [Automation] Failed download default template for
second zone. Actually it is a listTemplate issue.
2013-07-15 17:38:09 -07:00
Edison Su 8f4575e877 CLOUDSTACK-3400: add swift support 2013-07-13 02:07:15 -07:00
Murali Reddy b3fd25d45e CLOUDSTACK-3485: NPE while getting instance ID from Asyn Job when
publishing async job events on eventbus

handing case where instance id is null in the asyn job, while publishing
asyn job events on to event bus
2013-07-12 13:48:00 +05:30
Sanjay Tripathi 429e6bd4bb CLOUDSTACK-1768: Ability to delete Events and Alerts: Delete by a time period is required.
User should be able to delete/archive alerts and events by selecting a time period or by
choosing the alerts and events older than a date. Added the ability to choose a time period
too.
2013-07-11 14:12:17 +05:30
Jessica Wang ec42d7236c CLOUDSTACK-2988: API - Template Response - add isdynamicallyscalable property. 2013-07-10 13:51:54 -07:00
Ryan Dietrich 70f33efa72 CLOUDSTACK-3190: Async jobs actions now trigger event bus messages to be
published

-AsyncJobManagerImpl to publish async job events when async jobs are
created, updated and completed
2013-07-05 17:48:25 +05:30
Alex Huang bec53fb59a VMSync: Separating jobs from api 2013-07-03 11:22:40 -07:00
Min Chen 9a3067fb87 CLOUDSTACK-3314: templates downloaded to S3 should show up in
listTemplates when zoneId is provided.
2013-07-02 15:47:49 -07:00
Alena Prokharchyk 8a0470ee0f CLOUDSTACK-3207: added resourceLimit/resourceCount to the Project API response
Conflicts:
	setup/db/db/schema-410to420.sql
2013-07-02 15:34:08 -07:00
Min Chen 05f4680735 CLOUDSTACK-3314: ListTemplates only show one entry for cross-zone
templates.
2013-07-02 13:54:40 -07:00
Jessica Wang 1762be05a9 CLOUDSTACK-2084: API - when account type is ACCOUNT_TYPE_PROJECT, make listVlanIpRanges API to return accountName. 2013-07-01 14:22:06 -07:00
Mike Tutkowski 99227f7b3e SolidFire plug-in and related changes
SolidFire plug-in

SolidFire plug-in related
2013-06-28 16:59:21 -06:00
Min Chen 3160a0c2da Add template zone related information into TemplateZoneResponse. 2013-06-27 14:34:00 -07:00
Wei Zhou 181567ba74 CLOUDSTACK-1192: Disk I/O Statistics (vm stats) support KVM and XenServer only util 2013/06/25 2013-06-27 14:25:54 +02:00
Jayapal 6a7ae637dd CLOUDSTACK-1578 Egress default policy configurable using network offering in xenserver with VR as firewall provider 2013-06-24 13:37:00 +05:30
Min Chen 64c5266ec5 CLOUDSTACK-3120: ListTemplates didn't return Baremetal templates after
storage refactor.
2013-06-21 16:10:39 -07:00
Min Chen 2f9ba709a5 Add listCacheStoresCmd api for UI to list cache stores. 2013-06-20 18:06:30 -07:00
Min Chen 2fe732b354 CLOUDSTACK-3080: listVirtualMachines tag search refinement no longer
working.
2013-06-20 15:44:01 -07:00
Alena Prokharchyk 2072026340 CLOUDSTACK-3088: fixed listRouters/listInternalLbVms by name 2013-06-20 10:37:59 -07:00
Edison Su 97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Harikrishna Patnala 7b6b8d7a07 CLOUDSTACK-2987 Ensure XStools to be there in template inorder to enable dynamic scaling of vm
CLOUDSTACK-3042 - handle Scaling up of vm memory/CPU based on the presence of XS tools in the template
This also takes care of updation of VM after XS tools are installed in the vm and set memory values accordingly to support dynamic scaling after stop start of VM

Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:08:38 +05:30
Saksham Srivastava e420c3be8c CLOUDSTACK-2167: The Vlan ranges displayed are not in ascending order 2013-06-20 10:58:50 +05:30
Edison Su 9aec9c605c merge to master 2013-06-19 18:16:47 -07:00
Edison Su 11b9d5ff64 CLOUDSTACK-1405: add scope type in liststoragepoolcmd 2013-06-19 14:09:49 -07:00
Jessica Wang d5d0142ed4 CLOUDSTACK-3016: listZones API - take in networktype instead of zonetype parameter to be consistent with networktype property in ZoneResponse. 2013-06-19 10:22:14 -07:00
Jessica Wang 2f2bb6b316 CLOUDSTACK-3016: remove zonetype property from API response (userVM) 2013-06-18 14:55:56 -07:00
Jessica Wang 759eeca651 CLOUDSTACK-3016: remove zonetype property from API response (snapshot, ISO, template, network, volume) 2013-06-18 14:42:38 -07:00
Jessica Wang 0a8343e750 CLOUDSTACK-3016: remove zonetype property from API response (cluster, domainRouter, host, pod, storagePool, systemVM) 2013-06-18 13:54:37 -07:00
Jessica Wang b5abc0862b CLOUDSTACK-3016: remove zonetype parameter from listRouters API, listInternalLbVms API. 2013-06-18 10:41:37 -07:00
Wei Zhou 0dd45513e3 CLOUDSTACK-2885: show cpuNumber and cpuSpeed on VM Statistics page 2013-06-18 17:00:44 +02:00
Wei Zhou 882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Laszlo Hornyak 202cd15290 NPE fix
- fixes an NPE in case the pool.scope = null
- replaces null checks around toString with ObjectUtils.toString call

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-06-17 19:19:43 +01:00
Edison Su f41c800d88 merge to master 2013-06-14 19:06:33 -07:00
Jessica Wang 8925d39b78 CLOUDSTACK-3016: remove zonetype parameter from listVirtualMachines API. 2013-06-14 16:51:20 -07:00
Jessica Wang b4a692d80f CLOUDSTACK-3016: remove zonetype parameter from listVolumes API. 2013-06-14 16:39:04 -07:00
Jessica Wang ea0de9eaf4 CLOUDSTACK-3016: remove zonetype parameter from listStoragePools API. 2013-06-14 16:33:27 -07:00
Jessica Wang cb37d4cb63 CLOUDSTACK-3016: remove zonetype parameter from listHosts API. 2013-06-14 16:14:45 -07:00
Min Chen bb85a564da Remove state from vm_template table, we should use template_store_ref
state column to represent the state of a template in each zone.
2013-06-14 15:14:09 -07:00
Jayapal b72c79b370 CLOUDSTACK-2934 Fixed not showing uuid in list firewall rules response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-13 14:37:34 +05:30
Min Chen 18aeef3ef1 Merge branch 'master' (up to commit
c30d9be3ce) into object_store.
2013-06-12 11:20:32 -07:00
Nitin Mehta 83fcba9ee6 CLOUDSTACK-2946
CS-15158: Correcting the allocated size for local storage in listStoragePools
2013-06-12 14:58:54 +05:30
Harikrishna Patnala 215b638e8e CLOUDSTACK-2347: Zone filter for listSnapshots API
Added new optional parameter zone id in listSnapshots API which allows to list snapshots with additional criteria.
   Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
2013-06-12 13:35:58 +05:30
Wei Zhou 76ce304411 CLOUDSTACK-2707: use executeBatch instead of persist in Usage Server 2013-06-10 15:00:08 +02:00
Prachi Damle 8c9f681f9e CLOUDSTACK-2350: Anti-Affinity - As admin user, when tryinto update the affinity group for a Vm that is deployed by a regular user , he is presented with admin's affinity groups.
Changes:
- listAffinityGroups API takes in accountname and domainId parameter
- For admin, listall=true should return all affinity groups of all users
2013-06-07 15:28:28 -07:00
SrikanteswaraRao Talluri 4da995238b CLOUDSTACK-2783: FIXED listHypervisorCapabilities API response to include the following fields: 1. maxdatavolumes 2. maxhostspercluster 3. storagemotionenabled 2013-06-05 13:50:41 +05:30
Min Chen e92cd6d632 Move data store specific extract volume logic from VolumeManager to data
store driver.
2013-06-04 13:54:14 -07:00
Min Chen ef03d5a122 Move data store specific extract template/iso logic from
TemplateManager to data store driver.
2013-06-04 11:50:43 -07:00
Prasanna Santhanam 0401774a09 StoragePoolForMigrationResponse -> StoragePoolResponse
The additional response type is basically the same as
StoragePoolResponse. Only additional state reported is whether the
storage pool is suitable for migration. Since this is fetched from
hypervisor capabilities there is no need for a new response type.

Tested with the simulator and I can see the response format correctly.

mysql> select * from hypervisor_capabilities where id=18\G
*************************** 1. row ***************************
                      id: 18
                    uuid: 98b88e6e-ccf1-11e2-bd2a-af89de8bd27e
         hypervisor_type: Simulator
      hypervisor_version: NULL
        max_guests_limit: 100
  security_group_enabled: 1
  max_data_volumes_limit: 100
   max_hosts_per_cluster: 100
storage_motion_supported: 1
     vm_snapshot_enabled: 1
1 row in set (0.00 sec)

CloudMonkey output as below:
> find storagepoolsformigration id=0a644f79-53dd-4eb6-a871-64679a47cfc6
count = 1
storagepool:
name = PS0
id = 7c07ec9b-a3c6-3466-ab5a-f5669ead0b22
clusterid = 71fb5c34-4852-46e6-bb8f-c9da4e8f827c
clustername = C0
created = 2013-06-04T14:06:55+0530
disksizeallocated = 0
disksizetotal = 1099511627776
disksizeused = 0
ipaddress = 10.147.28.6
jobstatus = 0
path = /export/home/sandbox/primary0
podid = 560d9600-35dd-4a50-addd-81d5618536e9
podname = POD0
scope = CLUSTER
state = Up
suitableformigration = True
type = NetworkFilesystem
zoneid = 3108f711-0db6-4dad-a0d0-2fd7d413e5ef
zonename = Sandbox-simulator

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-04 14:26:40 +05:30
Prasanna Santhanam 767ed065c5 CLOUDSTACK-2815: Include dedication in simulator context
SimulatoComponentContext need sto include the dedicated resource manager
to see the commands/apis exposed by it.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-03 21:51:18 +05:30
Wei Zhou f714d26039 Revert "CLOUDSTACK-1301: Add VM Disk I/O Throttling"
This reverts commit 6dad8adf8f.
2013-06-03 07:48:03 +02:00
Wei Zhou 6dad8adf8f CLOUDSTACK-1301: Add VM Disk I/O Throttling 2013-06-01 08:03:02 +02:00
Wei Zhou b9b0168da4 CLOUDSTACK-1192: Add Disk I/O Statistics 2013-06-01 08:00:48 +02:00
Sateesh Chodapuneedi e7d468e221 CLOUDSTACK-2029 zone wide primary storage support for cloudstack over vmware deployments
DB changes to support hypervisor specific zone wide storage pool.
Added method findZoneWideStoragePoolsByHypervisor to PrimaryStorageDaoImpl to find suitable zone wide storage pool of specific hypervisor type.
Added column 'hypervisor' to table storage_pool. This column can be NULL. Used/populated only for zone wide primary storage pools.

Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-06-01 00:05:27 +05:30
Murali Reddy 470995b1c4 CLOUDSTACK-2192: [EIP/Optonal PublicIP] listNetworkOfferings is not
returning info about the capability "AssociatePublicIP"

added eip and associateEip capability details to the StaticNat service
response
2013-05-31 19:08:39 +05:30
Alena Prokharchyk da53ef1aed ApiServer: fixed non primitive Long "snapshotLimit" comparsion 2013-05-30 15:21:31 -07:00
Alena Prokharchyk 62ad6c4519 ApiServer: replaced hardcoded value of the integration.api.port paramter with the reference to the actual paramter name 2013-05-30 15:21:31 -07:00
Alena Prokharchyk 1300fc8128 AccountManager/Service: reduced visibility for methods that are called only from AccountManagerImpl itself 2013-05-30 11:18:32 -07:00
Alena Prokharchyk 0ea409546e RulesManager interface: changed visibility for methods that are being called only from RulesManagerImpl class, from public and defined in the interface, to private/protected 2013-05-30 11:18:31 -07:00
Kishan Kavala 3115ddf007 Added networkAclId to listNetworkResponse. Log ACL provider while applying network ACLs 2013-05-30 16:36:21 +05:30
Saksham Srivastava 17267794ad CLOUDSTACK-681: Dedicated Resources - Explicit Dedication, Private zone, pod, cluster or host. <Patch1>
This feature allows a user to deploy VMs only in the resources dedicated to his account or domain.

1. Resources(Zones, Pods, Clusters or hosts) can be dedicated to an account or domain.
   Implemented 12 new APIs to dedicate/list/release resources:
   - dedicateZone, listDedicatedZones, releaseDedicatedZone for a Zone.
   - dedicatePod, listDedicatedPods, releaseDedicatedPod for a Pod.
   - dedicateCluster, listDedicatedClusters, releaseDedicatedCluster for a Cluster
   - dedicateHost, listDedicatedHosts, releaseDedicatedHost for a Host.
2. Once a resource(eg. pod) is dedicated to an account, other resources(eg. clusters/hosts) inside that cannot be further dedicated.
3. Once a resource is dedicated to a domain, other resources inside that can be further dedicated to its sub-domain or account.
4. If any resource (eg.cluster) is dedicated to a account/domain, then resources(eg. Pod) above that cannot be dedicated to different accounts/domain (not belonging to the same domain)
5. To use Explicit dedication, user needs to create an Affinity Group of type 'ExplicitDedication'
6. A VM can be deployed with the above affinity group parameter as an input.
7. A new ExplicitDedicationProcessor has been added which will process the affinity group of type 'Explicit Dedication' for a deployment of a VM that demands dedicated resources.
   This processor implements the AffinityGroupProcessor adapter. This processor will update the avoid list.
8. A VM requesting dedication will be deployed on dedicatd resources if available with the user account.
9. A VM requesting dedication can also be deployed on the dedicated resources available with the parent domains iff no dedicated resources are available with the current user's account or
   domain.
10. A VM (without dedication) can be deployed on shared host but not on dedicated hosts.
11. To modify the dedication, the resource has to be released first.
12. Existing Private zone functionality has been redirected to Explicit dedication of zones.
13. Updated the db upgrade schema script. A new table "dedicated_resources" has been added.
14. Added the right permissions in commands.properties
15. Unit tests:  For the new APIs and Service, added unit tests under : plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/DedicatedApiUnitTest.java
16. Marvin Test: To dedicate host, create affinity group, deploy-vm, check if vm is deployed on the dedicated host.
2013-05-30 01:07:01 -07:00
Min Chen 6e55776795 CLOUDSTACK-2331: Failed to display exception object information in case of CloudRuntimeException. 2013-05-28 16:01:33 -07:00
Harikrishna Patnala 82974458a6 CLOUDSTACK-2672: Adding isVolatile parameter in service offering response object
Signed off by :- Nitin Mehta <nitin.mehta@citrix.com>
2013-05-27 18:25:29 +05:30
Min Chen 3c7fb2f790 Use template_view.state column to indicate readiness of a template. 2013-05-24 09:50:40 -07:00
Kishan Kavala ba67e5d56e CLOUDSTACK-2452: Fixed account upgrade for usage. Added cloumn default. Updated usage response for PF , LB and VPN to return UUID instead of Id 2013-05-24 16:00:49 +05:30
Min Chen 98af424053 Merge branch 'master' into object_store. 2013-05-23 18:00:15 -07:00
Alena Prokharchyk 7e6f3f94ba CLOUDSTACK-2628: added networkId parameter to the list of request parameters in listLoadBalancerRules API 2013-05-23 16:06:57 -07:00
Min Chen 19321d4eeb CLOUDSTACK-2629: ListRouters with networkid throws exception. 2013-05-22 15:27:04 -07:00
Min Chen 8a956203d1 ListImageStores still show those deleted image stores. 2013-05-22 14:33:40 -07:00
Edison Su 383be568b3 CLOUDSTACK-2527: enable attach/detach xs tool iso 2013-05-21 19:13:29 -07:00
Min Chen cb0659ab33 CLOUDSTACK-2590: we should only search for active user templates when
deleting an image store.
2013-05-21 12:01:53 -07:00
Murali Reddy d6452be861 CLOUDSTACK-652: meging 'portable public ip' feature
Squashed commit of the following:

commit f244f9ce7982db16984dd87c31545f1c0240c704
Merge: 993cbb0 f5c8e38
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:54:05 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java

commit 993cbb0df9fa6e64b96b18ed775b73cdf4a8f5d7
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 20 18:49:54 2013 +0530

    introduce 'transferPortableIP' interface method in network manger. This
    method will transfer association of portable ip from one network to
    another network.

commit 0c1c2652c1b39e9a81ca35464360e11ed9ef23f1
Merge: a718d35 a29e393
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Fri May 17 02:48:54 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	utils/src/com/cloud/utils/net/NetUtils.java

commit a718d353f7
Merge: ecca117 c211818
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 21:22:19 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/network/addr/PublicIp.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockConfigurationManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit ecca117e34
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 20:05:29 2013 +0530

    added integration tests for testing portable ip ranges

commit 895a27c277
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 15:12:19 2013 +0530

    - establish model for transferring portable IP association from a network
      with which it is associated to another network.

    - enabling static nat api, extended to transfer potrtable IP across the
      networks if the VM/network is different from the current associate
      network of the portable ip

commit 51509751b2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Mon May 13 12:05:33 2013 +0530

    seperate out associate/disassociate with guest network operations from
    alloc and release of portable ip

commit bd058f58c2
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 21:14:48 2013 +0530

    enhance disasociateIPAddr API to release protable IP associated with a
    guest network or VPC

commit 27504d9098
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sun May 12 16:53:45 2013 +0530

    enhance asociateIPAddr API to acquire a protable IP and associate with a
    guest network or VPC

commit f82c6a8431
Merge: 3dbfb44 0749013
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 23:32:13 2013 +0530

    Merge branch 'master' into portablepublicip

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java
    	server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java
    	setup/db/db/schema-410to420.sql

commit 3dbfb44eb5
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 20:33:19 2013 +0530

    - add 'portable' boolean as property of IpAddress, persist the property in
    IPAddressVO, return the property in IpAddressResponse

    - add ability to request portable IP in associateIpAddress api

commit bf3cb274cf
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 16:08:40 2013 +0530

    add the status of each portable IP (its state, details of associated data
    center/VPC/guest network etc) in the PortableIpRangeResponse returned by
    listPortableIpRanges API

commit e7b2fb2255
Author: Murali Reddy <muralimmreddy@gmail.com>
Date:   Sat May 11 14:36:01 2013 +0530

    Introdcues notion of 'portable IP' pool at region level.

    Introduces root admin only API's to provision portable ip to a region
       - createPortableIpRange
       - deletePortableIpRange
       - listPortableIpRanges
2013-05-20 20:05:47 +05:30
Prasanna Santhanam 6ea2b06aab Fixing multiple minor annoyances:
1. Keeping the description consistent - Memory not RAM when referring to
overcommit
2. getters And setters grouped, provided right casing.
3. Removed wildcard imports

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-05-19 18:34:26 +05:30
Edison Su f7c1b711ad merge to master 2013-05-16 23:56:20 -07:00
Prachi Damle a2eb7bab1e CLOUDSTACK-2056: DeploymentPlanner choice via ServiceOffering
- Changes merged from planner_reserve branch
- Exposing deploymentplanner as an optional parameter while creating a service offering
- changes to DeploymentPlanningManagerImpl to make sure host reserve-release happens between conflicting planner usages.
2013-05-16 15:02:17 -07:00
Murali Reddy d2d0398e33 CLOUDSTACK-2529: GlobalLoadBalancerResponse should have the full FQDN
for the global load balanced service
2013-05-16 15:19:41 +05:30
Mice Xia 6d57393629 instead of using '==', use equals() to test Long value equality 2013-05-16 16:00:02 +08:00
Edison Su a0c3d280b4 merge to master 2013-05-15 00:40:53 -07:00
Min Chen c6a5a7ee00 Fix CLOUDSTACK-2495: public templates are not visible to non-root users. 2013-05-14 21:52:29 -07:00
Min Chen 564d3d6fa0 Fix CLOUDSTACK-2488: Delete iso async job is running forever. 2013-05-14 16:12:49 -07:00
Min Chen 03c255068b Fix CLOUDSTACK-2484: not able to deploy VM from registered ISO. 2013-05-14 14:57:02 -07:00
Jayapal Reddy 2d950e2858 CLOUDSTACK-768: ACL on private gateway 2013-05-13 19:24:23 +05:30
Nitin Mehta 573f529ea0 mvn install didnt point me the compilation errors...fixing them 2013-05-13 18:18:56 +05:30
Nitin Mehta 8d53b1ef05 merge with master 2013-05-13 16:36:41 +05:30
Kishan Kavala 750bfe76ca CLOUDSTACK-763: Added filters to list APIs. Seperated service interface implementation to NetworkACLServiceImpl. Added default ACL to upgrade schema 2013-05-13 12:03:38 +05:30
Kishan Kavala e2449cfcf0 CLOUDSTACK-763: Added replaceNetworkACLList API. Added support for ACL action allow/deny and also number 2013-05-13 12:03:38 +05:30
Kishan Kavala ebf8a7fd1e CLOUDSTACK-763: Added APIs to create, delete and list NetworkACLlist. 2013-05-13 12:03:38 +05:30
Nitin Mehta 5f0f1001be remove unwanted files 2013-05-12 14:30:10 +05:30
Nitin Mehta c11dbad9c9 merge master 2013-05-11 15:28:43 +05:30
Nitin Mehta 5f9263b161 fix build 2013-05-11 14:27:19 +05:30
Nitin Mehta 1731a4a442 Add the new APIs along with tests 2013-05-11 14:13:38 +05:30
Alex Huang 342624e0eb Merged with head 2013-05-10 16:33:57 -07:00
Alex Huang 3047929367 Merged 2013-05-10 16:21:43 -07:00
Min Chen 0824be38ff Fix a bug where listImageStores also shows cacheStorage. 2013-05-09 21:49:12 -07:00
Alena Prokharchyk 2660a6b7a7 CLOUDSTACK-747: Internal LB between VPC tiers support
Squashed commit of the following:

commit def0861d5a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 10:53:09 2013 -0700

    Inernallb: added internalLbVm to the list of network elements for nonoss build

commit 56d94fc074
Merge: d828c15 8f9a42e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu May 9 09:51:36 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java

commit d828c154fd
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 14:58:22 2013 -0700

    internallb: Fixed nonoss build

commit 1b8a6986a6
Merge: 9e74fa9 738d35a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 8 13:20:07 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/com/cloud/network/NetworkModel.java
    	api/src/com/cloud/network/rules/LoadBalancerContainer.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	api/src/org/apache/cloudstack/network/lb/ApplicationLoadBalancerContainer.java
    	client/tomcatconf/commands.properties.in
    	engine/schema/src/com/cloud/network/dao/LoadBalancerDaoImpl.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkModelImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkModelImpl.java
    	server/test/resources/appLoadBalancer.xml
    	setup/db/db/schema-410to420.sql
    	test/integration/component/test_multiple_ip_ranges.py
    	test/integration/smoke/test_guest_vlan_range.py
    	tools/marvin/marvin/integration/lib/base.py

commit 9e74fa9406
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Thu May 9 00:11:40 2013 +0530

    marvin changes for internallbvm provider

    - changed the simulator context to load the internallb bean
    - fixed deployDataCenter to use the additional provider by default
    - fixed the sandbox script and the setup script for simulator checkin
      tests

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 0a2d49301b
Author: Jessica Wang <jessicawang@apache.org>
Date:   Tue May 7 15:50:41 2013 -0700

    Internal LB - UI - zone wizard - advanced zone - enable internal LB element, enable internal LB provider.

commit 43e1667f90
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 13:26:53 2013 -0700

    Moved all DAOs and VOs to the cloud-engine-schema project

commit 2fd94c8bbe
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 18:26:08 2013 +0530

    CLOUDSTACK-893 api

commit 12b64d6c00
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 17:06:15 2013 +0530

    Fixing the gmaven configuration for marvin/pom.xml

    For the marvin checkin test custom properties had a typo when run for
    the *nix environment.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1e4274dd9f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:43 2013 +0530

    Renaming TesDedicateVlanRange -> TestDedicateVlanRange

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 9264ac526f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:28:20 2013 +0530

    Adding isolation method to the zone creation of marvin

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 3a0dc67de0
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:27:26 2013 +0530

    adding ACL for dedicateGuestVlanRange set of APIs

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 79f6e11368
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 15:26:48 2013 +0530

    add debug logs when access checkers fail to find API

    When the access checkers fail for api discovery, we fail silently.
    instead record a debug message.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 92cb7d3e0f
Author: Hugo Trippaers <trippie@gmail.com>
Date:   Tue May 7 11:44:23 2013 +0200

    commit e0d8f01ecd enabled all tests. Fix
    AWSAPI build by removing broken tests and excluding failing tests.

commit 4a391464c7
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 10:57:23 2013 +0200

    commit e0d8f01ecd enabled all tests, but the tests in vmware-base are horribly broken and will not compile with the current CloudStack.

    Removing the tests to fix the nonoss build and they are so broken they should be rewritten from scratch anyway.

commit 2ca03a8513
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:51:34 2013 +0530

    moving test data to top level dictionary

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit ceaa4e1b0d
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:56 2013 +0530

    Adding tracelogs to the API discovery service

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit a3f5f01c7e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Tue May 7 13:50:12 2013 +0530

    dedicateGuestVlanRange is admin only API

    Adding ACL for the dedicateGuestVlanRange API.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 1c4c80fe91
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Tue May 7 09:58:16 2013 +0200

    Recent pom switcharoo caused the client to lose the dependecy on console-proxy, which it needs to include the systemvm

commit 8103f3c386
Author: Radhika PC <radhika.puthiyetath@citrix.com>
Date:   Tue May 7 11:30:17 2013 +0530

    CLOUDSTACK-893 first cut

commit 67d0411d73
Author: Dave Cahill <dcahill@midokura.com>
Date:   Fri Apr 19 17:31:44 2013 +0900

    Add docs for MidoNet networking plugin [CLOUDSTACK-996]

    Signed-off-by: Dave Cahill <dcahill@midokura.com>

commit c745e6d28e
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 16:34:03 2013 -0700

    Fixed up the simulator to run with windows paths in cygwin

commit be91c03702
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 10:34:22 2013 -0700

    Moved over the VLAN daos

commit dcc09f8472
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:31:47 2013 -0700

    Missing file and updated .gitignore

commit e9953cd1a8
Author: Alex Huang <alex.huang@gmail.com>
Date:   Mon May 6 06:29:59 2013 -0700

    Fixed up unit testing to use only an in class TestConfiguration

commit 6727571403
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 15:20:49 2013 -0700

    Fixed an incorrect unit test for affinity group.  Removed some useless pom.xml.

commit d015fb3520
Author: Alex Huang <alex.huang@gmail.com>
Date:   Thu May 2 06:50:38 2013 -0700

    Moved most of the VOs and DAOs from server package into engine-schema as well

commit 77547a58df
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 15:15:57 2013 -0700

    Removed files that are no longer used and further separated out the files in the core project

commit 345f3d3482
Author: Alex Huang <alex.huang@gmail.com>
Date:   Wed May 1 05:46:15 2013 -0700

    Moved agent commands to core and out of api

commit e91ca00571
Author: Alex Huang <alex.huang@gmail.com>
Date:   Tue Apr 30 19:06:20 2013 -0700

    Removed framework-api which is completely useless.  Changed framework-ipc to reference gson itself.  Move VOs into engine-schema.

commit f64564e490
Author: Dennis Lawler <dlawler@gmail.com>
Date:   Mon Apr 29 15:10:09 2013 -0700

    Removing filterwin2k option

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 944a7ea5d6
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:57:02 2013 +0100

    CLOUDSTACK-2319: fix "unable to add egress rules" in SecurityGroup

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit ff7f8ba362
Author: Wei Zhou <w.zhou@leaseweb.com>
Date:   Mon May 6 20:56:06 2013 +0100

    CLOUDSTACK-2322: update network.gateway to fix deployVm error on
    SharedNetwork after ipv6 support

    Signed-off-by: Chip Childers <chip.childers@gmail.com>

commit a153373c7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon May 6 11:45:19 2013 -0700

    CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack

commit 46f59cd49e
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 20:39:36 2013 +0530

    Fixed the incorrect assertion in noncontiguous_vlan test

    The assertion fails if the VLAN is found in which case find returns a
    positive number. So here the assertion should infact assert < 0 result.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit bd1dcc10b3
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:53:42 2013 +0530

    Affinity Groups requires multiple storage pools

    Fixing the affinity group test which would fail to find the appropriate
    storage pool to satisfy the anti-affinity group of the second VM

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 7f853cdb8f
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 19:16:15 2013 +0530

    fixing double calls to VM deploy

    This fixes regression introduced in commit 2f40a90c that made duplicate
    calls to deployVirtualMachine.

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 646e810fcf
Author: Prasanna Santhanam <tsp@apache.org>
Date:   Mon May 6 18:51:53 2013 +0530

    fixing wildcard imports

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit b29b6e8525
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Fri May 3 14:03:53 2013 +0200

    BigSwitch should only respond if it is the actual provider on the network.

    This fixes an NPE during the release call.

commit 6fcc9b009b
Author: Hugo Trippaers <htrippaers@schubergphilis.com>
Date:   Thu May 2 17:38:27 2013 +0200

    Prevent Nicira NVP tags from exceeding the 40 character limit.

commit d8e61a1c0a
Author: Sanjay Tripathi <sanjay.tripathi@citrix.com>
Date:   Thu May 2 13:45:39 2013 +0530

    CLOUDSTACK-2188 : Parsing error with Download Monitor while checking the health of downloaded templates

    Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>

commit 5b6e1140f9
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:58 2013 -0400

    CLOUDSTACK-2339: Adding libcloud example

commit 7be62d2374
Author: Sebastien Goasguen <runseb@gmail.com>
Date:   Mon May 6 05:35:19 2013 -0400

    CLOUDSTACK-2338: Adding example of how to sign api requests in python

commit 156fd68902
Author: Talluri <Srikanteswararao.Talluri@citrix.com>
Date:   Fri May 3 23:11:56 2013 +0530

    CLOUDSTACK-2323: fix test scripts to conform with library changes

    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33ff5e9107
Author: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Date:   Tue Apr 30 20:09:46 2013 +0530

    CLOUDSTACK-702: Tests for Multiple IP Ranges

    1.Deleting IP Range from the existing CIDR
    2.Add non-contiguous guest IP range in new CIDR
    3.Add overlapped guest IP range in existing CIDR

    Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
    Signed-off-by: Prasanna Santhanam <tsp@apache.org>

commit 33059d1f66
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 14:08:40 2013 +0530

    scaleUp VM response change corresponding UI changes

commit 92e18d8106
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Mon May 6 13:45:32 2013 +0530

    CLOUDSTACK-2337:Resize button available for root/domain admin and normal users

commit d5cd3f7e00
Author: Likitha Shetty <likitha.shetty@citrix.com>
Date:   Wed May 1 13:47:26 2013 +0530

    Dedicate guest vlan range to account

commit 12c79c8377
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 12:02:32 2013 +0530

    scale up virtual machine response change in the backend

commit 94bac27622
Author: Rohit Yadav <bhaisaab@apache.org>
Date:   Sun May 5 09:58:04 2013 +0530

    appliance: Upgrade systemvm appliance from rc1 to Debian7 GA

    Signed-off-by: Rohit Yadav <bhaisaab@apache.org>

commit c598bb0038
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sun May 5 01:57:35 2013 +0530

    CLOUDSTACK-2076:Listview widget infinte scrolling error

commit d0615ea9a1
Author: Pranav Saxena <pranav.saxena@citrix.com>
Date:   Sun May 5 01:15:14 2013 +0530

    CLOUDSTACK-2274:Detail view loading problem when deleting a zone

commit 733b513c3a
Author: Isaac Chiang <isaacchiang@gmail.com>
Date:   Sat May 4 13:41:02 2013 +0530

    CLOUDSTACK-2160:Refresh button functionality for security groups and statistics tab

commit 418d75d7a4
Author: Marcus Sorensen <marcus@betterservers.com>
Date:   Fri May 3 14:09:52 2013 -0600

    Summary: Release old DHCP entries

    Detail: Refresh dnsmasq with updated entries live, no outage

    BUG-ID: CLOUDSTACK-2299
    Submitted-by: Dennis Lawler <dlawler@gmail.com>
    Signed-off-by: Marcus Sorensen <marcus@betterservers.com> 1367611792 -0600

commit b3dce64577
Author: Kelven Yang <kelveny@gmail.com>
Date:   Tue May 7 10:57:19 2013 -0700

    fix unitest

commit b17885f0f6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue May 7 09:55:47 2013 -0700

    InternalLb: some fixes to the unittest

commit 1cff609347
Merge: 053e184 a3a5c13
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:23:08 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java

commit 053e18454d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri May 3 11:07:07 2013 -0700

    InternalLB: marvin integration test for internal lb feature

commit 2e8e2f98f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 13:53:20 2013 -0700

    InternalLB: don't allow to upgrade the network from the network offering with internal LB to the offering with public LB, and vice versa

commit c773d204c8
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Wed May 1 13:21:52 2013 -0700

    Internal LB: if we detect that we are inside an internal lb vm, call out to the ilb script to perform LB configuration

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 8c8845bf77
Merge: 7e95545 471ca30
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:14:06 2013 -0700

    Merge branch 'master' into internallb1

commit 7e9554596f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed May 1 10:01:16 2013 -0700

    InternalLb: boot args parameters cleanup for the internal lb vm

commit b7cf870074
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 30 10:31:28 2013 -0700

    InternalLb: more unittests for internal lb element

commit 63bb98ebe2
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 18:29:25 2013 -0700

    allow ssh on eth1

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit ca1c313c29
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:58:45 2013 -0700

    InternalLb: DB upgrade - update existing physical networks with InternalLbVm provider

commit ed50caa01c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 17:48:36 2013 -0700

    InternalLbVM: handle the scenario when sourceIpAddress is not passed when create internal Lb rule

commit 4c22c911a9
Author: Chiradeep Vittal <chiradeep@apache.org>
Date:   Mon Apr 29 15:56:00 2013 -0700

    backend support for Internal LB

    Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>

commit 7b24a7640c
Merge: 440e848 a0dbf89
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 15:49:48 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/api/query/QueryManagerImpl.java
    	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/firewall/FirewallManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit 440e8484d6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 29 13:27:06 2013 -0700

    InternalLB: unittests for InternalLoadBalancerVMManager

commit 63babe4b7e
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 26 13:44:01 2013 -0700

    InternalLb:

    1) Added unittests for InternalLoadBalancerVMService
    2) Added unittests for InternalLoadBalancerElementService

commit 4f9c47ce54
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 25 14:46:42 2013 -0700

    InternalLb: create internal lb vm specific service offering

commit 408ee59d1f
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb: new set of Web services APIs for managing Internal LB VMs

commit 7680e1cc10
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 17:08:08 2013 -0700

    Internallb:

    1) InternalLb and PublicLb can't be enabled on the same network offering
    2) Can have internalLb only on VPC tier

commit d73ca7ef73
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 24 13:02:32 2013 -0700

    InternalLb:
    1) fixed the bug when the guest nic on internal lb vm wasnt set to be default
    2) Don't send the rules to the internal lb vm if its in Stopped state

commit ca2fc30655
Merge: 8057567 04a2b2d
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 16:56:11 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/vpc/VpcManagerImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit 8057567aaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 23 13:15:36 2013 -0700

    Internallb: more unittests for ApplicationLoadBalancerService

commit 35c0273b85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 19 16:17:45 2013 -0700

    InternalLb: unittests for ApplicationLoadBalancerService

commit 69b23f7003
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 14:01:10 2013 -0700

    InternalLb: create/configure/listInternalLoadBalancerElement - fixes to the API response

commit a3321ce617
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 13:31:16 2013 -0700

    Internal LB : renamed the classes responsible for managing internal lb elements. Now the names are InternalLoadBalancerVMManager, InternalLoadBalancerVMService and InternalLoadBalancerVMManagerImpl

commit 2baf7c365c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 18 10:02:17 2013 -0700

    Internallb: verify requested IP for LB rule (if specified) against guest network cidr

commit 0cfe96bd00
Merge: 501f2ff 11162f5
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 17 15:41:51 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/network/IpAddress.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	setup/db/db/schema-410to420.sql

commit 501f2ffa0b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 17:03:50 2013 -0700

    InternalLb: validate source ip network as a part of LB rule creation

commit 4d9a7dfd85
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 16:03:32 2013 -0700

    InternalLB: in VPC, restrict public LB to one tier only. Internal LB can be supported on multiple tiers

commit 8689bf9eb3
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 15:59:56 2013 -0700

    Internal LB: added internal lb vm to the list of supported providers in VPC default offering

commit b7709b89ff
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 11:04:22 2013 -0700

    Internal Lb: added 2 boolean fields - internal_lb and public_lb - to the network offering. Define if internal or public LB service is supported. In the current release it's either one or another; in the future releases we might support both on the same network

commit 014689e45e
Merge: b3b16ba 90e8158
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 16 09:55:45 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/network/Network.java
    	plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java
    	server/src/com/cloud/network/NetworkManagerImpl.java
    	server/src/com/cloud/network/NetworkServiceImpl.java
    	server/test/com/cloud/network/MockNetworkManagerImpl.java
    	server/test/com/cloud/vpc/MockNetworkManagerImpl.java
    	setup/db/db/schema-410to420.sql

commit b3b16bae48
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 17:00:31 2013 -0700

    InternalLB: allow to specify more than one provider for the LB service when create network offering as diff providers can support internal and public LB for the same network

commit a4fc1d7d65
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 13:45:25 2013 -0700

    Internal LB:

    1) Added network_offering_details DB table and corresponding VO/DAO objects. Change createNetworkOffering web services api to accept the map of key/value pairs as details.
    2) Allow to have multiple providers for the same service for the network to support the case when LB service can have separate providers for Internal LB and Public LB

commit 4530cebf2b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 15 10:06:10 2013 -0700

    InternalLbVm: support for start/stop Internal lb vm

commit ae69f0ae56
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 17:25:02 2013 -0700

    InternalLb: fixed prepare() in InternalLbElement - have to prepare nics of User vms only

commit 888a83c221
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:58:27 2013 -0700

    InternalLb: Start/deploy internal LB vms for the existing LB rules as a part of network implement

commit 3b41d5bee1
Merge: bb73531 4b1a9f1
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:32:40 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	server/src/com/cloud/network/NetworkModelImpl.java
    	server/src/com/cloud/server/ManagementServerImpl.java

commit bb73531fed
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 15:13:55 2013 -0700

    Internal Lb: list internal lb vms as a part of listRouters response. Introduced new parameter - role (can be virtual_router or internal_lb_vm)

commit c113ea184b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 12:00:09 2013 -0700

    Add Internal Lb Provider/Element as a part of adding a physical network

commit 78c9db79da
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 12 10:05:28 2013 -0700

    InternalLbVm: destroy the internal lb vm when the last rule for the ip is being revoked

commit af6201257b
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 16:55:37 2013 -0700

    Internal LB: fixed some bugs in internal lb vm startup process

commit 1db240c2b6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:23:55 2013 -0700

    InternalLb: fixed searchCriteria constructor in ApplicationLoadBalancerDaoImpl

commit 3795048fcc
Merge: f4c2b53 5f8a278
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 14:09:31 2013 -0700

    Merge branch 'master' into internallb1

    Conflicts:
    	api/src/com/cloud/async/AsyncJob.java
    	api/src/org/apache/cloudstack/api/ApiConstants.java
    	api/src/org/apache/cloudstack/api/BaseCmd.java
    	api/src/org/apache/cloudstack/api/ResponseGenerator.java
    	client/tomcatconf/commands.properties.in
    	server/src/com/cloud/api/ApiDBUtils.java
    	server/src/com/cloud/api/ApiResponseHelper.java
    	server/src/com/cloud/server/ManagementServerImpl.java
    	setup/db/db/schema-410to420.sql

commit f4c2b53c21
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 13:46:47 2013 -0700

    InternalLB: modified InternalLbElement to start the Internal Lb vm for each ip address (if not already started)

commit 76a4b1cf81
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 11:41:47 2013 -0700

    InternalLB: added logic for acquiring guest ip address for the Internal LB rule

commit 915e39fbaa
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 11 10:19:18 2013 -0700

    Removed unused methods doing ipAllocation from GuestNetworkGuru and NetworkServiceImpl. The correct method is located in NetworkModelImpl

commit 3f2a62c7f6
Merge: 20beb7a a0b5ebc
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 17:16:07 2013 -0700

    Merge branch 'master' into internallb1

commit 20beb7a16c
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:28:12 2013 -0700

    Internal LB: applyLoadBalancerRules - put not null check for sourceIpAddressId (can be null when Schema is not Public)

commit 87e5f5b9a6
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Wed Apr 10 15:17:58 2013 -0700

    Internal LB: intermediate checkin - added InternalLBAppliance manager and managerImpl

commit 53b9c0d142
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:55:10 2013 -0700

    Internal LB: added @Since to API docs for Internal LB related commands

commit 867b305ea8
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 17:51:19 2013 -0700

    Internal LB: Made InternalLbElement to extend the ip deployer as the LB service implements IPDeployerRequester

commit 7b9af28094
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 15:45:30 2013 -0700

    InternalLb: new set of Web Services APIs to add InternalLB as a network element to the cloudStack (the element is packaged as an independent plugin). New APIs:

    1) configureInternalLoadBalancerElement
    2) createInternalLoadBalancerElement
    3) listInternalLoadBalancerElements

commit 039e303d4a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 14:01:11 2013 -0700

    InternalLB: Modified pluggable service VirtualRouterElementService to accept only VirtualRouter and VpcVirtualRouter as a VirtualRouterProvider type when add/configure elements. Other VirtualRouterProviderTypes are are taken care by elb/internal lb plugins.

commit f0018b4512
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Tue Apr 9 12:56:42 2013 -0700

    Internal LB:

    1)Added InternalLoadBalancerManager and corresponding Impl
    2)Add InternalLbVm as a default CS provider. DB upgrade is covered as well

commit e344cf250a
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:57:47 2013 -0700

    InternalLB - removed unused code from LoadBalancerDao

commit 3588f46848
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 16:23:03 2013 -0700

    Internal LB - added network-element plugin for internal lb service

commit 76325e6168
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 13:58:08 2013 -0700

    Internal Lb:

    1) When network has both kinds of LB rules - Public and Internal - never send them in the same set to the provider
    2) Added extra checks on the provider side to validate if the schema - Public or Internal - is supported.

commit 56c2fe1d37
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:34:59 2013 -0700

    InternalLB:

    1) Added new capability for the LB service - LbSchemes. Can take 2 values - Internal and Public.
    2) F5 and Netscaler LB providers - changes all LB related methods to accept LoadBalancingRule instead of ? extends FirewallRule.

commit 34bcb2d026
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Mon Apr 8 12:11:11 2013 -0700

    InternalLB: implemented list/delete/create web services API commands that will be used for Internal LB creation

commit 9ab31e11f7
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Fri Apr 5 15:59:55 2013 -0700

    InternalLB: change LoadBalancingRule - reference sourceIpAddress of th load balancer by its value, not DB id

commit 08f855d4e4
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Date:   Thu Apr 4 09:26:21 2013 -0700

    InternalLB:

    1) Added new set of Interfaces - including the new VO - for the internal load balancer
    2) DB change - added source_ip_address/source_ip_address_network_id/scheme (Internal/Public) fields to the load_balancer table
2013-05-09 11:54:41 -07:00
Min Chen 545d2e4eb6 Change removed field annotation in TemplateJoinVO to remove workaround
for not showing removed entries.
2013-05-08 18:04:02 -07:00
Min Chen e8c69632b6 Fix an issue in showing removed templates in list call. 2013-05-07 17:45:06 -07:00
Alena Prokharchyk b29449b4b7 CLOUDSTACK-129: added new API - listNetworkIsolationMethods - for displaying isolation methods supported by the cloudStack 2013-05-06 11:46:43 -07:00
Likitha Shetty c8d843241e Dedicate guest vlan range to account 2013-05-06 10:02:41 +05:30
Min Chen a221ecb484 Workaround an issue of null url when ListTemplateCommand is received on
SSVM side, also fix a bug in listTemplates with id passed.
2013-05-04 23:09:23 -07:00
Jayapal 1f1467974f CLOUDSTACK-1828 Source Nat on private gateway feature 2013-05-02 15:40:15 +05:30
Min Chen 3c6b7c2a01 Populate system vm template to template_store_ref in adding an image
store.
2013-05-01 12:10:24 -07:00
Min Chen bbd5d13213 Fix bugs in refactored listTemplates and listIsos API. 2013-04-30 11:31:45 -07:00
Kelven Yang ce7dc70b1d CLOUDSTACK-2194: Fix ApiServer component initialization sequence 2013-04-30 10:59:29 -07:00
Harikrishna Patnala deaf9106ca CLOUDSTACK-741: Granular Global Parameters and adding fixes for CLOUDSTACK-2176, CLOUDSTACK-2198, CLOUDSTACK-2200
Adding the zone, cluster, account level parameters
The parameters at scope (zone/cluster/pool/account) can be updated by updateConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
Whenever these scoped parameters are used in CS they get value from the corresponding details table if not defined get value from global parameter.
Same with the listConfiguration API with additional parameter zoneid/clusterid/accountid/storagepoolid
2013-04-29 14:11:51 +05:30
Nitin Mehta 335aca3f54 =changes #2 2013-04-28 10:28:31 +05:30
Nitin Mehta 242f5f9cf7 =More changes and marvin test 2013-04-27 11:08:02 +05:30
Jessica Wang a20ed3a43d CLOUDSTACK-2120: mixed zone management - API: change listZones API to to take in zonetype instead of networktype (to be consistent with other listXXXXXXXs API). 2013-04-26 11:37:32 -07:00
Min Chen efb4471dc9 CLOUDSTACK-2196 and CLOUDSTACK-2126: fix missing async job status in
listXXX api and incorrect async job status in other async api.

Conflicts:
	server/src/com/cloud/api/query/vo/AccountJoinVO.java
2013-04-25 17:40:18 -07:00
Jessica Wang 6f60833f93 CLOUDSTACK-2120: mixed zone management - (1) extend listRouters API to to take in zonetype. (2) UI: populate Routers list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of Routers based on selected option in zone type dropdown on top menu. 2013-04-25 15:10:33 -07:00
Jessica Wang b5979ba9b5 LOUDSTACK-2120: mixed zone management - (1) extend listZones API to to take in networktype. (2) UI: populate Zones list page with ones whose networktype matches selected option in zone type dropdown on top menu. (3) UI: count total number of zones based on selected option in zone type dropdown on top menu. 2013-04-25 10:40:08 -07:00
Jessica Wang ee02311fae CLOUDSTACK-2120: mixed zone management - (1) extend listHosts API to to take in zonetype. (2) UI: populate Hosts/SecondaryStorages list page with ones whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-25 09:51:57 -07:00
Nitin Mehta d1642a489c =initial changes 2013-04-25 18:29:57 +05:30
Jayapal d5c3f87903 CLOUDSTACK-1741 Added ip uuid into the AddIptoVmNicCmd response
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-04-25 15:16:26 +05:30
Jayapal 1f97b528c5 CLOUDSTACK-1573 listNics response update for not showing vlan to normal user 2013-04-25 14:48:41 +05:30
Jessica Wang 48b82a6f91 CLOUDSTACK-2120: mixed zone management - (1) extend listStoragePools API to to take in zonetype. (2) UI: populate Primary Storages list page with ones whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 16:36:07 -07:00
Jessica Wang d893ba881b CLOUDSTACK-2120: mixed zone management - (1) extend listVolumes API to to take in zonetype. (2) UI: populate Volumes list page with instances whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 11:26:58 -07:00
Min Chen 792fc471a2 Remove VolumeHostDao references from codebase. 2013-04-24 11:11:58 -07:00
Jessica Wang cdd459bb0b CLOUDSTACK-2120: mixed zone management - (1) extend listVirtualMachines API to to take in zonetype. (2) UI: populate Instances list page with instances whose zonetype matches selected option in zone type dropdown on top menu. 2013-04-24 10:38:28 -07:00
Murali Reddy f65f3b9d50 CLOUDSTACK-1958: List GSLB response should have the GSLB site (zone load
balancer rule) details as well
2013-04-24 21:03:26 +05:30
Vijayendra Bhamidipati b0caae6b33 CLOUDSTACK-1086: DeployVirtualMachine userdata enhancements
Description:

	Currently, userdata sent over to the DeployVMCmd and
	updateVMCmd commands can be upto 2K in length, whether
	sent over GET or POST. We remove this limitation for
	POST to change this limit to 32K. Also enabling lazy
	load on userdata to improve performance during reads
	of large sized userdata from user VM records.

Signed-off-by: Min Chen <min.chen@citrix.com>
2013-04-24 13:42:38 +05:30
Min Chen 7543f314a7 Remove more VMTemplateHostDao references. 2013-04-23 17:12:21 -07:00
Jessica Wang 04a2b2d326 CLOUDSTACK-2120: mixed zone management - extend listPods, listClusters, listHosts, listStoragePools, listSystemVms, listRouters API to return zone type. 2013-04-23 16:32:19 -07:00
Min Chen 246e58013d Remove VMTemplateHostDao reference from TemplateManagerImpl. 2013-04-23 15:09:37 -07:00
Jessica Wang 15e2bc463f CLOUDSTACK-2120: mixed zone management - extend listSnapshots API to return zone type. 2013-04-23 14:03:35 -07:00
Jessica Wang 6230e5b77b CLOUDSTACK-2120 - mixed zone management - extend listIsos API to return zone type. 2013-04-23 13:46:36 -07:00
Jessica Wang f7f1279d81 CLOUDSTACK-2120: mixed zone management - extend listTemplates API to return zone type. 2013-04-23 13:01:55 -07:00
Jessica Wang 16ba999bf1 CLOUDSTACK-2120: mixed zone management - extend listNetworks API to return zone type. 2013-04-23 13:01:55 -07:00
Jessica Wang 35e2072660 CLOUDSTACK-2120: mixed zone management - extend listVolumes API to return zone type. 2013-04-23 13:01:55 -07:00
Min Chen e40a06deae Fix extractTemplateCmd. 2013-04-22 21:48:57 -07:00
Jessica Wang 612e5fb672 LOUDSTACK-2120: mixed zone management - extend listVirtualMachines API to return zone type. 2013-04-22 10:08:19 -07:00
Min Chen 539824797c Refactor listTemplatesCmd and listIsoCmd to use db view. 2013-04-19 16:10:09 -07:00