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
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
Nitin Mehta
1c0b8db01b
CLOUDSTACK-4941:
...
Adding the missing file
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 16:27:20 -08:00
Min Chen
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2 .
2013-12-18 16:01:37 -08:00
Nitin Mehta
231e7c01f2
CLOUDSTACK-4941:
...
During HA and maintenance call different planners (if the original planners are not able to find capacity) which skip some heurestics
2013-12-18 14:58:37 -08:00
Marcus Sorensen
95364a4022
CLOUDSTACK-5531
...
Initial support for vhd, raw, vmdk image formats on KVM. Tested all formats with local and CLVM.
2013-12-16 14:32:51 -07: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
Alena Prokharchyk
9df10718e4
Resource metadata support for S2SVpnConnection
...
Conflicts:
server/src/com/cloud/metadata/ResourceMetaDataManagerImpl.java
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
setup/db/db/schema-421to430.sql
2013-12-12 16:39:02 -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
Alena Prokharchyk
9a21afb50b
Resource metadata support for customer gateway
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-12-12 10:16:30 -08:00
Alena Prokharchyk
cf84733f8b
Resource metadata support for Site2SiteVpnGateway
...
Conflicts:
setup/db/db/schema-421to430.sql
2013-12-12 10:15:36 -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
Jayapal
5c12250dea
CLOUDSTACK-5278 Fixed cleaning up egress default rules on VR and SRX
...
1. Egress default policy rules is send to the firewall provider. It is up to the
provider to configure the rules.
2. The default policy rules are send for both allow and deny default policy.
3. On network shutdown rules for delete are send.
4. For VR and SRX, by default deny the traffic. So no default rule to deny traffic is required.
2013-12-10 14:19:03 +05:30
tuna
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07: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
61e80f030a
remove unused code
2013-12-09 23:33:15 +07: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
4e914b7087
re-factor gre controller
...
Signed-off-by: tuna <ng.tuna@gmail.com>
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
Syed Ahmed
ee7380ace2
CLOUDSTACK-5296: Add certificate chain support for netscaler
...
This patch adds support for trust chains in the netscaler.
I initially planned on using the 10.1 API's "bundle" feature but during
my testing I found that was not working. So I am doing the chain linking
myself. Also NS can have only one entity of a certificate ie lets say
two different users try to add the same certificate on the netscaler
only one of them will go through. The other one says resouce already
exists even though they have different files.
This can be a problem in trust chains where the chain can be shared
between multiple accounts/certificates. So, I am using the figerprint as
an identifier of a certificate and making sure that we delete it only
when no one references it.
2013-12-05 15:35:28 +05:30
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
Alena Prokharchyk
7af387c894
Resource metadata support for NetworkACLList
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-11-26 17:12:12 -08:00
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
Alena Prokharchyk
5d974a234c
Resource metadata support for VPC Private Gateway
2013-11-26 12:48:15 -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
Alena Prokharchyk
602d4ef0cf
Resource metadata - support for VPC
2013-11-21 14:29:39 -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
Hugo Trippaers
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
Alex Huang
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
Alex Huang
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -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
Prachi Damle
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -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
Alex Huang
465626f6d1
Fixed issues with execute in sequence
2013-11-19 17:20:58 -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
Harikrishna Patnala
c29cd9d3c7
CLOUDSTACK-4835: Update global configuration test cases failed in master Changes made in update/list configuration API to use ConfigDepot
...
CLOUDSTACK-4169: Scoped configuraion parameters logic moved to ConfigDepot
CLOUDSTACK-5163: missing parameters in configuration table
2013-11-15 12:19:31 +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
4a8e9f8b8d
Resource Metadata: added implementation for Remote Access VPN
2013-11-13 14:26:16 -08:00
Alena Prokharchyk
96b9ebafc0
listRemoteAccessVpns: implemented search by networkId and id
2013-11-13 14:26:15 -08:00
Kelven Yang
fc9adec72e
CLOUDSTACK-669: Add host level side-by-side VM state report for graceful sync model migration
2013-11-12 18:32:51 -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
9f8f74c4ed
Added resource metadata support for PF rules
2013-11-12 10:55:27 -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
Laszlo Hornyak
b33a8371bc
license headers added
...
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-11-09 09:06:01 +01:00
Alena Prokharchyk
8bd1eaa210
ResourceMetaData: added support for userIpAddress (publicIp) metadata
2013-11-08 10:48: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
Hugo Trippaers
3c139ea84b
Probably accidentally committed with commit 191dc80fa4
2013-11-06 10:54:30 +01:00
Kelven Yang
191dc80fa4
VM power state for job oritented sync processing
2013-11-05 19:00:37 -08:00
Jayapal
b464a20a52
CLOUDSTACK-4736: Monitoring services in VR
2013-11-05 23:39:33 +05:30
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
Prachi Damle
4be7947281
CLOUDSTACK-4948: DeploymentPlanner: Logic to check if cluster can be avoided, needs to consider if VM is using local storage and/or shared storage
...
Changes:
- Consider if VM requires the local storage or shared storage or both for its disks.
- Accordingly all pools in the cluster should consider local or shared or both pools
Conflicts:
server/src/com/cloud/agent/manager/allocator/HostAllocator.java
2013-11-04 16:45:02 -08:00
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