ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
0965adb003
CLOUDSTACK-5672: Fix VM work job serialization issues in Add/Remove nic
2014-01-09 14:29:12 -08:00
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
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
5c1d639bc4
CLOUDSTACK-5829:
...
listvms should return the diskoffering id when deployed with an iso
2014-01-08 18:32:51 -08:00
ac8bc74269
CLOUDSTACK-5840:Remove old API method.
2014-01-08 18:11:12 -08:00
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
07557eb570
CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse
2014-01-08 14:40:10 -08:00
850bc9fa82
Hook the OpenDaylight plugin into CloudStack
2014-01-08 15:58:08 +01:00
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
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
e6238baa3a
- Adding @ACL and EntityType values to SecurityGroup, Snapshot
...
- Correctinf the VM and Volume APIs
2014-01-06 16:58:42 -08:00
6d0dbf5968
check for BroadcastDomainTypes on sourceNatIp
2014-01-06 22:13:51 +01:00
04a0d12a68
Adding @ACL annotation to Volume commands
2014-01-02 18:39:20 -08:00
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
c950651fe2
Use IAMService to implement QuerySelector adapter.
2013-12-26 19:53:49 -08:00
337e33a014
Adding EntityType for listAccounts
2013-12-26 15:17:08 -08:00
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
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
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
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
fbba17e68c
Resource metadata support for cloudStack user
2013-12-23 14:25:07 -08:00
79e64aa535
Resource metadata support for Disk Offering
2013-12-23 12:36:13 -08:00
630b7fb4a1
Fix listTemplates issues with new ACL model.
2013-12-20 17:57:44 -08:00
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
62bb5d8848
fix checkstyle
2013-12-19 15:05:58 -08:00
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
9c77f68095
Revert "Remove uncessary changes."
...
This reverts commit fcab2b776a
2013-12-19 13:35:52 -08:00
336241be76
Remove uncessary changes.
2013-12-19 13:35:37 -08:00
02ace3442d
0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to-
2013-12-19 13:35:21 -08:00
4bd2df42d0
Adding @ACL and EntityType to VM commands.
2013-12-18 16:34:37 -08:00
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
afcf967d24
Revert "CLOUDSTACK-4941:"
...
This reverts commit 231e7c01f2
2013-12-18 16:01:37 -08:00
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
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
3f092d14cc
Adding the AclEntityType attribute to APICommand annotation
2013-12-13 16:04:25 -08:00
d2922b9254
Separate ListAccounts cmd to use two different views.
2013-12-12 17:52:45 -08:00
312ff76f69
Separate listZones cmd to use two different views, also renamed previous
...
listZonesByCmd to listZonesCmd.
2013-12-12 17:40:30 -08:00
a6d03cd826
Separate IpAddress related cmds to use two different views.
2013-12-12 17:20:34 -08:00
add277a4aa
Separate network and VPC related cmd to use two different views.
2013-12-12 16:53:59 -08:00
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
7c6f1c14c2
ControlledEntity Interface change to return EntityType and added values to the AclEntityType enum and
2013-12-12 16:31:00 -08:00
1a985227b5
Changes to SecurityChecker
2013-12-12 16:30:53 -08:00
cf0a11e45a
pull merges
2013-12-12 13:00:26 -08:00
be5e5cc641
All Checkstyle problems corrected
2013-12-12 12:26:07 -08:00
9a21afb50b
Resource metadata support for customer gateway
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-12-12 10:16:30 -08:00
cf84733f8b
Resource metadata support for Site2SiteVpnGateway
...
Conflicts:
setup/db/db/schema-421to430.sql
2013-12-12 10:15:36 -08:00
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
67b97539ac
Separate ListTemplatePermissions and ListIsoPermissions commands to use
...
two different views.
2013-12-11 17:41:10 -08:00
8f21eca922
Separate Template/ISO related APIs to use two different views.
2013-12-10 12:23:39 -08:00
e66b58b65f
Separate AttachIso and DetachIso to use different response views.
2013-12-10 10:52:19 -08:00
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
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
bd238ce24e
CLOUDSTACK-5431: permit 'http' as service type for GSLB rule
2013-12-10 08:08:24 +05:30
4de09ee654
add Apache Licensed
2013-12-10 08:37:37 +07:00
d252d95c26
Separate all vm related user APIs to have two different views.
2013-12-09 17:30:57 -08:00
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
6730fa2b47
Fill in implementation of AclService.getGrantedDomains,
...
getGrantedAccounts and getGrantedResources.
2013-12-09 14:08:54 -08:00
61e80f030a
remove unused code
2013-12-09 23:33:15 +07:00
015ab6af8a
fix rebase master
2013-12-09 23:33:14 +07:00
3df8b912fc
add kvm support & LB service
2013-12-09 23:33:14 +07:00
d935d3865a
tuna
2013-12-09 23:33:14 +07:00
4e914b7087
re-factor gre controller
...
Signed-off-by: tuna <ng.tuna@gmail.com>
2013-12-09 23:33:14 +07:00
96188a3730
re-factor gre controller prototype
2013-12-09 23:33:14 +07:00
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
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
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
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
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
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
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
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
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
6c9edaf613
CLOUDSTACK-5285 Corrected the API description
2013-11-27 11:01:36 +05:30
7af387c894
Resource metadata support for NetworkACLList
...
Conflicts:
server/src/com/cloud/tags/TaggedResourceManagerImpl.java
2013-11-26 17:12:12 -08:00
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
5d974a234c
Resource metadata support for VPC Private Gateway
2013-11-26 12:48:15 -08:00
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
cf69731a52
Suring startup load the API permissions from commands.properties and @APICommand annotations
2013-11-25 17:01:56 -08:00
f231cec5b7
Loading api permissions from commands.properties during startup
2013-11-25 10:59:12 -08:00
015d06e7fc
Separate all volume related APIs to two Cmd classes based on two
...
response views.
2013-11-22 18:48:20 -08:00
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
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
602d4ef0cf
Resource metadata - support for VPC
2013-11-21 14:29:39 -08:00
c3baf3ad72
Interface for QueryChecker adapter.
2013-11-21 10:32:26 -08:00
81a794a5d3
Change two static response views to Full and Restricted.
2013-11-21 10:32:08 -08:00
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
170f32f171
Broke up some long strings
2013-11-21 07:25:01 -08:00
cf715ff491
Bump 4.3.0 to 4.4.0 in master
2013-11-21 16:01:15 +01:00
d620df2bdd
Reformatted all of the code.
2013-11-21 06:15:26 -08:00
eaa250fd3c
Formatted again after all the tab expansions and eol removals
2013-11-21 04:47:01 -08:00
224f479974
Removed trailing spaces
2013-11-21 04:08:01 -08:00
62e9273581
Removed trailing spaces
2013-11-21 03:12:05 -08:00
278ef81a83
side-by-side VM sync management at manager level
2013-11-20 17:59:38 -08:00
7ed030115e
Updated DB schema and DAO layer classes according to new FS.
2013-11-20 17:32:09 -08:00
e0d2423f06
Refactoring account_type for Domain_Admin and Normal_User types
2013-11-20 16:53:59 -08:00
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
8d62744681
Reformat all source code. Added checkstyle to check the source code
2013-11-20 07:26:53 -08:00
465626f6d1
Fixed issues with execute in sequence
2013-11-19 17:20:58 -08:00
Mike Tutkowski
Kelven Yang
Nitin Mehta
Min Chen
Alena Prokharchyk
Hugo Trippaers
Prachi Damle
Daan Hoogland
Murali Reddy
Edison Su
Marcus Sorensen
Alex Huang
Kishan Kavala
Jayapal
tuna
Fang Wang
Syed Ahmed
Bharat Kumar
Wido den Hollander