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