summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | | Merge "Call compute manager methods with instance as keyword argument"Jenkins2012-09-201-2/+2
|\| | | | | | | | | | | | | |_|/ / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Call compute manager methods with instance as keyword argumentJohannes Erdfelt2012-09-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reverts_task_state and wrap_instance_fault both expect to be able to find an instance keyword argument if an exception is raised while executing the wrapped function. Fix stop_instance and start_instance to call other compute manager methods with instance as a keyword argument to ensure the decorators correctly function. Only the nested call to the decorated function didn't have the instance keyword argument. As a result, the initial call would correctly perform the decorated functions. This fix will ensure that spurious and confusing log messages don't get generated. Change-Id: Id4268150f7bea8c52ecc539e1b9ea19b19967ae4
* | | | | | | | | | | | Merge "Properly create and delete Aggregates"Jenkins2012-09-205-7/+92
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Properly create and delete AggregatesJoe Gordon2012-09-195-7/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * If deleted aggregate with same name exists, ignore it * When delete aggregate, delete metadata as well * Removes aggregates.name unique constraint Fix bug 1052479 Change-Id: I430e69367bdedbf65049a5142d137ab788763ae3
* | | | | | | | | | | | | Merge "Add lookup by ip via Quantum for metadata service."Jenkins2012-09-203-12/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Add lookup by ip via Quantum for metadata service.Maru Newby2012-09-183-12/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The Nova network API's get_fixed_ip_by_address() is used by the metadata service in determining which instance to return metadata for. * This change implements support for the function in the Quantum v2 implementation of the network API to ensure that the metadata service can return results when Nova is configured to use Quantum. * Overlapping network spaces are not supported at this time. * Addresses bug 1052196 Change-Id: Iaa5d78c4de92313e93ee9008a2c26052a4f60602
* | | | | | | | | | | | | | Merge "fix unused import"Jenkins2012-09-201-2/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fix unused importlapgoon2012-09-201-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix unused import in nova/compute/manager.py Change-Id: If5f9222365ed5814a6c288eb0507e6ba922cd4b4
* | | | | | | | | | | | | | | Merge "Fix marker pagination for /servers"Jenkins2012-09-205-7/+26
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Fix marker pagination for /serversMark Washenberger2012-09-195-7/+26
| | |_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1053028. Recent changes to pagination required passing in full sqlalchemy objects into paginate_query. However, calls to paginate_query were passing in strings. Change-Id: Ib1396a78a12aef1a9cdc31f3624af30f19da44b5
* | | | | | | | | | | | | | | Merge "Always yield to other greenthreads after database calls"Jenkins2012-09-202-8/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Always yield to other greenthreads after database callsJohannes Erdfelt2012-09-192-8/+14
| |/ / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Since common database backends (eg MySQLdb and sqlite) are implemented in C extensions, eventlet cannot monkey patch the socket calls to ensure greenthread context switches occur during network I/O. Previously, this was done by sprinkling explicit greenthread.sleep(0) calls in areas known to cause problems. Switch that to always do a yield after execute. Change-Id: If91e49fbe212a02710b6ba4abd456222552e2575
* | | | | | | | | | | | | | | Merge "Send api.fault notification on API service faults."Jenkins2012-09-203-0/+47
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Send api.fault notification on API service faults.SandyWalsh2012-09-193-0/+47
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Exceptions caught by the API middleware will now send "api.fault" notifications indicating the offending URL and the underlying exception. The allows the billing/usage systems to track requests end-to-end without having to monitor log files. Disabled by default. Enable with --notify_api_faults Change-Id: Ied2783259413ba12d686b44b33e0707645e51afb
* | | | | | | | | | | | | | Merge "Update 'unlimited' quota value to '-1' in db"Jenkins2012-09-202-1/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Update 'unlimited' quota value to '-1' in dbvijaya-erukala2012-09-182-1/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates quota value to -1 in db rather than None if the user specify the quota limit as "unlimited". Fixes bug 979087 Change-Id: I0ec412189ad9630c4a875655294c1e77886108f5
* | | | | | | | | | | | | | | Merge "No stack trace on bad nova aggregate-* command"Jenkins2012-09-201-9/+9
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | No stack trace on bad nova aggregate-* commandJoe Gordon2012-09-191-9/+9
| | |_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a 'nova aggregate-*; command is run with a bad parameter, Nova-api should not throw a stack trace. For example: 'nova aggregate-details badID' shouldn't cause a stack trace fix bug 1053150 Change-Id: Iab6059f44b7cfb5428a2b55cea53d63809d7a575
* | | | | | | | | | | | | | | Merge "Fix aggregate_hosts.host migration for sqlite"Jenkins2012-09-202-2/+25
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix aggregate_hosts.host migration for sqliteJoe Gordon2012-09-192-2/+25
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make sure data is not lost during migration * Changes migration 111_general_aggregates * Adds test for change Fix bug 1053131 Change-Id: Idbf0cbd5fdb7758ea1794019807d83d159270cba
* | | | | | | | | | | | | | Merge "Don't include auto_assigned ips in usage"Jenkins2012-09-193-7/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Don't include auto_assigned ips in usageStanislaw Pitucha2012-09-193-7/+31
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a regression - auto_assigned floating ips should not be included in the quota_usages table. Fixes bug 1052997 Change-Id: Ifa98a5d44cf2a8a8d4c73b4f56b9615dd74b8383
* | | | | | | | | | | | | Merge "Added script to find unused config options."Jenkins2012-09-192-1/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Added script to find unused config options.Yosef Berman2012-09-182-1/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The script analyze_opts.py is added to identify unused options and options which are set to default values in the nova.conf file. Change-Id: Iec42781a56f73b7d0960bdd569f5dd06edbb88df
* | | | | | | | | | | | | Merge "Fix over rate limit error response"Jenkins2012-09-192-3/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix over rate limit error responseRipal Nathuji2012-09-182-3/+13
| | |_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1046021 Changing overLimitFault element in response to overLimit and setting the returned Content-Type appropriately. Also adding retryAfter attribute to provide the same information as the Retry-after header. Change-Id: I8c32fe7075b918afa62da3f84f1d3b35315e2b9b
* | | | | | | | | | | | | Correct IetAdm remove_iscsi_targetMotoKen2012-09-192-3/+3
| |_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove logical units should be done before delete the target while unexport iSCSI volume. Or ietd will show "No such file or directory" error. Fix bug 1043107 Change-Id: I06ac561898dbcee078c807ea5368c03e558b4fa9
* | | | | | | | | | | | Merge "xapi: fix create hypervisor pool"Jenkins2012-09-196-64/+235
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | xapi: fix create hypervisor poolMate Lakat2012-09-196-64/+235
| | |_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1049099. Fixing problems with the rpc api when creating hypervisor pools with xenapi. Rpc calls were not using the compute_rpcapi approach, thus were not properly versioned. Apart from that, the slave parameters were not forwarded to the master. A new (2.2) version is introduced where the rpc calls have the slave_info payload. Added tests to cover the pool cases. Some trivial extract methods performed on pool, to decouple the pool functionality from its dependencies. Change-Id: Ie44a1c09ef204affc4a657c71557691e83b22c22
* | | | | | | | | | | | Merge "Improve error handling of scheduler"Jenkins2012-09-192-50/+60
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Improve error handling of schedulerVishvananda Ishaya2012-09-172-50/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Modifies scheduler errors to report instance faults and to set instance_state back to None on failure. Related to bug 1051066 Change-Id: Id9f36a75370849db7baf3fe24ce96c6f4284255d
* | | | | | | | | | | | Bump version to 2013.1Thierry Carrez2012-09-191-1/+1
| |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bump version to 2013.1 on master branch to open Grizzly development Change-Id: Ie1632784c458b62b99321a0ba3a4d614672735b2
* | | | | | | | | | | Merge "Re-attach volumes after instance resize"Jenkins2012-09-198-24/+69
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Re-attach volumes after instance resizeRafi Khardalian2012-09-048-24/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1051600. Update the compute manager to pass block_device_info to three additional driver entry points and update all virtualization drivers to accept it as an optional argument. Within libvirt, migrate_disk_and_power_off() will now iterate and disconnect any existing connections. finish_migration() simply updates its use of to_xml(), passing block_device_info, which returns a libvirt XML fully populated with volumes. Finally, finish_revert_migration() no longer uses the on-disk XML file, instead generating it via to_xml; as the former lacks volume configuration. Change-Id: I7dccd03ef9cc7d2848f07764d4def3787e41e202
* | | | | | | | | | | | Merge "Add Keypairs extension to API samples test."Jenkins2012-09-1921-0/+215
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add Keypairs extension to API samples test.Mauro S. M. Rodrigues2012-09-1821-0/+215
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | NOTE: This include two samples of post request: One to create the keypair and another to import from a public key Change-Id: I754fd5998cf8be46a96e69e3459c91d4f767575e
* | | | | | | | | | | | Merge "Fix race condition in CacheConcurrencyTestCase"Jenkins2012-09-191-5/+26
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix race condition in CacheConcurrencyTestCaseJohannes Erdfelt2012-09-181-5/+26
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1052641 Recent changes made to fix bug 1035426 ended up creating a race condition in the tests for CacheConcurrencyTestCase. Since two greenthreads are used, the changes to utils.synchronized() can cause a race where one thread is deleting the lock directory out from under the other thread. An unrelated bug caused this race condition to be ignored since the greenthreads were never waited on and as a result, the exceptions never had a chance to be raised in the test case. Change-Id: I86b45414bbacd12bd3f5af323d26e0861c354ba8
* | | | | | | | | | | Merge "Raise BadRequest while creating server with invalid personality"Jenkins2012-09-192-0/+40
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Raise BadRequest while creating server with invalid personalitySirisha Devineni2012-09-182-0/+40
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Handle UnicodeDecodeError raises from compute api while trying to create server with invalid personality content and throw it as HTTPBadRequest Fixed bug 1050409 Change-Id: I27d47bbc9ed89abfa9827512fbfb3b16a0d87160
* | | | | | | | | | | Merge "make ensure_default_security_group() call sgh"Jenkins2012-09-193-6/+20
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | make ensure_default_security_group() call sghAaron Rosen2012-09-183-6/+20
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes sure that sgh is called when default security group is created. Fixes bug 1050982 Change-Id: I483e33d8977b2bfbd7456a7c7c0d1fe7803708f8
* | | | | | | | | | | Merge "Update quota when deleting volume that failed to be scheduled"Jenkins2012-09-198-28/+37
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Update quota when deleting volume that failed to be scheduledZhiteng Huang2012-09-188-28/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If one volume was failed to get scheduled, removing such volume should also clean up reservation. Also when create_volume is ready to send to scheduler, reservation should be committed no matter backend can successfully create that volume or not since deleting volume call will do a minus reservation even on volume with 'error' status. This change updates RPC API to version 2.2 Fix bug 1052052 Change-Id: Ia632a0e49318d534f0acbd3df5c9f6bb86eefa2a
* | | | | | | | | | | | Merge "sample api testing for os-floating-ips extension"Jenkins2012-09-1823-0/+195
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | sample api testing for os-floating-ips extensionSean Dague2012-09-1823-0/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | API testing for negative error codes now removed so this is only sample api testing Change-Id: I144a6b69498b86be56ceecb680c5be2a51acdbb8
* | | | | | | | | | | | Merge "Makes scheduler hints and disk config xml correct"Jenkins2012-09-1817-57/+121
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Makes scheduler hints and disk config xml correctVishvananda Ishaya2012-09-1817-57/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The scheduler hints and disk config extensions were not using proper prefixes when deserializing xml. This patch modifes them to deserialize properly. It leaves the old deserialization in place as well so anyone using the broken implementation will continue to work. It also updates the api samples to use the new format. Note that the proper fix required changing the alias for the scheduler hints extension, since the alias is used for xml, so the samples had to be moved. Finally it fixes an issue with deserialization, allowing it to support multiple hints with the same name. Part of bug 1050997 Change-Id: I9969582d65d44de25388f07b6d2013fb7d093fb2
* | | | | | | | | | | | | Merge "Add user-data extension to API samples tests"Jenkins2012-09-189-0/+153
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Add user-data extension to API samples testsSean Dague2012-09-189-0/+153
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia7da11820e0008c6a46715fb4016da4474c3ddcc