summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge "Sync small and safe changes from oslo"Jenkins2013-05-0114-25/+22
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Sync small and safe changes from osloMatthew Sherborne2013-05-0114-25/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ran the oslo-incubator sync script and brought across only the files that have small and safe changes. Change-Id: I41b400c189e52a2e7f642a03ad143d821aaa807c
* | | | | | | | | | | | | Merge "Sync jsonutils from oslo"Jenkins2013-05-011-16/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Sync jsonutils from osloStanislaw Pitucha2013-05-011-16/+42
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a sync of commit 9dcf688ea80f52cdb5413514198b2aa81d5a4e09 from the oslo-incubator project. It should improve the serialisation performance in general and tests runtime specifically. Change-Id: I6b0e7baeb24951ce3c0bc129d20c65daa0d8fa61
* | | | | | | | | | | | Merge "Update to using oslo periodic tasks implementation."Jenkins2013-05-017-364/+30
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Update to using oslo periodic tasks implementation.Michael Still2013-05-017-364/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Convert nova to using the oslo periodic tasks implementation. There are no functional changes in this review. Change-Id: I767e0ad17781d5f9d5e987e0a4ad65796243ae5c
* | | | | | | | | | | | | Merge "Fix baremetal get_available_nodes"Jenkins2013-05-012-30/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Fix baremetal get_available_nodesDevananda van der Veen2013-04-302-30/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Baremetal driver get_available_nodes was incorrectly returning only a list of unprovisioned nodes, leading update_availabile_resources to sometimes delete a baremetal node that had an instance provisioned to it -- sometimes even while the provisioning was still in process. Fix bug 1174952 Change-Id: I4f08a2f6539a5b6cd12245ac6b4dc308767ae0cd
* | | | | | | | | | | | | Merge "Convert the cache key from unicode to a string."Jenkins2013-05-011-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Convert the cache key from unicode to a string.Dan Florea2013-04-301-0/+1
| | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The memcached API expects string format, not unicode. Convert the key passed to the memory cache to a string before sending it to memcached. Since both the function name and the id that form the key are ascii format, a simple conversion from unicode to str is sufficient. Change-Id: I9d15858ad4e10aa183444cccda9c33676059e55a Fixes: bug #1174487
* | | | | | | | | | | | | Merge "Catch glance image create exceptions"Jenkins2013-05-014-2/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Catch glance image create exceptionsChris Yeoh2013-05-014-2/+23
| | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch exception from glance when image creation fails because the requested name is too long. Currently the exception is not caught in the api which results in an 400 Bad Request correctly being returned, but also leaving a traceback in the logs. Correctly catching the exception and explicitly raising an HTTPBadRequest removes the production of the traceback. Fixes bug #1169560 Change-Id: I511da79cb0b1b4578bf43f0819b2ac64fb6e5fb3
* | | | | | | | | | | | | Merge "Import oslo periodic tasks support."Jenkins2013-05-012-0/+188
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / / | |/| | | / / / / / / / / | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Import oslo periodic tasks support.Michael Still2013-05-012-0/+188
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I'll move nova across to this in the next review, I just want to make the import clearly separate. Change-Id: I4eefd9c73d443afcd0697ff5ddd59abf315b10e5
* | | | | | | | | | | Merge "import and install gettext in vm_vdi_cleaner.py"Jenkins2013-05-011-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | import and install gettext in vm_vdi_cleaner.pyAndrew Laski2013-04-301-0/+2
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | importing some nova modules expects _() to be defined, so lets define it before we start importing them. Change-Id: I7f951a24c19a53434c090cd2c01eded77c703943
* | | | | | | | | | | Merge "Add delete_net_interface function"Jenkins2013-05-011-37/+17
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add delete_net_interface functionEdgar Magana2013-04-291-37/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit adds a new function that deletes a specific tap device. This bug fix is targeted for Havana. Change-Id: I26be5d94550db35358caae642fb9000953346826 fixes: bug #1138408
* | | | | | | | | | | Merge "Fix attach when running as root without sysfsutils"Jenkins2013-04-301-0/+11
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix attach when running as root without sysfsutilsWalter A. Boring IV2013-04-301-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When someone runs nova as root, and sysfsutils is not installed an exception was being thrown when a volume attach call was made. This wouldn't happen when being run as non-root because of the rootwrap would trap for the missing sysfsutils app (systool). Change-Id: Icc852fa7fd7a137cc7df86b8b96aeb629639ffad Fixes: bug 1172486
* | | | | | | | | | | Merge "Add the availability_zone to the volume.usage notifications"Jenkins2013-04-3010-15/+105
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | |
| * | | | | | | | | | Add the availability_zone to the volume.usage notificationsMichael Kerrin2013-04-3010-15/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The volume.usage notifications are used to enable traffic based billing on volumes. The availability_zone of the instance is an important piece of information that can enable more specialized billing of customers. This makes the volume.usage events consistent with the volume.create.start/end snapshot.create.start/end, etc. emitted from cinder, which contain the availability_zone field. Change-Id: I9b6b03174cd03235d0e6cf01e34a6da13bd9bb70
* | | | | | | | | | | Merge "Small whitespace tweak."Jenkins2013-04-301-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Small whitespace tweak.Michael Still2013-04-301-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A small indentation cleanup to the filter scheduler. Change-Id: I0dc747e483c46f7e3988f813d52f689510dd481f
* | | | | | | | | | | | Merge "Kill off usage of locals() in the filter_scheduler."Jenkins2013-04-301-10/+18
|\| | | | | | | | | | | | |_|_|_|_|_|/ / / / / |/| | | | | | | | | |
| * | | | | | | | | | Kill off usage of locals() in the filter_scheduler.Michael Still2013-04-301-10/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We decided we don't like this syntax, so I figured I'd clean up this file while I was playing with it. Change-Id: I861b9bfcb98782a2f0b46ac5bff09664a13d339c
* | | | | | | | | | | Merge "Remove local variable only used in logging."Jenkins2013-04-301-3/+2
|\| | | | | | | | | |
| * | | | | | | | | | Remove local variable only used in logging.Michael Still2013-04-301-3/+2
| | |_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Kill off the locals() call as well. Just directly calculate the value. Change-Id: I6b96d08a16feb125d1eb9162ca186bf37b429cd6
* | | | | | | | | | Merge "Performance optimization for contrib.flavorextraspecs"Jenkins2013-04-305-10/+39
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Performance optimization for contrib.flavorextraspecsBoris Pavlovic2013-04-305-10/+39
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In method FlavorExtraSpecsController.index(): This method calls FlavorExtraSpecsController._get_extra_specs() that returns all extra_specs that has flavor. In db.api layer we are returning already extra_specs as plain object, so there is no reason to make one more time copy of extra_specs. In method FlavorExtraSpecsController.show(): This method should return extra_spec that corresponds to specified key and flavor_id. Was: Get all extra_specs by flavor_id and filter by key locally Now: Filter by flavor_id and key in db. Change-Id: I4c39f5f56511e67e37482cda1b4e9771ee9c7d7d
* | | | | | | | | | Merge "Create instance with deleting image"Jenkins2013-04-302-0/+40
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Create instance with deleting imageMatthew Sherborne2013-04-302-0/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If we attempt to create a new instance with an image that has just now been deleted in glance, (ie. status="DELETED", but deleted=False). The server should throw a 4XX error rather than a 5XX error. This commit just adds tests. Tests bug 1155458 Change-Id: Ifae470e96ddc4526ef67581a1d7171ccc5fd32b7
* | | | | | | | | | Merge "Update NovaBase model per changes on oslo.db.sqlalchemy"Jenkins2013-04-304-37/+70
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Update NovaBase model per changes on oslo.db.sqlalchemyZhongyue Luo2013-04-274-37/+70
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed NovaBase to inherit from models.TimestampMixin Added metadata attribute Added db.sqlalchemy to openstack-common.conf Oslo sync command: python update.py --modules db.sqlalchemy --base nova --dest-dir ../nova Change-Id: Ie4ad8e8b235e146ddb946cdf7f15d74e060ee4a3
* | | | | | | | | | Merge "Refactor work with db.instance_type_* methods"Jenkins2013-04-291-95/+81
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Refactor work with db.instance_type_* methodsBoris Pavlovic2013-04-291-95/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove session parameter from public methods: *) instace_type_get *) instance_type_get_by_name *) instance_type_get_by_flavor_id instance_type_destroy performance optimization: Get instance_type_ref without unnecessary extra specs instance_type_access_get_by_flavor_id performance optimization: was: 1 query get instance_type with joined extra_specs 1 query lazy load instance_type_projects now: 1 query get instance_type id 1 query get all instance_type_projects that correspond to id instance_type_access_add performance optimization: was: 1 query get instance_type with extraspecs 1 query add instance_type_access now: 1 get only instance_type id 1 query add instance_type_access instance_type_access_remove performance optimization: Same as in instance_type_access_add blueprint db-session-cleanup Change-Id: I6d1456289a97c46d7e8c9345474396c08e053970
* | | | | | | | | | | Merge "Destroy conntrack table on source host during migration"Jenkins2013-04-295-0/+30
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Destroy conntrack table on source host during migrationAnte Karamatic2013-04-265-0/+30
| | |_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a VM migrates from hostA to hostB, there will still be connections in the conntrack table of the hostA. If, for any reason, VM is migrated back to the hostA, while those connections are still in conntrack table, persistent connections (such is ssh) to VM, from outside, will get dropped. They get dropped cause hostA was expecting different packets and cause of that requires establishing new connection. By dropping conntrack table entries for VM we make sure that connection flow is not interupted by old packets. Change-Id: If8e146e05914e9febd6fc40a1d8085306c1244ea
* | | | | | | | | | | Merge "Fix VMware Hyper console url parameter error."Jenkins2013-04-292-2/+29
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fix VMware Hyper console url parameter error.Yaguang Tang2013-04-272-2/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug #1172177 Change-Id: Iab858741cba61f218c639d76fa80c047196bcc64
* | | | | | | | | | | Merge "ec2 CreateVolumes/DescribeVolumes status mapping"Jenkins2013-04-292-1/+35
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | ec2 CreateVolumes/DescribeVolumes status mappingChris Yeoh2013-04-222-1/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'attaching' and 'detaching' are not valid ec2 API volume status values. Instead map them both to 'in-use'. Note this will not pass the devstack exercises until https://review.openstack.org/#/c/27244/ goes through Fixes bug #1074901 Change-Id: Id3dfd525d24d622aab5e350e42713fdb7671b31e
* | | | | | | | | | | | Merge "Fix ec2 CreateVolumes/DescribeVolumes status"Jenkins2013-04-292-8/+1
|\| | | | | | | | | | |
| * | | | | | | | | | | Fix ec2 CreateVolumes/DescribeVolumes statusChris Yeoh2013-04-192-8/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In admin context CreateVolumes/DescribeVolumes returns extraneous information such as project_id, host, instance data etc. This results in output which is not compatible with the ec2 API. This change removes the addition of the extra information. This only partially fixes bug #1074901 as mapping the internal volume states to ones specified by the ec2 api results in the devstack euca.sh exercises to fail. But that can't be fixed until the fix in this patch is through as the extraneous information returned by DescribeVolumes causes euca-describe-volumes to not to show the attachment state for a volume which is needed by the euca exercises. Change-Id: I48a96fbfe4bb2e3da9514d688638ecdf3a168303
* | | | | | | | | | | | Merge "Adds tests for isolated_hosts_filter"Jenkins2013-04-292-35/+63
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Adds tests for isolated_hosts_filterMatthew Sherborne2013-04-262-35/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The isolated_hosts_filter takes two configuration options. This patch adds three tests defining the behaviour for when one or more of these variables are missing. This patch speeds things up a bit when the isolated_images option is missing, making it do less dict lookups to come up with the same answer. Matrix of isolated_hosts_filter changes: +----------------------+--------------------+--------------+ | Config options | Before patch | After | +----------------------+--------------------+--------------+ | 0 + 0 | No filtering | Same as B4 | | | no tests | Tested | +----------------------+--------------------+--------------+ | 0 + iso_image | Block iso'd images | Same as B4 | | | no tests | Tested | +----------------------+--------------------+--------------+ | iso_host + 0 | Block iso'd images | Same as b4 | | | no tests | Tested | +----------------------+--------------------+--------------+ | iso_host + iso_image | Block matched h+i | Same as b4 | | | Tested | Tested | +----------------------+--------------------+--------------+ Change-Id: Ibe6725e39a771b31fdf49513335275deba33e96b
* | | | | | | | | | | | Merge "Fix up regression tester"Jenkins2013-04-291-64/+92
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix up regression testerJoe Gordon2013-04-171-64/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Clean up to support pydoc * Support -h * Make it actually work * Improve docstrings * Add copyright Change-Id: I977df71e8213e39e9eebf9cc56b2dd7625959870
* | | | | | | | | | | | | Merge "Fixes race condition of deleting floating ip"Jenkins2013-04-292-5/+31
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixes race condition of deleting floating ipWangpan2013-04-262-5/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1172599 reproduce steps: 1. create an instance 2. get a floating ip from pool 3. associate the ip to instance created at step 1 4. delete the instance and the ip at a very little interval reason may be that: 1. the action of delete ip find the ip is associated to a fixed ip at first(at api level) 2. and then the fixed ip is released when the instance is deleted 3. so nova-network manager findes this issue and raises exception.FloatingIpNotAssociated(address=floating_address) Change-Id: I253d0b240451e8a728532639e9857894f6fc6870