Commit Graph

26169 Commits

Author SHA1 Message Date
Laszlo Hornyak df11bb2811 CLOUDSTACK-8279: Fix unit test for java 1.8
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-27 20:06:27 +01:00
Laszlo Hornyak f8c003d13a CLOUDSTACK-8279: test fix for java 1.8
The test build on an assumption on the order of items in a Set, while this changed in java 1.8

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-27 19:38:12 +01:00
Laszlo Hornyak e6e3a20bd6 removed redundant autoboxing
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-27 19:38:12 +01:00
Laszlo Hornyak 5626a340dd Logical expression simplification, == true is redundant
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-27 19:38:12 +01:00
Rohit Yadav 3786aa0e67 server: fix unit test to fix build
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit dd5fb2ebd6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-27 19:19:09 +05:30
Rohit Yadav 43cf1da865 CLOUDSTACK-5238: password checks, NPE fixes and minor fixes
- insecure authenticators excluded in configuration
- snapshot response should have zone
- remove vmsnapshots when removing accounts

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

Conflicts:
	api/src/org/apache/cloudstack/api/response/VMSnapshotResponse.java
	server/src/com/cloud/api/ApiResponseHelper.java
	server/src/com/cloud/storage/download/DownloadActiveState.java
2015-02-27 18:24:46 +05:30
Rohit Yadav 8829a0d4a7 plugins: fix version to fix build
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-27 16:20:27 +05:30
Rohit Yadav a75ff23131 CLOUDSTACK-8273: fix baremetal account creation
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e000646790)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalVlanManagerImpl.java
2015-02-27 15:55:09 +05:30
Rohit Yadav 6f4db0ce4b CLOUDSTACK-5237: Add a default PBKDF2-SHA-256 based authenticator
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9533c54db6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-27 15:53:58 +05:30
Rohit Yadav d8e1bf1506 CLOUDSTACK-7089: don't log VNC password
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e287de9fd9)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-26 18:11:12 +05:30
Rohit Yadav 4dde4106c0 server: Add missing import, fixes build
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-26 17:49:55 +05:30
Rohit Yadav 6df2fe7a8a CLOUDSTACK-8273: refactor baremetal user name to utils, restrict baremetal user
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit cb08707add)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	server/src/com/cloud/user/AccountManagerImpl.java
2015-02-26 17:47:01 +05:30
Gaurav Aradhye f393199325 CLOUDSTACK-8277: Code improvement - test_shared_networks.py, test_multiple_ip_ranges.py
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-26 13:05:45 +05:30
Gaurav Aradhye 429abe2bd5 CLOUDSTACK-8276: Changes in Marvin to find free vlan in a setup when vlan is not returned for an existing network with listNetworks API
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-02-26 13:04:20 +05:30
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 985a61652e)
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 b462a56f27)
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 070813a106)
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 a85aea74de)
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 500baea9b6
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 0ba75bcebd)
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