Commit Graph

23132 Commits

Author SHA1 Message Date
Daan Hoogland 60e8d131cf findbugs: moved call on static object to synchronized block(cherry
picked from commit f3529a19a9)
2014-01-28 14:14:47 +01:00
Daan Hoogland 9eae5f6929 Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cloudstack.git 2014-01-28 13:49:42 +01:00
Daan Hoogland 4f6638d7c7 findbugs: nullpointer dereference guarded(cherry picked from commit
43ba36f979)
2014-01-28 13:49:14 +01:00
Likitha Shetty 95bd04e449 CLOUDSTACK-5965. VM displayname is not returned by API.
If user doesn't supply a display name during VM launch, default it to VM name(uuid) in listVM response.
2014-01-28 16:43:12 +05:30
Hugo Trippaers 997c0f8d15 Fix the exclusion for opensaml1, this should take care of the repository dependencies causing grief on the jenkins slaves. 2014-01-28 10:33:31 +01:00
Hugo Trippaers 3bd38eb17e Findbugs finding : Incorrect use of equality 2014-01-28 08:58:28 +00:00
Sachchidanand Vaidya cc98125067 These are additional fixes to make Juniper Contrail plugin work 2014-01-28 08:58:22 +00:00
Likitha Shetty 4583bac05b CLOUDSTACK-5796. [VMware] Size column is not getting updated in snapshot_store_ref table when a snapshot is backed up in secondary storage.
Calculate and update the size of a backed up snapshot. This snapshot size is in turn used to update the secondary_storage count for an account.
2014-01-28 09:21:05 +05:30
Rajesh Battala 39447cce6e CLOUDSTACK-5941 User Vm deployment on HyperV is failing due to change in the userdata script location and moved to json model 2014-01-28 07:03:08 +05:30
Rajesh Battala 7ac48934f7 CLOUDSTACK-5821 systemvmiso is locked by systevmvm in hyperv 2014-01-28 07:03:08 +05:30
Rajesh Battala 807dc09138 CLOUDSTACK-5561 Support of multiple public vlans on VR running in HyperV 2014-01-28 07:03:08 +05:30
Brian Federle ce0dc3b306 Enable static NAT dialog search: Use 'keyword' instead of 'name' 2014-01-27 13:41:11 -08:00
Brian Federle c4b3e4c0cc Enable static NAT dialog: Fix search filter not working 2014-01-27 13:38:02 -08:00
Brian Federle 9f18b075a9 List view: Fix advanced search not popping up with multiple panels 2014-01-27 13:33:12 -08:00
Min Chen f77974b5d2 Fix trailing whitespace from cherry-pick 2014-01-27 13:31:35 -08:00
Min Chen cfe7864618 CLOUDSTACK-5960: Domain admin or user cannot register a template using
S3/Swift object store.
2014-01-27 13:31:35 -08:00
Brian Federle b7d6495892 Plugin API: Support multiple JS includes per plugin
For any plugin/module, allow including additional JS dependencies via
new plugin syntax.

To include JS files, instead of passing a function directly, pass an
array with the first element being a sub-list of the includes:

cloudStack.plugin.myPlugin = [
    ['file1', 'file2', 'fileN' ...], // These will be loaded before
                                     // plugin is executed
    function(plugin) { // The plugin entry point
        ...
    }
];

-- Where each item represents a JS file relative to the plugin folder
   and without the .js extension. Sub-folders are also supported, i.e.,
   'subfolder/file1'
2014-01-27 12:39:36 -08:00
Marcus Sorensen 0502d2f375 CLOUDSTACK-5697 This patchset fixes a bug with the recently merged
vxlan code. Users can set a physical network to isolation type 'vxlan',
put public traffic on that physical network, and it will still attempt
to use 'vlan' isolation on the KVM hosts. This is going to be an issue
for other isolation types as well, but I'm not familiar with them, so
I'm just fixing vxlan for now.
2014-01-27 12:11:18 -07:00
Min Chen d40e52776a Add ResourceType annotation for ListTemplatesCmd. 2014-01-27 10:46:15 -08:00
Marcus Sorensen daeea46da0 CLOUDSTACK-5956 remove persist flag during live migration 2014-01-27 11:04:05 -07:00
Sanjay Tripathi a735de8f85 CLOUDSTACK-5953: In hypervisor_capabilities, max_guests_limit are
not correct for XS 6.2 or other specific version hypervisor.
2014-01-27 22:50:40 +05:30
Sanjay Tripathi b25ee92c34 CS-5950: Wrong storage tags are used for ISO deployed VMs. 2014-01-27 16:58:55 +05:30
Wido den Hollander 49a29ce0cf Switch to Java 7
We now require at least Java 7 to build and run CloudStack.

Both the DEB and RPM packaging now also require Java 7 during installation
of the packages.
2014-01-27 11:54:43 +01:00
Koushik Das a0f21ff6bf CLOUDSTACK-5949: Remove unused field vnc_password from user_vm_view
Removed unused field. This will ensure that list VM queries are not blocked.
2014-01-27 15:43:20 +05:30
Laszlo Hornyak dea320f7b9 RAT fix
added license header to test
2014-01-25 20:50:14 +01:00
Laszlo Hornyak e4da3775c9 removed redundant Long, Short, Double, Float and Boolean instantiations
- Added unit tests
- Added javadoc

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-25 20:09:45 +01:00
Laszlo Hornyak 884e8c6510 replaced Long instantiation with parseLong
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-25 16:11:51 +01:00
Laszlo Hornyak ebf57654e7 replaced Long instantiations with Autoboxing
Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2014-01-25 15:01:03 +01:00
Prachi Damle 8f8cd21dec EntityType value for SSHKeyPair and ResourceTag 2014-01-24 22:34:18 -08:00
Prachi Damle bc45d33f19 @ACL and EntityType for Network commands 2014-01-24 22:27:13 -08:00
Prachi Damle 4808c0fdcb @ACL and EntityType for VPC commands 2014-01-24 22:14:50 -08:00
Sheng Yang 3c955c3659 CLOUDSTACK-5779: Make VmwareResource use VirtualRoutingResource 2014-01-24 19:57:52 -08:00
Jessica Wang cb8cf1eb18 CLOUDSTACK-5614: UI - Infrastructure > Sockets > listView > (1) split "XenServer" into "XenServer 6.2.0" and "XenServer"(prior to 6.2.0).
(2) change label of Hyperv to Hyper-V.
2014-01-24 18:32:38 -08:00
Sheng Yang 069bc3686e CLOUDSTACK-5779: Make CitrixResource to use VirtualRoutingResource 2014-01-24 18:28:31 -08:00
Sheng Yang 285f23f11b CLOUDSTACK-5779: Generalize calling to execute or create file for KVM 2014-01-24 18:28:25 -08:00
Sheng Yang 2d3022594c CLOUDSTACK-5779: Generalize calling to execute or create file for Vmware 2014-01-24 18:28:00 -08:00
Sheng Yang 2d100f1269 CLOUDSTACK-5779: Generalize calling to execute or create file for Xen 2014-01-24 18:27:55 -08:00
Prachi Damle e4c188a5cb Default accessType is Use - Read and Use 2014-01-24 18:16:59 -08:00
Prachi Damle 4a30102ca8 ListSecurityGroupCmd should have the EntityType added to the command 2014-01-24 17:58:35 -08:00
Prachi Damle 1d98ef9821 @ACL and EntityType for FirewallRule commands 2014-01-24 17:06:11 -08:00
Prachi Damle 695de1eaed @ACl and @EntityType annotations for: AffinityGroup, AutoScale, Events 2014-01-24 17:06:09 -08:00
Brian Federle 417b8e089f VM snapshots: Only show quiescevm checkbox if hypervisor is VMware 2014-01-24 11:04:11 -08:00
Devdeep Singh aab881be21 CLOUDSTACK-5942: The agent at places logs the password of the user. It should mask the
password from the message string before writing to the log. Made a change to do so.
2014-01-24 15:04:00 +05:30
Min Chen d47d4bbd20 Guard NPE due to empty policies. 2014-01-23 18:32:48 -08:00
Min Chen 344d3a37cc Add missing AclApiServiceImpl bean into spring xml. 2014-01-23 18:32:48 -08:00
Prachi Damle af14699c4c fixing the build _ AffinityGroup command changes 2014-01-23 18:17:43 -08:00
Prachi Damle 96a64b933e - Adding OperateEntry during loading of commands
- Replace ListEntry By OperateEntry
- ApiDispatcher should pass on the API name
2014-01-23 17:50:59 -08:00
Wido den Hollander dad98ef4de test: Add UnitTest for LibvirtSecretDef 2014-01-23 21:09:25 +01:00
Hugo Trippaers 50b6de4714 Findbugs finding : Fix potential NPE 2014-01-23 16:14:56 +00:00
Hugo Trippaers 5e0d61bf98 Findbugs finding: Fix object comparison with == instead of equals 2014-01-23 15:53:26 +00:00