summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | Sync db.models.Quota* with migrations.Svetlana Shturm2013-06-201-8/+15
| | |_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Blueprint: db-sync-models-with-migrations Change-Id: Ic97690b650151eb7086cbd40093c0f3c373133e2
* | | | | | | | | | | | | | | | | | | | | Merge "Log xml in libvirt _create_domain failures"Jenkins2013-06-272-3/+104
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Log xml in libvirt _create_domain failuresMatt Riedemann2013-06-172-3/+104
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an error occurs defining, launching or enabling hairpin mode on a libvirt domain, log the xml for reproduction and analysis. Fixes bug 1183534 Change-Id: Ic8f1d11c5a92779c686b7248895bbc6f2cfdbf0b
* | | | | | | | | | | | | | | | | | | | | Merge "Port flavor_access extension to v3 API Part 2"Jenkins2013-06-275-34/+33
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Port flavor_access extension to v3 API Part 2Alexei Kornienko2013-06-275-34/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Ports the flavor_access extension and the corresponding unittests to the v3 framework. Partially implements blueprint nova-v3-api Change-Id: I671f490bad2daaaae06d48328f4fff10076ab0ed
* | | | | | | | | | | | | | | | | | | | | Sync to_primitive() IPAddress support from OsloDan Smith2013-06-271-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enlightens to_primitive() that it may just call str() to serialize netaddr.IPAddress objects. We need this for NovaObject serialization through legacy interfaces temporarily while we migrate things. Related to blueprint unified-object-model Change-Id: Ibdee90e4bbd337d541344977e2a689982e0a7d34
* | | | | | | | | | | | | | | | | | | | | Merge "xenapi: Make BitTorrent url more flexible"Jenkins2013-06-273-21/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | xenapi: Make BitTorrent url more flexibleBrian Elliott2013-06-263-21/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change xenapi bittorrent plugin to not assume that torrent file is under CONF.xenapi_torrent_base_url + image_id + ".torrent". This allows for sources images from arbitrary torrent URLs. Change-Id: Ica9462a51c6299b5affc861781f3054d18866458
* | | | | | | | | | | | | | | | | | | | | | Merge "xenapi: Improve cross-device linking error message."Jenkins2013-06-271-1/+7
|\| | | | | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | xenapi: Improve cross-device linking error message.Brian Elliott2013-06-261-1/+7
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Catch invalid-cross device linking exceptions raise from os.rename and provide a more intelligible error message. Change-Id: I22b6a145141431b6d4e4cb0176881f0cf0dd609f
* | | | | | | | | | | | | | | | | | | | Merge "Port flavor_access extension to v3 API Part 1"Jenkins2013-06-272-0/+532
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Port flavor_access extension to v3 API Part 1Alexei Kornienko2013-06-272-0/+532
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Partially implements blueprint nova-v3-api Change-Id: I6a2648ac9f59ff122f06a63991b57e595b2c5696
* | | | | | | | | | | | | | | | | | | Merge "Add tests for libvirt's reboot functionality"Jenkins2013-06-271-0/+85
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Add tests for libvirt's reboot functionalityNikola Dipanov2013-06-181-0/+85
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patcha adds the missing tests for libvirt drivers reboot method. Change-Id: I6215f80bd15820dac80151e7063916dbbc21d761
* | | | | | | | | | | | | | | | | | | | Merge "Check the instance ID before creating it"Jenkins2013-06-271-13/+16
|\| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Check the instance ID before creating itAnte Karamatić2013-06-181-13/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At least with libvirt 1.x instance goes into shutdown state before its ID is changed. This means that there's a race condition during reboot where nova might try to create an instance that's already defined. By checking if the ID of the new and old instance is the same, we avoid that situation and reiterate on the loop. The tests for this are added in I6215f80bd15820dac80151e7063916dbbc21d761 Change-Id: I493b828f0c6848fbadc591be2f47fd1b12fd3a51 Fixes: bug 1181924
* | | | | | | | | | | | | | | | | | | | Merge "Add update() method to NovaObject for dict compatibility"Jenkins2013-06-271-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add update() method to NovaObject for dict compatibilityDan Smith2013-06-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In order for objects to behave like dicts, they need to support the update() method. This patch adds that. Related to blueprint unified-object-model Change-Id: Icb3932682285cbf8e7362e5b748e42a754b17fe7
* | | | | | | | | | | | | | | | | | | | | Merge "Add obj_to_primitive() to recursively primitiveize objects"Jenkins2013-06-272-0/+42
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Add obj_to_primitive() to recursively primitiveize objectsDan Smith2013-06-262-0/+42
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally we need to recursively process a NovaObject into a representative dict or list. This patch adds a function to do that recursively, accounting for nested objects and lists of objects. Related to blueprint unified-object-model Change-Id: I6adb84f9e5a0564ec4af14200e26e838b4a5bb6e
* | | | | | | | | | | | | | | | | | | | Merge "Stop creating folders in virt unit tests"Jenkins2013-06-272-17/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Stop creating folders in virt unit testsJoe Gordon2013-06-252-17/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Before nova.tests.virt.libvirt tests created 4 empty UUID named folders in the top level nova directory. Tests should not leave artifacts like these around. Fix bug 1194676 Change-Id: I941b23ecb94db2f4a0cc60eeb06766f960775ba1
* | | | | | | | | | | | | | | | | | | | Merge "Accept is_public=None when listing all flavors"Jenkins2013-06-263-1/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Accept is_public=None when listing all flavorsXavier Queralt2013-06-173-1/+13
| | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nova-client uses a None (with capital N) when listing all the flavors. Right now this is interpreted as a wrong query by n-api preventing us from listing the private flavors using the nova-client. Fixes bug #1190239 Change-Id: I2a9b1c24cd744c8819c1d41e0ad103d05398401c
* | | | | | | | | | | | | | | | | | | | Merge "Adds support for the Indigo Virtual Switch (IVS)"Jenkins2013-06-265-6/+223
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Adds support for the Indigo Virtual Switch (IVS)Kevin Benton2013-06-095-6/+223
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements: blueprint ivs-vif-driver Adds line to rootwrap config to allow call to ivs-ctl to control the Indigo switch. Adds a new 'ivs' VIF type in network/model.py. Adds support to the LibvirtGenericVIFDriver class for the IVS switch. Adds functions to linux_net.py to create and delete IVS vif ports. Adds unit tests to test the new IVS methods. Change-Id: I65436b82f65374103644af8aba9dba14ba73f94c
* | | | | | | | | | | | | | | | | | | | | Merge "Port quota classes extension to v3 API Part 1"Jenkins2013-06-262-0/+291
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Port quota classes extension to v3 API Part 1Chris Yeoh2013-06-242-0/+291
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This changeset only copies the v2 files (implementation and test) into the appropriate v3 directories unchanged. The copy as-is will not be loaded by either the v2 or v3 extension loaders. The second changeset will then make the changes required for it to work as a v3 extension. This is being done in order to make reviewing of extension porting easier as gerrit will display only what is actually changed for v3 rather than entirely new files Partially implements blueprint nova-v3-api Change-Id: I328b32aee29021bae42cba5d97e0735e7b691ac9
* | | | | | | | | | | | | | | | | | | | | | Merge "Cells: Pass object for start/stop"Jenkins2013-06-262-0/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Cells: Pass object for start/stopChris Behrens2013-06-212-0/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The compute_api start/stop methods expect an Instance object, but cells is still passing the dict or sqlalchemy form. Fixes bug 1191040 Change-Id: I21e0f0b5d7e3160e23c7a84f59ae3899538c7327
* | | | | | | | | | | | | | | | | | | | | | | Merge "Retry quota_reserve on DBDeadlock"Jenkins2013-06-261-0/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Retry quota_reserve on DBDeadlockChris Behrens2013-06-211-0/+1
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | quota_reserve() can raise DBDeadlock... so this adds the decorator that retries the transaction. Fixes bug 1193199 Change-Id: Id632360372b21f3e75a2af50153eb18cc2025390
* | | | | | | | | | | | | | | | | | | | | | Merge "Cells: Add support for global cinder"Jenkins2013-06-2612-22/+444
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Cells: Add support for global cinderChris Behrens2013-06-1112-22/+444
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements cinder support for compute cells when cinder is a global installation. Adds syncing of the block device mapping table between child cells and API cells. Implements blueprint cells-cinder-support Change-Id: Ife5be9922db0742c8ee4f970517396be86597cce
* | | | | | | | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-06-2639-6667/+6982
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-06-2639-6667/+6982
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Iad4b2634e0504494769046054911f53d306c99a5
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make fake_network tolerant of objects"Jenkins2013-06-261-4/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Make fake_network tolerant of objectsDan Smith2013-06-261-4/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes fake_network not break if passed an instance object or list of instance objects. Related to blueprint unified-object-model Change-Id: Ic484e850966d514c758baedb46571b5296e89580
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Prepare fake instance stubs for objects"Jenkins2013-06-261-1/+6
|\| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Prepare fake instance stubs for objectsDan Smith2013-06-261-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This fixes a couple of calling convention tolerances on fake instance_get methods, as well as makes stub_instance() return a more accurate instance dict. Related to blueprint unified-object-model Change-Id: I9772be52c3f8bbd8cab0ec2dd93821f3e4287b6a
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Port flavors core API to v3 tree"Jenkins2013-06-263-0/+960
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Port flavors core API to v3 treeMauro S. M. Rodrigues2013-06-133-0/+960
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Port flavors core API (which does *not* include all extensions, like flavor create) to the V3 API, adapting the way it's loaded to fit with the new extension framework and, of course, its tests. This also change the flavors requests and responses links on unit tests since project_id is no longer present on v3 url Partially implements blueprint v3-api-core-as-extensions Change-Id: Ide2eb22a89be3bd9adcf5e09cbef23e824a83fc1
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Change resource links when url has no project id"Jenkins2013-06-263-328/+338
|\| | | | | | | | | | | | | | | | | | | | | | | | |_|/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Change resource links when url has no project idMauro S. M. Rodrigues2013-06-133-328/+338
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch allow response body to be look like the request url. So if a project_id is passed the resource links on the response will also have a project_id, and in the case of api-v3 where project_id are no longer present in the url the response will not have it either. Complements bp v3-api-remove-project-id. Also fix two minor issues on the unit tests, which were breaking with this change: - When doing ServersViewBuilderTest there was no api version specified. - ServersControllerTest was duplicating api version on the application url. Change-Id: I872332ef56b4b6e99fedb43833ad45e8e654f44f
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make info_cache handle when network_info is None"Jenkins2013-06-261-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Make info_cache handle when network_info is NoneDan Smith2013-06-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The info_cache['network_info'] data can be None, so don't string- convert it to 'None'. Related to blueprint unified-object-model Change-Id: I7a18f9189ab31beca0f8df764531387b4dd41b50
* | | | | | | | | | | | | | | | | | | | | | | Merge "Fix instance object's use of a db query method parameter"Jenkins2013-06-262-2/+4
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Fix instance object's use of a db query method parameterDan Smith2013-06-262-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The limit and marker arguments are kwargs, which need to be correct to pass some mock tests in the unit tests for api. Related to unified-object-model Change-Id: I16b45ff73a6d79313fdd4a1124309f558497ab72
* | | | | | | | | | | | | | | | | | | | | | | Merge "Make NovaObject support the 'in' operator"Jenkins2013-06-262-0/+14
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Make NovaObject support the 'in' operatorDan Smith2013-06-262-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is needed for dict emulation. Related to unified-object-model Change-Id: I6e024dc284a353181d3ffc84329f234e16b79118