summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "xenapi: Added logging for sparse copy"Jenkins2013-06-052-2/+38
|\
| * xenapi: Added logging for sparse copyAarti Kriplani2013-06-052-2/+38
| | | | | | | | | | | | | | | | | | After 300 seconds(default), logs how many bytes have been written already, and how many are left, so as to be able to track progress of the long running task. Implements blueprint log-progress-of-sparse-copy Change-Id: I289ab978ec4b31f1015c783111c01a460de33f09
* | Merge "Improve Python 3.x compatibility"Jenkins2013-06-0525-36/+79
|\ \ | |/ |/|
| * Improve Python 3.x compatibilityDirk Mueller2013-06-0125-36/+79
| | | | | | | | | | | | | | | | | | Mechanical translation of the deprecated except x,y: construct with except x as y: The latter works with any Python >= 2.6. Add Hacking check. Change-Id: I845829d97d379c1cd9b3a77e7e5786586f263b64
* | Merge "Don't log warn if v3 API is disabled."Jenkins2013-06-051-1/+1
|\ \
| * | Don't log warn if v3 API is disabled.Dan Prince2013-06-031-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | This makes sense because the V3 API is disabled by default. Fixes LP Bug #1187217. Change-Id: I1f182fa480bfef19dbe6d4b575200100fe2ee515
* | | Merge "Make object actions pass positional arguments"Jenkins2013-06-054-22/+33
|\ \ \
| * | | Make object actions pass positional argumentsDan Smith2013-06-044-22/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changes the Object API to also pass positional arguments to remotable methods. Previously, we required only keyword arguments to these methods in order to mirror our current RPC behavior. This is not really necessary and could be confusing. Since there are no actual users of these APIs in the tree right now, we can make this change without needing to bump any versions. Related to blueprint unified-object-model Change-Id: Ifb12843d16500d383d4e9c607121d5584400f247
* | | | Merge "_s3_create handles image being deleted"Jenkins2013-06-051-64/+69
|\ \ \ \
| * | | | _s3_create handles image being deletedChris Yeoh2013-05-301-64/+69
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change so _s3_create handles the image it is creating being deleted while it is creating it without logging a stacktrace and instead just logging a simple message explaining what happened. Fixes bug 1084703 Change-Id: I9d984dd1cf4f393010493cacd048d20ad5225db8
* | | | | Merge "Launch_at and terminated_at on server(s) response"Jenkins2013-06-0534-38/+744
|\ \ \ \ \
| * | | | | Launch_at and terminated_at on server(s) responseAndrew Melton2013-05-3134-38/+744
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements bp usage-details-on-instance Change-Id: I0a9101c43a51d597a1eaff9d5a5d08d602024e72
* | | | | | Merge "Fix bug where consoleauth depended on remote conductor service"Jenkins2013-06-051-2/+2
|\ \ \ \ \ \
| * | | | | | Fix bug where consoleauth depended on remote conductor serviceSam Morrison2013-05-311-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1186123 Conductor API was being imported directly so ignoring use_local FLAG Change-Id: I055a5301d4c18d201d67f114047f503114751603
* | | | | | | Merge "Make instance object tolerate isotime strings"Jenkins2013-06-054-6/+22
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Make instance object tolerate isotime stringsDan Smith2013-06-034-6/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Any time we get a db object over RPC, the datetime has been serialized to an isotime string. We have other legacy code that needs to tolerate this, and those hacks would need to be replicated in the objects transition. Instead, make the instance object type function tolerate isotime-formatted strings so that we can more easily convert RPC-transited database objects until we're fully converted, at which time we could remove the tolerance. Luckily, the objects still end up with a datetime internally, which means the rest of the code can stop needing to handle strings and datetimes gracefully. Related to blueprint unified-object-model Change-Id: I132559d3541d19353de6acc36a2740185e564105
* | | | | | | Merge "Add fake_instance.py"Jenkins2013-06-051-0/+40
|\| | | | | |
| * | | | | | Add fake_instance.pyDan Smith2013-06-031-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are lots of places in the tests where we create a piece of an instance-like dict and return that from a stubbed database function. This "works" right now, but won't in the future of stricter objects. This adds a fake_instance.py (to mirror the other ones already there) which builds an instance database primitive that includes sane values for every field it should have. This will make testing much easier going forward with instance objects. Related to blueprint unified-object-model Change-Id: I13d97cc101c1964aa91ce48093507bbc88803cbb
* | | | | | | Merge "Enhance multipath parsing"Jenkins2013-06-052-11/+72
|\ \ \ \ \ \ \
| * | | | | | | Enhance multipath parsingPatrick Schaefer2013-05-292-11/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The output of the multipath command is not always parseable from the current implementation. This causes attach to fail. Fixes Bug: #1184861 Change-Id: I1afa96a695b1008672226e7e76eb8e0feca52578
* | | | | | | | Merge "IPMI driver sets bootdev option persistently."Jenkins2013-06-041-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | IPMI driver sets bootdev option persistently.Devananda van der Veen2013-05-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch changes baremetal ipmi driver's behavior with regards to setting the chassis boot device. Previous behavior: set bootdev = pxe for next boot only. New behavior: set bootdev = pxe persistently. Fixes bug 1178092 Change-Id: I735965422a950fbd249414b5eecd0a1b21dbabea
* | | | | | | | | Merge "Call scheduler for run_instance from conductor"Jenkins2013-06-0420-205/+708
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Call scheduler for run_instance from conductorAndrew Laski2013-06-0420-205/+708
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This prepares for having the conductor query the scheduler for a list of hosts to build an instance on. In order to accomplish this the API sends a build_instances message to conductor, or spawns a greenthread in local mode, rather than sending a message to the scheduler. This is being done so that conductor can handle the orchestration of long running tasks like spawning instances. By making this move, the API is free to return to the caller while conductor queries the scheduler for a host to provision to. In the case of cells the build_instances message first goes to the cells scheduler in order to pick a cell to send it to, and then it is sent to the conductor in that cell. Part of bp query-scheduler Change-Id: I4539888e78ebdbb8cef6647273b959a012280110
* | | | | | | | | | Merge "Fix postgresql failures related to Data type"Jenkins2013-06-045-40/+136
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix postgresql failures related to Data typeMauro S. M. Rodrigues2013-06-035-40/+136
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Postgresql is kind of sensitive about different kind of data in a query, so it was failing in cases like lookin for an ip using a filter which wasn't a valid ip or ids values greater than the id type on the table. This patch fix this behavior to fixed ips and floating ips. Fixes bug 1182754 Change-Id: I83d532c28c9aec690e8e1ffad8b58e71d619d728
* | | | | | | | | Merge "Remove unused launch_time from instance"Jenkins2013-06-049-15/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Remove unused launch_time from instanceChris Behrens2013-05-319-15/+1
| | |_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'launch_time' is passed around as part of instance properties when an instance is being built, however it is not a column in the DB nor is it even used anywhere. It was also unnecessarily copied around in various tests. This patch removes all references to it. Change-Id: I2300cd6b8539d15bbcd35ab4c00ab99d4be13eb5
* | | | | | | | | Merge "Ports consoles API to v3 API"Jenkins2013-06-043-0/+440
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Ports consoles API to v3 APIChris Yeoh2013-06-013-0/+440
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ports the core consoles API functionality to the V3 API as a plugin along with the corresponding tests Partially implements blueprint v3-api-core-as-extensions Change-Id: Iada86afbfeed055942fef554d12cd36385aa2e1f
* | | | | | | | | | Merge "Link to explanation of --checksum-full rule."Jenkins2013-06-041-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Link to explanation of --checksum-full rule.Russell Bryant2013-06-031-0/+2
| | |_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Mark McLouglin made a _great_ post to a bug explaining why this rule is needed. Save off a link to it in the code. Change-Id: I478b2f8de59f26d56385525a195108045507969c
* | | | | | | | | | Merge "Avoiding multiple code loops in filter scheduler"Jenkins2013-06-041-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Avoiding multiple code loops in filter schedulerYang Yu2013-06-041-0/+2
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code snippet can not provide the original target. In the filters module, there is one line code will never be invoked because of the code logic, so I modified it. Fixes: bug 1186945 Change-Id: I3f2a662c28ab466b178268cae3502c40a1d22657
* | | | | | | | | | Merge "Stop libvirt errors from outputting to strerr"Jenkins2013-06-042-0/+10
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Stop libvirt errors from outputting to strerrHans Lindgren2013-06-032-0/+10
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When a libvirt error happens, the default is to output to stderr. This behavior can be omitted by registering a new error that simply passes without doing anything. Resolves bug 1182184. Change-Id: If946f9d05388c93c0630d454e5ca3b6625bb14f9
* | | | | | | | | Merge "python3: Add py33 to tox.ini"Jenkins2013-06-031-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | python3: Add py33 to tox.iniChuck Short2013-06-011-1/+1
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce py33 to tox.ini to make testing with python3 easier. Change-Id: I3f966efc1a845aaa8e317d810bd6a1366acd323c Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | Merge "Adds ability to black/whitelist v3 API extensions"Jenkins2013-06-034-14/+139
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Adds ability to black/whitelist v3 API extensionsChris Yeoh2013-06-034-14/+139
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds a config option which will blacklist specific v3 API extensions from being loaded even if they are detected. Adds a config option which if the list is not empty will stop any v3 API extension from being loaded unless it is in the whitelist. No filtering occurs if the whitelist is empty Creates a config option group osapi_v3 to hold the two new options and osapi_v3_enabled renamed to just enabled within the new group Partially implements blueprint v3-api-extension-framework Change-Id: Iec7fdb073b933791b0110dae485538c9080f2670
* | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-0338-649/+538
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-0338-649/+538
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I62a4e2c0ab6b0c313fbf0e2acc098223b9bbc3fa
* | | | | | | | | | Merge "Add Davanum to the mailmap."Jenkins2013-06-031-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add Davanum to the mailmap.Davanum Srinivas2013-06-031-0/+1
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Noticed a duplicate entry in the AUTHORS file, added to .mailmap. Change-Id: Iec730880e4db0bb5a2919ebca0dd2e96628bcfe5
* | | | | | | | | Merge "Moved sample network creation out of unittest base class constructor."Jenkins2013-06-036-3/+13
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Moved sample network creation out of unittest base class constructor.Sergey Skripnick2013-05-246-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This sample networks only needed in: nova.tests.api.ec2.test_cloud nova.tests.integrated.test_api_samples nova.tests.network.test_manager nova.tests.test_libvirt nova.tests.test_xenapi Moreover, base class constructor is not good place for sample data creation. Database should be empty before runing tests. Fixes: bug 1181502 Change-Id: I8dcaa5b36a1da0c0928c9445c556d788d463844e
* | | | | | | | | Merge "In utils.tempdir, pass CONF.tempdir as an argument."Jenkins2013-06-031-2/+4
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | In utils.tempdir, pass CONF.tempdir as an argument.David Ripton2013-05-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's ugly, and potentially racy, to mess around with other modules' global variables. Instead, pass CONF.tempdir into tempfile.mkdtemp as the 'dir' keyword argument. Because we already pass **kwargs to mkdtemp, inspect **kwargs and only set 'dir' if it's not already there. Change-Id: I8a2b34cd051919db29facabc1664cf357073b1d7
* | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-0338-13344/+15099
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-0238-13344/+15099
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I0f6918b35da30acadce3d05d36d7dc4084be6aca