summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | Merge "Add README for doc folder"Jenkins2012-09-172-1/+32
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add README for doc folderJoe Gordon2012-09-132-1/+32
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In preparation for more more man pages Change-Id: I55a9d332e5cbba90ff1e2a2cb0c0d24ae35fba5b
* | | | | | | | | Merge "Add api_samples tests for servers actions"Jenkins2012-09-1733-1/+442
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add api_samples tests for servers actionsDan Smith2012-09-1433-1/+442
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I67446ccd53c83b5fcfc3a1857a10e160263834dd
* | | | | | | | | | Merge "Fix XML deserialization of rebuild parameters"Jenkins2012-09-171-0/+9
|\| | | | | | | | |
| * | | | | | | | | Fix XML deserialization of rebuild parametersDan Smith2012-09-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This picks up the following attributes which are currently ignored when poking this via XML: - accessIPv4 - accessIPv6 - adminPass Change-Id: I947aa2f942022d839919ae7516759955e5b06668
* | | | | | | | | | Merge "Make compute/manager.py use self.host instead of FLAGS.host"Jenkins2012-09-172-5/+6
|\| | | | | | | | | | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make compute/manager.py use self.host instead of FLAGS.hostDan Smith2012-09-132-5/+6
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents the instances returned from getting a different instance['host'] than was supplied to the manager. This shows up during integrated testing of 'resize'. Change-Id: Ifa4316bf7099dc2c60c4e87cfaafa93a4bc2e5b1
* | | | | | | | Merge "workaround lack of quantum/nova floatingip integration"Jenkins2012-09-151-3/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | workaround lack of quantum/nova floatingip integrationDan Wendlandt2012-09-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug 1040956 The Nova/Quantum integration in Folsom does not yet proxy Nova floating IP calls to Quantum. However, Horizon automatically makes calls to Nova to list floating IPs, which prior to this patch resulted in a Horizon error message due to the fact that the Quantum integration code in Nova would raise an Unimplemented error. This patch changes that behavior to instead return an empty list. This is a workaround for Folsom. The correct long-term behavior is either to: 1) have Nova proxy all floating-ip calls to Quantum when quantum is enabled. 2) have Horizon use the Quantum floating-ip API when Quantum is enabled. Change-Id: I5414d935e872a9da108511b50e70545d82b73347
* | | | | | | | | Merge "Corrects use of instance_uuid for fixed ip"Jenkins2012-09-151-2/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Corrects use of instance_uuid for fixed ipMotoKen2012-09-141-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses instance_uuid rather than instance_id since commit 66f9e085a. Fixes bug 1050417. Change-Id: I6161c7a6ad9c3891e100daae39fe8ea82bfd8654
* | | | | | | | | | Merge "All security groups not returned to admins by default."Jenkins2012-09-156-4/+95
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | All security groups not returned to admins by default.Eoghan Glynn2012-09-146-4/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1046054. Previously security groups relating to all tenants were returned when requested by an admin user. Now only those groups related to the current tenant are returned by default. To recover the old behaviour, the all_tenants search option may be specified via the native API with: /v2/<project_id>/os-security-groups?all_tenants=1 or via the EC2 API with: Action=DescribeSecurityGroups&Filter.1.Name=all-tenants&Filter.1.Value.1=1 Note that the latter is slightly ultra vires with respect to the EC2 API spec, in the sense that this filter is in addition to the standard set. Since we don't pay attention to many of these standard filters as yet, this stepping slightly off-piste is deemed worth it. Change-Id: I6157e408394d04096d21747d665e3b3aa6aa55de
* | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2012-09-1521-52673/+105899
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2012-09-1321-52673/+105899
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibcf44205f71393d3663e2479f5e63a8ac54861a1
* | | | | | | | | | | Merge "Add security groups extension to API samples test."Jenkins2012-09-1429-0/+327
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add security groups extension to API samples test.Matthew Treinish2012-09-1429-0/+327
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie7635cacf96e0bafbd412ff40d7912aa0da4677d Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>
* | | | | | | | | | | | Merge "Remove useless _get_key_name() in servers API"Jenkins2012-09-141-10/+0
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Remove useless _get_key_name() in servers APIMark McLoughlin2012-09-131-10/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This no longer does anything useful. Firstly, we already check that the body dict has a server key. Secondly, AttributeError will never be thrown here since we have already checked that the entity is a dict. Finally, we don't need to set this key to None if it's not supplied by the client since we later use get() to to look it up. Change-Id: I4235117cc47e5b5cbdad4425edb3c7059e608d49
* | | | | | | | | | | | | Merge "Add entity body validation helper"Jenkins2012-09-144-21/+56
|\| | | | | | | | | | | | | |_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Add entity body validation helperMark McLoughlin2012-09-134-21/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a _valid_body() helper for the servers API to avoid repeating the same tests in multiple methods. Include a check that the 'server' value is actually a dict. Also remove the superfluous checking of req.body which is a leftover from when the body wasn't a method parameter. Change-Id: If8114cc76d68567005c85c803f29e30e034db89a
* | | | | | | | | | | | Merge "Allow older versions of libvirt to delete vms"Jenkins2012-09-142-6/+58
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Allow older versions of libvirt to delete vmsVishvananda Ishaya2012-09-142-6/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libvirt < 0.9.4 doesn't support undefineFlags, so the vms can't be deleted. This patch adds a workaround to fallback to the old style of undefine if undefineFlags throws an Attribute error. It also attempts to remove any managed save images that exist. Fixes bug 1051010 Change-Id: I155fe2ab3be347b1515c5aab4a9233921bd722ca
* | | | | | | | | | | | | Sync a change to rpc from openstack-common.Russell Bryant2012-09-141-1/+1
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit pulls in the following change from openstack-common: ee44222 Change the qpid_heartbeat default to 60 seconds. Fix bug 1050661. Change-Id: I42acdca42f27fbbe9a52441f8cf7ea8261fd8d24
* | | | | | | | | | | | Merge "Add a resume delete on volume manager startup"Jenkins2012-09-141-0/+6
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add a resume delete on volume manager startupJohn Griffith2012-09-131-0/+6
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently if for some reason the volume service was stopped during the zero out operation of a volume delete there was no way to get the volume removed from the system (it would be present in deleting status forever). This change adds a simple check of volumes in the DB with status of deleting, and if any are found it restarts the delete process on them. addresses bug #1011150 Change-Id: I6aa26e9eaa94da4b620f01160931cbfcad9dadf7
* | | | | | | | | | | | Merge "libvirt: Cleanup L2 and L3 rules when confirm vm resize"Jenkins2012-09-142-2/+54
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | libvirt: Cleanup L2 and L3 rules when confirm vm resizeJian Wen2012-09-142-2/+54
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup security group and nwfilter rules on source node in resize-confirm. Add test cases for confirm_migration and _cleanup_resize. Fixes bug 1050196 Change-Id: Id5495c41f3b51aa555a540f2c8aa718b653ae034
* | | | | | | | | | | | Merge "Correct typo in memory_mb_limit filter property"Jenkins2012-09-142-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Correct typo in memory_mb_limit filter propertyBrian Elliott2012-09-142-2/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug blocking memory oversubscription in builds bug 1048842 Change-Id: I932d0a7248f231127965331886664bfd9092dad0
* | | | | | | | | | | Merge "Allow for deleting VMs from down compute nodes."Jenkins2012-09-142-11/+31
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Allow for deleting VMs from down compute nodes.Joe Gordon2012-08-312-11/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 872899 If compute node service_is_up returns false, just delete the VM from the database. If compute node recovers, setting running_deleted_instance_action=reap will clean up the node. Change-Id: Ibb5f1e22c2e482d304c59a485a04b882ead0c67d
* | | | | | | | | | | Merge "Fixes import issue on Windows"Jenkins2012-09-141-1/+6
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixes import issue on WindowsAlessandro Pilotti2012-09-131-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes Bug #1034043 The crypt module is not available on Windows. Since this is a blocking issue on Hyper-V and since the only function using it is _set_passwd (not implemented on Windows), the import can be safely conditionally avoided. Change-Id: Iefe97edcfcff3b70593e07628b6a6f85e680cbc7
* | | | | | | | | | | Merge "Use tmpdir and avoid leaving test files behind"Jenkins2012-09-141-2/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use tmpdir and avoid leaving test files behindJohn Griffith2012-09-131-2/+13
| | |_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We were just creating a file for testing iscsi persist files and weren't cleaning up after the test. Change this to use a tmpdir and make sure we leave no tracks. Fixes bug #1050086 Change-Id: I714177d7789da8b628ab63c163a2c3f1698dd940
* | | | | | | | | | | Merge "Add more useful logging around the unmount fail case."Jenkins2012-09-141-3/+7
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add more useful logging around the unmount fail case.Joshua Harlow2012-09-131-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Raise a better message with a more useful message rather than raising a process execution error, which although useful is not especially meaningful. Bug 1050645 Change-Id: Id9817de26fdb16f8fce17ebd093a9550e63be19c
* | | | | | | | | | | Merge "Add 422 test unit test for servers API"Jenkins2012-09-131-7/+56
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Add 422 test unit test for servers APIMark McLoughlin2012-09-131-7/+56
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a straightforward test case to check the cases where we're returning 422 from the servers API. Add a comment to ServersAllExtensionsTestCase which clarifies who it differs from these new 422 tests. Change-Id: Idb39e37f4a620199abb986793ae9415a5115dba9
* | | | | | | | | Overload comment in generated SSH keysThierry Carrez2012-09-131-1/+1
| |_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Overload comment in generated SSH keys in order not to leak information about the user and host that actually generated them. Patch based on a suggestion by Pedro Perez. Fixes bug 1050347. Change-Id: I73bbdba1f6c9e83a5e7e70564959b9d7abaa5e29
* | | | | | | | Merge "Validate keypair create request body"Jenkins2012-09-132-2/+19
|\ \ \ \ \ \ \ \
| * | | | | | | | Validate keypair create request bodySirisha Devineni2012-09-132-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check if keypair create request body has manditory keys like keypair, name and raise HTTPBadRequest if the required keys are missing. Fixes bug 1049619 Change-Id: Ia6129e1b04e910fbea81b62b921a228aafa32f64
* | | | | | | | | Merge "Return 400 if create volume snapshot force parameter is invalid"Jenkins2012-09-135-2/+44
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Return 400 if create volume snapshot force parameter is invalidRongze Zhu2012-09-135-2/+44
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1014689 * Add is_valid_boolstr function in utils.py * Add force parameter check in SnapshotsController.create() * Add unittest for invalid force parameter. Change-Id: Ie6a07a2ac589da76f52a82b126a6d66e5987edc4
* | | | | | | | | Merge "Backport changes from Cinder to Nova-Volume"Jenkins2012-09-137-0/+2145
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Backport changes from Cinder to Nova-VolumeBen Swartzlander2012-09-127-0/+2145
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NetApp C-mode driver. Generic NFS-based block device driver. NetApp NFS-based block device driver. blueprint netapp-volume-driver-cmode blueprint nfs-files-as-virtual-block-devices blueprint netapp-nfs-cinder-driver bug 1037619 bug 1037622 Change-Id: I513c3f88bcb03f3b71a453f92f5912d7730a8bbc
* | | | | | | | | | Merge "Add reservations parameter when cast "create_volume" to volume manager"Jenkins2012-09-131-1/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Add reservations parameter when cast "create_volume" to volume managerRongze Zhu2012-09-131-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1050192 Add reservations parameter when _cast_create_volume cast "create_volume" to volume manager. So VolumeManager.create_volume() can commit the reservations in volume quota. Change-Id: I8f3104d53bde55d4d83f39253869cc78a8511750