27382 Commits

Author SHA1 Message Date
Mike Tutkowski
bcd227fb6b Pass on all operations to CloudStackPrimaryDataStoreDriverImpl 2015-05-07 12:24:05 -06:00
Rohit Yadav
a9e07691a4 build: fix replace.properties path
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-07 17:18:16 +02:00
Daan Hoogland
1c408dec37 Merge branch '4.5' after 4.5.1 vote passes 2015-05-07 16:03:26 +02:00
Rohit Yadav
4ba72a877c Updating pom.xml version numbers for release 4.5.2-SNAPSHOT
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-07 15:33:01 +02:00
Rohit Yadav
11b7b0a3c3 Merge branch 'GA-4.5.1' into 4.5 2015-05-07 15:27:45 +02:00
Gaurav Aradhye
5ba904abc2 CLOUDSTACK-8450: Fix method calls in test_escalations_hosts.py
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #235
2015-05-07 14:12:59 +05:30
Gaurav Aradhye
f33f044d19 CLOUDSTACK-8449: Include zoneid parameter in base library for updateConfiuration method
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #234
2015-05-07 12:32:14 +05:30
Rohit Yadav
5af7c352aa Merge branch 'nuke-awsapi': Remove awsapi from CloudStack
This closes #216

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 17:14:37 +02:00
Rohit Yadav
0af9c65de1 db: don't drop cloudbridge db in schema-451to460-cleanup.sql
It may be useful for users to get some data, so avoid dropping cloudbridge db

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:58:53 +02:00
Rohit Yadav
b81361c0f1 developer: avoid deploying with cloudbridge sqls
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +02:00
Rohit Yadav
069aa4e5f3 CLOUDSTACK-8433: remove awsapi db usage and add upgrade cleanup path
- Removes awsapi db properties usage across codebase
- Removes references from spring xmls, test cases and TransactionLegacy
- Adds sql command to drop database cloudbridge in schema-451to460-cleanup.sql

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +02:00
Rohit Yadav
58999daafe CLOUDSTACK-8433: remove awsapi rpm and debian packaging
- Removes awsapi packaging rules for debian, centos63, centos7, fedora 20/21
- Removes catalina port 7080 service configs
- Fixes build replace properties for AWSAPILOG
- Removes maven profile for building awsapi and deploying db in developer profile

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +02:00
Rohit Yadav
bb86d03601 CLOUDSTACK-8433: remove awsapi and awsapi-setup
Following actions from discussions on dev ML regarding removing awsapi and
prefering ec2stack. Reference from last PR:
https://github.com/apache/cloudstack/pull/44

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 15:22:04 +02:00
Gaurav Aradhye
c3e8d3d047 CLOUDSTACK-8445: Keep only dvs tag for test case which tests the VCenter port groups
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #232
2015-05-06 18:31:17 +05:30
Gaurav Aradhye
6c3dc15fcb CLOUDSTACK-8394: Skip test cases through setUp() instead of setUpClass()
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #231
2015-05-06 16:25:32 +05:30
Abhinandan Prateek
e1a212842a CLOUDSTACK-8429: optimizing travis to run configurable set of tests only after configurable runs 2015-05-06 08:49:16 +05:30
Rohit Yadav
464af9cb29 debian: allow openjdk1.8 as optional dependency
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 02:19:04 +02:00
Rohit Yadav
54f3e7733f debian: allow openjdk1.8 as optional dependency
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
shapeblue-4.5.1-00
2015-05-06 02:09:41 +02:00
Rohit Yadav
25e555bd2d packaging: rpm related fixes
CLOUDSTACK-7460: mgmt server package should not create agent directory
Revert "CLOUDSTACK-8402: Depend on openjdk 1.7 for both CentOS 6 and 7"
Revert "CLOUDSTACK-8404: uninstall/conflict if java-1.8.0-openjdk is installed"

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-06 01:46:21 +02:00
Rohit Yadav
3ac3534544 Revert "CLOUDSTACK-8402: EL7 rpms should depend on openjdk7"
This does not fail on centos7, reverting the fix.

This reverts commit 52a0adad04d67555a50ab58662735039f438c7e0.
2015-05-06 01:43:35 +02:00
pritisarap12
628dde7fd2 CLOUDSTACK-8308: Adding automation test cases for VM/Volume snapshot continuation
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #230
2015-05-05 20:43:57 +05:30
Rohit Yadav
21dd2ed9e2 CLOUDSTACK-7460: mgmt server package should not create agent directory
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-05 15:26:36 +02:00
pritisarap12
a380be6081 CLOUDSTACK-8308: Adding automation test cases for VM/Volume snapshot testpath snapshot limits
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #170
2015-05-05 16:22:18 +05:30
Abhinandan Prateek
1eb6f929ab CLOUDSTACK-8429: optimizing travis to run configurable set of tests only after configurable runs 2015-05-05 14:11:41 +05:30
Gaurav Aradhye
d849dd628f CLOUDSTACK-8394: Added missing lower() conversion 2015-05-05 09:54:26 +05:30
pritisarap12
a29fd6584a CLOUDSTACK-8308: Adding automation test cases for VM/Volume snapshot testpath - cuncurrent snapshots
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #181
2015-05-04 17:21:13 +05:30
Rohit Yadav
0eb4eb2370 Updating pom.xml version numbers for release 4.5.1
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
4.5.1
2015-05-04 12:17:03 +02:00
Rohit Yadav
d889a33bf4 pom: add files to be excluded from rat check
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-04 12:13:16 +02:00
Rajani Karuturi
e0721fe976 volume upload: when create template fails, rolling back transaction 2015-05-04 15:15:33 +05:30
Wido den Hollander
329e94828d CLOUDSTACK-1302: Make sure the disk cache mode is passed to the KVM Agent
The StartCommand did not contain the proper cache mode due to VolumeJoinVO
not containing the cache_mode field.
2015-05-04 10:23:00 +02:00
SrikanteswaraRao Talluri
ff4f31c4ea bug-id:correcting few more errors in testpaths reviewed-by: self
Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>
2015-05-03 22:41:55 +05:30
Koushik Das
23bde8ea7a CLOUDSTACK-8438: Proper enforcement of hypervisor capability "max. guest limit"
VMs in transition states - Starting, Stopping, Migrating - are also taken into account for enforcing "max. guest limit"

(cherry picked from commit 3100fc15544bd5bdbe8d2eb0a0e429355657b910)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:56:10 +02:00
Rohit Yadav
cb3d03c7b0 ui: use cloudstack logo as favicon
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit ba9c4cfa81206647af2fd8165652290fa7236350)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:25:44 +02:00
Laszlo Hornyak
a686d2e8b3 added favicon
This closes #225

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0347f733dd7768eca4448c8c110973c4f801f0b6)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:25:34 +02:00
Rohit Yadav
ba9c4cfa81 ui: use cloudstack logo as favicon
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:24:05 +02:00
Laszlo Hornyak
0347f733dd added favicon
This closes #225

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:23:32 +02:00
Rohit Yadav
1840805aab server: Introduce Unknown Status to be used in AbstractInvestigatorImpl
The PR #211 introduced changes where the abstract investigator testIpAddress()
would return other Status, which previously only returned null, Up or Down. In
this patch we introduce a new Status "Unknown" that replaces null's semantics.

The important changes #211 introduced was the debugging statements as semantically
the changes would work same as the consumers of testIpAddress() method only used
if returned values were Up or Down and in other cases (null, Alert etc) it would
simply continue to loop through the resources being investigated.

Keeping the debug logs, this commit only replaces the previously returned null
values with Status.Unknown and fixed the debug statements to reflect the same.
In case of trapped exceptions too, we return Unknown status but log the exception
we trapped.

server: add null assertions and remove dead code with testIpAddress usage

This closes #222

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 7a1cb28c9f548ac185dcb7c59eb2fadb7d550718)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:16:04 +02:00
Rohit Yadav
7a1cb28c9f server: Introduce Unknown Status to be used in AbstractInvestigatorImpl
The PR #211 introduced changes where the abstract investigator testIpAddress()
would return other Status, which previously only returned null, Up or Down. In
this patch we introduce a new Status "Unknown" that replaces null's semantics.

The important changes #211 introduced was the debugging statements as semantically
the changes would work same as the consumers of testIpAddress() method only used
if returned values were Up or Down and in other cases (null, Alert etc) it would
simply continue to loop through the resources being investigated.

Keeping the debug logs, this commit only replaces the previously returned null
values with Status.Unknown and fixed the debug statements to reflect the same.
In case of trapped exceptions too, we return Unknown status but log the exception
we trapped.

server: add null assertions and remove dead code with testIpAddress usage

This closes #222

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:15:29 +02:00
Rohit Yadav
8f25be7c0f CLOUDSTACK-8404: uninstall/conflict if java-1.8.0-openjdk is installed
This would force to uninstall openjdk 1.8.0 and only install 1.7 in case of ACS
4.5.x releases. On master/4.6, we might support java 1.8.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-03 15:04:33 +02:00
Rajani Karuturi
89fa251119 CLOUDSTACK-8429: travis: running junit tests only in the first job
added a new environment variable RUNUNITTESTS
running full build if RUNUNITESTS is true else skipping tests
job1 now runs only unittests
removed some of the test files from job9 and job10 as they are timing
out.

This closes #218
2015-05-01 22:57:31 +05:30
Laszlo Hornyak
e6a02acb06 CLOUDSTACK-8335: removed ceph repository - artifact resolved from maven central
This closes #221

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-01 16:48:48 +02:00
Rohit Yadav
df3dea58a2 CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config
From b3f18e7d74a0f09db9977554a6c7648b7edbc33d, the zone level systemvm local
storage setting never worked as it needed to be moved to config depot.

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

Conflicts:
	plugins/network-elements/internal-loadbalancer/src/org/apache/cloudstack/network/lb/InternalLoadBalancerVMManagerImpl.java
	server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java
2015-05-01 15:27:40 +02:00
Rohit Yadav
279efb0432 CLOUDSTACK-6139: Fix regression, allow zone level systemvm localstorage config
From b3f18e7d74a0f09db9977554a6c7648b7edbc33d, the zone level systemvm local
storage setting never worked as it needed to be moved to config depot.

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-01 15:24:53 +02:00
Rajani Karuturi
fdea7eb472 maven plugin cleanup
1. removed redundant maven-site-plugin
2. added maven-resources-plugin version 2.7 which has the fix for
   http://jira.codehaus.org/browse/MRESOURCES-140

This closes #220
2015-05-01 16:20:08 +05:30
Rajani Karuturi
bd71fcb650 Fixed two coverity reported issues
Dereference after null check
Dm: Dubious method used

This closes #219
2015-05-01 16:08:26 +05:30
Koushik Das
3100fc1554 CLOUDSTACK-8438: Proper enforcement of hypervisor capability "max. guest limit"
VMs in transition states - Starting, Stopping, Migrating - are also taken into account for enforcing "max. guest limit"
2015-05-01 12:49:56 +05:30
Abhinandan Prateek
fb0bfd5d4f CLOUDSTACK-8429: disabling unit test for faster build 2015-05-01 12:35:03 +05:30
Daan Hoogland
9e3b825f91 findbugs: make default encoding explicit 2015-05-01 08:20:27 +02:00
Laszlo Hornyak
58e5dca8ef CLOUDSTACK-8335: removed ceph repository - artifact resolved from maven central
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
2015-05-01 11:10:06 +05:30
Abhinandan Prateek
00962d4a5f CLOUDSTACK-8429: removing some tests as they timeout on travis 2015-05-01 09:01:04 +05:30