26205 Commits

Author SHA1 Message Date
Felix Geyer
01e28a31bc Convert debian/rules to short dh-style.
Signed-off-by: Wido den Hollander <wido@widodh.nl>
2015-03-05 14:35:52 +01:00
Felix Geyer
6e0867b307 Specify maven repo location.
By default it chooses a location based on $HOME which is not guranteed to
have a proper value on buildds.

We also need to take care of cleaning it up after the build.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2015-03-05 14:35:52 +01:00
Felix Geyer
f1301a2c5d Swap maven3 | maven build-dependency.
maven3 is not a package in Debian and buildds look only at the
first alternative.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
2015-03-05 14:35:52 +01:00
Rohit Yadav
acde8268c0 Merge remote-tracking branch 'phillipkent/master'
This closes #98

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-05 18:28:01 +05:30
Phillip Kent
d4523c5778 modify description for name parameter in ListVMsCmd.java 2015-03-05 12:30:26 +00:00
Rajani Karuturi
04bda84299 Fixed coverity reported resource leak in LdapManagerImpl 2015-03-05 17:05:25 +05:30
René Moser
6fef3ed22b CreatePortForwardingRuleCmd: Fix typos and update descriptions.
Signed-off-by: Sebastien Goasguen <runseb@gmail.com>

This closes #94
2015-03-05 11:03:00 +01:00
Rajani Karuturi
debcbcc145 Fixed PMD NullDeref issues in S3Utils. 2015-03-05 11:58:24 +05:30
Sebastien Goasguen
83e9a0a80a Fix marvin version in Dockerfile 2015-03-04 13:43:25 +01:00
Sebastien Goasguen
ccb38c8d5e Fix RAT issues due to new Dockerfile 2015-03-04 13:00:08 +01:00
Sebastien Goasguen
1b05de04bd Add Dockerfile for simulator 2015-03-04 11:59:03 +01:00
Rajani Karuturi
c5c1b1d462 Fixed checkstyle issues due to commit 0b6c540a203453580bb76a0d0a60be292fccfa0e 2015-03-04 16:21:53 +05:30
santhosh
0b6c540a20 listDirectory method updated to use ObjectListing.isTruncated().
Because buckets can contain a virtually unlimited number of keys, the
complete results of a list query can be extremely large. To manage large
result sets, Amazon S3 uses pagination to split them into multiple
responses.

Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #25
2015-03-04 12:52:48 +05:30
Laszlo Hornyak
7c1590ffd6 kvm: Check the return value of the cloudstack-setup-agent command
Bug-Url: https://issues.apache.org/jira/browse/CLOUDSTACK-8016
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Rajani Karuturi <rajanikaruturi@gmail.com>

This closes #93
2015-03-04 12:42:14 +05:30
Jayapal
619f014255 CLOUDSTACK-8298: Update copying large size VR config file in xenserver
When there is large size VR configuration (aggregate commands) copying data to VR using vmops plugin was failed
 because of the ARG_MAX size limitation. The configuration data size is around 300KB.

 Updated this to create file in host by scp with file contents. This will create file in host.
 Then copy the file from the host to VR using hte vmops createFileInDomr method.

  In host file get created in /tmp/ with name VR-<UUID>.cfg, once it copied to VR this file will be removed.
2015-03-04 11:52:10 +05:30
Laszlo Hornyak
1f72548f57 CLOUDSTACK-4807: tests for NetUtils
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-03-03 21:21:52 +01:00
Marcus Sorensen
57cd7f3db5 LibvirtComputingResource: Support 'Oracle Linux 7' as pv guest
Change-Id: Ib3fd2fec7434564e937ac5b6b3cfee472a5fdc98
2015-03-03 10:44:12 -08:00
Sanjay Tripathi
736c7d7668 CLOUDSTACK-8296 VMs cannot be migrated with XenMotion as network is not available. 2015-03-03 13:14:04 +05:30
Abhinandan Prateek
58c5850bee CLOUDSTACK-8265: added foreign key constriant on guest os id 2015-03-03 02:25:09 -05:00
Rohit Yadav
ef99f01e59 Merge remote-tracking branch 'anshul/CLOUDSTACK-6900'
This closes #68

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-02 16:40:44 +05:30
Rohit Yadav
085554d81d Merge remote-tracking branch 'laszlo/CLOUDSTACK-8292'
This closes #91

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-02 16:37:20 +05:30
Rohit Yadav
db443c1734 Merge remote-tracking branch 'laszlo/CLOUDSTACK-8294'
This closes #92

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-02 16:36:39 +05:30
Rohit Yadav
541c23ed07 Merge remote-tracking branch 'laszlo/CLOUDSTACK-8279'
This closes #90

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-02 16:35:36 +05:30
Rohit Yadav
62e179b16d Merge remote-tracking branch 'exoscale/fix/python-support'
This closes #89

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-03-02 16:31:23 +05:30
Laszlo Hornyak
a0eb144987 packaging: date fix
rpmbuild complained about the date "Fri Oct 03 2012"
according to the calendar, Oct 3 2012 was Wednesday

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-03-02 02:08:17 +01:00
Laszlo Hornyak
873649eb3b CLOUDSTACK-8294: fix for java 1.8 build
The test testFindSecurityProfileByUuid built an assumptio on the order of the arguments after transforming through a HashMap.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-03-01 13:20:51 +01:00
Laszlo Hornyak
0fda5a03a4 CLOUDSTACK-8292: fix for java 1.8 compilation
Refactored to use the XPatch expressions to check the generated domain xml rathern than string comparison.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2015-02-28 20:11:46 +01:00
Rohit Yadav
ed099c3f96 server: check and set sercure cookie flag only after login
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 0f819f1583116d93ca3ebf460b69cd74144a25b2)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-28 18:23:05 +05:30
Rohit Yadav
20bcb4b673 CLOUDSTACK-7063, CLOUDSTACK-7064: Add security headers on HTTP response
- Adds X-XSS-Protection header
- Adds X-Content-Type-Options header
- Fixes to use json content type defined from global settings
- Uses secure cookie if enabled in global settings

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit b6b3494782d8bc1033941b802380ba1d5ebd464c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-28 18:14:49 +05:30
Rohit Yadav
843c0f891b scripts: use cloudmanagementserver.keystore instead of cloud.keystore
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit f70afa1375dd353a68c3ee9be941a605025cfc04)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-28 17:06:27 +05:30
Daan Hoogland
a831beb982 Merge branch 'master' of https://github.com/ghxandsky/cloudstack 2015-02-28 00:03:33 +01:00
Rohit Yadav
694a694860 pbkdf2: fix encoding issue when converting byte[] to String
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit 814e5574dcabbbf52b878d9fd448be7a66118597)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-28 00:44:20 +05:30
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 dd5fb2ebd6904026e2ba0b3efcb6c382f860ffdd)
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 5481485a083957ff58da3b6fea9d7b6d20f06875)
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 e000646790597cb6c245311f57761b41d23a4e34)
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 9533c54db669b22b268fcc21766e21c231e48d84)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-27 15:53:58 +05:30
Pierre-Yves Ritschard
d5e3d4911d Support all pythons from 2.6 up. 2015-02-27 09:27:52 +01:00
ghxandsky
eaf734915f Fix cloud.spec for building management rpm, need not create agent dir but agetn rpm (kvm host agent) 2015-02-26 23:51:43 +08:00
ghxandsky
b6d9163ae2 Add distribution fedora21 in packaging/package.sh 2015-02-26 22:54:04 +08:00
Rohit Yadav
d8e1bf1506 CLOUDSTACK-7089: don't log VNC password
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
(cherry picked from commit e287de9fd90a06ee7f86d31ba69a84481f0820f1)
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 cb08707addbffa12abc50aec9ad980059f23910c)
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 985a61652eb5dc97503c002e9fc3c3a7ca39b70c)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
2015-02-25 16:47:40 +05:30