etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
26,088 Commits 323 Branches 325 Tags 845 MiB
Commit Graph

8954 Commits

Author SHA1 Message Date
Sebastien Goasguen cdc66c9e70 Small typo correction, exisits -> exists 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #57
 2014-12-15 11:26:19 +05:30
Rohit Yadav aa92f5d483 Merge remote-tracking branch 'anshulg/CLOUDSTACK-8067' 
This closes #56

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-12 21:40:21 +05:30
Wei Zhou 19e99848c8 CLOUDSTACK-7882: SSH Keypair Creation/Selection in UI 
Thanks Ilia Shakitko for the porting and testing.
 2014-12-12 14:30:34 +01:00
Wei Zhou c9d492d714 CLOUDSTACK-255: fix NPE in createPortForwardingRule due to no PortForwarding provider 2014-12-12 11:13:18 +01:00
Wei Zhou fec31d53c3 CLOUDSTACK-8064: UpdatePortForwardingRuleCmd implementation 2014-12-12 10:19:06 +01:00
Wei Zhou dcb7fcc6df CLOUDSTACK-8063: list secondary Ips information in VM response 2014-12-12 09:47:27 +01:00
Anshul Gangwar 1115bc9cc6 CLOUDSTACK-8067: Fixed NPEs in MS log related to console proxy VM 2014-12-12 11:24:28 +05:30
Min Chen 528bc80b4c CLOUDSTACK-8061: Extracting volume when it is in migrating state causes 
both the operations to fail.
 2014-12-11 09:53:33 -08:00
Wei Zhou f5619f428b CLOUDSTACK-8051: fix NPE in updateNetwork due to static nat rules exist but no StaticNat provider 2014-12-11 15:13:36 +01:00
Rohit Yadav fdb782ffcb CLOUDSTACK-8014: Fix NPE searching including removed templates 
Steps to reproduce if you have this issue:
- Create a VM's volume snapshot
- Remove VM's template and mark the template as removed with timestamp in DB
- Restart mgmt server and create a volume out of snapshot you should get NPE

Fix: In `storagePoolHasEnoughSpace`, we're only searching for a VM's volume's
snapshot's template by Id and not including removed templates. This is a corner
case and NPE hits when template has been marked removed for a VM's volume's
template so we should search including removed templates.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f189c105d8)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-10 19:31:27 +05:30
Koushik Das f6854bc984 CLOUDSTACK-8054: No event generated on host maintenance mode is completed 
Added events for host maintenance start and completion
 2014-12-10 10:18:34 +05:30
Koushik Das ef9830d6a4 Merge branch '4.5' 
Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
	tools/appliance/build.sh
 2014-12-09 14:59:36 +05:30
Wei Zhou 13205e6be1 CLOUDSTACK-8050: VM Guest OS type does not update if template guestostype changes 2014-12-09 08:21:35 +01:00
Koushik Das 016d009adf CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash 
The last commit 513adab51b didn't fully fix it. Scenario #1 was not handled, only #2 was handled.
Fixed #1 as part of this commit.
1. If VM is in stopped state in CS due to 'PowerMissing' report from old host (hostId is null) and then there is a 'PowerOn' report from new host
2. If VM is in running state in CS and there is a 'PowerOn' report from new host
 2014-12-09 11:46:45 +05:30
Daan Hoogland 05b2ec4f55 Merge branch 'hotfix/CID-1256277' 2014-12-08 12:40:08 +01:00
Jayapal 8f8e311110 CLOUDSTACK-8030: Updated router to come up egress default ALLOW 
On default iptables rules are updated to add ACCEPT egress traffic.
    If the network egress default policy is false, CS remove ACCEPT and adds the DROP rule which
    is egress default rule when there are no other egress rules.

    If the CS network egress default policy is true, CS won't configure any default rule for egress because
    router already came up to accept egress traffic. If there are already egress rules for network then the
    egress rules get applied on VR.

    For isolated network with out firewall service, VR default allows egress traffic (guestnetwork --> public network)
 2014-12-08 11:32:01 +05:30
Nitin Mehta b1e4c6db07 Revert "Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured."" 
This reverts commit 24aaf19239.
 2014-12-08 11:20:49 +05:30
Nitin Mehta 24aaf19239 Revert "CLOUDSTACK-7919: If there is an out of band movement for the VR, irrespective of the fact that came as out of band live migrate or HA, reboot the router to make sure the router has all the rules configured." 
This reverts commit 39a671dfd8.
 2014-12-05 15:24:09 +05:30
Wei Zhou 2554cfb140 CLOUDSTACK-7847: Can't deploy in project using customer created compute offerings 2014-12-05 08:42:22 +01:00
Jayapal 2d7f0c693b CLOUDSTACK-8027: Update error msg for enable static nat 2014-12-05 12:55:41 +05:30
Jayapal 936a17be22 CLOUDSTACK-8027: Update error msg for enable static nat 2014-12-05 12:45:22 +05:30
Damodar 7ef0f5507d Attach volume events are not correctly shown in events. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-12-04 20:01:41 +05:30
Wei Zhou fc1a09ff49 Add snapshotName parameter in CreateSnapshotCmd 2014-12-04 15:29:39 +01:00
Wei Zhou d4605556c6 fix NPE when delete a domain 2014-12-04 15:28:41 +01:00
Damodar 7b8fe0c8cd Attach volume events are not correctly shown in events. 
Signed-off-by: Koushik Das <koushik@apache.org>
 2014-12-04 19:31:03 +05:30
Sheng Yang 3c9e14e85a CLOUDSTACK-5241: Remove Rot13 usage 2014-12-03 19:38:47 -08:00
Sheng Yang feeafa76a4 CLOUDSTACK-5241: Remove Rot13 cipher 2014-12-03 19:30:31 -08:00
Min Chen 344d98e0bd CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search. 2014-12-03 09:48:07 -08:00
Min Chen 8cb11f407f CLOUDSTACK-7981: added back resource tag related columns to user_vm_view to support resource tag related search. 2014-12-03 09:33:22 -08:00
Laszlo Hornyak a81b59e2a4 Revert "some unused fields deleted" 
This reverts commit 31db58f720.
 2014-12-03 18:09:49 +01:00
Daan Hoogland 590667076d CID-1256277 use StringBuffer in loop 2014-12-03 13:32:22 +01:00
Wei Zhou c25d4fdea2 CLOUDSTACK-7847: Separate ListDomains cmd to use two different views 2014-12-03 12:33:57 +01:00
Wei Zhou 0407fb334f CLOUDSTACK-7847: add max.domain.* in global setting and display domain resources in listDomainsCmd response 2014-12-02 11:52:10 +01:00
Sheng Yang 77c88fa917 CLOUDSTACK-7999: Always override local keystore file with the entry in DB 2014-12-01 19:03:23 -08:00
Sheng Yang c987080c26 CLOUDSTACK-7999: Always override local keystore file with the entry in DB 2014-12-01 18:59:25 -08:00
Koushik Das c3515c9ff9 CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash 
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-01 18:49:09 +05:30
Koushik Das 513adab51b CLOUDSTACK-7994: Network rules are not configured in VR after out-of-band movement due to host crash 
Ensure that VR is re-booted when it is moved to another host out-of-band. This is necessary to re-program all network rules
 2014-12-01 18:09:58 +05:30
Wei Zhou af2f21894c CLOUDSTACK-7983: Create Disk/Service Offering for Domain Admin 2014-12-01 13:03:37 +01:00
Rohit Yadav 5241d0faf8 CLOUDSTACK-7903: Fix build regression from previous fix 
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 1e0880cbab)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-01 16:39:01 +05:30
Rohit Yadav 1e0880cbab CLOUDSTACK-7903: Fix build regression from previous fix 
The previous fix tried to access StatsCollector from UsageManagerImpl
which is not possible due to dependency cycle.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-01 16:35:23 +05:30
Ilia Shakitko e124781445 CLOUDSTACK-7903: Decreased minimal usage aggregation range value 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9b907902d2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
 2014-12-01 15:55:30 +05:30
Ilia Shakitko 9b907902d2 CLOUDSTACK-7903: Decreased minimal usage aggregation range value 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-12-01 15:52:00 +05:30
Rohit Yadav d28b716d8a CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers 
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 21a6bef53b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-28 15:46:17 +05:30
Rohit Yadav 21a6bef53b CLOUDSTACK-7989: Ignore Auth API calls in unauthenticated HTTP handlers 
If an auth API call (such as login, logout) is called on unauthenticated port
such as the 8096 integration server port, we need to ignore such API calls
as calling auth APIs on 8096 is un-necessary and is undefined.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-28 15:43:29 +05:30
Harikrishna Patnala cdfdda2051 CLOUDSTACK-6075: Increase the ram size for router service offering 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 488c17858f)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-27 16:05:34 +05:30
Harikrishna Patnala 488c17858f CLOUDSTACK-6075: Increase the ram size for router service offering 
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
 2014-11-27 16:04:59 +05:30
Min Chen bf8dd828f5 CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate 
resource tags due to joining user_vm_details to user_vm_view.
 2014-11-26 17:40:06 -08:00
Min Chen 4e7af26c9f CLOUDSTACK-7981: listVirtualMachine is too slow in case of duplicate 
resource tags due to joining user_vm_details to user_vm_view.
 2014-11-26 17:23:07 -08:00
amoghvk 960b7bbf74 CLOUDSTACK-7977 
Fix password generator, add guards for minimum length
 2014-11-26 15:08:48 -08:00
amoghvk 95ea203907 CLOUDSTACK-7976 : Param validation for global params involving domain name 2014-11-26 14:54:42 -08:00
amoghvk 86895ec13c Add validation for domain names passed via global pamaremets 2014-11-26 14:45:50 -08:00
Harikrishna Patnala 9585aa0b51 CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit eae733817b)
 2014-11-25 15:55:54 +05:30
Daniel Vega 02ca6f2e5b CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
(cherry picked from commit c919ff83d8)
 2014-11-25 15:55:30 +05:30
Rohit Yadav 7ff31f1b22 Merge remote-tracking branch 'origin/inetaddress' 
- Tested locally against unit tests
- TravisCI build passed: https://travis-ci.org/apache/cloudstack/builds/41990351
- Manual QA passed for basic auth and saml auth using default IDP settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/api/ApiServlet.java
 2014-11-25 14:32:09 +05:30
Harikrishna Patnala eae733817b CLOUDSTACK-6465: vmware.reserve.mem is missing from cluster level settings 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-11-25 12:22:31 +05:30
Daniel Vega c919ff83d8 CLOUDSTACK-7917: Validating Load Balancer Rule when updating LB + unit test 
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
 2014-11-25 11:55:43 +05:30
Edison Su 7175247c5e CLOUDSTACK-7966: 
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
 2014-11-24 14:30:32 -08:00
Edison Su 4e5b3d028d CLOUDSTACK-7966: 
remove snapshot_store_ref entry, in which role is Primary, during
storage GC
 2014-11-24 14:27:56 -08:00
Wido den Hollander 72ba98b1b8 Validate IPv4 address using Apache Commons Validator 2014-11-24 14:43:48 +01:00
Wido den Hollander 87a7810ade Fix UnitTest ApiServlet 2014-11-24 11:48:13 +01:00
Sanjay Tripathi d475b62838 CLOUDSTACK-7964: listAccounts API is not listing correct value of resource limits. 2014-11-24 13:44:42 +05:30
Saksham Srivastava c615aafd77 CLOUDSTACK-7962: Change state to Volume State 2014-11-24 12:08:58 +05:30
Saksham Srivastava 690a5ded35 CLOUDSTACK-7962: VM Snaptshot should add check for root volume status also 2014-11-24 11:20:19 +05:30
Laszlo Hornyak 31db58f720 some unused fields deleted 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:04 +01:00
Laszlo Hornyak 712a729bd7 unused logger removed 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:03 +01:00
Laszlo Hornyak 3577423da9 removed executable flags from java classes 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:49:01 +01:00
Laszlo Hornyak 2a6d6891eb Some simplification on getClientAddress in ApiServlet 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:48:58 +01:00
Laszlo Hornyak fa52ffad65 unit test for getClientAddress 
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
 2014-11-23 19:48:57 +01:00
Min Chen b85183ede7 CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong 
url.
 2014-11-21 15:18:47 -08:00
Min Chen 9ac93d3e43 CLOUDSTACK-7678:volumes are getting uploaded successfully with wrong url. 2014-11-21 14:36:36 -08:00
Wido den Hollander 4bd49df3f5 Use InetAddress for passing Remote Address instead of String 2014-11-21 12:10:35 +01:00
Syed 9f8d0051ed CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-11-21 03:39:57 -05:00
Will Stevens 1be6fb143e CLOUDSTACK-7822: Fixed SSL Cert Tests and relaxed chain validation 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-11-21 03:38:52 -05:00
Min Chen 66e0f049db CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying 
all the tags of all resources.
 2014-11-20 09:48:07 -08:00
Min Chen 5fa7801b20 CLOUDSTACK-7954:ListTags API is ignoring the resourceID and displaying 
all the tags of all resources.
 2014-11-20 09:46:00 -08:00
Min Chen 7de9d2f002 Revert "BUG-ID: CS-27662: ListTags API is ignoring the resourceID and displaying" 
This reverts commit 3014fd0089.
 2014-11-20 09:44:55 -08:00
Min Chen 3014fd0089 BUG-ID: CS-27662: ListTags API is ignoring the resourceID and displaying 
all the tags of all resources.
Reviewed-by: Frank
 2014-11-20 09:31:29 -08:00
Syed 8ea7902075 CLOUDSTACK-7952: Remove private key from SslCertResponse (listSslCerts) 
Signed-off-by: Will Stevens <wstevens@cloudops.com>
 2014-11-20 03:46:03 -05:00
Edison Su 4140811549 CLOUDSTACK-7947: 
double check if parent snapshot is removed or not, when creating new
snapshot

Reviewed-by: Min
 2014-11-19 16:13:05 -08:00
Edison Su bd79965329 CLOUDSTACK-7947: 
double check if parent snapshot is removed or not, when creating new
snapshot

Reviewed-by: Min
 2014-11-19 16:12:28 -08:00
Edison Su 2ccecce515 CLOUDSTACK-7946: 
fix compile
 2014-11-19 16:09:30 -08:00
Edison Su 15c0efb774 CLOUDSTACK-7946: 
fix compile
 2014-11-19 16:08:54 -08:00
Edison Su d856a2acad CLOUDSTACK-7946: 
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
 2014-11-19 16:08:27 -08:00
Edison Su 67113ff0b2 CLOUDSTACK-7946: 
remove leftover state in volume and snapshot table in case of mgt server
shutdown during storage operation.
Reviewed-by: Min
 2014-11-19 16:06:37 -08:00
Saksham Srivastava f0a4a639de CLOUDSTACK-7941: CloudStack should log IP address of actual client even if a ReverseProxy is there 2014-11-19 16:07:10 +05:30
Kishan Kavala 4e896938ee BUG-ID: CLOUDSTACK-5324 when router requires upgrade throw ResourceUnavailableException with scope VirtualRouter. API willl return generic Network Unavailable error. 
Reviewed-By: Damoder
 2014-11-19 09:46:56 +05:30
Prachi Damle 968ca060ee CLOUDSTACK-5853 cannot deploy vm with differing service storage tag and data disk storage tag 
Changes:
- Reverting Marcus's fix since this issue has already fixed by https://issues.apache.org/jira/browse/CLOUDSTACK-5426
 2014-11-18 14:07:51 -08:00
Prachi Damle 7f54894045 CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage. 
Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan.
 2014-11-18 14:07:49 -08:00
Prachi Damle 48553d7434 CLOUDSTACK-7559 After migrating root volume to other cluster wide storage, start VM is not running the VM with root disk from new storage. 
Changes:
- During VM start, do not use the last host Id, if the host's cluster does not match the cluster provided in the deployment plan.
 2014-11-18 09:47:20 -08:00
Daan Hoogland f2ccee7a03 name convention adherence 2014-11-18 16:52:46 +01:00
Hugo Trippaers 302d5195d4 Merge branch 'bugfix/CID-1254835' 2014-11-18 14:31:33 +01:00
Hugo Trippaers e1d4a329c4 Package name should reflect the location on the filesystem or viseversa 2014-11-18 14:12:44 +01:00
Anshul Gangwar 9c328cb9dd CLOUDSTACK-7929: While creating network offering if one specifies negative value for network rate then we will convert that value to 0 i.e. unlimited 
This closes #40
 2014-11-18 14:25:30 +05:30
Anshul Gangwar 8307dd9105 CLOUDSTACK-7930, CLOUDSTACK-7931: Do not allow to set invalid values for global settings which are of type integer and float 
This closes #41
 2014-11-18 14:25:12 +05:30
Anshul Gangwar 4721e66d0e CLOUDSTACK-7541: Added restriction to not allow custom disk offering with disksize UI doesn't allow but with API we were able to create custom disk offering with disk size which was causing this issue 
This closes #28
 2014-11-18 14:24:58 +05:30
Anshul Gangwar 44d12330b9 CLOUDSTACK-7758: Fixed although api calls are failing, event tab shows them as successful 
This closes #29
 2014-11-18 14:24:47 +05:30
Anshul Gangwar ae199b6ce7 CLOUDSTACK-7703, CLOUDSTACK-7752: Fixed deployment planner stuck in infinite loop. 
If we create VM with shared service offering and attach disk with local disk offering,
and one of storage pool is full(cannot be allocated) and other is not full then
we are not putting the cluster in avoid list which is causing this infinite loop.

Fixed by putting the cluster in avoid list even if one of the storage pool is full(cannot be allocated)
 2014-11-18 14:12:45 +05:30
Anshul Gangwar c04cdae60b CLOUDSTACK-7767: fixed events are not generated for snapshot creation 2014-11-18 14:12:33 +05:30
Anshul Gangwar f43ffb9a0f CLOUDSTACK-7688, CLOUDSTACK-7747: restricted various operations for VM with VM snapshots which breaks VM snapshots. 
Now they are informed that they cannot perform the operation.
 To perform operation they have to remove VM snapshots of VM.
 2014-11-18 14:12:02 +05:30
Hugo Trippaers ef30300281 CID-1254834 secStorageVm can only be null in a special case 2014-11-18 09:37:35 +01:00