summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | set timeout for paramiko ssh connectionPhong Ly2013-04-062-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | set powervm connection timeout to 60 seconds to eliminate crashing if ssh server is slow in responding. Change-Id: Ic7f4d092de73e73c6edb909713bf3a2347a50334
* | | | | | | | | | Merge "baremetal: Integrate provisioning and non-provisioning interfaces"Jenkins2013-04-106-12/+131
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | baremetal: Integrate provisioning and non-provisioning interfacesArata Notsu2013-04-046-12/+131
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Originally, baremetal pxe/tilera driver managed two types of network interfaces in two tables; provisioning interfaces in bm_nodes table and non-provisioning (normal) interfaces in bm_interfaces table. But, now actually both types are handled in the same way and there is no difference between them except for which table they are in. This patch moves the provisioning interfaces to bm_interfaces. However it does not drop prov_mac_address in bm_nodes since VirtualPowerManager still uses it to identify a target in a list of VMs returned by the VM's host. Change-Id: I5ce940e7127aa3b29ba7802612938dc5dbc3152f
* | | | | | | | | | | Merge "Fix error message in pre_live_migration."Jenkins2013-04-101-8/+10
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix error message in pre_live_migration.Michael Still2013-04-081-8/+10
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We are using locals() to reference a variable which doesn't exist in this error message. Also rename the instance variable while I am here to be more consistent with other uses. Resolves bug 1164072. Change-Id: I96f5e2a81ac2e97181c3e87df83e19b381f4bcd2
* | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-04-1022-82596/+146946
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-1022-82596/+146946
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I91007468d2da94bb669931ad09dce4c2f5d3efad
* | | | | | | | | | | Merge "Fix typo: libvir => libvirt"Jenkins2013-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix typo: libvir => libvirtJoe Gordon2013-04-101-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix in fakelibvirt test Change-Id: I7969df6e04808f5c14386d197b73c6d9a1c7dd44
* | | | | | | | | | | Merge "Cleanup trailing whitespace in api samples."Jenkins2013-04-108-26/+26
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Cleanup trailing whitespace in api samples.Michael Still2013-04-108-26/+26
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | No functional changes. Change-Id: I7511ba490bc0c86e80eda10a8246884338f57fdd
* | | | | | | | | | | Merge "Remove unnecessary LOG initialisation"Jenkins2013-04-1081-212/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove unnecessary LOG initialisationStanislaw Pitucha2013-04-1081-212/+0
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove a lot of getLogger lines and imports of logging in modules which never use that functionality. Change-Id: Icdaee2c540980412b000d02ebf1ec568dcf5b38a
* | | | | | | | | | | Merge "Clarify volume related exception message"Jenkins2013-04-101-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clarify volume related exception messageJoe Gordon2013-04-101-1/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before the message was "status must be available," which could either mean nova couldn't fetch the status or the status was not set to 'available'. As this message means the latter, make it more explicit by putting available in quotes. Change-Id: I1b167073463c781569919926fa9b8960f4fecf59
* | | | | | | | | | | Remove unnecessary parens.Russell Bryant2013-04-103-5/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is just some random code cleanup. It removes some unnecessary parens in some conditional statements to be more consistent with the style used elsewhere in the code. Change-Id: I49951c0ffe2b50e0dee50552eb1ddbf7ff871ecf
* | | | | | | | | | | Simplify random host choice.Russell Bryant2013-04-102-15/+14
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The random Python module provides a handy funcion for choosing a random element from a sequence. Use that instead of a more manual method of accomplishing the same thing. Change-Id: I1908bd5e79b6c21d0dcf7e540143e9b8de478d24
* | | | | | | | | | Add tenant/ user id to volume usage notificationsOllie Leahy2013-04-0910-20/+267
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Volume usage notifications are generated to enable traffic based billing on volumes. Include tenant id and user id to make these notifications more useful to billing systems. Fixes bug # 1158292 Change-Id: Ic71c10f0fc5d9e8c5a0e2f538de072e7ccca20ee
* | | | | | | | | | Merge "Catch NoValidHost exception during live-migration"Jenkins2013-04-092-1/+34
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / |/| | | | | | | | |
| * | | | | | | | | Catch NoValidHost exception during live-migrationHans Lindgren2013-04-092-1/+34
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid leaving the instance state as MIGRATING if scheduling of a target host fails, add this exception to the list of exceptions for which the instance task state is reset to None. Resolves bug 1166771. Change-Id: I23343091725051624c0eb0b82e9f03a7f9d5f4f4
* | | | | | | | | Merge "Import eventlet in __init__.py"Jenkins2013-04-092-0/+37
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Import eventlet in __init__.pyMichael Still2013-04-092-0/+37
| | |_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | All of this is because if dnspython is present in your environment then eventlet monkeypatches socket.getaddrinfo() with an implementation which doesn't work for IPv6. To turn this off you need to set an environment variable before you do the import. Resolves bug 1164822. Change-Id: I2382db7b3ac4a2d940e0c45dfe3d48f499de2f16
* | | | | | | | | Merge "Evacuated instance disk not deleted"Jenkins2013-04-095-4/+211
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Evacuated instance disk not deletedKravchenko Pavel2013-04-095-4/+211
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds disk cleanup in case instance is not on shared storage. Added new methods to compute.rpc and virt.driver interface to validate that instance files located on shared storage on remote compute node. Fixes bug 1156269 Change-Id: Ia4cc601d0d824ba04f595df96461cfa85ad3b90c
* | | | | | | | | Merge "Fix a bad tearDown method in test_quantumv2.py."Jenkins2013-04-091-6/+3
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix a bad tearDown method in test_quantumv2.py.Robert Collins2013-04-091-6/+3
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cleanup code runs in LIFO order, so this was calling the mox methods in the wrong order. Secondly the whole point of addCleanup is to register code to run as soon as it is known that it should run, vs tearDown which only runs if setUp succeeds, and doesn't know what other code completed. Change-Id: Iff3b91e9d43cc58b667b32cacc4b97b6e0e1f298
* | | | | | | | | Merge "Security groups may be unavailable"Jenkins2013-04-091-4/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Security groups may be unavailableStanislaw Pitucha2013-04-091-4/+2
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently all missing security group situations are reported as errors and exceptions. This is not the case - any user requesting a wrong id or name can cause it and it's not an issue in Nova. A busy system can generate a large number of those messages causing unnecessarily high error count. This change stops reporting this situation as exception in the logs. Change-Id: Ide856cbbde2db025b0e2def79652cc6c9b00566b
* | | | | | | | | Merge "libvirt: Get driver type from base image type."Jenkins2013-04-094-18/+51
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | libvirt: Get driver type from base image type.Vishvananda Ishaya2013-04-024-18/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we are using the raw backend (no cow), we should set the driver type based on the type of the source image instead of always using raw. Calls to to_xml were moved after _create_image so that the image type could be determined when creating the xml for libvirt. Fixes bug 1163009 Change-Id: Ic8d5f0ab83d868a42f834d39c0afb64818d7e027
* | | | | | | | | Merge "Add reset function to nova coverage."Jenkins2013-04-094-1/+55
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add reset function to nova coverage.Mitsuhiko Yamazaki2013-04-084-1/+55
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now nova coverage is standardized to accumulate coverage data. It enables user to get combined coverage data of several tests. In addition to it, we need to restart nova services when measuring coverage of each test because there is no function to reset data. This adds reset coverage data API. Fixes bug: 1164331 Change-Id: Idd16cf3849b6510e7c620ed3bf16d507ed44c328
* | | | | | | | | Merge "Add an extension to show the network id of a virtual interface"Jenkins2013-04-0924-4/+430
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Add an extension to show the network id of a virtual interfaceZhi Yan Liu2013-04-0824-4/+430
| | |_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extension adds the OS-EXT-VIF-NET:net_id param so that users can determine vif plunged into which network now. DocImpact Change-Id: I56bef5c45f7f545aa5e9b13760dff1c802da0f8f Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | | | | | | | Merge "nova-consoleauth start failed by consoleauth_manager option missing "Jenkins2013-04-081-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | nova-consoleauth start failed by consoleauth_manager option missing Zhi Yan Liu2013-04-071-0/+1
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Miss onsoleauth_manager option importing caused nova-consoleauth service start failure: "NoSuchOptError: no such option: consoleauth_manager". Fixes bug: 1164845 Change-Id: I59a15a423f49ee6c28401f905b4973c2231faaa6 Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | | | | | | Merge "Add missing tests for instance_type_extra_specs_* methods"Jenkins2013-04-081-0/+45
|\ \ \ \ \ \ \
| * | | | | | | Add missing tests for instance_type_extra_specs_* methodsBoris Pavlovic2013-04-051-0/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There was no tests in test_db_api for instance_type_extra_specs_* methods. Add tests to ensure that all works. blueprint db-api-tests Change-Id: Ie88aa776574c5ddf37a1adcf7cc2c9e70c6eb810
* | | | | | | | Merge "Remove race condition (in InstanceTypeProjects)"Jenkins2013-04-083-10/+86
|\| | | | | | |
| * | | | | | | Remove race condition (in InstanceTypeProjects)Boris Pavlovic2013-04-053-10/+86
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Soft delete all duplicate rows with the same (project_id, instance_type_id) except one with the biggest value in `id` column. Create UC on columns (project_id, instance_type_id, deleted) Add tests for migration Fix instance_type_access_add method Replace Select then Insert -> Try to Insert. blueprint db-enforce-unique-keys Change-Id: Id70509337e78f3bf778501f2c77aa03263580ef0
* | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-081-298/+632
| |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | Change-Id: Ie8f1609f82471ffc0da4594c590aaf763189edf8
* | | | | | | Merge "Cannot boot vm if quantum plugin does not support L3 api"Jenkins2013-04-072-1/+21
|\ \ \ \ \ \ \
| * | | | | | | Cannot boot vm if quantum plugin does not support L3 apiAaron Rosen2013-04-042-1/+21
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1163670 Change-Id: I87f0b73e5040b5f9cf7d8c30aa16a2a33faca14f
* | | | | | | Merge "Correct network uuid field for os-network extension "Jenkins2013-04-071-2/+3
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | |
| * | | | | | Correct network uuid field for os-network extension Zhi Yan Liu2013-04-051-2/+3
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | "nova net-list" does not return network uuid even when the uuid is available, and instead returns only the id. This is because the "network_dict" function in the extension improperly uses "in" to check for a Network model object. This also reduces compatibility in the API. Fixes bug: 1162409 Change-Id: I30d4c8bfa37d89123f35ee8cc7c67f0e819262a7 Signed-off-by: Zhi Yan Liu <zhiyanl@cn.ibm.com>
* | | | | | Allow describe_instances to use tags for searchesStephen Gran2013-04-052-0/+263
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the EC2 API, the DescribeInstances API call allows for a 'filter' argument to be passed, consisting of key/value filter pairs. If the filter contains tag:<something> or tag-<something>, the search is done on resource tags. See http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html for details of the API and http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html for usage. Change-Id: If2622c4dacbdd3a53fd6d49242225692da8b741a Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>
* | | | | | Merge "Only call getLogger after configuring logging."Jenkins2013-04-055-5/+8
|\ \ \ \ \ \
| * | | | | | Only call getLogger after configuring logging.Davanum Srinivas2013-04-055-5/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Logging needs to be setup properly before we try to log something. Fix a test case that loads the code but does not execute the code that results in the LOG being setup properly. Fixes LP# 1161031 Change-Id: I9d5bc6b87cfb25243f00e17b532d4485dc4454e4
* / / / / / Add SecurityGroups API sample testsGiampaolo Lauria2013-04-0413-10/+78
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add sample tests for adding and removing security groups Fixes bug 1157222 Change-Id: Ib8450fcd6334b720a2199d52e07ae00f78aa6df0
* | | | | Merge "Resolve conflicting mac address in resize"Jenkins2013-04-043-1/+108
|\ \ \ \ \