Commit Graph

27613 Commits

Author SHA1 Message Date
Daan Hoogland 43a39d1eb0 findbugs: possible nullpointer 2015-02-19 10:27:51 +01:00
Rohit Yadav 1544d090b4 CLOUDSTACK-7671: before starting run systemd-tmpfiles --create
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-19 14:55:31 +05:30
Rohit Yadav c78d3416e7 Revert "Revert "CLOUDSTACK-7671: Management server restart failed after reboot""
This reverts commit e2ca6e38d5.
2015-02-19 14:55:31 +05:30
Daan Hoogland 4485dcb374 cobertura chokes on final in try-with-resource 2015-02-19 10:24:25 +01:00
Daan Hoogland 0f8a055dff findbugs: equals() call on Long instead of =-comparison 2015-02-19 10:23:10 +01:00
Marcus Sorensen 6c05d9f572 CLOUDSTACK-8263: KVM - virsh resize doesnt refresh libvirt's view of the volume size, refresh pool
Change-Id: I5ea54f7389d72b57bb625e4d87b45b65eb0c96cd
2015-02-18 12:55:53 -08:00
Marcus Sorensen c82d011112 CLOUDSTACK-8263: KVM - virsh resize doesnt refresh libvirt's view of the volume size, refresh pool
Change-Id: I5ea54f7389d72b57bb625e4d87b45b65eb0c96cd
2015-02-18 12:54:26 -08:00
SrikanteswaraRao Talluri 9c381a21c4 instead of adding zone wide primary storage in the cluster block,
added it in the zone block.
CLOUDSTACK-8229
Testing: tested with KVM and zone deployment was fine.

In the config file, zone wide primary storage details looks like this:
  "primaryStorages": [
        {
          "url": "nfs://10.147.28.7/export/home/talluri/primary1",
          "XRT_PriStorageType": "NFS",
          "name": "XenRT-Zone-0-Pod-0-Cluster-0-Primary-Store-0",
          "hypervisor": "KVM",
          "scope" : "zone"
        }
      ],

reviewed-by: talluri
2015-02-18 19:30:15 +05:30
Rohit Yadav cb0cd50145 rhel7: keep same name as on master branch
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 16:38:36 +05:30
Rohit Yadav 9de521f390 rhel7: fix service name
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 16:29:24 +05:30
ramamurtis 206be251ae CLOUDSTACK-8245: Scrolling down the network service providers list from the UI never ends
(cherry picked from commit 2e5c1614ed)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 12:25:43 +05:30
ramamurtis 4f698b3d4f CLOUDSTACK-8246: Add Cluster - Guest traffic label displayed Incorrectly
(cherry picked from commit d363b2afce)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 11:23:10 +05:30
Rohit Yadav 446e08d25d Merge remote-tracking branch 'rags22489664/master'
This closes #76
2015-02-18 11:22:24 +05:30
Pierre-Yves Ritschard 1dc0611bcd ensure agent reconciliation triggers events
(cherry picked from commit 0ba75bcebd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 11:15:44 +05:30
Pierre-Yves Ritschard c37841817e ensure agent reconciliation triggers events
(cherry picked from commit 0ba75bcebd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 11:15:13 +05:30
Marcus Sorensen e77b4ae8e8 CLOUDSTACK-8263: KVM - use virsh instead of libvirt for resizing qcow2, as libvirt bindings are insufficient
Change-Id: I08246219cb1469a46dc6a9ec76a8c3a67b0b8bf6
2015-02-17 18:10:08 -08:00
Marcus Sorensen 9bf2626e57 CLOUDSTACK-8263: KVM - use virsh instead of libvirt for resizing qcow2, as libvirt bindings are insufficient
Change-Id: I08246219cb1469a46dc6a9ec76a8c3a67b0b8bf6
2015-02-17 18:09:41 -08:00
Marcus Sorensen 61a50ce5e4 CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage
Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a
2015-02-17 14:27:13 -08:00
Marcus Sorensen ed8184a5b2 CLOUDSTACK-8263: KVM - notify qemu process of resized volume for libvirt-resized storage
Change-Id: Iddd8bb068855d3565075d3ecf7c6c0f074d00e1a
2015-02-17 14:25:55 -08:00
Gaurav Aradhye e768d702cb CLOUDSTACK-8261: test_haproxy.py - Remove the code checking AppCookle and LbCookie Stickiness policies
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-17 18:33:24 +05:30
Gaurav Aradhye 8bfda973c2 CLOUDSTACK-8259: Code improvement - test_routers.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-17 18:23:34 +05:30
Gaurav Aradhye 9734582197 CLOUDSTACK-8258: test_iso.py - Removed assertion on Iso name when random characters are appended to test data before creating Iso
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-17 18:19:52 +05:30
Gaurav Aradhye a95ce8138a CLOUDSTACK-8257: test_escalations_volume.py - Removing asserts on volumes names as they don't hold true when random characters are appended to the volume name before creation
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-17 18:19:29 +05:30
Gaurav Aradhye 95f17d61f8 CLOUDSTACK-8219: Marvin: Correct code related to getting free vlan in the setup
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-17 18:18:13 +05:30
Koushik Das 075c841052 volume upload: cannot delete a volume in NotUploaded state Added exception handler in the upload status monitor thread. 2015-02-17 12:31:41 +05:30
Koushik Das d19ea5226a volume upload: Use volume/template UUID instead of ID in UploadStatusCommand 2015-02-17 12:31:40 +05:30
Rajani Karuturi 58f2fb1bb1 volume upload: post response http error code is 200 even for error case
Returned appropriate error code(bad request, internal server error, ok)
2015-02-17 12:31:38 +05:30
Rajani Karuturi 643165a07e volume upload: used netty server to do the file upload 2015-02-17 12:31:27 +05:30
Rajani Karuturi 41382f6f04 Volume upload: state goes to " UploadAbandoned " state when uploaded thru UI. 2015-02-17 11:52:35 +05:30
Rajani Karuturi b616894c21 volume upload: fixed issues during request validation
adding the encoded metadata to the signature
2015-02-17 11:50:58 +05:30
Rajani Karuturi bc997f1acb volume upload: escape $1 in the rewrite rule 2015-02-17 11:34:18 +05:30
Rajani Karuturi 5c4fd12a9b volume upload: using the timeout from configuration
removed the hardcoded 60 min
2015-02-17 11:33:29 +05:30
Rajani Karuturi 812a140d17 volume upload: returning only the first payload incase of templates
Cross zone copy will be intiated by the management server.
2015-02-17 11:32:40 +05:30
Rajani Karuturi 3814677977 volume upload: getUploadParamsForVolume url has IP address instead of hostname, SSL fails 2015-02-17 11:31:44 +05:30
Rajani Karuturi 01c41d09db volume upload: returning the install path and size in UploadStatusCommand 2015-02-17 11:28:32 +05:30
Rohit Yadav 2580edbcfb CLOUDSTACK-7908: UserVmResponse returns userid/username information of the creator
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 16:12:22 +05:30
Rohit Yadav 2b7073c73f CLOUDSTACK-7085, CLOUDSTACK-7084: disallow empty passwords
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e5cd75790a)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:34:06 +05:30
Rohit Yadav e5cd75790a CLOUDSTACK-7085, CLOUDSTACK-7084: disallow empty passwords
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:31:22 +05:30
Rohit Yadav 1a6df6f978 CLOUDSTACK-7908: Add user_id column to vm_instance table
Design Document:
https://cwiki.apache.org/confluence/display/CLOUDSTACK/Allow+VM+listing+by+User+ID

- Adds column to VMInstance DAO
- Adds column in vm_instance table
- Adds column in the UserVMJoinVO
- Adds default admin user which has UID = 2
- Adds migration path that sets user_id to first user of the accountId that
  owns the vm in vm_instance table
- Add arg on list VMs API to query by userId, add support in query layer
- Refactor VMInstanceVO and child classes to accept userId
- Add code to let service layer pass userId if loggedIn user belongs to same
  account as the owner executing an API call or use first user from owner account
- In case of CPVM and SSVM use system user ID
- Fix unit tests and spring injections

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:02:38 +05:30
sanjeev 67268d9db3 Iterate one more time before failing iso download
Signed-off-by: sanjeev <sanjeev@apache.org>
2015-02-16 12:16:21 +05:30
Daan Hoogland 8ad2e309a4 CLOUDSTACK-8238 handling of retry ping improved
Fixed on 4.4 and master but not on 4.5, cherry-picked on 4.5 using commit
fbafc957dc

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

Conflicts:
	engine/orchestration/src/com/cloud/agent/manager/DirectAgentAttache.java
2015-02-16 11:35:41 +05:30
SrikanteswaraRao Talluri a7b8e987d3 As this is not tested and causing other failures, reverting for now and let the author resubmit a fresh patch
Revert "Automation of CCP Objects Verification after external changes made to the original setup Purpose of this code:"

This reverts commit 7461297f3e.
2015-02-14 21:20:25 +05:30
Gaurav Aradhye e66ceaa254 CLOUDSTACK-8255: Adding secondary IP to correct ethernet interface present on the VM
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-13 18:08:17 +05:30
SrikanteswaraRao Talluri d552eb42b5 added missing comma in test_data.py 2015-02-13 17:58:45 +05:30
Ashutosh K ada8cdce70 CLOUDSTACK-7911: Adding test cases for usage test path
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-13 16:02:56 +05:30
SrikanteswaraRao Talluri a68de9acb6 CLOUDSTACK-8161: disable template create and dynamic scaling tests for LXC 2015-02-13 15:47:19 +05:30
Gaurav Aradhye 500baea9b6 CLOUDSTACK-8235: Fixed test case in test_bugs.py to read variable data from configurableData section of test_data.py and also fixed wrong parameter name
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-13 13:06:08 +05:30
Gaurav Aradhye 015aed9bef CLOUDSTACK-8217: Fixed marvin base library method for passing 'lbdevicecapacity' parameter while adding netscaler device
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-13 12:53:54 +05:30
Gaurav Aradhye eab63a6dd9 CLOUDSTACK-8149: Fixed test_Virtualrouter_alerts.py for VMware
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-13 12:40:09 +05:30
Gaurav Aradhye d849a66b47 CLOUDSTACK-8253: Code correction and improvement: test_haproxy.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-13 12:36:28 +05:30