wilderrodrigues
6b415cb26f
Merge branch 'feature_fix_pep8_2' of https://github.com/isoutham/cloudstack into fix/pep8_issues
...
Testing PR #304
2015-05-27 09:34:07 +02:00
sanjeev
dce34ad747
Skip snapshot tests since it is not supported on LXC
...
This closes #314
2015-05-27 12:45:31 +05:30
pritisarap12
39e2590a7b
CLOUDSTACK-8513: Fixed VM deployment issue
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #313
2015-05-27 12:11:46 +05:30
Gaurav Aradhye
6ea65370d7
CLOUDSTACK-8516: Fixed syntax errors and pep8 issues in testpath_storage_migration.py
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #313
2015-05-27 12:05:15 +05:30
sanjeev
90847df531
Skip vm migration code from the test since it is not supported on LXC
2015-05-27 11:50:00 +05:30
Gaurav Aradhye
f2178af317
CLOUDSTACK-8515: Skip snapshot test cases for HyperV and LXC
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #311
2015-05-27 11:41:40 +05:30
Gaurav Aradhye
3a7ad46725
CLOUDSTACK-8514: test_haproxy.py - Verifying router state before validating network rules
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #309
2015-05-27 10:19:51 +05:30
Ian Southam
56483436f0
Pep8 changes that got lost with the strange double push request problem last time
2015-05-26 07:07:43 -04:00
wilderrodrigues
75463356fb
CLOUDSTACK-8506
...
Removing the previous logic and adding a method to check if the CIDR is 31 bit prefixed
Adding tests for the new method
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #303
2015-05-26 12:10:00 +02:00
Gaurav Aradhye
0552039a8a
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 #300
2015-05-26 12:13:42 +05:30
Rohit Yadav
767305101f
Revert "Fixed debchange tool's removal of timestamp and wrong sort order in changelog"
...
Reverting commit based on comment by @rsafonseca:
https://github.com/apache/cloudstack/pull/291#issuecomment-105253780
This reverts commit 68d18c2349 .
2015-05-25 20:56:20 +02:00
Rohit Yadav
5713222ec7
pom: exclude debian/source/format from rat build
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 16:57:44 +02:00
Rafael da Fonseca
68d18c2349
Fixed debchange tool's removal of timestamp and wrong sort order in changelog
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #291
2015-05-25 16:45:50 +02:00
Rafael da Fonseca
4cdfbf337d
Fixes problem with having to change the "-SNAPSHOT" string in debian/rules for releases, deb packaging was broken in master due to this in a merge with release version. Fixes some warnings generated by dpkg-buildpackage regarding upstream tarball an source versioning Reduces source tarball from 669MB to 183MB (it was including .git), now build is faster and takes up less space
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 16:45:50 +02:00
Rohit Yadav
cde6ef94b8
CLOUDSTACK-8247: Pull average Cpu util report between polling
...
Pull average Cpu util report between polling intervals instead of since boot
instead of using values since uptime
(cherry picked from commit 04176eaf17 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
This closes #297
2015-05-25 15:52:00 +02:00
Gaurav Aradhye
b9a0b88078
CLOUDSTACK-8512: Fixed test script issues in test_escalations_hosts.py
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #299
2015-05-25 18:47:52 +05:30
Gaurav Aradhye
c6b3fe2c57
CLOUDSTACK-8511: Moved file test_escalations_hosts.py to maint folder
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #298
2015-05-25 18:37:04 +05:30
Rohit Yadav
e752f88991
CLOUDSTACK-8339: Include profile script in rpm packaging that fixes PATH
...
Normal users would require /sbin in their paths to access lsmod, this adds
a profile.d script that adds /sbin, for centos7, f20 and f21 packages.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 14:40:50 +02:00
Rohit Yadav
e5d3084526
CLOUDSTACK-8339: Allow non-root users to add KVM host
...
This allows non-root users to add KVM hosts, the user should be an admin or
added to sudoers to execute sudo cloudstack-setup-agent.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Signed-off-by: Remi Bergsma <apache@remi.nl>
This closes #288
(cherry picked from commit d2b0c1a32b )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 14:36:29 +02:00
sanjeev
dfafb441b0
CLOUDSTACK-8509: Skip snapshot tests for LXC and Hyper-V
...
This closes #296
2015-05-25 18:03:14 +05:30
sanjeev
e6de9abeb4
CLOUDSTACK-8508 Install wget package inside LXC vm
...
This closes #295
2015-05-25 17:04:34 +05:30
Daan Hoogland
2fbccf1c3f
removed undefined packaging macros
2015-05-25 12:21:38 +02:00
Rohit Yadav
9dcfbceae7
kvm: for disabling pxe, pass empty file
...
Passing the file argument to the xml break for EL 7.1, the fix removes
the argument as just passing rombar='off' with its file arg to be empty string.
This closes #290
(cherry picked from commit aafa0c80b3 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-25 00:31:32 +02:00
Milamber
87d4086a64
CLOUDSTACK-6181 Specify GB for the value of rootdisksize parameter. Add some Bytes/GB for log or exception messages. Fix Gb->GB.
2015-05-23 17:52:21 +01:00
wilderrodrigues
d7854791b2
Merge branch 'xen_tests_fix'
...
This closes #293
2015-05-23 17:17:22 +02:00
wilderrodrigues
58f6e8d977
Merge branch 'xentestfix' of https://github.com/rsafonseca/cloudstack into xen_tests_fix
...
Testing PR #293
2015-05-23 17:05:49 +02:00
Rafael da Fonseca
79d24ae218
Fix xenserver tests for travis
2015-05-23 16:14:09 +02:00
wilderrodrigues
28729db7bc
Merge branch 'rfc_3021'
...
This closes #292
2015-05-23 11:08:32 +02:00
wilderrodrigues
44057a0f0f
Merge branch 'improvement/RFC_3021_31_Bit_Prefixes' of https://github.com/schubergphilis/cloudstack into rfc_3021
...
Testing PR #292
2015-05-23 10:10:13 +02:00
wilderrodrigues
a83f74d83e
CLOUDSTACK-8506
...
- Changing the implementation of the NetUtils.ipRangesOverlap() a little bit in order to be compliant with RFC 3021
- 2 unit tests added
- ranges from 0 to 255 covered by the tests, which also test the negative cases.
2015-05-22 20:08:09 +02:00
Rohit Yadav
cd55413c6a
CLOUDSTACK-8243: KVM agent should not use hardcoded string tails
...
For KVM agent, guid is configurable in agent.properties, this fix allows the
configuration to work by removing string tail (the -LibvirtComputingResource suffix).
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #286
(cherry picked from commit 803b946c2f )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-22 18:12:10 +01:00
wilderrodrigues
14863bbaff
CLOUDSTACK-8506
...
- Added subnetUtils.setInclusiveHostCount(true) to NetUtils.isIpWithtInCidrRange() method. It makes the 31-bit prefixes work just fine
- Added 3 unit tests to test valid and invalid ranges.
2015-05-22 18:17:16 +02:00
Rafael da Fonseca
487d90148c
Fixed problem with static files reload: - Tomcat was not caching most static files in index.jsp due to changing timestamp - Page reload performance was very poor - Issue affects all versions since 4.0
...
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This closes #277
2015-05-22 15:22:16 +01:00
sanjeev
345db34583
CLOUDSTACK-8507: Added code to install httpd package inside vm if not found
...
This closes #287
2015-05-22 18:59:05 +05:30
Rohit Yadav
d7f4498f76
kvm: Strip trailing comma for qemu-img convert options
...
Fix trailing comma for qemu-img convert options, Qemu 2.0+ not tolerant to it
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 90ac1aba13 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-22 13:33:54 +01:00
Rohit Yadav
274222769a
CLOUDSTACK-8252: Ignore VLAN 4095 which is n/a on linux
...
VLAN id 4095 is commonly used as a 'tag passthrough' in virtualization environments
(VMware, specifically). This vlan id is incompatible with Linux, but we can
allow the admin to manually configure the bridge if the same passthrough is
desired.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit aee35c96a8 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-05-22 13:26:06 +01:00
Rohit Yadav
c37060a1ff
CLOUDSTACK-8338: Fix hypervisor stats reporting for KVM on EL7
...
EL7 has a different output to 'free', use /proc/meminfo instead of a tool to be
more consistent across distros
(cherry picked from commit 212a05a345 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java
2015-05-22 12:10:54 +01:00
wilderrodrigues
0c6758f917
Merge branch 'improvement/annotations_xen_kvm'
...
This closes #280
2015-05-22 12:55:53 +02:00
Abhinandan Prateek
ad6ac9bb10
CLOUDSTACK-8488: network with LB fails to restart as the bash script mangles the escape characters, fixed
2015-05-22 16:24:20 +05:30
Rohit Yadav
1c81b241e7
CLOUDSTACK-8505: Don't allow non-POST requests for default login API
...
We add a new contract to pass Http request to authentication plugin system. In
the default login API, we disallow non-POST requests.
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 9e9b231672 )
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
Conflicts:
api/src/org/apache/cloudstack/api/auth/APIAuthenticator.java
plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmd.java
plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmd.java
plugins/user-authenticators/saml2/src/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmd.java
plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/GetServiceProviderMetaDataCmdTest.java
plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LoginAPIAuthenticatorCmdTest.java
plugins/user-authenticators/saml2/test/org/apache/cloudstack/api/command/SAML2LogoutAPIAuthenticatorCmdTest.java
server/src/com/cloud/api/ApiServlet.java
server/src/com/cloud/api/auth/DefaultLoginAPIAuthenticatorCmd.java
server/src/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java
server/test/com/cloud/api/ApiServletTest.java
2015-05-22 11:44:34 +01:00
wilderrodrigues
3228854a97
Merge branch 'improvement/annotations_kvm_citrix' of https://github.com/schubergphilis/cloudstack into improvement/annotations_xen_kvm
...
Testing branch
2015-05-22 12:38:08 +02:00
Gaurav Aradhye
424b5bb8d0
CLOUDSTACK-8492: Fix string case issue
...
Signed-off-by: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
This closes #284
2015-05-22 15:41:13 +05:30
Daan Hoogland
22ee66eea6
debian snapshot packaging break on merged versioning
2015-05-22 09:17:55 +02:00
sanjeev
67ad418299
CLOUDSTACK-8504: Remove creating network with RVR by default
...
This closes #283
2015-05-22 12:30:16 +05:30
Milamber
8e67045a4b
Update L10N resource files on master branch with 4.6 translation strings from Transifex (20150522)
2015-05-22 07:48:36 +01:00
Rafael da Fonseca
b5cc147862
Fixes breadcrumbs problem described in CLOUDSTACK-7907
...
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>
This closes #282
2015-05-22 10:48:56 +05:30
Koushik Das
1cd2e9bc44
Merge branch 'CLOUDSTACK-8301' of https://github.com/apache/cloudstack
2015-05-22 09:47:59 +05:30
Rene Moser
84266b1c72
api: network: fix and reformat descriptions
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
This closes #275
2015-05-21 17:49:19 +02:00
Rene Moser
c1fbb7821a
api: loadbalancer: fix and reformat descriptions
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-05-21 17:49:18 +02:00
Rene Moser
a1f58c48ec
api: iso: fix and reformat descriptions
...
Signed-off-by: Daan Hoogland <daan.hoogland@gmail.com>
2015-05-21 17:49:18 +02:00