53feecaa76
findbugs: null check for gateway and netmask instead of gateway
...
twice(cherry picked from commit
d30ddf6d59
2014-01-28 14:53:11 +01:00
a71871d11c
findbugs: fixes for ApiServer, ApiSerializerHelper and
...
ApiXmlDocWriter(cherry picked from commit
9aced41d70
2014-01-28 14:47:06 +01:00
1c7361756c
Findbugs: scariest issues in ApiResponseHelper fixed (cherry picked from
...
commit 9a1b882d0e
2014-01-28 14:24:21 +01:00
60e8d131cf
findbugs: moved call on static object to synchronized block(cherry
...
picked from commit f3529a19a9
2014-01-28 14:14:47 +01:00
9eae5f6929
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git
2014-01-28 13:49:42 +01:00
4f6638d7c7
findbugs: nullpointer dereference guarded(cherry picked from commit
...
43ba36f979
2014-01-28 13:49:14 +01:00
95bd04e449
CLOUDSTACK-5965. VM displayname is not returned by API.
...
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
2014-01-28 16:43:12 +05:30
807dc09138
CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV
2014-01-28 07:03:08 +05:30
f77974b5d2
Fix trailing whitespace from cherry-pick
2014-01-27 13:31:35 -08:00
cfe7864618
CLOUDSTACK-5960: Domain admin or user cannot register a template using
...
S3/Swift object store.
2014-01-27 13:31:35 -08:00
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
b25ee92c34
CS-5950: Wrong storage tags are used for ISO deployed VMs.
2014-01-27 16:58:55 +05:30
a0f21ff6bf
CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
...
Removed unused field. This will ensure that list VM queries are not blocked.
2014-01-27 15:43:20 +05:30
d47d4bbd20
Guard NPE due to empty policies.
2014-01-23 18:32:48 -08:00
af14699c4c
fixing the build _ AffinityGroup command changes
2014-01-23 18:17:43 -08:00
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
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
513f1dba36
CLOUDSTACK-5705: fixed the thumbnail not wrking for hyperv
2014-01-23 10:54:08 +05:30
b2de225f54
CLOUDSTACK-5703: putting rdp server port value in host details
2014-01-23 10:54:08 +05:30
5941ac46d2
CLOUDSTACK-5344 commit for console proxy rdp for hyperv
2014-01-23 10:54:08 +05:30
1b89ae7acb
CLOUDSTACK-5478:
...
Publish uuid for deployvm action event.
2014-01-22 16:50:50 -08:00
39c0a302b4
Fix the isRootAdmin and isDomainAdmin to return true or false even if the permission is denied by IAM
2014-01-22 13:59:59 -08:00
33cd1ab921
Merge branch 'master' into rbac
2014-01-22 11:23:51 -08:00
ab627bc767
Changed "authenticate" method to return both - result of authentication, and action to perform when authentication failed - to the accountManagerImpl. Only if authenicators request INCREMENT_INCORRECT_LOGIN_ATTEMPT_COUNT, the incorrect_login_attempts parameter will be increased
...
Signed-off-by: Alena Prokharchyk <alena.prokharchyk@citrix.com>
2014-01-21 17:45:53 -08:00
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
c0da0a884a
CLOUDSTACK-5921:S3 security key is stored in DB unencrypted
2014-01-21 14:34:32 -08:00
0846bfe1ff
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-20 23:10:54 -07:00
3689f72f27
CLOUDSTACK-5913:API rate limiting throws a different error than expected
...
when Throttle limit hit in the API.
2014-01-20 15:49:19 -08:00
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
929fbabaa2
Merge branch 'master' into rbac.
2014-01-17 14:37:08 -08:00
a9733b5df2
CLOUDSTACK-5731: Use general instance type to categorize VM work jobs to correctly serialize VM operations
2014-01-17 11:55:14 -08:00
06f8c1de75
CLOUDSTACK-5692: obscure passwords when using cifs as storage
2014-01-17 14:00:24 +05:30
bd79fb33a6
CLOUDSTACK-5870: API support for retrieving user data
2014-01-16 15:31:18 -08:00
47fd67b7fa
CLOUDSTACK-4987: when addNic to vm, don't make account check if the call is made by ROOT admin
2014-01-16 13:34:45 -08:00
3ef560d925
CLOUDSTACK-5873: [Automation] Failed to attach volume to VM, if the vm is created with option startvm=false
2014-01-16 12:15:18 -07:00
aa6dddc778
CLOUDSTACK-4987: when addNic to vm, don't make account check if the vm belongs to ROOT admin
2014-01-16 10:59:38 -08:00
dd50210e74
CLOUDSTACK-5877: ListTemplates does not sort based on sort_key.
2014-01-15 17:39:00 -08:00
6d9146bf2d
CLOUDSTACK-5408 [Automation] Failed to deploy vm in vmware environment with error "due to java.io.IOException: Cannot run program "mount": java.io.IOException: error=12, Cannot allocate memory"
...
Bump up RAM size of system offering for SSVM to 512MB. Fix if default service offering is already not present.
Signed-off-by: Sateesh Chodapuneedi <sateesh@apache.org>
2014-01-16 01:30:06 +05:30
6c1849f4bf
Fix Spring wiring issues in starting up MS.
2014-01-14 16:20:30 -08:00
6583cb3800
Add listAclGroupsByAccount to QuerySelector adapters and remove
...
AclProxyService interface.
2014-01-14 16:19:25 -08:00
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
f8681de07c
Invalid reference to a class which has been moved
...
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2014-01-14 15:13:12 +01:00
16d36dd75f
Fix checkstyle
2014-01-14 14:04:57 +05:30
e5512960af
CLOUDSTACK-5865. Unable to use login API if domainId parameter is id and not uuid
2014-01-14 13:47:27 +05:30
fac9f2da0f
Adding messageBus events for adding and removal of an account.
2014-01-13 22:12:39 -08:00
bae498c89e
Handle search of those entities without db view created using new ACL
...
model.
2014-01-13 21:55:56 -08:00
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
f1ecd9ed31
Removing the AclServiceImpl old bean entry
2014-01-11 01:01:00 -08:00
6cd121fe7b
RootAdmin and DomainAdmin access check via IAM
2014-01-10 17:06:10 -08:00
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
43f0f901dd
Remove VO and DAO from cloud-engine-schema.
2014-01-10 15:57:39 -08:00
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
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
2571dd7713
CLOUDSTACK-5829:
...
listvms should return the diskoffering id when deployed with an iso
2014-01-10 14:19:36 -08:00
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
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
9486a9652e
CLOUDSTACK-5852: router search in DomainDouterDao using AllFieldsSearch filters few routers due to router_network_ref join. Created a seperate search to list running routers with filters.
...
Conflicts:
engine/schema/src/com/cloud/vm/dao/DomainRouterDao.java
2014-01-10 19:58:59 +05:30
6944bf9bba
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 22:02:43 -07:00
ae35782ccd
Merge from 4.3: CLOUDSTACK-5662: XenServer can't discover iSCSI targets with different credentials
2014-01-09 21:36:34 -07:00
5fb6edd684
Changed the package to name to org.apache.cloudstack
2014-01-09 16:12:26 -08:00
ae8560b195
Moved security out into its own jar. Will be adding more to it. Fixed a few white space issues brought up by checkstyle in eclipse.
2014-01-09 16:12:25 -08:00
8b6e89c012
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 15:44:02 -07:00
1e2e1ea051
CLOUDSTACK-5765: cleanup internal serialization and exception propagation issues
2014-01-09 14:29:13 -08:00
87381d4236
CLOUDSTACK-5725: put origin flow context id into log4j context prefix to link jobs with the orchestration work flow in logging
2014-01-09 14:29:12 -08:00
ad6454d2bf
CLOUDSTACK-5767: Remove the logic of using underlying job related fields for volume specific logic.
2014-01-09 14:29:12 -08:00
737a382c38
Fix a typo caused problem in attach-volume process
2014-01-09 14:29:12 -08:00
ac0faeb091
Fix auto-merge caused issues
2014-01-09 14:29:12 -08:00
0587382265
CLOUDSTACK-669: Finalize VM work dispatching mechanism to avoid big switch statement
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
bf9a554522
CLOUDSTACK-669: covert VMsnapshot orchestration flows to make them be serialized with other VM operations
2014-01-09 14:29:12 -08:00
caf87ac5d9
Merge from 4.3: CLOUDSTACK-4810: Enable hypervisor snapshots for CloudStack-managed storage (for XenServer and VMware)
2014-01-09 15:06:25 -07: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
0e315f16c0
CLOUDSTACK-5656: Removed Filtering of revoked rules while listing. API returns state as Deleting for revoked rules.
2014-01-09 22:01:59 +05:30
7c8facf3c9
Change checkstyle to run on every sub project, so it will also run when you build an individual module
2014-01-09 17:00:11 +01: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
858b9b1177
CLOUDSTACK-5813: With S3 as secondary storage, snapshot taken in one
...
zone cannot be used to create volume in another zone. zoneId parameter
in createVolumeCmd is not observed.
2014-01-08 17:15:04 -08:00
1ea02fed4a
Revert "CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default"
...
This reverts commit 3c68b9f850
2014-01-08 16:03:21 -08:00
c3680cc111
CLOUDSTACK-5839: fixed xml serializer to process collection field when its elements are of String type
2014-01-08 15:38:50 -08:00
07557eb570
CLOUDSTACK-5839 : return canEnableIndividualService in listNetworkServiceProvidersResponse
2014-01-08 14:40:10 -08:00
cbe2560a78
CLOUDSTACK-5303: fix incorrect resource count (snapshot, secondary_storage)
...
(cherry picked from commit 4bb85cd7f9
2014-01-08 15:38:06 +01:00
3e45dfb942
CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
2014-01-08 19:10:40 +05:30
776b5059fb
CLOUDSTACK-5742 Add usage event detials for vm state transitions when using custom compute offering.
...
Conflicts:
server/src/com/cloud/vm/UserVmManagerImpl.java
server/src/com/cloud/vm/UserVmStateListener.java
2014-01-08 19:10:39 +05:30
54275f4f05
CLOUDSTACK-5552 Set private gateway state to ready on delete failure
2014-01-08 11:44:41 +05:30
cb0c14671a
CLOUDSTACK-5826: do netmask/gateway validation before calculating the POD cidr
2014-01-07 10:20:30 -08:00
ab3a2c20cd
CLOUDSTACK-5552 fixed private gateway DB clean up on router upgrade required
2014-01-07 17:57:58 +05:30
c3d8e207c8
CLOUDSTACK-5314: Negative (-ve) values for primary storage and volumes are shown in the resource count table.
2014-01-07 15:07:02 +05:30
4dcc5671d1
CLOUDSTACK-5812: pass podId information when request for secondary ip address in Basic zone guest network
2014-01-06 17:22:17 -08: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
89a20d3eed
CLOUDSTACK-5771:listImageStores returns error in keyword search.
2014-01-06 14:50:10 -08:00
e02e19a6f1
Make AclApiServiceTest pass without changing ApiServerService signature.
2014-01-06 10:43:01 -08:00
1069f56f8e
CLOUDSTACK-5406: Not able to take snapshot becasue of secondary_storage limit of 400 gb exceeded even though we have not really consumed this limit in secondary store.
2014-01-06 16:09:09 +05:30
d374cd5a2c
Add Unit Testcases for AclApiService.
2014-01-03 17:18:44 -08:00
e59420c514
CLOUDSTACK-5691: Fix for attaching an uploaded volume to instance running
...
on hyperv. There were multiple issues here. Upload volume was actually
failing because the post download check for vhd on the cifs share was
unsuccessful. Also the agent code wasn't parsing the volume path correctly.
Fixed it too.
2014-01-03 16:55:28 +05:30
77878299fb
CLOUDSTACK-5552 fixed private gateway DB clean up on failure
2014-01-03 12:57:12 +05:30
e5b4a1d869
Moved the loading of commands.properties to the IAM plugin
2014-01-02 18:39:18 -08:00
3c68b9f850
CLOUDSTACK-4540: Set execute.in.sequence.network.element.commands=true by default
...
The things is, VR would take time to execute the commands, say it would need
time t1(which is greater than 0).
And the interval between parallel deployment is t2(which can be almost 0). In
any case, VR need to handle commands in sequence internally, so if t1 > t2, then
the new task in the VR would wait longer and longer to execute, then some
commands result in timeout ultimately. No matter how long the timeout is, if
there are enough big number of queued task for VR, the last ones can timeout.
Currently VR has a robust mechanism to sequence the jobs internal and I
confirmed in this case, it works well. But there is no way to fix this issue if
VR is already 100% load at all time.
Probably we can improve the speed of VR internal executing, but seems the
ultimate answer is: set execute.in.sequence.network.element.commands to true. VR
doesn’t know how long it would take for mgmt. server to timeout, only mgmt.
server knows that.
By setting sequence execution in VR to "true", mgmt server would handle the
commands in a queue, make sure that VR won't be overload and report unexpected
failure just because it's overload.
2014-01-02 15:41:31 -08:00
fd0fabd3e2
CLOUDSTACK-5551: Search not working for Configuration parameters in (Account/zone/cluster/storage) settings page
...
Added filters while listing scoped configuration parameters.
Fixed: Some parameters are missing from UI settings tab because of missing scope entry in configuration table.
Signed-off-by: Koushik Das <koushik@apache.org>
2014-01-02 16:18:21 +05:30
619674e21e
CLOUDSTACK-5656: Rules will remain in Revoked state when router upgrade is required. Filtered revoked rules while listing. Show genreric error since router is not visible to enduser.
...
Conflicts:
server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2014-01-02 15:08:49 +05:30
700184f3ba
Added config to enable/disable router version check
2014-01-01 17:32:00 +05:30
79dc74dcb8
CLOUDSTACK-5698: support network ACL list search by keyword
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
2014-01-01 16:59:52 +05:30
2cf356e047
isSameIsolationId
2013-12-31 12:25:17 +01:00
14241ce233
CLOUDSTACK-5667: Shared Network - fails to launch router due to "
...
Multiple generic soure NAT IPs provided for network"
'getExistingSourceNatInNetwork' method was retruning source nat ip for
a particular account, resulting in multiple source nat ip's to be
assigned to a shared network on network implemen. Fix ensures that
account id is not considered for shared network implement.
2013-12-31 11:09:57 +05:30
db8d5f602a
CLOUDSTACK-5422: Changing XenServer Tools Version 6.1 + doesnt work.
2013-12-30 20:01:06 +05:30
a782d17caa
CLOUDSTACK-3806: OS Preference can not be set.
2013-12-30 20:01:06 +05:30
f6b063de79
CLOUDSTACK-4973: Specified keyboard language is not showing as default in consoleView passed during deployVM.
2013-12-27 18:17:22 +05:30
40a9909864
Fix check style errors
2013-12-27 16:39:29 +05:30
dcf8ddfb24
CLOUDSTACK-5340 [Hyper-V] Control IPs are not getting released when VRs are in stopped state
2013-12-27 14:56:02 +05:30
ab304d2821
CLOUDSTACK-5592
...
ssh should run on eth1 interface in ssvm/cpvm running in HyperV.
2013-12-27 14:50:08 +05:30
18fd0157a5
CLOUDSTACK-5365 added route for mgmt cidr in the VR running on HyperV
2013-12-27 14:46:28 +05:30
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
b7c3411be9
Fixing the issues in loading the beans
2013-12-26 15:17:10 -08:00
6f800506fd
CLOUDSTACK-5653:S3 object store as Secondary Storage, the template
...
created from different zone is not available for the other zones.
2013-12-26 14:48:21 -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
fead6706ff
CLOUDSTACK-5530 attempt to add secondary storage with the same name is ignored
2013-12-26 12:43:44 -08:00
5d262d7b59
CLOUDSTACK-5648:CopyTemplate and CopyISO across zones fails after NFS
...
migration to S3.
2013-12-26 12:39:39 -08:00
16763be77f
Fixed issue in setting vm ip,mac in vm_instance table
...
This issue is not seen in 4.2, It is observed only in 4.3.
2013-12-26 16:58:04 +05:30
c75f8bcc06
CLOUDSTACK-5420: The agent manager wasn't transitioning the host to maintenance
...
mode if their are no vms running on the host. Made the change to do so.
2013-12-26 11:15:51 +05:30
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
435aefec15
CLOUDSTACK-5254: If VR is not upgraded, leave firewall rule in Active state. Rule will be applied when VR is upgraded
2013-12-24 18:13:50 +05:30
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
cca60cd86d
fix network ACL unit test
2013-12-23 17:27:16 +05:30
0335009a1e
CLOUDSTACK-5300: Catch vpn add error failure, removed failed user and return failure status
2013-12-23 17:15:21 +05:30
55d84bdd5f
CLOUDSTACK-5587, CLOUDSTACK-5589: Router version in 2.2.x routers is null. Added null check when comparing min version
2013-12-23 17:15:03 +05:30
34894f5a9d
CLOUDSTACK-5564: The deployment on other hosts in the cluster used to fail because
...
cloudstack though the storage pool wasn't accessible from the host. Make sure host
to pool mapping is added in the storage_pool_host_ref table when a host is added
to the cluster.
2013-12-23 17:06:11 +05:30
630b7fb4a1
Fix listTemplates issues with new ACL model.
2013-12-20 17:57:44 -08:00
83bbe682d9
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 17:42:45 -08:00
edc1b78d84
Revert "Revert "CLOUDSTACK-5281:""
...
This reverts commit ab37009e90
2013-12-20 17:30:05 -08:00
ab37009e90
Revert "CLOUDSTACK-5281:"
...
This reverts commit 6b62a04eaf
2013-12-20 17:23:33 -08:00
c2baed665b
Moved the check-style.xml into the tools directory given that we're not using the project to reference the style any longer. Fixed problems with eclipse complaining about copy-dependencies
2013-12-20 17:21:34 -08:00
6b62a04eaf
CLOUDSTACK-5281:
...
Resource limit shouldnt be counted for resources with display flag = 0. Correcting this for the networks at the moment.
2013-12-20 16:58:43 -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
1832cf6660
CLOUDSTACK-5597: don't perform data disk allocation on the primary storage when attachVolume calls is made for the vm which ROOT disk hasn't been created yet.
2013-12-20 13:39:13 -08:00
179cdea8e9
CLOUDSTACK-5596: reload vm state after vm been force stopped
...
Conflicts:
server/src/com/cloud/ha/HighAvailabilityManagerImpl.java
2013-12-20 11:26:50 -08:00
7b0c85da3c
CLOUDSTACK-5502: interpret vlan='untagged' as vlan == null
2013-12-20 13:46:58 +01: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
02ace3442d
0001-Fixed-issue-with-DataStoreDrivers-not-being-able-to-
2013-12-19 13:35:21 -08:00
227567cf6c
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value
2013-12-19 22:56:34 +05:30
707da55fe3
CLOUDSTACK-5554: Custom disk offering allows to create a datadisk with size greater than custom.diskoffering.size.max value Fixed both custom.diskoffering.size.max and custom.diskoffering.size.min to ensure input values while deploying the VM and creating volume APIs.
...
Moved both parameters to VolumeOrchestrationService using ConfigDepot
2013-12-19 16:03:27 +05:30
13ba5e45a1
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 18:56:12 -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
3c965d0685
CLOUDSTACK-669: convert volume attach/detach flows to make them be serialized with other VM operations
2013-12-18 16:14:07 -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
ce774e184e
Fixing the management server startup
2013-12-18 14:14:55 -08:00
cc27a740dc
CLOUDSTACK-5528 : When VR version is not known set requiresUpgrade flag to true
...
Conflicts:
server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java
server/test/com/cloud/vpc/NetworkACLServiceTest.java
2013-12-18 18:29:08 +05:30
961834661c
CLOUDSTACK-5466:Fixed freeing ip address in removeIpFromNic
2013-12-18 14:49:47 +05:30
d810ab46fe
Revert "reverted 3a3fec3cb6 because it fails a unit test"
...
This reverts commit f4ee1a8115
2013-12-18 14:43:25 +05:30
96309a7867
Fixed issue in getting interface number in IpAssocVpcCommand
...
Regression from the below commit
commit 494ccd821d
2013-12-18 12:06:50 +05:30
e53081fe26
CLOUDSTACK-5534: MySQL exception raised when searching for users with
...
keyword.
2013-12-17 16:58:22 -08:00
e54d1dec9d
CLOUDSTACK-5533: Disable VR's DNS functionality if user choose to use external dns
...
Also fix the regression that external dns won't be used if "dns" service in the
network offering is unset.
2013-12-17 16:06:58 -08:00
f4ee1a8115
reverted 3a3fec3cb6 because it fails a unit test
2013-12-17 15:16:48 -08:00
78e4dd8566
CLOUDSTACK-4852: Since upgrade to 4.2 only users at the zone-attached domain level can manipulate VMs
...
Changes:
- The vmprofile owner passed in to the planner should be the VM's account and not the caller
- Do not do the access check for Root Admin
Conflicts:
server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java
2013-12-17 14:55:56 -08:00
729a79e85c
Refactor db view based list apis to use new IAM acl search criteria.
2013-12-16 14:31:32 -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
9d3827e6fe
CLOUDSTACK-669: refactor VM work job dispatcher to allow volume/snapshot manager to participate serialized job handling
2013-12-16 15:15:30 -08:00
12adbffbea
CLOUDSTACK-5517: NPE observed during "release portable IPs" as part of
...
account cleanup
ensure proper portable ip address are released as part of account
cleanup
2013-12-16 19:36:23 +05:30
e2915c6ce5
CLOUDSTACK-5145 : Added permission checks while deleting network ACLs
2013-12-16 18:12:44 +05:30
3a3fec3cb6
CLOUDSTACK-5145 : Added permission checks while deleting network ACLs
...
Conflicts:
server/src/com/cloud/network/vpc/NetworkACLServiceImpl.java
2013-12-16 18:02:43 +05:30
7cac5aa9fc
CLOUDSTACK-5514. Response of listAccounts API call includes removed users
2013-12-16 15:53:08 +05:30
46d1e1afb2
CLOUDSTACK-5446:KVM-Secondary Store down-Even after secondary store is
...
brought back up after being down for few hours,snapshot jobs do not get
triggered with reason "there is other active snapshot tasks on the
instance to which the volume is attached".
2013-12-13 22:04:29 -08:00
3f092d14cc
Adding the AclEntityType attribute to APICommand annotation
2013-12-13 16:04:25 -08:00
bd54ed8071
CLOUDSTACK-5417 Updating egress firewall rules CiDR on external network restart
2013-12-13 14:45:44 +05:30
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
d2c74bcf14
Changes to RoleBasedEntityAccessChecker to replace Role by Policy
2013-12-12 16:30:56 -08:00
1a985227b5
Changes to SecurityChecker
2013-12-12 16:30:53 -08:00
b084cc469a
CLOUDSTACK-5283:
...
Not able to list snapshots when few snapshots are in "CreatedOnPrimary" state. Dont throw an exception when snapshot doesnt have an entry in the snapshot store ref for the snapshot in Image store because that fails to list all snapshots and also it can a perfect use case when the backup flag is not turned on.
2013-12-12 13:18:56 -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
7833dd592c
JUnit test for NetworkACLManagerImpl#applyNetworkACL
...
Signed-off-by: Daan Hoogland <dhoogland@schubergphilis.com>
2013-12-12 15:01:51 +01: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
010b007ee4
CLOUDSTACK-5414: With NFS Image Store migrated to S3 an error is thrown
...
in creation of Virtual Router.
2013-12-11 14:17:43 -08:00
b385cb4f7a
Fixed test case failures in network acl
2013-12-11 14:20:11 +05:30
27ee78fe0a
CLOUDSTACK-5244 Fixed issue with applying acl items of acl to private gateway
2013-12-11 11:02:15 +05:30
8f21eca922
Separate Template/ISO related APIs to use two different views.
2013-12-10 12:23:39 -08:00
5036097659
CLOUDSTACK-5419: missing parameters in configuration table and to remove unused parameters
...
Signed-off-by: Koushik Das <koushik@apache.org>
2013-12-10 16:49:44 +05:30
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
d910b42339
fix bean error
2013-12-10 11:30:55 +07:00
5e23f00b1a
add Apache Licensed and add check native
2013-12-10 10:37:29 +07:00
f355359b23
fix issues
2013-12-10 10:37:28 +07:00
0b0e2627d6
fix duration
2013-12-10 10:36:30 +07:00
fca6d56681
remove private changes
2013-12-10 10:36:30 +07:00
dc151115be
AutoScaling without NetScaler
2013-12-10 10:35:55 +07:00
c60a256ebd
fixed egress rules for palo alto plugin and cleaned up extra api calls on master
...
Signed-off-by: Sheng Yang <sheng.yang@citrix.com>
2013-12-09 18:26:57 -08: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
e79350d256
CLOUDSTACK-3664:
...
scaling up vms was not considering parameter cluster.(memory/cpu).allocated.capacity.disablethreshold. Fixed it
Also added overprovisioning factor retrieval at the cluster level for host capacity check
2013-12-09 15:40:17 -08:00
4a9da03760
CLOUDSTACK-5426 Cannot deploy instance having multiple volumes that use different storage tags for storage pools in same cluster
...
Fixing the Imports missing
2013-12-09 15:37:15 -08:00
Daan Hoogland
Daan Hoogland
Likitha Shetty
Rajesh Battala
Min Chen
Marcus Sorensen
Sanjay Tripathi
Koushik Das
Prachi Damle
Damodar Reddy
Anshul Gangwar
Nitin Mehta
Alena Prokharchyk
Mike Tutkowski
Kelven Yang
Saksham Srivastava
Sateesh Chodapuneedi
Alex Huang
Ian Southam
Murali Reddy
Harikrishna Patnala
Bharat Kumar
Kishan Kavala
Hugo Trippaers
Sheng Yang
Wei Zhou
Jayapal
Devdeep Singh
Edison Su
Antonio Fornie
tuna
Will Stevens