Commit Graph

3010 Commits

Author SHA1 Message Date
Koushik Das 5779292e93 CLOUDSTACK-6052: List VM enhancement to support querying with multiple VM IDs
New parameter 'ids' added to listVirtualMachine API. The syntax looks like
http://localhost:8096/api?command=listVirtualMachines&listAll=true&ids=eddac053-9b12-4d2e-acb7-233de2e98112,009966fc-4d7b-4f84-8609-254979ba0134
The new parameter will be mutually exclusive with the existing 'id' parameter.
2014-03-13 17:05:35 +05:30
Sanjay Tripathi bc4c8052fd findbugs: impossible cast in CreateServiceOfferingCmd file. 2014-03-13 15:04:18 +05:30
amogh.vasekar 3ee1fc28de CLOUDSTACK-6217:
Add APIs for ability to add new guest OS types, and their hypervisor specific mappings.
The table guest_os_hypervisor is currently maintained but not used, and the APIs reuse the same

Signed off by: Nitin Mehta <nitin.mehta@citrix.com>
2014-03-12 17:03:38 -07:00
Sheng Yang f45de30d1b CLOUDSTACK-6047: Enable VR aggregation commands for VR start/reboot 2014-03-11 13:04:26 -07:00
Sanjay Tripathi c7d31fe288 CLOUDSTACK-4760 : Enabling GPU support for XenServer.
CLOUDSTACK-4762 : Enabling VGPU support for XenServer.

This feature is to enable the GPU-passthrough and vGPU functionality,
with the help of this feature, admins/users will be able to leverage
the GPU graphics unit power by deploying a virtul machine with GPU or
vGPU support or by changing the service offering of an existing VM
at any later point of time. There GPU/vGPU enabled VMs are able to run
graphical applications.
For now, this feature is only supported with XenServer hypervisor but
can be extended to add the support of other hypervisors.
2014-03-11 15:44:51 +05:30
Nitin Mehta 33a0dec965 CLOUDSTACK-6221:
Publish first class objects involved in an operation (for now vm uuid) on the event bus . Example -  during attach/detachIso along with iso id, vm id should be available as well.
2014-03-10 16:22:34 -07:00
Alena Prokharchyk bf9375b8b9 CLOUDSTACK-6214: apply network rules when plug new guest nic to router for the network in Setup state
Conflicts:
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java

Conflicts:
	api/src/com/cloud/network/VpcVirtualNetworkApplianceService.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManager.java
	server/src/com/cloud/network/router/VpcVirtualNetworkApplianceManagerImpl.java
	server/test/com/cloud/vpc/MockVpcVirtualNetworkApplianceManager.java
2014-03-10 11:42:24 -07:00
Min Chen 748c090b29 Fix unapproved licens issue. 2014-03-10 11:27:10 -07:00
Nitin Mehta ded7e682dc CLOUDSTACK-5478: Enable publishing uuid for all the async apis in the CallContext.
The advantage would be that event publishing can pick up the uuid and publish them.
2014-03-07 16:50:21 -08:00
Mike Tutkowski 548c81082b Adding license header 2014-03-07 16:43:03 -07:00
Mike Tutkowski c427e8db1c CLOUDSTACK-6170 2014-03-07 15:38:50 -07:00
Alena Prokharchyk 7b0c5cfcbe Removed unused methods from BaseCmd class. Moved some helper methods to AccountManagerImpl class 2014-03-07 11:33:10 -08:00
Antonio Fornie c211f0bbbe Dispatcher corrections, refactoring and tests
Corrects problems from previous attempt. Fixes based on help comments from
the community and conflict resolution

Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-03-07 19:12:07 +01:00
Alena Prokharchyk 7cb913235a Removed unused parameter from @Parameter 2014-03-06 16:06:00 -08:00
Min Chen 48e08fe676 Merge branch 'master' into rbac. 2014-03-06 14:02:20 -08:00
Mike Tutkowski 9b66866dc2 CLOUDSTACK-6170 2014-03-06 13:01:11 -07:00
Nitin Mehta 830328b63d CLOUDSTACK-6199: Hide action events for Vm/Volume commands when the resources have display flag=0.
Introduce generic BaseAsync(Vm/Volume)Cmd to make get the flag value for logging action events.
Rename the db field as display rather than display_event in keeping with the convention
2014-03-05 16:40:44 -08:00
Anthony Xu ab1d3af460 Use seperate path to sync VM metadata for XS
VM status sync only does VM status sync
2014-03-05 15:44:50 -08:00
Min Chen 922cdc0dd1 Fix unapproved licens issue. 2014-03-05 14:31:28 -08:00
Mike Tutkowski b06e66c50a CLOUDSTACK-6170 2014-03-05 13:55:12 -07:00
Min Chen 793becf524 CLOUDSTACK-5920: Add some interface methods and constants required by
IAM.
2014-03-05 09:40:55 -08:00
Min Chen d0ae4d9a9f CLOUDSTACK-5920:Add interface to ControlledEntity to return IAM
entity type.
2014-03-05 09:40:55 -08:00
Prachi Damle 695d689de5 Adding annotations for more admin APIs 2014-03-04 18:14:05 -08:00
Nitin Mehta 339c4f4c3f CLOUDSTACK-6199: Action Events - hide them when display flag is off in the context of "Ability to have better control over first class objects in CS" feature.
For root admin - s/he should be able to see all the events despite the value of the flag.
2014-03-04 14:59:30 -08:00
Alena Prokharchyk bbf5a912c6 list* APIs - added parameter helping to filter by "display" flag (available to ROOT admin only) 2014-03-03 14:37:46 -08:00
Prachi Damle a837ac8873 Adding Operate access check at service layer, since we are not checking access on the command parameter here 2014-03-03 13:35:19 -08:00
Alena Prokharchyk fd43cf1516 Revert "CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information"
This reverts commit ebcaec8632.
Reverting as it breaks API compatibility
2014-03-03 12:44:08 -08:00
David Grizzanti ebcaec8632 CLOUDSTACK-5872: Async response from addAccountToProject doesn't contain useful information
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2014-03-03 11:02:34 +01:00
Min Chen e5d722654a Rename IAMEntityType.AclGroup and AclPolicy. 2014-03-02 16:06:29 -08:00
Kelven Yang cdf605b2cd NDC.pop() can return empty string, this causes a loop spinning in CallContext.UnregisterAll(). 2014-02-28 15:35:59 -08:00
Kelven Yang b21662f890 make sure XS report VM state even if there is no running VM on the host. 2014-02-28 15:35:59 -08:00
Kelven Yang 537bf7ced1 add job path to help associate an API job to related internal job. Reviewed-By: Self 2014-02-28 15:35:59 -08:00
Kelven Yang 90ea3249a8 disable cluster-scope report from XS resource 2014-02-28 15:35:57 -08:00
Kelven Yang 5d73217723 process the missing power report of a VM that exists in CloudStack but not in hypervisor 2014-02-28 15:35:57 -08:00
Alena Prokharchyk d9a4e038a0 Enhanced updateVirtualMachine API with optional parameter "name" - to allow update hostName for the virtual machine 2014-02-28 14:35:37 -08:00
Alena Prokharchyk bb6fddf434 listVirtualMachines API: ability to search by service offering the vm is created from
listVolumes API: ability to search by disk offering the volume is created from
2014-02-26 16:56:33 -08:00
Prachi Damle 187f9cd0a2 iam/plugin: Rename Acl to IAM everywhere 2014-02-25 16:43:23 -08:00
Prachi Damle f41604fc6c Renaming AclEntityType --> IAMEntityType 2014-02-25 16:43:17 -08:00
Mandar Barve b0c6d47347 - Updated APICommand annotation to add new flags that indicate if API request or response carry sensitive info - Updated all API classes with the new annotation flag values as per the API's sensitivity - Updated server code to check response annotation before audit logging
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit df270d6387c362b960064ee5123c14782e767a19)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-25 22:59:10 +01:00
Alena Prokharchyk e2ec094722 Display flag support for VpnConnection/VpnGateway/RemoteAccessVpn 2014-02-21 14:51:22 -08:00
Alena Prokharchyk 0f489732c8 Display flag support for LB/InternalLB/NetworkACL rules 2014-02-21 14:03:10 -08:00
Alena Prokharchyk 92064e347a Display flag support for autoscale vmGroup and vmProfile 2014-02-21 11:52:50 -08:00
Alena Prokharchyk 27a790bdc1 DisplayFlag update support for PF/Firewall/EgressFirewall rules 2014-02-21 11:06:52 -08:00
Alena Prokharchyk 21d016b3dd API response: added new field to @Param - RoleType[] authorized() default {}. The field defines who is authorized to see this partciluar reponse field. If not specified, the parameter is returned to everybody 2014-02-20 17:15:43 -08:00
Alena Prokharchyk 2f7bfc0c73 Display flag support for publicIpAddress and VPC. Once set to false, the object is not listed to the regular user. Available to be set by Root admin only 2014-02-20 17:15:42 -08:00
Niels de Vos fe83a85436 Add support for Primary Storage on Gluster using the libvirt backend
The support for Gluster as Primary Storage is mostly based on the
implementation for NFS. Like NFS, libvirt can address a Gluster environment
through the 'netfs' pool-type.
2014-02-20 14:52:01 +01:00
Nitin Mehta c171e2c3e4 CLOUDSTACK-4744: Enhance root admin API updateVolume with chaininfo parameter as a part of "Better control over first party objects" feature. 2014-02-19 18:01:18 -08:00
Prachi Damle 42a7d41c55 Adding annotations to router commands 2014-02-19 12:22:35 -08:00
Prachi Damle bbaa742863 Adding annotations to admin commands 2014-02-19 12:22:33 -08:00
Prachi Damle f0a9b3b510 @ACL from some commands 2014-02-19 12:22:30 -08:00
Min Chen 586ee74000 Clean up SecurityChecker.AccessType and modify code to use them
consistently.
2014-02-14 11:23:05 -08:00
Min Chen 8072e50845 Fixed a bug for listTemplates with TemplateFilter=shared. 2014-02-13 16:47:41 -08:00
Marcus Sorensen b77b55f040 CLOUDSTACK-6089: Use resource tag's key to determine match in
equals() method for ResourceTagResponse
2014-02-12 17:00:10 -07:00
Marcus Sorensen d33798f0d9 CLOUDSTACK-6089: Implement equals() method for ResourceTagResponse
so that the java Set can properly determine if a ResourceTagResponse
is unique. This ensures we don't get duplicate resource tags showing
up any time a UserVmResponse is crafted (which can be quite often
due to the way the responses are crafted).
2014-02-12 16:10:48 -07:00
Alena Prokharchyk e0de79b170 Resource metadata: by default, all metadata is set with display=true (meaning that the detail is avaialble for display to the regular user). If admin wants to set a specific detail to be false, he has to specify it explicitly in addResourceDetail command 2014-02-10 12:05:59 -08:00
Jayapal 37c4015d4d CLOUDSTACK-6040: Updated the ip addr validation in create port forwarding 2014-02-10 14:28:33 +05:30
Min Chen 3b58a45e04 Merge branch 'master' into rbac. 2014-02-07 13:43:36 -08:00
Alena Prokharchyk 782c530685 Revert "CLOUDSTACK-6003 fixing plus refactoring dispatcher" as it breaks API dispatching for commands having Map<String,String> as a parameter type
This reverts commit 447430c3df.

Conflicts:
	api/src/org/apache/cloudstack/api/BaseCmd.java
	server/src/com/cloud/api/ApiDispatcher.java
	server/src/com/cloud/network/as/AutoScaleManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-02-06 14:46:58 -08:00
Alena Prokharchyk e51d472b0c External UUID control: as only Root admin can change external UUID, so modified @Parameter to enforce the check 2014-02-05 15:56:40 -08:00
Alena Prokharchyk 4305d817ba External UUID control support for PublicIpAddress/RemoteAccessVpn/PortForwardingRule/S2SVpnGateway/S2SVpnConnection 2014-02-05 15:56:40 -08:00
Alena Prokharchyk 9641e1dbee External UUID control support for NetworkACLList/LoadBalancer/ApplicationLoadBalancer 2014-02-05 10:36:21 -08:00
Hugo Trippaers 8a9d9798d9 Fix camelcasing inconsistency causing an assertion error.
java.lang.AssertionError: Searching for a field that's not there: serviceName
	at com.cloud.utils.db.SearchBase.set(SearchBase.java:219)
	at com.cloud.utils.db.SearchBase$Interceptor.intercept(SearchBase.java:475)
	at com.cloud.network.dao.MonitoringServiceVO$$EnhancerByCGLIB$$84195222.getServiceName(<generated>)
	at com.cloud.network.dao.MonitoringServiceDaoImpl.<init>(MonitoringServiceDaoImpl.java:41)
2014-02-05 17:46:33 +01:00
Devdeep Singh a24263fe81 CLOUDSTACK-6030: Encrypt the primary and secondary smb storage password when it is stored in the db. 2014-02-05 15:44:09 +05:30
Prachi Damle 0908f64ec7 add @ACL and EntityType to VMSnapshot APIs 2014-02-04 18:05:29 -08:00
Prachi Damle f6df4845fe Adding EntityType to vpn commands 2014-02-04 17:52:51 -08:00
Alena Prokharchyk aaa20947a9 ExternalUUID control support for Firewall and Egress Firewall rules 2014-02-04 17:06:04 -08:00
Alena Prokharchyk 7cb4b571c8 ExternalUUID control: enforce checking uuid validity by defining checkUUID method in the corresponding absract class, and performing the check during API command dispatching 2014-02-04 15:47:13 -08:00
Alena Prokharchyk e5335cd6e4 CLOUDSTACK-2789: UpdateVPC shouldn't require name parameter 2014-02-04 15:47:13 -08:00
Alena Prokharchyk 8065ee445f External UUID control support for VPC and NetworkACLItemp 2014-02-04 15:47:12 -08:00
Alena Prokharchyk 7cd0ad336b External UUID control support for AutoscaleVmProfile and AutoscaleVmGroup 2014-02-04 15:47:12 -08:00
Alena Prokharchyk 6af6ce7e9e 1) Added External UUID control support for network.
2) Moved UUIDManager interface to cloud-util package
2014-02-04 15:47:12 -08:00
Prachi Damle f84375442e Merge branch 'master' into rbac
Conflicts:
	api/src/org/apache/cloudstack/api/command/user/autoscale/ListAutoScaleVmProfilesCmd.java
	api/src/org/apache/cloudstack/api/command/user/volume/ResizeVolumeCmd.java
	plugins/network-elements/juniper-contrail/test/org/apache/cloudstack/network/contrail/management/MockAccountManager.java
	server/src/com/cloud/api/ApiServer.java
	server/src/com/cloud/api/query/QueryManagerImpl.java
	server/src/com/cloud/template/TemplateAdapterBase.java
	setup/db/db/schema-430to440.sql
	tools/apidoc/gen_toc.py
2014-02-04 12:07:32 -08:00
Antonio Fornie 447430c3df CLOUDSTACK-6003 fixing plus refactoring dispatcher
Signed-off-by: Daan Hoogland <daan@onecht.net>
(cherry picked from commit a9bcc1ea3b7dfd3fcc5c795b0095c77851ebe618)
Signed-off-by: Daan Hoogland <daan@onecht.net>
2014-02-04 13:37:08 +01:00
Alena Prokharchyk 158280181d generateAlert API: set max value of "description" parameter to match correspondig field's length in VO object 2014-01-31 09:21:55 -08:00
Marcus Sorensen d409d709e3 CLOUDSTACK-6000: When expunging fails, move volume state back to
Destroy, so that the cleanup thread will try again on next run.
2014-01-30 23:33:27 -07:00
sbalineni ed3e1b95b0 VPC Support for contrail networking
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-30 18:13:48 -08:00
Alena Prokharchyk 02bdb28d76 Resource metadata support for autoscale vm group object 2014-01-30 13:04:56 -08:00
Alena Prokharchyk cb073e0634 listAutoscaleVmProfiles: added zoneId to the list of optional api parameters 2014-01-30 12:36:56 -08:00
Alena Prokharchyk 65c5de1cb6 Removed recently introduced api.servlet.endpoint global config as CS already has config serving the same purpose - 'endpointe.url' 2014-01-29 14:57:01 -08:00
Alena Prokharchyk fdb25d6f5b Resource metadata support for autoscaleVmProfile CS object 2014-01-29 14:57:00 -08:00
Alena Prokharchyk 3b781d1a22 ResizeVolume API - volumeId should be a required parameter 2014-01-29 14:57:00 -08:00
Alena Prokharchyk 68937cd207 CLOUDSTACK-5983: changed responseName param in assignCertToLoadBalancer and removeCertFromLoadBalancer API commands 2014-01-29 11:50:27 -08:00
Min Chen 748dc1541c Support attaching policy to account. 2014-01-28 10:00:17 -08:00
Daan Hoogland 1c7361756c Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from
commit 9a1b882d0e)
2014-01-28 14:24:21 +01: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
Sheng Yang 285f23f11b CLOUDSTACK-5779: Generalize calling to execute or create file for KVM 2014-01-24 18:28:25 -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
Kishan Kavala c0f60651b9 CLOUDSTACK-5690: Added upgarde template support for 4.3 64 bit templates. Changed min required version for VR to 4.3 2014-01-17 12:51:16 +05:30
Alena Prokharchyk bd79fb33a6 CLOUDSTACK-5870: API support for retrieving user data 2014-01-16 15:31:18 -08:00
Kelven Yang 14e399410b CLOUDSTACK-5696: fix a regression caused by out-of-band sync changes 2014-01-15 16:22:27 -08:00
sbalineni cc2b1c4961 Contrail plugin fixes -master branch, single commit, no transaction wrappers
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-15 14:11:49 -08:00
Min Chen 6583cb3800 Add listAclGroupsByAccount to QuerySelector adapters and remove
AclProxyService interface.
2014-01-14 16:19:25 -08:00
Sachchidanand Vaidya 0bff705621 Add L3VPN isolation method for contrail plugin
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2014-01-14 13:55:35 -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
Murali Reddy 470f251cbb CLOUDSTACK-5849: Failed shutdown of the network causes network state to
be changed to 'Implemented'

Wrong network state transition

s_fsm.addTransition(State.Shutdown, Event.OperationFailed,State.Implemented

fix keeps state as Shutdown
2014-01-13 17:47:47 +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
Marcus Sorensen fc082832d3 CLOUDSTACK-5853
Create two storage pools, one with storage tag X, one with storage tag Y.
Create a service offering with storage tag X.
Create a disk offering with storage tag Y.
Attempt to deploy a virtual machine with a datadisk, using given offerings, it fails.

Deployment planner keeps a global object 'avoid'. It loops through each volume to
be created, asking storage allocators for matching pools, passing this avoid object.

First disk matches a pool or pools, adds ALL other pools to avoid object, then
deployment planner attaches matching pools to a list for that disk.

Second disk matches a pool, adds all other pools to avoid object, then deployment
planner says "wait, matching pool is in avoid, can't use it". Oops. In fact, at this
point ALL pools are in avoid (unless there are other pools that have both tags).

Need to remove matching pool from the avoid set during each select phase.
2014-01-10 11:55:54 -07: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
Mike Tutkowski 6944bf9bba Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 22:02:43 -07:00
Mike Tutkowski ae35782ccd Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials 2014-01-09 21:36:34 -07:00
Kelven Yang 1e2e1ea051 CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues 2014-01-09 14:29:13 -08:00
Kelven Yang 0965adb003 CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic 2014-01-09 14:29:12 -08:00
Kelven Yang 8c93bd6080 CLOUDSTACK-669: Convert volume snapshot orchestration flow to make it be serialized with other VM operations 2014-01-09 14:29:12 -08:00
Mike Tutkowski 03118c2969 Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware) 2014-01-09 14:44:35 -07: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 ac8bc74269 CLOUDSTACK-5840:Remove old API method. 2014-01-08 18:11:12 -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
Daan Hoogland 6d0dbf5968 check for BroadcastDomainTypes on sourceNatIp 2014-01-06 22:13:51 +01:00
Prachi Damle 04a0d12a68 Adding @ACL annotation to Volume commands 2014-01-02 18:39:20 -08:00
Murali Reddy 8b151c98c2 CLOUDSTACK-5403: Shared network - None of PF, LB rules work after router
restart, firewall rules dropped from iptables post restart

on VR restart, not all public IP's associated with the network are sent
with IpAssocCmd to VR. This fix will ensure all the ip's associated with
the network irrespective of the account are sent as part of
IpAssocCommand

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2013-12-27 14:27:57 +05:30
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
Alena Prokharchyk 79e64aa535 Resource metadata support for Disk Offering 2013-12-23 12:36:13 -08:00
Min Chen 630b7fb4a1 Fix listTemplates issues with new ACL model. 2013-12-20 17:57:44 -08:00
Nitin Mehta f083f91b0b CLOUDSTACK-5281:
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the vms at the moment.
2013-12-20 15:33:37 -08:00
Edison Su 62bb5d8848 fix checkstyle 2013-12-19 15:05:58 -08:00
Edison Su 8caf52c6bc add xenserver 6.2.0 hotfix support, to optimize vdi copy
add xenserver hot fix

Conflicts:

	api/src/com/cloud/vm/VirtualMachineName.java
	core/src/com/cloud/host/HostInfo.java
	core/src/org/apache/cloudstack/storage/to/SnapshotObjectTO.java
	deps/XenServerJava/src/com/xensource/xenapi/VDI.java
	engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/XenserverSnapshotStrategy.java
	engine/storage/src/org/apache/cloudstack/storage/endpoint/DefaultEndPointSelector.java
	engine/storage/src/org/apache/cloudstack/storage/image/db/SnapshotDataStoreDaoImpl.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/XenServerGuru.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerPoolVms.java
	plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageProcessor.java
	server/src/com/cloud/configuration/Config.java
2013-12-19 14:15:41 -08:00
edison su 9c77f68095 Revert "Remove uncessary changes."
This reverts commit fcab2b776a.
2013-12-19 13:35:52 -08:00