summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | Merge "Fix live migration when volumes are attached"Jenkins2012-09-212-11/+0
|\ \ \ \ \ \
| * | | | | | Fix live migration when volumes are attachedVishvananda Ishaya2012-09-202-11/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was some safety code in live-migration to make sure volumes were exported before trying to live-migrate volumes. This code is broken with cinder as it doesn't expose a way to do this. Since the code was basically just a safety measure, this just deletes it so live migration works again. Fixes bug 1050421 Change-Id: I3ecd58dc2c37eab30ebfa04140475a9198aede67
* | | | | | | Merge "Update volume detach smoke test to check status."Jenkins2012-09-211-1/+8
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Update volume detach smoke test to check status.Dan Prince2012-09-211-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates test_007_me_can_detach_volume so that it waits for the volume status to become active for up to 10 seconds after initiating the command to detach the volume. Previously it just waited for 5 seconds without checking the status which can be problematic in that it causes the subsequent test to delete the volume to fail intermittently (because only active or error volumes can be deleted). I noticed this in SmokeStack because 2 days ago this commit landed: b46f224f7555e3065b0daacd101b65d86117f0c1 and it is now causing a fair amount of intermittent volume tests to fail for Nova and Cinder. Apparently now that we have ordered the commands to remove an iscsi target properly it takes a bit longer... Change-Id: Ibfd25af93f9cb063a76a04138b8d23d28a01b89a
* | | | | | | Merge "Fixes to the SolarisISCSI Driver"Jenkins2012-09-211-6/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fixes to the SolarisISCSI DriverYosef Berman2012-09-201-6/+5
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Even when the san_is_local config option was set to false, the SolarisISCSIDriver's _execute method was accidentally set to util.execute by the VolumeDriver's __init__ method. Fix bug 1053041 Change-Id: Ifd8436874759d75633da3dbbfa01bd99f979ddea
* | | | | | Merge "Add lun number (0) to model_update in HpSanDriver"Jenkins2012-09-212-3/+6
|\ \ \ \ \ \
| * | | | | | Add lun number (0) to model_update in HpSanDriverJohn Griffith2012-09-202-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The HpSanDriver was not setting the lun number in model_update and as a result default value of 1 was being used. Trouble is the Lun number used by LeftHand is 0, so the connect info would be wrong and fail when trying to attach the volume. Fixes bug #1053717 Change-Id: I2391db062dff35365030e33c3eb0569fdd397949
* | | | | | | Imported Translations from TransifexOpenStack Jenkins2012-09-2121-28039/+20248
| |_|/ / / / |/| | | | | | | | | | | | | | | | | Change-Id: Ib9c73197069b55d53df762d3b70918d8477f1dbb
* | | | | | Merge "libvirt: return after soft reboot successfully completes"Jenkins2012-09-201-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | libvirt: return after soft reboot successfully completesJohannes Erdfelt2012-09-201-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A soft reboot shuts down an instance, waits for the instance to shutdown, then starts the instance and waits for the instance to finish starting. However, instead of returning success, it continues back into the loop and waits for the instance to be shutdown again. That will continue until the soft reboot times out, which is by default 120 seconds. This manifested itself as a unit test that would consistently take 120 seconds to run, but could possibly affect deployed environments by restarting instances that are shutdown shortly after a soft reboot. Change-Id: I012c53343be4b4eb943643903fc47c7fe70a594d
* | | | | Merge "Clarify dangerous use of exceptions in unit tests"Jenkins2012-09-204-17/+32
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Clarify dangerous use of exceptions in unit testsJohannes Erdfelt2012-09-204-17/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Also, update unit tests to use more specific exception where possible to make auditing easier in the future. Change-Id: I4906e2f8e3ebacf0587f1471ca8dd46c73edc17a
* | | | | Merge "Added description of operators for extra_specs"Jenkins2012-09-201-0/+25
|\ \ \ \ \
| * | | | | Added description of operators for extra_specsJinwoo 'Joseph' Suh2012-09-111-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are several new operators added for extra_specs that are used in compute capability filter and aggregate filter. These are described in document in this patch. Fixed bug 1047036. Change-Id: Id86c6672d7bda458ecb918f1900d6f8a9526ad41
* | | | | | Cleanup test_api_samples:_compare_resultJohannes Erdfelt2012-09-201-9/+5
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This method uses 'except Exception' which is discouraged, but it doesn't appear to need the exception handler at all. Also, add some minor cleanups to make it easier to read and understand. Change-Id: I4bd33442e498107da34d01cebfa36149be4c7a84
* | | | | Merge "Fix solidfire unit tests"Jenkins2012-09-201-11/+12
|\ \ \ \ \
| * | | | | Fix solidfire unit testsJohannes Erdfelt2012-09-201-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A couple of tests attempted to reimplement assertRaises(), but did so badly. self.fail() will raise AssertionError, which is a subclass of Exception, so even if the tested exception wasn't raised, it would silently treat it as a success. This buggy testing code hid a failure to properly test the intended functionality in test_delete_volume_fails_no_volume. Change-Id: I4e31bf6cb3b042aa2d9ba2a5ccaf40319d0fc124
* | | | | | Merge "Stop double logging to the console"Jenkins2012-09-201-5/+0
|\ \ \ \ \ \
| * | | | | | Stop double logging to the consoleVishvananda Ishaya2012-09-201-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code in nova for logging added an extra root handler to be able to log messages to the console during log setup. This handler was removed in the setup method. The common setup method no longer removes this handler, so don't create it. Note that there may be a small period before the logging setup is finished where messages will not appear. Fixes bug 1053512 Change-Id: I879360ecd60d607112b1210d7afd5860e9ccb295
* | | | | | | Merge "Modified 404 error response for server actions"Jenkins2012-09-201-6/+12
|\ \ \ \ \ \ \
| * | | | | | | Modified 404 error response for server actionsArathi2012-09-181-6/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | User-friendly messages are returned if any server action is requested on non-existent servers Fixes bug 1050922 Change-Id: I884285fcb62225acd9078d16191398d844a227cb
* | | | | | | | Merge "Recreate nw_info after auto assigning floating ip."Jenkins2012-09-201-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Recreate nw_info after auto assigning floating ip.Dan Prince2012-09-201-0/+4
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When auto assigning floating IPs recreate the nw_info array so that API calls to get instance details will immediately display the assigned floating IP info. Fixes LP Bug #1053479. Change-Id: Ia58a5391099317479d968fcf01682229926a4a99
* | | | | | | | Merge "Fix startup with DELETED instances"Jenkins2012-09-201-0/+7
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix startup with DELETED instancesStanislaw Pitucha2012-09-201-0/+7
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Make sure that compute manager with DELETED and SOFT_DELETED instances starts up properly. Before it was possible to end up with only the db entry and no local configuration allowing a successful restart (even then it would be the wrong decision to try). Fixes bug 1053441 Change-Id: Iab1ca81068733a5e8546c32ad122f1d60d22310b
* | | | | | | | Merge "Re-generate sample config file"Jenkins2012-09-201-12/+89
|\ \ \ \ \ \ \ \
| * | | | | | | | Re-generate sample config fileMark McLoughlin2012-09-201-12/+89
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: - recent resource tracker changes moved around options and added new options like disk_allocation_ratio - new send_arp_for_ha_count option - qpid_heartbeat default increased - volume_tmp_dir added by image cloning support - netapp_nfs and solidfire volume driver additions DocImpact: update nova.conf docs Change-Id: I4b53e4c51a40de1321f70a2bed16ac7020a2f160
* | | | | | | | Merge "Inherit the base images qcow2 properties"Jenkins2012-09-202-2/+25
|\ \ \ \ \ \ \ \
| * | | | | | | | Inherit the base images qcow2 propertiesJoshua Harlow2012-09-182-2/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating an image based off a base image we likely want to ensure that we are inheriting some of that bases properties. This includes items like cluster_size and encryption for now. Likely it is not intended for those to differ in a child image. Blueprint backing-file-options Change-Id: I0d684ca9825a3d9c4310e4a6d4279f10331d210e
* | | | | | | | | Merge "Raise NotFound for non-existent volume snapshot create"Jenkins2012-09-203-2/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | Raise NotFound for non-existent volume snapshot createSirisha Devineni2012-09-203-2/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When user tries to create snapshot of a non-existent volume then handle the VolumeNotFound exception raised during snapshot creation and throw it as HTTPNotFound Fixes bug 1050388 Change-Id: I869ed6a29f66889636bcf92115117d407079e539
* | | | | | | | | Merge "Fix solidfire option declaration"Jenkins2012-09-201-3/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix solidfire option declarationMark McLoughlin2012-09-201-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1053427 The sf_allow_tenant_qos option is a boolean, not a string. Change-Id: I7d1e8c7e8f545710314395c91e269f08cc110c36
* | | | | | | | | | Merge "Use test.TestingException instead of duplicating it"Jenkins2012-09-201-8/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use test.TestingException instead of duplicating itJohannes Erdfelt2012-09-201-8/+4
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As much as like the name, it's not really necessary to duplicate test.TestingException Change-Id: Ieaca2b57a7cad58e86d2f92d4555fe26538ec47d
* | | | | | | | | | Merge "Replace builtin hash with MD5 to solve 32/64-bit issues."Jenkins2012-09-202-6/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Replace builtin hash with MD5 to solve 32/64-bit issues.Ben Swartzlander2012-09-192-6/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It seems that Python's builtin hash returns different values on 32-bit and 64-bit architectures, so it's safer to use a well-defined hash like MD5. bug 1050359 Change-Id: Ibb49f7b9028085d2aedaf05b94e1e1dcdf5e4cb4
* | | | | | | | | | | Merge "Adds API sample testing for rescue API extension"Jenkins2012-09-2029-0/+491
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adds API sample testing for rescue API extensionNikola Dipanov2012-09-2029-0/+491
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds tests and templates for testing of the server rescue API extension. Tests both json and XML API functionality. Change-Id: Icb241e96ebedde0b6385f8ba60eebd0e768f22da
* | | | | | | | | | | | Merge "Restore SIGPIPE default action for subprocesses"Jenkins2012-09-202-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Restore SIGPIPE default action for subprocessesThierry Carrez2012-09-202-0/+17
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Python ignores SIGPIPE on startup, because it prefers to check every write and raise an IOError exception rather than taking the signal. Most Unix subprocesses don't expect to work this way. This patch (adapted from Colin Watson's post at http://tinyurl.com/2a7mzh5) sets SIGPIPE back to the default action for nova.utils.execute and nova-rootwrap created subprocesses. Fixes bug 1053364 Change-Id: I17e1629bb4ef4268515c6734ddb6e12746739c52
* | | | | | | | | | | Merge " Cleanup unused import in manager.py"Jenkins2012-09-201-2/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Cleanup unused import in manager.pyNewptone2012-09-191-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I86be592fc0ee8ddb81417b737702c4201442d0df
* | | | | | | | | | | Merge "Fix bugs in resource tracker and cleanup"Jenkins2012-09-2016-367/+813
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix bugs in resource tracker and cleanupBrian Elliott2012-09-2016-367/+813
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bugs in resource tracker: * Handle disk oversubscription * Handle suspended/powered off instances The usage model is changed to the old style that is based on actual instance usage on a compute host. (Not the current point in time of the hypervisor's reported host stats) There is now a 'limits' filter property that can be passed from the scheduler to the compute node to indicate that oversubscription of resources is desired: The 'limits' filter property is a dict with the following possible keys: * memory_mb - Specifies the memory ceiling for the compute node. * disk_gb - Specifies the disk space ceiling for the compute node. * vcpu - Specifies the max number of vcpus for the compute node. There is also some general cleanup and additional unit tests in an attempt to simplify down this function. bug 1048842 bug 1052157 Change-Id: I6ee851b8c03234a78a64d9f5c494dfc7059cdda4
* | | | | | | | | | | Merge "Adds deserialization for block_device_mapping"Jenkins2012-09-202-0/+71
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adds deserialization for block_device_mappingVishvananda Ishaya2012-09-192-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The os-volumes extension adds the ability to boot from a volume or snapshot by including block_device_mapping in the server create request. This patch adds code to the xml deserializer so block_device_mapping can be specified via xml as well. Fixes bug 1052695 Change-Id: I3e586abb32976df98d70c29b6a021fd01c4c186b
* | | | | | | | | | | | Merge "Clean up test_state_revert"Jenkins2012-09-202-23/+38
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Clean up test_state_revertJohannes Erdfelt2012-09-192-23/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While the test is simply to ensure that the state is reverted, no matter what the failure, it did so a bit bluntly. The use of Exception on both the raising side and the catching side ended up masking a variety of other unintended failures. stop_instance and start_instance had bugs (fixed in parent patch) which ended up raising a KeyError exception. This still ended up resetting the state correctly because only the nested call to the decorator did not use the keyword argument for instance. rebuild_instance, revert_resize, prep_resize and resize_instance all required multiple extra arguments that weren't passed. This raised a TypeError exception. revert_resize and resize_instance also required an elevated context or nova.db.api.migration_get() would raise a exception.AdminRequired exception. Even with these unintended problems, the test still performed it's intended purpose, to test that task state is reverted. However, the use of Exception makes auditing the test harder. Change-Id: I5150957375ab3e57e7971f5e15daba531bb58803