summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | Fix whitespace issue in indentChris Behrens2013-05-151-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Extra whitespace cleanup in nova/cells/messaging.py Change-Id: I000b2585ab9018af42f25bc83e7e0b0c2bd92e5a
* | | | | | | | | Merge "Clean up test_api_samples a bit"Jenkins2013-05-181-277/+200
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Clean up test_api_samples a bitGiampaolo Lauria2013-05-171-277/+200
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove all unnecessary return statements in our tests Change-Id: Ic01a211e48781241cac3fdef75760a3a6dafadc6
* | | | | | | | | Merge "Update mailmap"Jenkins2013-05-181-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Update mailmapJoe Gordon2013-05-171-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update mailmap to reflect new email address that I will be committing under Change-Id: I9f8610ad982ed678c0b367b3a1768578739b2543
* | | | | | | | | Merge "Don't raise unnecessary stack traces in EC2 API"Jenkins2013-05-181-2/+0
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Don't raise unnecessary stack traces in EC2 APIJoe Gordon2013-05-161-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | exception.EC2APIError exceptions are always expected, so no reason to have a LOG.exception when one is raised. Furthermore nova.api.ec2.ec2_error already logs the exception so the duplicate log statement is just removed Fix Bug 1180973 Change-Id: I4b42a9a764f6e15bb94a383e8a725d52d7436bd7
* | | | | | | | | | Remove unnecessary parens in test_volumesRick Harris2013-05-171-21/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Return statements were using unnecessary parens, this removes them. Change-Id: Iee63ffa826d323a89493e16c1b9592bae74e350f
* | | | | | | | | | Use strict=True instead of `is_valid_boolstr`Rick Harris2013-05-177-48/+128
| |/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Oslo's `bool_from_string` learned the `strict` keyword which allows callers to detect invalid boolean values, so we can use that instead of having a new Nova-specific function. Change-Id: I61bfa4029897c7304bd54d6cdae9f9a9bc4c1f78
* | | | | | | | | Merge "Remove usage of locals() for formatting from nova.api.*"Jenkins2013-05-1717-91/+109
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove usage of locals() for formatting from nova.api.*Boris Pavlovic2013-05-1817-91/+109
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using of locals() for formatting string is a nasty thing because: 1) It is not so clear as using explicit dicts 2) It could produce hidden errors during refactoring 3) Changing name of variable causes change in message 4) Creating a lot of unused variables fixes bug 1171936 Change-Id: I293d7ebb875f65cce322d4938d1ae323f3aded8d
* | | | | | | | | Merge "Switch to flake8+hacking."Jenkins2013-05-177-729/+49
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Switch to flake8+hacking.Monty Taylor2013-05-177-729/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a bunch of local custom scripts. Replace with configurable external tools. Use local hacking checks for nova specifics. Change-Id: I75a01375ba0ec36d2ff05abc47abe0a3f225eda5
* | | | | | | | | | Merge "Fix flake8 errors in anticipation of flake8."Jenkins2013-05-177-17/+17
|\| | | | | | | | | | |_|_|_|_|_|_|_|/ |/| | | | | | | |
| * | | | | | | | Fix flake8 errors in anticipation of flake8.Monty Taylor2013-05-177-17/+17
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | Change-Id: I7c713f95eb974d5998d2be50722df7d6f64a234e
* | | | | | | | Merge "Remove locals() from messages in virt/disk/api.py"Jenkins2013-05-171-17/+16
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Remove locals() from messages in virt/disk/api.pyMichael Still2013-05-171-17/+16
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes, just removing something which annoyed me when I read the code. Change-Id: Ia2d232d6ee2e61d3785b57798391474b8e99dee1
* / / / / / / Cast `size` to int before comparisonRick Harris2013-05-162-7/+103
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `_get_and_check_image_metadata` pulls `size` from the image, which comes in as string, but fails to convert it to an integer before comparing with the flavor's `root_gb` size. This patch adds the cast along with some test coverage for this method. Fixes bug 1180159 Change-Id: I92bc9d6a808e49173d806e434cb145c751c8314a
* | | | | | Merge "Add ca cert file support to cinder client requests"Jenkins2013-05-163-7/+26
|\ \ \ \ \ \
| * | | | | | Add ca cert file support to cinder client requestsCian O'Driscoll2013-05-163-7/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow for ca certificates file to be specified when doing cinder client requests. Needed when using custom ca authorities. Change-Id: Ib9aa15df2fc7d96cb8587c13769399e353c032c6 Fixes: bug #1179476
* | | | | | | Merge "Don't inject settings for dynamic network"Jenkins2013-05-163-15/+187
|\ \ \ \ \ \ \
| * | | | | | | Don't inject settings for dynamic networkBen Nemec2013-05-163-15/+187
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using Quantum for networking and setting flat_injected to inject network settings into the guest VM, Nova injects a static network configuration for networks using DHCP. This change checks for the existence of a dhcp server and, if found, does not inject static settings for that network. Due to limitations of the legacy network info, the fix only applies when new-style network info is passed to the injection template function. The only code still passing in legacy network info is in libvirt, and there is work ongoing to remove that dependency. Fixes bug 1163985 Fixes bug 1112659 Change-Id: I8d3f16bde22e1c6dc0d2432aa263e2b15ae5c93a
* | | | | | | | Merge "Fix header issue for baremetal_deploy_helper.py"Jenkins2013-05-161-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix header issue for baremetal_deploy_helper.pyJay Lau2013-05-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix header issue baremetal_deploy_helper.py is not a python script which can not be run directly, so there is no need to keep "#!/usr/bin/env python" but change it to "# vim: tabstop=4 shiftwidth=4 softtabstop=4" Change-Id: Ic4957673605cd71dc19fc38a2626bdaa35d102c0
* | | | | | | | | Merge "Mox should cleanup before stubs"Jenkins2013-05-162-1/+18
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Mox should cleanup before stubsRick Harris2013-05-162-1/+18
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests that define both Mox and Stubs may not receive a proper cleanup by the `TestCase` base class. The reason is that the order in which the Mox and Stubs are unset may not necessarily match-up with the order in which the tests called them. For example: Suppose we have a test that Stubs a method in its `setUp` and then Mox's that same method in the test body: Stub: Original-Func -> Stubbed-Func Mox: Stubbed-Func -> Mocked-Func Now when `TestCase` ultimately does its `cleanUp`, it will UnStub before UnMocking: UnStub: Stubbed-Func -> Original-Func UnMox: Mocked-Func -> Stubbed-Func Notice that generic cleanup has mistakingly left `Stubbed-Func` in place. Given that Stubs and Mox can be performed in any order, the upshot here is that the generic cleanup can't always be relied on. The proposed solution has two parts: a best-practice change and a small code-change. The code-change is to reverse the current order to UnMox before UnStubbing. While in theory the order is arbitrary, in practice, we have lots of Stubs in `setUp` methods already, so UnMox'ing first makes sense (and it fixes a current bug to boot!) The best-practice change is to recommend against stubbing and mocking the same function as well as to always place stubs before mocks when relying on the generic cleanup. If a developers needs to deviate from this, cleanup of stubs created after mocks are their responsibility. Fixes bug 1180671 Change-Id: I42ab8b55026c0a133625a7cc81ed8b960e9d47d7
* | | | | | | | Merge "libvirt: Catch VIR_ERR_NO_DOMAIN in list_instances"Jenkins2013-05-162-3/+8
|\ \ \ \ \ \ \ \
| * | | | | | | | libvirt: Catch VIR_ERR_NO_DOMAIN in list_instancesJian Wen2013-05-162-3/+8
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 25f50d9a didn't catch the exact exception for looking up deleted domain. Partly fixes LP Bug #1032741. Change-Id: I6c6f7d8a736c833488b6cb8e00530dc4138f1424
* | | | | | | | Merge "Reverse compare arguments in filters tests"Jenkins2013-05-161-3/+3
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Reverse compare arguments in filters testsChris Behrens2013-05-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When using assertEqual, the expected result should actually be the first argument so any failures have 'expected' and 'actual' values printed properly. Change-Id: I34d16f298eb0bf62e2abaaf31e80911fa124dc24
* | | | | | | | Merge "Copy the RHEL6 eventlet workaround from Oslo"Jenkins2013-05-162-1/+3
|\ \ \ \ \ \ \ \
| * | | | | | | | Copy the RHEL6 eventlet workaround from OsloMark McLoughlin2013-05-022-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Tests in oslo-incubator now need the horrendous hack to workaround an issue with eventlet on RHEL6. We've moved the patch_tox_venv tool and redhat-eventlet.patch into oslo-incubator, so add them to openstack-common.conf. Change-Id: I1acfec282b64d7582144b155119bedb1741db2f7
* | | | | | | | | Merge "Architecture property updated in snapshot libvirt"Jenkins2013-05-162-3/+50
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Architecture property updated in snapshot libvirtBelmiro Moreira2013-05-092-3/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | During an instance snapshot if the architecture property is defined in the image it is updated twice in the snapshot image. The snapshot is created with the metadata values from the "instance_system_metadata" table and then, if defined, the architecure property is updated from the value in the base image in that moment. There is no reason to treat this property differently from others. Also, it didn't respect the "non_inheritable_image_properties" option. This change removes the special behavior for the architecture property in the libvirt driver during a snapshot. Fixes: bug #1176173 Change-Id: Ic5b4e3d462c08df167e14522fa25a7cf857c6aad
* | | | | | | | | | Merge "Fix for missing multipath device name"Jenkins2013-05-162-2/+69
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for missing multipath device nameWalter A. Boring IV2013-05-152-2/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to formatting changes in the multipath -l output we were sometimes missing the device name for each of the multipath devices which gave us a device of '/dev/'. This causes problems on detach. Fixes Bug: #1180497 Change-Id: I6017dda149776624fac452140d3d0f5df3f5fd5a
* | | | | | | | | | | Merge "Detach volume fails when using multipath iscsi"Jenkins2013-05-162-23/+71
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Detach volume fails when using multipath iscsiXing Yang2013-05-132-23/+71
| | |_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Enabled multipath for libvirt iscsi volume driver. Attach volume worked, however, detach volume failed. It failed because it can't find multipath device "/dev/mapper/xxxxxxxx" from connection_info and block device mapping table. The fix is to retrieve multipath device info dynamically at detach time. Fixes: bug #1178893 Change-Id: I53a3888daef93b57bf7f57438f74cee05e794b52
* | | | | | | | | | Revert "Include list of attached volumes with instance info"Russell Bryant2013-05-1569-329/+52
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit dd66f235ecf2ff67819917ee07bcb0ea13a1b17b. This changed the core servers API without doing it as an API extension, so it's not an acceptable change as written. Change-Id: I3787060583de1371e366647d38d69f37746317d5
* | | | | | | | | | Merge "Sync rpc from oslo."Jenkins2013-05-165-6/+9
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Sync rpc from oslo.Russell Bryant2013-05-155-6/+9
| | |/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Sync some trivial Python 3 compatibility and pep8 improvements from oslo. I just want to have this in sync so that pulling in a feature I'm working on comes in without unrelated changes Change-Id: I13fcb0bd538a153b90acf0b18497e335a64dc9d1
* | | | | | | | | | Merge "Remove openstack.common.version."Jenkins2013-05-153-97/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove openstack.common.version.Monty Taylor2013-05-153-97/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieb9ac3c2ce85777a33a2e15640670d03b2e7d2b7
* | | | | | | | | | Merge "Add missing tests for db.fixed_ip_*(). functions."Jenkins2013-05-154-19/+218
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add missing tests for db.fixed_ip_*(). functions.Victor Sergeyev2013-05-154-19/+218
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added new tests for fixed_ip*() functions. Function fixed_ip_create() should return FixedIp instance rather than FixedIp.address, because it is used in a tests later. Fix calls of fixed_ip_create() respectively. blueprint test-db-api Change-Id: Id5e9d4486605bde9d9fd1e631d868603a7a7c604
* | | | | | | | | | | Merge "Reverse path SNAT for DNAT floating-ip."Jenkins2013-05-151-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Reverse path SNAT for DNAT floating-ip.Brent Eagles2013-05-141-0/+3
| | |_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch applies a reverse SNAT rule to allow instances that have an assigned floating IP to communicate with other instances in the same OpenStack deployment, security group rules permitting. The patch allows members of the same private network to communicate with each other using their floating-ips in a more consistent fashion. The rule also addresses the situation where the target is on another private network. This will only work for interaction between two servers that both have floating IPs assigned to them. Specifically, this patch solves the problem where a target server "sees" the private address of the client. By SNAT'ing to the client's floating-IP, the "sees" the correct reply address and the reverse route follows the same path that an actual external connection would take. The SNAT ONLY occurs if a DNAT occurred before hand, allowing communication on private networks using private IPs to remain fully private and internal. The limitation is of course if a DNAT occurs for other reasons, there may be issues. Resolves bug 1178745 Change-Id: I55b7131cff5fd5a2ebf826945370d4d550e74136
* | | | | | | | | | | Merge "Fix quantum security group driver to accept none for from/to_port"Jenkins2013-05-152-10/+52
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix quantum security group driver to accept none for from/to_portAaron Rosen2013-05-142-10/+52
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The quantum security group driver did not accept none values for from_port/to_port which the nova security group api supports. This patch allows None values to be passed in for those params and adds a unit test. In addition the from/to_port responses would be different if using quantum instead of nova. This patch fixes that and adds unit tests. Fixes bug 1176027 Change-Id: Id57e253c9dd1787ee25fc5cbb562743692d7abe4
* | | | | | | | | | Merge "Cells: Don't allow active -> build"Jenkins2013-05-155-0/+131
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
generated by cgit (git 2.34.1) at 2026-02-25 17:38:15 +0000