26155 Commits

Author SHA1 Message Date
Rohit Yadav
e1827fc696 CLOUDSTACK-8285: check and update IP capacity states based on allocation state
- Backend should update if state was diabled and now has changed
- UI's fetch latest does not actually fetch latest

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 985a61652eb5dc97503c002e9fc3c3a7ca39b70c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-25 16:47:40 +05:30
Daan Hoogland
cc9461bdb8 Merge branch 'patch-1' of https://github.com/NuxRo/cloudstack 2015-02-25 11:35:16 +01:00
NuxRo
f06dc56e6a Update messages.properties 2015-02-25 10:31:57 +00:00
Daan Hoogland
76010d8871 Merge branch 'CLOUDSTACK-8210_2' of https://github.com/K0zka/cloudstack 2015-02-25 10:22:28 +01:00
Rohit Yadav
4f9bc70b1f CLOUDSTACK-8282: startSystemVM should override consoleproxy.start setting
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b462a56f27b21455b70415ea03663af5cd62647e)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-25 14:30:13 +05:30
Abhinandan Prateek
6caee8590a CLOUDSTACK-8265: added os mappings for Ubuntu 14.04 2015-02-24 07:30:54 -05:00
Marcus Sorensen
77d11eb1a3 LibvirtComputingResource: Fix coverity scan, recent bugfixes revealed a potential unhandled null in getResizeScriptType
Change-Id: I5715a4424646261f2c43cd5e0a16fd72dd12c753
2015-02-23 16:56:19 -08:00
NuxRo
81378c49de Update messages.properties
Instances ca be scaled up or down, no only up.
2015-02-23 16:01:42 +00:00
Rohit Yadav
09e26c826f db: use explicit USE statements to avoid SQL failures
create-schema-premium.sql may fail with certain MySQL/MariaDB version which
require explicit database use.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-23 02:00:18 +05:30
Laszlo Hornyak
a9912a00b8 packaging for fedora 21
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-21 22:44:40 +01:00
Laszlo Hornyak
7319f25cf7 added net-tools to the dependencies of the agent on fedora 20
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-21 18:41:52 +01:00
Laszlo Hornyak
7340748b5c CLOUDSTACK-8163: added fedora 20 to the help text of the package script
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-21 18:41:52 +01:00
Laszlo Hornyak
b66bf97425 CLOUDSTACK-8163: initial version of packaging for fedora 20 based on centos 7 packaging
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-21 18:41:51 +01:00
Daan Hoogland
245c32538b Merge branch 'hotfix/scp-exception' of https://github.com/DaanHoogland/cloudstack 2015-02-21 14:06:16 +01:00
Daan Hoogland
b3281eef15 Merge branch 'master' of https://github.com/DaanHoogland/cloudstack 2015-02-21 13:12:18 +01:00
Daan Hoogland
e13d45e2c6 catch specific exception and log clear message on error 2015-02-21 12:32:29 +01:00
Daan Hoogland
0e31366a3d Merge branch 'hotfix/singlerun-test-breakage' of https://github.com/DaanHoogland/cloudstack 2015-02-20 16:10:59 +01:00
Gaurav Aradhye
53bae00801 CLOUDSTACK-8269: Code changes in primary storage test cases as per recent change in product behavior
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-20 20:03:45 +05:30
Ashutosh K
0440960933 CLOUDSTACK-7594: Adding automation test cases for stopped VM test path
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-20 20:02:08 +05:30
Gaurav Aradhye
ba08229ff9 CLOUDSTACK-8264: Code improvement - test_stopped_vm.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-20 19:59:37 +05:30
Daan Hoogland
d64672aeb7 test fails unexplicalby while functionality is ok 2015-02-20 14:24:45 +01:00
Pierre-Luc Dion
db9a4f3648 fix CLOUDSTACK-8187 and CLOUDSTACK-8232: missing UI labels 2015-02-19 22:39:56 -05:00
Pierre-Luc Dion
0c70d11bc3 CLOUDSTACK-8188: missing labe:label.password.reset.confirm 2015-02-19 22:37:12 -05:00
Daan Hoogland
ee82033da1 mvn on buildslaves that don't have it in path and then call it 2015-02-19 13:07:03 +01:00
Daan Hoogland
45a3ad2186 mvn on buildslaves that don't have it in path 2015-02-19 11:58:40 +01:00
Rohit Yadav
39dce59562 CLOUDSTACK-6541: Fix monthly recurring snapshot UI limit, limit to 1-28 days
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 070813a106e548be44963a3f7787861a642b115b)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-19 15:42:53 +05:30
Rohit Yadav
d82879e548 CLOUDSTACK-5824: poll for delete snapshot and volume events
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit a85aea74ded3c8d1aadec19a9e7f062a34ce63fc)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-19 15:34:16 +05:30
Gaurav Aradhye
7629000ffe CLOUDSTACK-8264: Adding missing change in test_data.py caused due to commit 500baea9b6c816caae93ab2f8d0ba31f99c3f8fc
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-19 15:23:25 +05:30
Daan Hoogland
43a39d1eb0 findbugs: possible nullpointer 2015-02-19 10:27:51 +01:00
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
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
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 0ba75bcebde4e8a4773c7b31e5d8b88bf748a131)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-18 11:15:44 +05:30
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
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
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 e5cd75790a64e4ba2e8bef83affabe6db4de8acd)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-16 15:34:06 +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
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 7461297f3e17b431643e7a8c575e799d0e151261.
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