Commit Graph

20863 Commits

Author SHA1 Message Date
Chip Childers f9f17980b2 Adding license headers to the newly imported contrail plugin files 2013-10-08 10:10:07 -04:00
Pedro Marques 7099686b70 Contrail network virtualization plugin. 2013-10-08 09:38:06 -04:00
sanjeevneelarapu f6c6f03fad CLOUDSTACK-702: 1. Moved common code to setupClass method 2. Added a test to deply vm in new CIDR and verify dns service on alias IP
Conflicts:

	test/integration/component/maint/test_multiple_ip_ranges.py

Signed-off-by: sanjeevneelarapu <sanjeev.neelarapu@citrix.com>
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 1efd544ee27fd0c7c9eac4649568647c0dcbc85b)
2013-10-08 16:26:18 +05:30
Nitin Mehta 6e80bb001c CLOUDSTACK-4824:
Add support for adding zone details
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-07 15:48:43 -07:00
Jessica Wang 4f932d048e CLOUDSTACK4515: UI > Settings tab of zone/cluster/account/primaryStorage detailView > add Description field. 2013-10-07 13:35:26 -07:00
Laszlo Hornyak 977a75f1be UsageManagerInternal fix
aed5e9dc2a seems to inroduce some typo to run

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-07 13:13:40 -07:00
Chris Suich 4c2e40ac37 Added storage_provider_name to storage_pool_view
Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-07 11:51:32 -07:00
Jessica Wang d1a536a4e3 CLOUDSTACK-4672: UI > Network > details tab > add new field "broadcasturi" to show Primary VLAN, Secondary Isolated VLAN. 2013-10-07 11:32:56 -07:00
Jessica Wang da814c658b CLOUDSTACK-4796: UI > Instances > detailView > add new action "Assign Instance to Another Account". 2013-10-07 10:22:24 -07:00
Alena Prokharchyk 66185076df Addded back Agent Load Balancing functionality (was temporarely disabled in master by vmSync merge) 2013-10-07 09:46:52 -07:00
Darren Shepherd 23ddf29532 Fix vmware code inclusion into systemvm.iso and other random nonoss->noredist 2013-10-07 09:20:41 -07:00
Gaurav Aradhye 98daad9300 CLOUDSTACK:4537 - Fixed shared network and vpc test cases
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
2013-10-07 21:42:45 +05:30
Girish Shilamkar fbf057a323 CLOUDSTACK-4262: Fix TestVPCNetworkGc.test_01_wait_network_gc
As per the test plan, after waiting for network gc
LB rules should be cleared. Added that check instead of router
being in stopped state.

Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit abdb84bb05abc9f2bd102bca1c1b34865f34d771)
2013-10-07 21:41:06 +05:30
Darren Shepherd cf4a612cdb Add license header 2013-10-05 12:18:34 -07:00
Min Chen f1895ea39a CLOUDSTACK-4816: Make S3 upload multipart or singlepart configurable. 2013-10-04 18:21:25 -07:00
Nitin Mehta a6852a340d CLOUDSTACK-3101:
fix listDiskOffering to not display offerings to the normal users with forDisplay=false. But display them to ROOT Admin irrespective of the flag.
Added display flag in the updateVolume/offeirng commands
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 18:19:07 -07:00
Darren Shepherd b3c178480b Check for null just in case
This code was recently switched from using HashMap to ConcurrentHashMap.
ConcurrentHashMap does not accept null keys and will through a NPE.  Adding
a null check just in case somebody passes null.
2013-10-04 17:05:15 -07:00
Nitin Mehta f8976a41ce CLOUDSTACK-3101:
fix listVolumes to not display volumes to the normal users with forDisplay=false. But display volumes to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-04 16:16:28 -07:00
Kelven Yang 16b022b1b1 CLOUDSTACK-4802: Change VM start flow to better support VM snapshot on certian version of vSphere, (vSphere 5.0 Update 2). If we detect that VM has pending VM snapshot, we will fully honor VM disk info from vCenter, since in some version of vSphere (vSphere 5.0 U2) does not allow disk-editting when VM has pending snapshot. 2013-10-04 16:13:56 -07:00
Hugo Trippaers ff336c3e9c Fix typo 2013-10-05 01:12:16 +02:00
Mike Tutkowski bced4c7e8b Add support for hypervisor snapshots to CloudStack-managed storage (for XenServer and VMware) 2013-10-04 15:41:20 -06:00
Darren Shepherd 66b853789c Fix typo in pom name 2013-10-04 14:37:23 -07:00
Edison Su a129fe4e66 add missing files 2013-10-04 14:17:49 -07:00
Chris Suich 180cfa19e8 Refactor Storage Related Resource Code
These changes are a joint effort between Edison and I to refactor some
of the code around snapshotting VM volumes and creating
templates/volumes from VM volume snapshots. In general, we were working
towards allowing PrimaryDataStoreDrivers to create snapshots on primary
storage and not requiring the snapshots to be transferred to secondary
storage.

High level changes:
-Added uuid to NfsTO, SwiftTO & S3TO to cut down on the requirement of
PrimaryDataStoreTO and ImageStoreTO which don't really serve much of a
purpose
-Initial work towards enable reverting VM volume from snapshots
-Added hypervisor commands for introducing and forgetting new hypervisor
objects (snapshots, templates & volumes)

Signed-off-by: Edison Su <sudison@gmail.com>
2013-10-04 13:06:42 -07:00
Laszlo Hornyak c9f41d4046 unit test for KVMFencer
A few cases covered with unit tests.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:38:33 -07:00
Laszlo Hornyak 826c69fd29 ConstantTimeBackoff test and cleanup
- javadoc changed - the old one was copy-pasted from AgentShell
- start and stop method removed - they did the same as the overridden methods
- _counter removed as it was only written, but never read
- remove from _asleep map was moved to a finally block, to make sure it is removed even in case of the thread gets interrupted
- Tests created for the above scenarios.

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 11:24:43 -07:00
Laszlo Hornyak bd8536739c remove txn attribute from DB
txn attribute was never actually used

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
2013-10-04 10:15:39 -07:00
Hugo Trippaers 2b47611c5d Fix for -SNAPSHOT problem in debian rules. Use -snapshot in the changelog to force the packaging to use the -SNAPSHOT extension for maven targets 2013-10-04 18:12:57 +02:00
Sowmya Krishnan 2621602787 CLOUDSTACK-4776: New Tests for Netscaler as external LB provider in VPC
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
(cherry picked from commit 76c85d0ce854aa7d868ba9e018382237c88fe42c)
2013-10-04 17:41:24 +05:30
Wei Zhou 3a999e70af CLOUDSTACK-4813: add function to get ExitValue when run bash commands
(cherry picked from commit b4397acfcc)
2013-10-04 11:06:16 +02:00
Prasanna Santhanam 5ed493c6e6 pep8: fix recent pep8 violations
Signed-off-by: Prasanna Santhanam <tsp@apache.org>
2013-10-04 14:13:37 +05:30
Nitin Mehta 73f6843840 CLOUDSTACK-4803:
Return "path" parameter as a result of all Volume calls. But to the admin only
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-03 18:00:42 -07:00
Nitin Mehta 2229e3e242 CLOUDSTACK-4803:
fix listVirtualMachines to not display vms to the normal users with forDisplay=false. But displayvms to ROOT Admin irrespective of the flag.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-03 15:10:55 -07:00
venkataswamybabu budumuru 59ad4a9ab5 Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
Have added a test for transferring portable ip across different works with in the same zone.
(cherry picked from commit 32cdffdd629134864220fbc400d3d28f0e6549c2)
2013-10-03 20:01:22 +05:30
Hugo Trippaers 3f583684c6 Temporary fix for the chicken and egg problem when making changes to the configuration database. 2013-10-03 12:36:34 +02:00
Kelven Yang a3babdd61c CLOUDSTACK-4790: Skip reserved VMware scsi device number for SCSI disks 2013-10-02 17:53:56 -07:00
Nitin Mehta 765f56a02c =Comment the test for now to unblock everyone. Will file a bug and fix it 2013-10-02 15:48:36 -07:00
Nitin Mehta 8466fad6ca CLOUDSTACK-4785:
Adding list details for UserVm.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:53:07 -07:00
Nitin Mehta 85b5c6e353 CLOUDSTACK-4785:
Add support for adding user vm details and removing them.
Signed off by : nitin mehta<nitin.mehta@citrix.com>
2013-10-02 14:16:45 -07:00
Darren Shepherd aed5e9dc2a Add Manage Context framework
The managed context framework provides a simple way to add logic
to ACS at the various entry points of the system.  As threads are
launched and ran listeners can be registered for onEntry or onLeave
of the managed context.  This framework will be used specifically
to handle DB transaction checking and setting up the CallContext.
This framework is need to transition away from ACS custom AOP to
Spring AOP.
2013-10-02 13:09:52 -07:00
Alena Prokharchyk a2bf7f035e CLOUDSTACK-4784: 22x to 4.x upgrade - don't ignore redundant router network offering, when update ntwk_offering_serivce_map with PF/StaticNat/SourceNat services 2013-10-02 11:09:44 -07:00
Laszlo Hornyak b44bc9db02 NumbersUtil cleanup
- removed methods that were not used
- parseLong, parseInt and parseFloat replaced with the commons-lang NumberUtils call
- Test for the remaining methods

Signed-off-by: Laszlo Hornyak <laszlo.hornyak@gmail.com>
Signed-off-by: Hugo Trippaers <htrippaers@schubergphilis.com>
2013-10-02 10:55:00 +02:00
Darren Shepherd 4590813836 Fix UsageServer startup
Add back @Component to ConfigurationDaoImpl and scan for the package in
Spring config.
2013-10-01 10:30:36 -07:00
Alena Prokharchyk 3e7d0efb90 AddResourceDetail: enabled support for adding details for user vm (user_vm_details db table) 2013-10-01 09:28:35 -07:00
Sowmya Krishnan a5ede3af7f CLOUDSTACK-4696 Handle Netscaler Provider enable for both zones
Signed-off-by: venkataswamybabu budumuru <venkataswamybabu.budumuru@citrix.com>
2013-10-01 11:18:30 +05:30
Alena Prokharchyk b253d95de9 UpdateVirtualMachine: code cleanup - got rid of warnings and unused code from the method; extracted part of the code to its separate method. 2013-09-30 15:34:56 -07:00
Brian Federle 1a23d6ebab Remove file added by accident in previous commit. 2013-09-30 10:08:16 -07:00
Darren Shepherd 19ef999e36 Wrong field was used in check 2013-09-30 10:07:28 -07:00
Darren Shepherd cba8e40e4b Add license headers to fix build 2013-09-30 09:51:45 -07:00
Darren Shepherd efbfae723e Switch to setter injection for extensibility
Various classes are using member injection to inject extensible objects.
Really those object should come from an AdapterList that is injected in.
This patch switches the code to use setter injection that will later allow
spring to inject an AdapterList or something similar to allow
extensibility.
2013-09-30 09:45:07 -07:00