summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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 "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
|\
| * Resolve conflicting mac address in resizeLance Bragstad2013-04-033-1/+108
| | | | | | | | | | | | | | | | | | | | This patch fixes bug 1161226 and mac address conflicts when migrating or resizing an instance using the PowerVM driver. This will ensure that if a migration or resize is taking place on the same host, a temporary mac address will be assigned to the original LPAR so there is no conflict on the VIOS when a second LPAR is started with the same address. Change-Id: I59db484defb789f3a7c0eddbd5ef9e92efc22419
* | Merge "Fix SecurityGroups XML sample tests"Jenkins2013-04-041-1/+1
|\ \
| * | Fix SecurityGroups XML sample testsGiampaolo Lauria2013-04-031-1/+1
| | | | | | | | | | | | | | | | | | Fixes bug 1157521 Change-Id: I38ad52e0720feea37e8dbda8ad9c29162842c8f1
* | | Merge "Modify _verify_response to validate response codes."Jenkins2013-04-041-350/+236
|\| |
| * | Modify _verify_response to validate response codes.Giampaolo Lauria2013-04-031-350/+236
| |/ | | | | | | | | | | | | | | The method will now take a response code as an additional parameter and will validate it against the actual one. Fixes bug 1156684 Change-Id: Idba3f54ed50b359d9230707fb45e7c5ea68e6b7d
* | Merge "Add CRUD methods for tags to the EC2 API."Jenkins2013-04-048-0/+503
|\ \
| * | Add CRUD methods for tags to the EC2 API.Stephen Gran2013-03-288-0/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is an incomplete implementation of the EC2 tags API. In EC2, most resources are able to be tagged. See http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/Using_Tags.html In openstack, the only currently 'taggable' resource is an instance, as it has an instance_metadata table associated. So far, only instance tagging has been implemented, but it is relatively simple to extend this to other resource types by creating the associated model and api calls. Additionally, in EC2 searches, shell-style globs are allowed, eg: fo* will match fo, foo, foobar fo? will match foo This has been left to do at a later date. DocImpact: Adds new API calls: CreateTags, DeleteTags, DescribeTags See: http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-CreateTags.html http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DeleteTags.html http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeTags.html Fixes: bug #1096821 Implements: blueprint ec2-tags-api Change-Id: Idf1108f6a3476cabdbdb32ff41c00aa4bc2d9ffe Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>
* | | Merge "Move console scripts to entrypoints."Jenkins2013-04-0455-3205/+3427
|\ \ \
| * | | Move console scripts to entrypoints.Monty Taylor2013-04-0455-3205/+3427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As part of the move of plugins to entrypoints, take advantage of the entrypoints based console scripts, which will make our command line scripts available for unittesting. Part of blueprint entrypoints-plugins Co-authored-by: Michael Still <mikal@stillhq.com> Change-Id: I5f17348b7b3cc896c92263dd518abb128757d81f
* | | | Merge "Optimize resource tracker queries for instances"Jenkins2013-04-042-9/+26
|\ \ \ \
| * | | | Optimize resource tracker queries for instancesBrian Elliott2013-04-042-9/+26
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instance_get_all_by_host_and_node() had 4 different joins being done. The resource tracker is the only consumer of this method and does not need the joins. This optimization will save many unnecessary rows from being fetched during the update_available_resource() audit task. Change-Id: I414c219e4563634e270007fe3d0fa980b273e795
* | | | Merge "Remove deprecated Grizzly code."Jenkins2013-04-0416-953/+14
|\ \ \ \
| * | | | Remove deprecated Grizzly code.Joe Gordon2013-04-0416-953/+14
| |/ / / | | | | | | | | | | | | | | | | | | | | Now that Havana development has started remove code deprecated in Grizzly. Change-Id: Ie3e7611347c334c359dea98d759345b97c66c9c1
* | | | Merge "Fallback to conductor if types are not stashed."Jenkins2013-04-042-14/+53
|\ \ \ \
| * | | | Fallback to conductor if types are not stashed.Brian Elliott2013-04-042-14/+53
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the instance types are not stashed, fallback to the conductor API to retrieve them. bug 1164110 Change-Id: I1f0ef48e072f8580980de5bd8d43cf2206cd7d27
* | | | Merge "Fix legacy_net_info guard"Jenkins2013-04-042-10/+28
|\ \ \ \
| * | | | Fix legacy_net_info guardRick Harris2013-04-032-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The existing code assumes that `legacy_net_info` is always in legacy mode, meaning a list of tuples which causes it to break when passed a new-style NetworkInfo object. Fixes bug 1164152 Change-Id: I2131d9b24045cd7531454b65d97776b11ec3ab02
* | | | | Merge "After migrate, catch and remove deleted instances"Jenkins2013-04-042-5/+67
|\ \ \ \ \
| * | | | | After migrate, catch and remove deleted instancesStanislaw Pitucha2013-04-032-5/+67
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On the host init, starting with a deleted instance which has been previously evacuated from the host results in an InstanceNotFound exception. Catch and log this, and then call driver.destroy() so that the hypervisor driver can clean up the deleted instance. If we don't do this during host init, it will cause problems during periodic tasks. Fixes bug 1155152 Co-authored-by: Devananda van der Veen <devananda.vdv@gmail.com> Change-Id: I979a698b8e739b9335f37b81e789285f91977a8e
* | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-04-041-413/+435
|\ \ \ \ \ \
| * | | | | | Imported Translations from TransifexOpenStack Jenkins2013-04-041-413/+435
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | Change-Id: I2abbf4025e7467a090efba9d1f7820a1fcac29d1
* | | | | | Merge "Guard against content being None"Jenkins2013-04-041-2/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Guard against content being NoneRick Harris2013-04-021-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | `content` can be passed in as None, so we need to set it to the empty list if that occurs. This also fixes the bad-practice of using a mutable data-type as a default argument. Fixes bug 1163598 Change-Id: Ie991c9452a21cfb036d3955a094ec345805d63d1
* | | | | | Simplify and correct the bm partition sizes.Robert Collins2013-04-041-17/+7
| |_|_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The sfdisk code that landed uses -D, which ends up subtracting space from the first partition - this plays havoc with precisely sized disk images due to a bug in the automatic adjustment code. Instead we directly specify the spare space to be allowed. Additionally, sfdisk can be used much more simply, avoiding any room for us to make arithmetic errors, and reducing the opportunity for race conditions with udev so this change does that. Change-Id: I7f95e867d8775f49698cbbf4b1be40e69db9d538
* | | | | Merge "Fix a typo in attach_interface error path"Jenkins2013-04-031-2/+2
|\ \ \ \ \
| * | | | | Fix a typo in attach_interface error pathDan Smith2013-04-031-2/+2
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | This prevents an attach failure from raising the proper exception to the caller. Change-Id: I51559cf395fc99738127b7a443437197d15f3d4c
* | | | | Merge "Grab instance for migration before updating usage"Jenkins2013-04-031-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Grab instance for migration before updating usageAndrew Laski2013-04-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates _update_usage_from_migrations so that it grabs the instance associated with a migration before updating usage. Bug 1163622 Change-Id: I64acef912ae71ea5c7fb66e9fcaafe5750c63eaf
* | | | | Merge "Explain why the give methods are whitelisted."Jenkins2013-04-031-2/+10
|\ \ \ \ \
| * | | | | Explain why the give methods are whitelisted.Joshua Harlow2013-04-021-2/+10
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order to aid mine (and likely others) understanding of this code it seems to make sense to document what these special whitelisted attributes are. Change-Id: I1c11484fc74e898df5d25ab94ed0cdb288accd67
* | | | | Merge "Update latest oslo.setup."Jenkins2013-04-031-2/+2
|\ \ \ \ \
| * | | | | Update latest oslo.setup.Monty Taylor2013-04-021-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If3d397a1a33e14912abb1f7c94790640fe255d3a
* | | | | | Merge "Limit the checks for block device becoming available."Jenkins2013-04-033-8/+66
|\ \ \ \ \ \
| * | | | | | Limit the checks for block device becoming available.Joshua Harlow2013-04-023-8/+66
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of previously looping potentially forever for a block device mapping to become created from the volume api, basically blocking a greenthread until this happens we now will have a number of attempts (defaulting to 10) that we will wait for the volume api to create said block device mapping (or error out). Fixes bug 1162064 Change-Id: I6ff0b42aad48df735d09f91a0a9fe98e6abcf2eb
* | | | | | Merge "Fix _error_out_instance exception handler"Jenkins2013-04-031-1/+1
|\ \ \ \ \ \ | |_|_|/ / / |/| | | / / | | |_|/ / | |/| | |