Commit Graph

1082 Commits

Author SHA1 Message Date
Alena Prokharchyk
68937cd207 CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands 2014-01-29 11:50:27 -08:00
Marcus Sorensen
0502d2f375 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
Min Chen
d40e52776a Add ResourceType annotation for ListTemplatesCmd. 2014-01-27 10:46:15 -08:00
Prachi Damle
8f8cd21dec EntityType value for SSHKeyPair and ResourceTag 2014-01-24 22:34:18 -08:00
Prachi Damle
bc45d33f19 @ACL and EntityType for Network commands 2014-01-24 22:27:13 -08:00
Prachi Damle
4808c0fdcb @ACL and EntityType for VPC commands 2014-01-24 22:14:50 -08:00
Prachi Damle
e4c188a5cb Default accessType is Use - Read and Use 2014-01-24 18:16:59 -08:00
Prachi Damle
4a30102ca8 ListSecurityGroupCmd should have the EntityType added to the command 2014-01-24 17:58:35 -08:00
Prachi Damle
1d98ef9821 @ACL and EntityType for FirewallRule commands 2014-01-24 17:06:11 -08:00
Prachi Damle
695de1eaed @ACl and @EntityType annotations for: AffinityGroup, AutoScale, Events 2014-01-24 17:06:09 -08:00
Prachi Damle
af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -08:00
Prachi Damle
96a64b933e - Adding OperateEntry during loading of commands
- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name
2014-01-23 17:50:59 -08:00
Damodar Reddy
4925b9f6a1 CLOUDSTACK-2031:support for number of ips per nic limit needs to be added for the multiple ip address per nic 2014-01-23 18:14:12 +05:30
Min Chen
33cd1ab921 Merge branch 'master' into rbac 2014-01-22 11:23:51 -08:00
Alena Prokharchyk
a0197006ef Removed "host" config parameter definition from ClusterManager interface as it got moved to cloud-api package 2014-01-21 17:19:52 -08:00
Alena Prokharchyk
452c20b242 Configuration: define "host" global config parameter in cloud-api package instead of ClusterManager as the parameter is mostly used by sevices components running remotely (consoleProxy, secondarystorage), or by third party integrators.
Also intoroduced one more global config parameter - api.servlet.endpoint (default value is "http://localhost:8080/client/api?"). The parameter defines API end point. Can be used by CS components/services deployed remotely, for sending CS API requests
2014-01-20 13:37:52 -08:00
Min Chen
929fbabaa2 Merge branch 'master' into rbac. 2014-01-17 14:37:08 -08:00
Milamber
98183e905d Add Apache License. 2014-01-17 11:28:14 +00:00
Alena Prokharchyk
bd79fb33a6 CLOUDSTACK-5870: API support for retrieving user data 2014-01-16 15:31:18 -08:00
Min Chen
6583cb3800 Add listAclGroupsByAccount to QuerySelector adapters and remove
AclProxyService interface.
2014-01-14 16:19:25 -08:00
Alex Huang
68b8891c62 Removed all reminants of the IdentityService. Created the KeysManager to move the management
of keys out of management server
2014-01-14 13:11:35 -08:00
Min Chen
bae498c89e Handle search of those entities without db view created using new ACL
model.
2014-01-13 21:55:56 -08:00
Murali Reddy
af657b3d71 CLOUDSTACK-5861: networks that failed to implement can not be destroyed
introduces a force option in delete network to forcifully delete a
network. This comes handy in rare cases where network fails to implenet
and network is in shutdown state, but network shutdown to rollback
implement process fails as well.

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
	server/src/com/cloud/user/DomainManagerImpl.java
2014-01-13 23:28:35 +05:30
Marcus Sorensen
6e902f8354 Fix Null pointer in CreateVlanIpRangeCmd 2014-01-11 10:09:52 -07:00
Marcus Sorensen
8ee61f3a57 CLOUDSTACK-5502 createVlanIpRange, allow untagged to be accepted per previous use,
equate empty string to untagged in api parameter input
2014-01-10 17:09:41 -07:00
Min Chen
43f0f901dd Remove VO and DAO from cloud-engine-schema. 2014-01-10 15:57:39 -08:00
Min Chen
e42a262f6c Remove old APIs and old security checker plugins. Also use QuerySelector
adapater in ACL search routine.
2014-01-10 14:54:31 -08:00
Prachi Damle
42e53702a2 CLOUDSTACK-5732 [UI] Search is not working in Affinity Groups panel
- Added keyword support

Conflicts:

	api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java
	api/src/org/apache/cloudstack/query/QueryService.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
2014-01-10 14:45:08 -08:00
Harikrishna Patnala
5bf78b82c0 CLOUDSTACK-4904: Unable to see a derieved template if the
parent template is deleted. Modified template_view so that removed(or InActive) templates also be there in the view.
Previous behavior of listing templates and state column in vm_templates will be the same.
2014-01-10 10:26:10 -08:00
Bharat Kumar
7053c222f9 CLOUDSTACK-5651 deployVm: customparameters param name has to be changed
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/ScaleVMCmd.java
	api/src/org/apache/cloudstack/api/command/user/vm/UpgradeVMCmd.java
	server/src/com/cloud/server/ManagementServerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
2014-01-10 10:01:43 -08:00
Nitin Mehta
5c1d639bc4 CLOUDSTACK-5829:
listvms should return the diskoffering id when deployed with an iso
2014-01-08 18:32:51 -08:00
Min Chen
649d9d927f CLOUDSTACK-5840:Migration from NFS to S3 should be done in one API
(updateCloudToUseObjectStore) instead of two APIs.
2014-01-08 17:25:13 -08:00
Alena Prokharchyk
07557eb570 CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse 2014-01-08 14:40:10 -08:00
Hugo Trippaers
850bc9fa82 Hook the OpenDaylight plugin into CloudStack 2014-01-08 15:58:08 +01:00
Alena Prokharchyk
b15431e574 CLOUDSTACK-5810: addSecondaryIp to vm's nic - derive the ip owner from the vm instance account, not from the caller 2014-01-06 17:09:14 -08:00
Alena Prokharchyk
647ea6e2d0 listNics API: added optional networkId parameter allowing to list nics by network id for the specific vm 2014-01-06 17:09:14 -08:00
Prachi Damle
e6238baa3a - Adding @ACL and EntityType values to SecurityGroup, Snapshot
- Correctinf the VM and Volume APIs
2014-01-06 16:58:42 -08:00
Prachi Damle
04a0d12a68 Adding @ACL annotation to Volume commands 2014-01-02 18:39:20 -08:00
Min Chen
c950651fe2 Use IAMService to implement QuerySelector adapter. 2013-12-26 19:53:49 -08:00
Prachi Damle
337e33a014 Adding EntityType for listAccounts 2013-12-26 15:17:08 -08:00
Alena Prokharchyk
526af5e326 Included guestOsId to userVmResponse - as we let to change this param through updateVm call, we should return it in the response 2013-12-26 13:28:29 -08:00
Min Chen
5d262d7b59 CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
migration to S3.
2013-12-26 12:39:39 -08:00
Alena Prokharchyk
03226ba539 Added deviceId parameter to the NicResponse. This information can be useful for the user if he wants to see the order of the networks in his vm 2013-12-24 15:34:43 -08:00
Alena Prokharchyk
914bc46484 CLOUDSTACK-5390: when calculate index (page #) in NetworkManager, rely on fact that getStartIndex() returned by API, returns pageSize*(page-1). So to get index(page), you need to do the reverse calculation 2013-12-23 16:28:06 -08:00
Alena Prokharchyk
fbba17e68c Resource metadata support for cloudStack user 2013-12-23 14:25:07 -08:00
Min Chen
630b7fb4a1 Fix listTemplates issues with new ACL model. 2013-12-20 17:57:44 -08:00
edison su
9c77f68095 Revert "Remove uncessary changes."
This reverts commit fcab2b776a.
2013-12-19 13:35:52 -08:00
edison su
336241be76 Remove uncessary changes. 2013-12-19 13:35:37 -08:00
edison su
02ace3442d 0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to- 2013-12-19 13:35:21 -08:00
Prachi Damle
4bd2df42d0 Adding @ACL and EntityType to VM commands. 2013-12-18 16:34:37 -08:00
Prachi Damle
3f092d14cc Adding the AclEntityType attribute to APICommand annotation 2013-12-13 16:04:25 -08:00
Min Chen
d2922b9254 Separate ListAccounts cmd to use two different views. 2013-12-12 17:52:45 -08:00
Min Chen
312ff76f69 Separate listZones cmd to use two different views, also renamed previous
listZonesByCmd to listZonesCmd.
2013-12-12 17:40:30 -08:00
Min Chen
a6d03cd826 Separate IpAddress related cmds to use two different views. 2013-12-12 17:20:34 -08:00
Min Chen
add277a4aa Separate network and VPC related cmd to use two different views. 2013-12-12 16:53:59 -08:00
Prachi Damle
7c6f1c14c2 ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and 2013-12-12 16:31:00 -08:00
Prachi Damle
1a985227b5 Changes to SecurityChecker 2013-12-12 16:30:53 -08:00
Alex Huang
cf0a11e45a pull merges 2013-12-12 13:00:26 -08:00
Alex Huang
be5e5cc641 All Checkstyle problems corrected 2013-12-12 12:26:07 -08:00
Kishan Kavala
fa38a7a409 Upgrade router template by accountName and domainId instead of accountId
Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/router/UpgradeRouterTemplateCmd.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-12 18:28:30 +05:30
Min Chen
67b97539ac Separate ListTemplatePermissions and ListIsoPermissions commands to use
two different views.
2013-12-11 17:41:10 -08:00
Min Chen
8f21eca922 Separate Template/ISO related APIs to use two different views. 2013-12-10 12:23:39 -08:00
Min Chen
e66b58b65f Separate AttachIso and DetachIso to use different response views. 2013-12-10 10:52:19 -08:00
Murali Reddy
bd238ce24e CLOUDSTACK-5431: permit 'http' as service type for GSLB rule 2013-12-10 08:08:24 +05:30
tuna
4de09ee654 add Apache Licensed 2013-12-10 08:37:37 +07:00
Min Chen
d252d95c26 Separate all vm related user APIs to have two different views. 2013-12-09 17:30:57 -08:00
Murali Reddy
be67f5d17a CLOUDSTACK-5428: support NetScaler to be configured exclusively for GSLB
service and not used for LB

Fix adds a boolean flag to addNetscalerLoadBalancer api, which
will mark added NetScaler for exclusive GSLB service. A netscaler marked
as exclusive gslb service provider is not picked for any guest network's
lb provider.
2013-12-10 06:20:58 +05:30
Min Chen
6730fa2b47 Fill in implementation of AclService.getGrantedDomains,
getGrantedAccounts and getGrantedResources.
2013-12-09 14:08:54 -08:00
tuna
015ab6af8a fix rebase master 2013-12-09 23:33:14 +07:00
tuna
3df8b912fc add kvm support & LB service 2013-12-09 23:33:14 +07:00
tuna
d935d3865a tuna 2013-12-09 23:33:14 +07:00
tuna
96188a3730 re-factor gre controller prototype 2013-12-09 23:33:14 +07:00
Kishan Kavala
587f587621 CLOUDSTACK-5145 : Added permission checks while listing network ACLs and acl Items. Users will be able to list items that they have access to.
Conflicts:
	api/src/com/cloud/network/vpc/NetworkACLService.java
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLListsCmd.java
	server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
	server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-09 21:57:47 +05:30
Fang Wang
15338e42a8 cloudstack-4308 Add API listCapabilities for KVMSnapshotEnabled so that UI can use it for recurring snapshot.
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/config/ListCapabilitiesCmd.java
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
	server/src/com/cloud/server/ManagementServerImpl.java

Conflicts:
	api/src/org/apache/cloudstack/api/response/CapabilitiesResponse.java
2013-12-06 16:05:57 -08:00
Min Chen
a416f6c3c3 Fix API build error based on new DB schema, now only
RoleBasedEntityAccessChecker needs to be fixed.
2013-12-06 15:09:00 -08:00
Prachi Damle
5475312612 CLOUDSTACK-5399: Add option to createVolume API to specify a VM, to place the volume appropriately and attach immediately
Changes:

    - Added 'virtualmachineid' parameter to the createVolume API to specify a VM for the volume. The Vm should be in 'Running' or 'Stopped' state.
    - This parameter is used only when createVolume API is called using snapshotid parameter
    - When this parameter is set, the volume is created from the snapshot in the pod/cluster of the VM. Also the volume is then attached to the VM in the same request
    - If attach Volume fails but create has succeeded, the API errors out but the Volume created remains available. User may attach the same volume later
    - When Vm is provided, but if no storage pool is available in the VM's pod/cluster then the volume is not created and API fails.
2013-12-06 11:18:26 -08:00
Alena Prokharchyk
bd6f706b72 CLOUDSTACK-5261: added support for Alert publishing via ROOT Admin API
Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/AgentManagerImpl.java
	engine/orchestration/src/com/cloud/vm/VirtualMachineManagerImpl.java
	engine/storage/image/src/org/apache/cloudstack/storage/image/TemplateServiceImpl.java
	engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultHostListener.java
	engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
	plugins/hypervisors/hyperv/src/com/cloud/hypervisor/hyperv/discoverer/HypervServerDiscoverer.java
	plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/VmwareServerDiscoverer.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/discoverer/XcpServerDiscoverer.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	server/src/com/cloud/alert/ConsoleProxyAlertAdapter.java
	server/src/com/cloud/alert/SecondaryStorageVmAlertAdapter.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerExtImpl.java
	server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	server/src/com/cloud/resourcelimit/ResourceLimitManagerImpl.java
	server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
	server/src/com/cloud/vm/UserVmManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java
	usage/src/com/cloud/usage/UsageManagerImpl.java

listAlerts: introduced new parameter "name" to the alertResponse

Conflicts:
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	server/src/com/cloud/alert/AlertManagerImpl.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

Added new Admin API - generateAlert. Available to ROOT admin only

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/BaseCmd.java
	usage/src/com/cloud/usage/UsageAlertManagerImpl.java

listAlerts: implemented search by alert name

Conflicts:
	api/src/org/apache/cloudstack/alert/AlertService.java
	api/src/org/apache/cloudstack/api/command/admin/resource/ListAlertsCmd.java
	engine/schema/src/com/cloud/alert/AlertVO.java
2013-12-04 10:05:46 -08:00
Bharat Kumar
e5cfe94818 CLOUDSTACK-5160 add a map to specify the custom compute parameters in the deployvm api.
Signed-off-by: Jayapal <jayapal@apache.org>
2013-12-04 11:28:45 +05:30
Bharat Kumar
68406ba29d CLOUDSTACK-5161 enable scaling of a vm using custom offering
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-29 17:53:33 +05:30
Alena Prokharchyk
426f564944 Resource metadata support for NetworkACLItem
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/network/ListNetworkACLsCmd.java
2013-11-27 14:38:12 -08:00
Jayapal
6c9edaf613 CLOUDSTACK-5285 Corrected the API description 2013-11-27 11:01:36 +05:30
Nitin Mehta
414d415dba CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Adding functions to resourcelimitmanager and doing it for the volumes at the moment.
2013-11-26 16:21:45 -08:00
Nitin Mehta
6bea532efa CLOUDSTACK-5206: Ability to control the external id of first
class objects. Putting in the generic methods and trying it
 for objects like vm, volume. This is the first cut
2013-11-26 09:52:17 -08:00
Prachi Damle
cf69731a52 Suring startup load the API permissions from commands.properties and @APICommand annotations 2013-11-25 17:01:56 -08:00
Prachi Damle
f231cec5b7 Loading api permissions from commands.properties during startup 2013-11-25 10:59:12 -08:00
Min Chen
015d06e7fc Separate all volume related APIs to two Cmd classes based on two
response views.
2013-11-22 18:48:20 -08:00
Min Chen
11c0c263f2 QueryChecker interface and ACL search criteria to be used for query api
for entities with db views created.
2013-11-22 16:36:38 -08:00
Alena Prokharchyk
fad0cfcc18 Added new paramerer "start" to createVPC command. When false is passed in, VPC won't be started (its VPC VR won't get implemented) till the point when the first netwotrk gets implemented in the VPC.
The parameter is optional and true by default to preserve the original behavior

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vpc/CreateVPCCmd.java
	engine/orchestration/src/org/apache/cloudstack/engine/orchestration/NetworkOrchestrator.java
2013-11-22 09:39:54 -08:00
Min Chen
c3baf3ad72 Interface for QueryChecker adapter. 2013-11-21 10:32:26 -08:00
Min Chen
81a794a5d3 Change two static response views to Full and Restricted. 2013-11-21 10:32:08 -08:00
Alex Huang
433a631916 Reformat of source code to set a stable base for the future. I couldn't get checkstyle enabled. There's still about a thousand errors from checkstyle. Most of it from length errors from comments and strings. Will attempt to remove those tonight. This change is so large I just want to get it in before any merge nightmares. The changes are fairly minor though and I did a full compile and start a server with the reformat code. 2013-11-21 07:56:47 -08:00
Alex Huang
170f32f171 Broke up some long strings 2013-11-21 07:25:01 -08:00
Alex Huang
d620df2bdd Reformatted all of the code. 2013-11-21 06:15:26 -08:00
Alex Huang
224f479974 Removed trailing spaces 2013-11-21 04:08:01 -08:00
Alex Huang
62e9273581 Removed trailing spaces 2013-11-21 03:12:05 -08:00
Kelven Yang
278ef81a83 side-by-side VM sync management at manager level 2013-11-20 17:59:38 -08:00
Min Chen
7ed030115e Updated DB schema and DAO layer classes according to new FS. 2013-11-20 17:32:09 -08:00
Wido den Hollander
1edaa36cc6 CLOUDSTACK-1302: Allow a cache mode per disk offering
Per disk offering the setting none, writeback or writethrough can be set

This allows for both safety and performance for writes.
2013-11-20 17:11:10 +01:00
Alex Huang
8d62744681 Reformat all source code. Added checkstyle to check the source code 2013-11-20 07:26:53 -08:00
Syed Ahmed
481af07fb1 Adding protocol parameter to loadbalancer response 2013-11-19 22:12:44 +05:30
Kishan Kavala
a9413707c9 Fix listRouter by clusterId and upgradeRouterTemplate by clusterId 2013-11-18 13:05:34 +05:30
Edison Su
1292b76c63 Add a new method on datastoredriver: getCapabilities, which will be called by liststoragepoolcmd. UI can make decision based on the capabilities of the storage.
And also add a new table: snapshotdetails
2013-11-14 15:55:39 -08:00
Alena Prokharchyk
96b9ebafc0 listRemoteAccessVpns: implemented search by networkId and id 2013-11-13 14:26:15 -08:00
Alena Prokharchyk
d905c10214 listFirewallRules - added optional networkId parameter allowing to search for firewall rules by guest network id 2013-11-12 17:17:48 -08:00
Alena Prokharchyk
268c27b4f2 ListPortFowardingRules: added networkId to the list of optional parameters to list by 2013-11-11 16:17:43 -08:00
Rajesh Battala
19e9849d86 Enabled the traffic lable support the hyperv hypervisor type. Modified the physical_network_traffic_types table to introduce hyperv_network lable column.
Modified associated VO's and impls classes. Modified the List/Update/Add TrafficType command api's and response classes.
Fixed the Unit tests
2013-11-08 20:21:18 +05:30
Syed
0076307863 Squashed merge of Ssl Termination feature
Bug: https://issues.apache.org/jira/browse/CLOUDSTACK-4821
FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/SSL+Termination+Support

This patch implements the SSL offload feature for loadbalancers
and includes the implementaion for this to work with Netscaler.

The following are the new API's that this patch adds

uploadSslCert
deleteSslCert
listSslCert
assignCertToLoadBalancer
removeCertFromLoadBalancer

Unit tests are also included in the patch.
2013-11-08 16:49:16 +05:30
Sebastien Goasguen
b36ed1289a CLOUDSTACK-4998 additional bug fixed 2013-11-08 10:39:49 +01:00
Edison Su
0997ccac22 fix compile 2013-11-07 16:56:41 -08:00
Edison Su
c233492bfc Add quiencevm option on createsnapshotcmd 2013-11-07 14:57:05 -08:00
Kishan Kavala
3f5b8f7063 CLOUDSTACK-4793 : Added UpgradeRouterTemplate API. Added filters to listRouters API. listRouters response includes verion and required upgrade flag. Min VR version is checked before sending commands to router 2013-11-07 19:49:05 +05:30
Bharat Kumar
7095ea2b5e CLOUDSTACK-4738 Dynamic compute offering.
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-07 12:41:20 +05:30
Mike Tutkowski
10c513a259 CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2013-11-06 21:02:39 -07:00
Hugo Trippaers
a7201a81b2 The VPC offering has the option internaly to specify the compute offering (service offering), expose this via the api.
Added a field to the command for serviceOfferingId and changed the internal interface to accept the service offering as parameter

Applied automated code cleanup
2013-11-06 22:13:00 +01:00
Will Stevens
8f8ad3f38e Squashed commit of the Palo Alto Networks firewall integration plugin.
This patch adds a network plugin to support Palo Alto Networks firewall (their appliance and their VM series firewall).

More information in the FS: https://cwiki.apache.org/confluence/display/CLOUDSTACK/Palo+Alto+Firewall+Integration

Features supported are:
- List/Add/Delete Palo Alto service provider
- List/Add/Delete Palo Alto network service offering
- List/Add/Delete Palo Alto network with above service offering
- Add instance to the new network (creates the public IP and private gateway/cidr on the PA as well as the source nat rule)
- List/Add/Delete Ingress Firewall rule
- List/Add/Delete Egress Firewall rule
- List/Add/Delete Port Forwarding rule
- List/Add/Delete Static Nat rule
- Supports Palo Alto Networks 'Log Forwarding' profile globally per device (additional docs to come)
- Supports Palo Alto Networks 'Security Profile Groups' functionality globally per device (additional docs to come)

Knowns limitations:
- Only supports one public IP range in CloudStack.
- Currently not verifying SSL certificates when creating a connection between CloudStack and the Palo Alto Networks firewall.
- Currently not tracking usage on Public IPs.

Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-11-06 10:08:22 -08:00
Harikrishna Patnala
a286dec098 CLOUDSTACK-4908: CPU socket count of host Adding cpu socket count of the host in hostresponse
Signed-off-by: Koushik Das <koushik@apache.org>
2013-11-05 16:12:36 +05:30
Min Chen
ce3638bb03 Merge branch 'master' into rbac. 2013-11-04 15:49:29 -08:00
Alena Prokharchyk
7a26894eb0 Changes to @Parameter - added RoleType[] authorized() field. The field defines who is authorized to put the parameter to the call. If the person is not authorized, the parameter will be ignored.
Also fixed CLOUDSTACK-5024 - added storageId to the list of the request parameters (available to the Root admin only)
2013-11-01 22:48:11 -07:00
Min Chen
2ef4d5200c Merge branch 'master' into rbac. 2013-10-31 17:16:33 -07:00
Edison Su
c5bec6b336 add quiescevm in createvmsnapshotcmd 2013-10-31 16:45:05 -07:00
Alena Prokharchyk
78b1ac4126 CLOUDSTACK-3868: fixed "count" param in listUsageRecords API to return the actual number of records matching the search criteria. Used to return the wrong value - the number of records per page
Conflicts:
	server/src/com/cloud/usage/UsageServiceImpl.java
	utils/src/com/cloud/utils/db/GenericDaoBase.java
2013-10-31 15:25:57 -07: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
Sebastien Goasguen
ee5a3964aa CLOUDSTACK-4998: fix assignvm response string 2013-10-30 04:09:04 -04: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
Min Chen
6be228a438 CLOUDSTACK-4024:Provide a way to upgrade from existing NFS secondary
storage to S3.
2013-10-28 21:01:31 -07:00
Darren Shepherd
9f7b4884a7 Make commands.properties optional for non-ACS code
Currently any new API extension to CloudStack must edit
commands.properties to add the appropriate ACLs.  This generally works
fine for ACS as we control the contents of that file and distribute
all the code ourself.  The hang up comes when somebody develops code
outside of ACS and want to add their code to an existing ACS
installation.  The Spring work that has been done has made this much
easier, but you are still required to manually edit
commands.properties.  This change introduces the following logic.

First check commands.properties for ACL info.  If ACL info exists, use
that to authorize the command.  If no ACL information exists (ie
null), then look at the @APICommand annotation.  The defaults of
@APICommand will provide no ACL info.  If the @APICommand annotation
provides no ACL info, use that.
2013-10-25 16:31:55 -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
Sheng Yang
1528725949 CLOUDSTACK-754: Enable Remote Access VPN for VPC
With integration smoke test case.
2013-10-24 17:34:41 -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
Wei Zhou
059e3beb28 CLOUDSTACK-4505: add ExpungeVM command to expunge a destroyed VM on demand 2013-10-24 11:52:00 +02:00
Darren Shepherd
63e46ad1d0 Make system CallContext load user on demand
Before every thread would hit the database once at the start to
load the system account and user.  The loaded objects are almost never
used.  This change optimizes the behavior and lazy loads the system
user and account object.
2013-10-23 23:09:58 -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
Laszlo Hornyak
847274f31f Some StringBuffers replaced by StringBuilders
StringBuffers replaced by StringBuilders to avoid unnecesary synchronization overhead.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-22 23:35:08 +02: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
dhoogland
c0c46268ac CLOUDSTACK-4328 httpclose/mode as keepAliveEnabled 2013-10-22 12:44:23 +02:00
Harikrishna Patnala
54e365d00b CLOUDSTACK-4493: registerSSHKeyPair API doc contains wrong API response (private key) Changing the response object of register and list ssh keypairs APIs
Signed-off-by: Koushik Das <koushik@apache.org>

Conflicts:
	api/src/org/apache/cloudstack/api/command/user/ssh/CreateSSHKeyPairCmd.java
2013-10-22 10:43:00 +05:30
Alena Prokharchyk
1ff5994a1c RemoveResourceDetail API - fixed response name to be lowercase to follow the rest of CS APIs' convention 2013-10-21 21:01:50 -07:00
Alena Prokharchyk
25d6e6ec66 CLOUDSTACK-4894: DestroyVirtualMachine API - added "expunge" admin-only parameter. When passed as true, the vm gets expunged immediately (false by default to preserve the initial command behavior)
Conflicts:
	api/src/org/apache/cloudstack/api/ApiConstants.java
	api/src/org/apache/cloudstack/api/command/user/vm/DestroyVMCmd.java
2013-10-21 11:11:42 -07:00
Alena Prokharchyk
aa570783e8 Added resource tag support for Zone 2013-10-17 15:26:28 -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
350c94474b Updates to revertSnapshot API Added revertSnapshot API action to UI 2013-10-14 15:19:51 -07:00
Laszlo Hornyak
87c1b357f2 BaseCmd not used methods
These private methods were only calling each other:
- writeNameValuePair
- writeObjectArray
- writeSubObject
- escapeXml
- escapeJSON

public method requireXmlEscape was only called from these methods, it was never overridden

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-12 23:26:20 +02:00
Laszlo Hornyak
6df77ec0ce BaseCmd.buildResponse methods removed
Both buildResponse methods were abandoned

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-12 19:42:50 +02:00
Min Chen
21dc2bef2a Fix getEntityOwnerId for CreateAclGroupCmd and CreateAclRoleCmd. 2013-10-11 20:56:46 -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
Min Chen
6b8cee5fc9 Fix build error. 2013-10-10 14:11:08 -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
Prachi Damle
ec4fa61ae3 Tested ACL for StartVmCmd using the new RoleBasedEntityAccessChecker 2013-10-10 00:46:06 -07:00
Prachi Damle
0b1aaf514f More logic to Role based checker 2013-10-10 00:43:56 -07:00
Min Chen
2b4703b6e6 Change ListVMsCmd to use new role and entity permission information. 2013-10-09 21:56:52 -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
Prachi Damle
579806440b Add permission flag to acl_entity_permission 2013-10-07 14:30:15 -07:00
Prachi Damle
385dfc230f Schema and VO/Dao for Role Permission 2013-10-07 12:33:28 -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
Edison Su
a129fe4e66 add missing files 2013-10-04 14:17:49 -07:00
Chris Suich
180cfa19e8 Refactor Storage Related Resource Code
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

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

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
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
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
Min Chen
bcd4cdd295 Fix compilation issue due to method rename. 2013-10-02 14:14:25 -07:00
Darren Shepherd
aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Prachi Damle
bb271926fb WIP AccessChecker plugin 2013-10-01 18:11:30 -07:00
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
Laszlo Hornyak
c61997f022 basic test for ApiDispatcher
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-09-30 13:08:15 +02:00
Alena Prokharchyk
43770e0cb2 CLOUDSTACK-4744: enhanced root admin API updateVolume with state/storageId parameters as a part of "Better control over first party objects" feature.
Also fixed existing bugs for the API:

* corrected action event to be VOLUME.UPDATE (was VOLUME.ATTACH)
* all parameters to update, should be optional - fixed that. If nothing is specified, the db object will remain with its original fields
2013-09-28 21:44:47 -07:00
Alex Huang
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
ed22dfef1b Add transaction handling in AclServiceImpl, and parent role support in
createAclRole.
2013-09-27 10:14:13 -07:00
Min Chen
97fd99b09a Add all Apis for AclRole. 2013-09-26 17:48:29 -07:00
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
Min Chen
ddae23c168 Add parent_role_id to acl_role table. 2013-09-23 13:18:57 -07:00
Min Chen
12b6e700b6 The first version of all the ACL VOs and DAOs. 2013-09-19 17:50:33 -07:00
Prachi Damle
3333a04c40 During Upgrade to 4.3, Populate the API Permissions per Out-Of-Box Role from commands.properties file 2013-09-19 12:32:54 -07:00
Daan Hoogland
2614b00c51 sdn hosted vpc gateways (using lswitch) 2013-09-18 16:56:56 +02:00
Alena Prokharchyk
d3d49bd0aa CLOUDSTACK-4632: updateNetwork with the new network offering - log original and new network offerings' ids in the Action event 2013-09-17 17:11:09 -07:00
Kelven Yang
832db1b398 Apply https://reviews.apache.org/r/14084/ 2013-09-17 16:29:48 -07:00
Wei Zhou
a7c91fea67 add error message for ResourceAllocationException in DeployVMCmd.java
(cherry picked from commit e74d8a1d14)
2013-09-11 10:06:48 +02: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
Prachi Damle
96ca70e2da CLOUDSTACK-4259 Dedicated Resources: createAffinityGroup API should not allow admin to create the group of this type through API
Changes:
- Block API from creating this type of group
2013-09-03 20:02:53 -07:00
Prachi Damle
ef22b42b38 CLOUDSTACK-4221: Dedicated Resources: changes to associate the dedicated resource with the 'ExplicitDedication' affinity group
Changes:
- Implict creation of the 'ExplicitDedication' Affinity group during resource dedication
- Only one group per account or per domain will be present
- ListDedicatedResources by affinityGroup
- Deployment should consider dedicated resources associated to the group only
- Deleting affinity group should release the dedicated resouces
- Releasing the dedicated resources should remove the group associated if there are no more resources.

Conflicts:

	plugins/dedicated-resources/src/org/apache/cloudstack/dedicated/DedicatedResourceManagerImpl.java
	plugins/dedicated-resources/test/org/apache/cloudstack/dedicated/manager/DedicatedApiUnitTest.java
	server/src/com/cloud/configuration/ConfigurationManagerImpl.java
2013-09-03 20:02:38 -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
Jayapal
7aea599eb4 CLOUDSTACK-4586 Added CIDR validation for SG Egress rules 2013-09-03 14:18:18 +05:30
Wei Zhou
62b09c9253 CLOUDSTACK-2319: fix incorrect account_id in event table for Revoke SecurityGroupRule commands
(cherry picked from commit d9ba234d6c)
2013-09-02 16:53:55 +02:00
Daan Hoogland
f1a4e9fdf5 copyrights 2013-09-01 23:49:05 +02:00
Ian Duffy
7ded3c803d Prep for merge with master 2013-08-31 21:55:27 +01:00
Ian Duffy
bdba0ddeed Bring up to date with master 2013-08-31 00:25:48 +01:00
Chris Suich
2be1039f60 Added missing getters to UserVmResponse
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-08-28 12:02:55 -07:00
Laszlo Hornyak
3fe468cc28 fix exception message
changed the exception message to include accountName instead of account, since account at this point is known to be null

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Chiradeep Vittal <chiradeep@apache.org>
2013-08-28 11:58:46 -07:00
Jessica
9fd5a81809 CLOUDSTACK-2405. DOC. Changing ownership of a VM from one account to another in any domain. 2013-08-28 10:08:16 -07:00
Alex Huang
8113ebb08f Moved the csvtotags into StringUtils. It was there to begin with. No idea who copied it to ConfigurationManager 2013-08-26 20:27:27 -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
Alex Huang
ff6b3fd11a Removed getzone 2013-08-26 17:31:08 -07:00
Min Chen
e65a302f15 CLOUDSTACK-3950: add "regionsecondaryenabled" in listCapabilitiesCmd
response.
2013-08-20 15:59:46 -07:00
Mike Tutkowski
0f60b5d41c CLOUDSTACK-4331 - Enable more capacity from a managed storage device to be given to CloudStack 2013-08-14 15:02:57 -06:00
Edison Su
c58f15d867 CLOUDSTACK-4222: use new volume object in case of migrate volume 2013-08-13 15:16:45 -07: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
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
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
Likitha Shetty
a4400721bd CLOUDSTACK-4182. Id field is not set in the xml response for DeployVirtualMachine/CreateVolume/CreateNetwork API's. 2013-08-08 14:35:04 +05:30
Alex Huang
5161ded69c Removed the configuration parameters from Config.java 2013-08-07 16:41:05 -07:00
Alex Huang
49cd4fa380 Connected config gathering to CloudStack 2013-08-07 16:41:04 -07:00
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
Wei Zhou
5cfc69a7aa CLOUDSTACK-3947: Fix similar issues related to getSyncObjType / getSyncObjId 2013-08-06 10:42:31 +02:00
Sateesh Chodapuneedi
f17e6fc0a6 CLOUDSTACK-4097 2 optional parameters of addCluster API are not declared correctly
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2013-08-06 06:49:09 +05:30
Jessica Wang
0a0aae5f72 This reverts commit c4589e6ec7. Should not unescape queryFilter on server-side. 2013-08-05 15:06:40 -07:00
Min Chen
151a7ee497 CLOUDSTACK-3861 and CLOUDSTACK-3862: Deprecate old S3/Swift classes. 2013-08-02 18:16:46 -07:00
Min Chen
3e5a84a8bb CLOUDSTACK-4053: Removal of AddSwiftCmd and ListSwiftsCmd APIs broke api
back compatibility.
2013-08-02 15:33:43 -07:00
Min Chen
9f3f13f70a CLOUDSTACK-3748:AddS3Cmd NPE. 2013-08-02 13:53:43 -07:00
Min Chen
a2f1d23378 CLOUDSTACK-3748: AddS3Cmd NPE. 2013-08-02 13:53:43 -07:00
Alex Huang
8930cfa983 Switched over to use the new jobs framework 2013-08-02 11:07:55 -07:00
Ian Duffy
532e04db1a Disable password changing when ldap is enabled
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-08-02 14:20:47 +05:30
Bharat Kumar
21f1b137cb Cloudstack-3753 Multiple VLAN range API need to accept a list rather than "add" or "remove" per command
Reviewed-by: Alena Prokharchyk

Conflicts:
	server/test/com/cloud/network/MockNetworkManagerImpl.java
2013-08-01 13:36:20 -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
Wei Zhou
d571b49d00 CLOUDSTACK-3947: Override getSyncObjType and getSyncObjId in CreateLBStickinessPolicyCmd.java to prevent concurrent operations on Loadbalancer in a network 2013-08-01 10:04:18 +02:00
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
Harikrishna Patnala
2c53ede1de CLOUDSTACK-3848: Usage events for dynamic scaling of cpu/ram operation on VM 2013-07-31 15:07:17 +05:30
Alex Huang
1e1ee902a2 Moved over the new jobs framework from vmsync. This has not been integrated into the server package yet. Will do that next 2013-07-30 15:00:58 -07:00
Alena Prokharchyk
9b7c4a6c47 CLOUDSTACK-3948: fixed createAutoscaleVmProfile - for situation when no autoscaleUserId is passed in, take it from caller user id, not caller account id
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/CreateAutoScaleVmProfileCmd.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
2013-07-30 14:13:58 -07:00
Isaac Chiang
452176c0b4 CLOUDSTACK-3935:Inconsistent json object name for image store api 2013-07-30 19:20:56 +08:00
Jonathan Creasy
650de7998d Fixing typo of "createing" that should be "creating" https://issues.apache.org/jira/browse/CLOUDSTACK-3915
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
(cherry picked from commit 2388157596)
2013-07-30 09:41:38 +05:30
Prasanna Santhanam
bcf239db08 CLOUDSTACK-2715: Making MigrateSysteVm response uniform
with responses on other systemVm apis. All systemVM apis return
SystemVmResponse - rebootSystemVm, stopSystemVm etc. MigrateSystemVm is
now made uniform.

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-29 12:32:57 +05:30
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
Rajesh Battala
24a8d60d6f CLOUDSTACK-62 [AWS Style Health Checks] Response of the API listLoadBalancerRuleInstances should show the service state of a VM if health check is configured for it 2013-07-26 16:40:26 +05:30
Min Chen
b2cad5b698 CLOUDSTACK-3709: Add the missing file. 2013-07-25 17:29:58 -07:00
Murali Reddy
739f7cadeb CLOUDSTACK-3764: [EIP/ELB] [BasicZone] Unable acquire IP as non-ROOT
domain users

Since the basic zone network is owned by 'Root' domain, domain access
checkers will fail for the accounts in non-root domains while acquiring
public IP. So add an exception for the 'Basic' zone shared network with
EIP/ELB service.
2013-07-25 19:17:39 +05:30
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
Harikrishna Patnala
0010faee4b Fix for CLOUDSTACK-2536
Removing memoryovercommitratio and cpuovercommitratio parameters from addCluster and updateCluster APIs,
since these can be configurable using updateConfiguration API at cluster level.
By default while creating cluster these values are taken from global configuration parameters.
2013-07-25 13:42:08 +05:30
Saksham Srivastava
135a2e66c5 CLOUDSTACK-2508: Template usage should report both physical and virtual sizes 2013-07-24 18:17:09 +05:30
Alena Prokharchyk
6c22c7b614 CLOUDSTACK-3720: fixed API doc for listResourceLimits API 2013-07-22 13:24:27 -07:00
Alex Huang
02236576c0 Changed some debug logs to trace 2013-07-22 11:48:12 -07:00
Alex Huang
1325014a03 Changed VirtualMachineProfile to be non-generic. From here on VirtualMachineManager will only manage vm instance. It doesn't understand the difference between different types of VMs. This makes the vmsync code to be generic across all vms. 2013-07-22 11:48:11 -07:00
Harikrishna Patnala
03fac83180 CLOUDSTACK-3358: create template from a volume/snapshot should also take input from User/Admin whether xstools / vmware tools installed in the VM
Signed off by : Nitin Mehta<nitin.mehta@citrix.com>
2013-07-19 11:55:32 +05:30
Ian Duffy
cd11fbd3d8 CLOUDSTACK-3344: unescape value 2013-07-18 15:20:40 +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
Alena Prokharchyk
36c0224142 CLOUDSTACK-3584: fixed security group related apis with the correct class reference for projectid parameter
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/vmgroup/CreateVMGroupCmd.java
2013-07-17 10:58:44 -07:00
Bharat Kumar
dd33abffbe Cloudstack-2997 Make haproxy maxconn configurable
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-07-17 10:06:11 +05:30
Prachi Damle
ee664a1cac CLOUDSTACK-2159 Anti-Affinity - When "HostAntiAffinityProcessor" plugin is not included in the deployment , deployVirtualMachine() command does not error out when passing the affiitygroupnames parameter.
Changes:
- Added a check during vm deployment to see if a processor for the affinity group type is available
2013-07-16 15:48:07 -07:00
Prachi Damle
686f9ae64f CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
- Changes to the API Cmd needed to use CallContext instead of UserContext
2013-07-16 13:17:43 -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
Prachi Damle
fa9ca72f36 CLOUDSTACK-2155: Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes:
- Locking the group and save reservation mechanism done by DPM
- Added admin operation to cleanup VM reservations
- DPM will also cleanup VM reservations on startup
2013-07-16 10:53:06 -07:00
Prachi Damle
661088927d CLOUDSTACK-2155 Anti-Affinity -When Vm deployment is done in parallel , anti-affinity rule is not honored.
Changes to check if the destination found does not conflict with any vm reservation
2013-07-16 10:53:02 -07:00
Alena Prokharchyk
9b521be4d0 CLOUDSTACK-1948: fixed pagesize to support -1 (unlimited) value 2013-07-15 11:35:46 -07:00
Edison Su
0c1ae20e77 add inital swift support
Conflicts:

	server/src/com/cloud/resource/ResourceManagerImpl.java
	server/test/com/cloud/resource/MockResourceManagerImpl.java
2013-07-13 02:07:03 -07:00
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
Vijayendra Bhamidipati
7ea8c5fd9a CLOUDSTACK-1510: NPE when primary storage is added with wrong path
Description:

	a) Fixing NPE when wrong path is provided for primary datastore.
	b) No error dialog shows up in GUI when wrong path is provided,
	   after NPE fix - propagating exception upward.
	c) If the KVM agent is down, an invalid datastore gets logged in
	   storage_pool table and doesn't get removed, so it shows up
	   in the GUI in the list of datastores - fixing this as well.
2013-07-10 14:55:57 -07:00
Edison Su
94aa67eae0 fix simulator 2013-07-09 10:42:03 -07:00
Prasanna Santhanam
f96b89f25e CLOUDSTACK-3273: ClassCastException when adding cache store via API
Filter the detail map sent over the wire into Map<String, String> before
processing underneath by  storage life cycle

Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-07-05 15:32:41 +05:30
Alex Huang
ab5f5809c3 VMSync: Added copyright 2013-07-03 11:23:22 -07:00
Alex Huang
bec53fb59a VMSync: Separating jobs from api 2013-07-03 11:22:40 -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
Murali Reddy
2f3764ef94 CLOUDSTACK-1959: GSLB: add capability to provide weights to the sites
involved in the GSLB

add weights to each site participating in the GSLB. Traffic will be load
balanced across the sites based on the weigths associated with each
site. If not specified weight of site is defaulted to 1.
2013-07-02 17:55:58 +05:30
Murali Reddy
1c67e34c82 CLOUDSTACK-3287: [GSLB] API "updateGlobalLoadBalancerRule" is not
recognised by CloudStack

added api to managementServerImpl and ensure glsb config is applied to
gslb service providers
2013-07-02 00:07:58 +05:30
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
Harikrishna Patnala
c8692f2e4a CLOUDSTACK-3245: non admin user not able to register template
Reviewed-by: Alena Prokharchyk
2013-06-27 14:09:52 -07:00
Min Chen
a654e52cb6 Fix an issue of createVolumeCmd for regular user. 2013-06-26 15:46:48 -07:00
Harikrishna Patnala
9385cf0453 CLOUDSTACK-2835: VR Deployement from admin registered template is failing because registered template type is user. Additional parameter "isrouter" in register/update template API for the root admin. True if registered template is of type ROUTING.
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-26 16:00:12 +05:30
Alena Prokharchyk
8b2aae0bfe CLOUDSTACK-3169: ipAssoc - set account id of the ip to the project account. Used to be set to the network owner which is System in Shared network case, and the further verification used to fail because of that 2013-06-24 15:25:05 -07: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
Sebastien Goasguen
5f06500ed4 CLOUDSTACK-3143: add response in the response string 2013-06-23 23:32:56 -04:00
Min Chen
933e4e6dff Code cleanup. 2013-06-21 10:10:42 -07:00
Min Chen
2f9ba709a5 Add listCacheStoresCmd api for UI to list cache stores. 2013-06-20 18:06:30 -07:00
Edison Su
97f8c524b8 merge object_store 2013-06-20 00:18:00 -07:00
Abhinandan Prateek
d3d6350219 CLOUDSTACK-2168: removed unused commit 2013-06-20 11:30:26 +05:30
Ian Duffy
576884ec10 Add fix for CLOUDSTACK-2168. Changed listAll output to conform to the same output as listconfiguration
Signed-off-by: Abhinandan Prateek <aprateek@apache.org>
2013-06-20 11:28:22 +05:30
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
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
882220e802 CLOUDSTACK-1301: VM Disk I/O Throttling 2013-06-18 10:02:55 +02:00
Dave Brosius
93938ca716 remove dead allocations
Signed-off-by: Dave Brosius <dbrosius@mebigfatguy.com>
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-06-18 11:37:31 +05:30
Jessica Wang
fea9a0ed12 CLOUDSTACK-3016: remove zonetype parameter from listSnapshots API. 2013-06-17 16:39:45 -07:00
Jessica Wang
3e852cc29b CLOUDSTACK-3016: remove zonetype parameter from listNetworks API. 2013-06-17 16:26:09 -07:00
Jessica Wang
880029844b CLOUDSTACK-3016: remove zonetype parameter from listTemplates, listIsos API. 2013-06-17 16:08:38 -07:00
Jessica Wang
cb35ec6f4d CLOUDSTACK-3016: remove zonetype parameter from listSystemVMs API. 2013-06-17 15:58:33 -07:00
Jessica Wang
56d390d54e CLOUDSTACK-3016: remove zonetype parameter from listPods API. 2013-06-17 15:51:07 -07:00
Jessica Wang
9d0d02222b CLOUDSTACK-3016: remove zonetype parameter from listClusters API. 2013-06-17 15:28:39 -07:00
Jessica Wang
9e7356c686 CLOUDSTACK-3016: remove zonetype parameter from listSnapshots API. 2013-06-17 15:00:44 -07:00