summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Merge "Fix for correctly parsing snapshot uuid in ec2api"Jenkins2012-12-132-8/+13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for correctly parsing snapshot uuid in ec2apiRohan Rhishikesh Kanade2012-12-122-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * EC2 snapshot id correctly translated instead of volume uuid. * Add unit tests changes for the existing test. Fixes LP Bug #1089371 Change-Id: Id650ba53dc6cda946531493e3887a01fc5d9bda4
* | | | | | | | | | | Merge "Clean up run_tests.sh"Jenkins2012-12-131-3/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clean up run_tests.shHengqing Hu2012-12-131-3/+0
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete lines. Change-Id: Id6c868c857733dc4cbeceacab4d3a817b43b77b1
* | | | | | | | | | | Merge "Add support for parsing the <uuid> from libvirt host capabilities"Jenkins2012-12-132-0/+7
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Add support for parsing the <uuid> from libvirt host capabilitiesDaniel P. Berrange2012-12-112-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The libvirt host capabilities provide a <uuid> element which uniquely identifies the host platform. Change-Id: Ic619a24b4b90c757b868aa78396d6cdee56ccb4b Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | Merge "Add support for libvirt domain <smbios> XML config"Jenkins2012-12-132-0/+31
|\| | | | | | | | | | | | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add support for libvirt domain <smbios> XML configDaniel P. Berrange2012-12-112-0/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On x86 platforms the SMBIOS data tables can be customized using the <smbios> XML config. For example, to populate them based on the <sysinfo> data <smbios mode="sysinfo"/> Or to copy the host's SMBIOS <smbios mode="host"/> Change-Id: Ia4e6c1d9b0d66c58700ccf0f0fd97fa302aba64d Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | Merge "Use nova.test.TestCase as the base test class."Jenkins2012-12-137-19/+14
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use nova.test.TestCase as the base test class.Clark Boylan2012-12-127-19/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Subclass nova.test.TestCase instead of unittest.TestCase so that all tests get the proper setUp and tearDown needed for all tests. Part of blueprint grizzly-testtools Change-Id: I8f3cd49e6e0e36eade1fd6ccb6c15359d38f2236
* | | | | | | | | | | | Merge "Add support for libvirt domain <sysinfo> XML config"Jenkins2012-12-132-0/+165
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Add support for libvirt domain <sysinfo> XML configDaniel P. Berrange2012-12-112-0/+165
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libvirt domains can have system metadata defined in a <sysinfo> XML element. For the x86 platform with KVM guests, this can then be used to populate the SMBIOS data tables <sysinfo> <bios> <entry name="vendor">Acme</entry> </bios> <system> <entry name="manufacturer">Acme</entry> <entry name="product">Wile Coyote</entry> <entry name="uuid">c7a5fdbd-edaf-9455-926a-d65c16db1809</entry> </system> </sysinfo> Change-Id: Ib4980ddc2f558921893a7e208e304ba59636e430 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | Merge "Add Jian Wen to .mailmap"Jenkins2012-12-131-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add Jian Wen to .mailmapJian Wen2012-12-121-0/+2
| | |_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To follow company policy Change-Id: I8737bfddba93b1a822de57eaad83c27e18e4a534
* | | | | | | | | | | | Merge "Fixes string formatting error."Jenkins2012-12-131-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fixes string formatting error.Sulochan Acharya2012-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes a small string formatting error in exception.py by adding missing converstion type. Fixes bug #1089416 Change-Id: I48fb39c669b2a1e81f052349cdb700e146ee2c4d
* | | | | | | | | | | | | Merge "Make update_service_capabilities() accept a list of capabilities"Jenkins2012-12-135-12/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Make update_service_capabilities() accept a list of capabilitiesMana Kaneko2012-12-035-12/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible to send multiple capabilites by single RPC. Change-Id: I7c1b75eada17181c4fe08c55992b34d66276f498
* | | | | | | | | | | | | | Merge "Fix KeyError of log message in virt/libvirt/utils.py"Jenkins2012-12-121-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix KeyError of log message in virt/libvirt/utils.pyQiang Guan2012-12-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add arguments vg and lv for function check_size() so that locals() can get them. Fixes: bug #1088434 Change-Id: I6b5609fe1be7e0bf09a45e65eab91427059a89db
* | | | | | | | | | | | | | | Merge "Move remaining aggregate operations to conductor"Jenkins2012-12-128-23/+116
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | | Move remaining aggregate operations to conductorDan Smith2012-12-128-23/+116
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch moves the following aggregate operations from compute to conductor: aggregate_get_by_host() aggregate_metadata_add() aggregate_metadata_delete() In order to do that, it also changes the signature of the corresponding VirtAPI methods to take the aggregate object instead of just the id, so that we don't re-introduce any db messaging behavior. I debated about using the set_delete mechanism in the metadata_add API to avoid adding a separate conductor API for delete, but decided that it wasn't worth the extra round trips, no matter how much I may wish it were. Change-Id: Ic0117879c8ce576cdc8e6c5af018bb918a15d4c0
* | | | | | | | | | | | | | | Merge "Port to argparse based cfg"Jenkins2012-12-129-318/+426
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Port to argparse based cfgMark McLoughlin2012-12-119-318/+426
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Import latest cfg from oslo-incubator with these changes: Add deprecated --logdir common opt Add deprecated --logfile common opt. Allow nova and others to override some logging defaults Fixing the trim for ListOp when reading from config file Fix set_default() with boolean CLI options Improve cfg's argparse sub-parsers support Hide the GroupAttr conf and group attributes Fix regression with cfg CLI arguments Fix broken --help with CommonConfigOpts Fix ListOpt to trim whitespace updating sphinx documentation Don't reference argparse._StoreAction Fix minor coding style issue Remove ConfigCliParser class Add support for positional arguments Use stock argparse behaviour for optional args Use stock argparse --usage behaviour Use stock argparse --version behaviour Remove add_option() method Completely remove cfg's disable_interspersed_args() argparse support for cfg The main cfg API change is that CONF() no longer returns the un-parsed CLI arguments. To handle these args, you need to use the support for positional arguments or sub-parsers. Switching nova-manage to use sub-parser based CLI arguments means the following changes in behaviour: - no more lazy matching of commands - e.g. 'nova-manage proj q' will no longer work. If we find out about common abbreviations used in peoples' scripts, we can easily add those. - the help output displayed if you run nova-manage without any args (or just a category) has changed - 'nova-manage version list' is no longer equivalent to 'nova-manage version' Change-Id: I19ef3a1c00e97af64d199e27cb1cdc5c63b46a82
* | | | | | | | | | | | | | | | Merge "Remove unused bridge interfaces"Jenkins2012-12-126-4/+195
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Remove unused bridge interfacesÉdouard Thuleau2012-12-076-4/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a network gateway of multi hosted network is unsed by any VM on the host, we tear down it. It is implemented only with the VLAN manager. Fixes LP bug #1084651 Change-Id: Ia7e399de5b8ddf6ec252d38dfbb8762c4f14e3a5
* | | | | | | | | | | | | | | | | Merge "remove session param from instance_get"Jenkins2012-12-121-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | remove session param from instance_getDevananda van der Veen2012-12-121-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove unused session param from instance_get blueprint db-session-cleanup Change-Id: Id8d7129ca0f8477b1e99a405653c498c4ed4cd76
* | | | | | | | | | | | | | | | | | Merge "remove session param from instance_get_by_uuid"Jenkins2012-12-121-8/+13
|\| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | remove session param from instance_get_by_uuidDevananda van der Veen2012-12-121-8/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | remove session param from public method instance_get_by_uuid create private method to retain session param for the few places which need it blueprint db-session-cleanup Change-Id: I80f682018c88d2a14e454ab1af1dff4fe0be7432
* | | | | | | | | | | | | | | | | | Merge "Allow rpc-silent FloatingIP exceptions in n-net"Jenkins2012-12-122-0/+49
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Allow rpc-silent FloatingIP exceptions in n-netDan Smith2012-12-112-0/+49
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch uses the new client_exceptions functionality to squelch some errant exception dumps in the RPC layer. Fixes bug 1084707 Change-Id: I31a783a67d7722751fcfeafab40e781dc762dd65
* | | | | | | | | | | | | | | | | | | Merge "Allow conductor exceptions to pass over RPC silently"Jenkins2012-12-123-24/+76
|\| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | Allow conductor exceptions to pass over RPC silentlyDan Smith2012-12-113-24/+76
| | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When one service performs an operation on behalf of another, the act of passing back an exception (even a known one) causes a lot of scary log messages about the (presumed to be) error case. This patch applies the new client_exceptions decorator to methods in the conductor manager to prevent excess logging for known situations. Fixes bug 1084706 Change-Id: I56e472b0f08d584f5bbe5181ca909f2c11352120
* | | | | | | | | | | | | | | | | | Merge "Use admin user to read Quantum port."Jenkins2012-12-123-3/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | Use admin user to read Quantum port.Gary Kotton2012-12-093-3/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of blueprint vif-plugging-improvements. The port vif_type is only returned from Quantum when the user is an admin user. This patch ensures that when Nova reads the ports the user is an admin user. Change-Id: I4d1a2bfc6e3ae4ad63fe5c72eda32137713b31c6
* | | | | | | | | | | | | | | | | | | Merge "Add vif_type to the VIF model"Jenkins2012-12-124-2/+33
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Add vif_type to the VIF modelGary Kotton2012-12-094-2/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is part of blueprint vif-plugging-improvements. The patch has two parts: 1. Add support for vif_type to the VIF model 2. Read the vif_type from the Quantum port binding The patch is backward compatible, that is, a quantum plugin does not need to return the vif_type. Change-Id: Ice772f00b22163da98b98a2c69a0a4ad3f5526ff
* | | | | | | | | | | | | | | | | | Merge "Adds API Sample tests for DiskConfig extension."Jenkins2012-12-1245-0/+1529
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Adds API Sample tests for DiskConfig extension.Tiago Mello2012-12-1245-0/+1529
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements blueprint nova-api-samples Fixes bug 1070158 Change-Id: Ied2efc3ae17599b61133247273a7a4bec9020927
* | | | | | | | | | | | | | | | | | Merge "Move some opts into nova.utils"Jenkins2012-12-122-10/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / |/| | | | | | | | | | | / / / / / / | | |_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Move some opts into nova.utilsMark McLoughlin2012-12-122-10/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Both rootwrap_config and instance_usage_audit_period are only used in nova.utils. blueprint: scope-config-opts Change-Id: Ide687af9b302f97f91a64b79f502a59fe7a715a3
* | | | | | | | | | | | | | | | | Merge "Properly scope password options"Jenkins2012-12-129-26/+33
|\| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Properly scope password optionsMark McLoughlin2012-12-129-26/+33
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enable_instance_password is only used in api.openstack.compute.servers so move it there. password_length is passed as a parameter to every generate_password() call, so just move it into nova.utils and have generate_password() use it by default. Note: using a config option as the default value of a kwarg isn't a good idea because the option value is read when the function is defined which means you can't control its value during unit tests. Instead we use password=None as the default. blueprint: scope-config-opts Change-Id: I445174515fc2eacc56c7cccecadadd2a7e57d4f4
* | | | | | | | | | | | | | | | | Merge "Ensure datetimes can be properly serialized."Jenkins2012-12-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Ensure datetimes can be properly serialized.Russell Bryant2012-12-121-3/+4
| | |_|_|_|_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The nova-network manager was returning db models from methods invoked via rpc.call(). These db models include non-primitive types that can not be properly serialized (namely datetime objects). Use to_primitive() to ensure that the data gets serialized properly. Fix bug 1089430. Change-Id: I019504cf68b2d420437c550b596eda8a12fe6618
* | | | | | | | | | | | | | | | Merge "Implement an XML matcher"Jenkins2012-12-123-4/+452
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | Implement an XML matcherKevin L. Mitchell2012-12-113-4/+452
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Uses the "Matcher" interface of the testtools assertThat() call to compare XML document strings safely. This will result in more useful error results and will ignore attribute ordering issues that caused problems with tests affected by lxml version skew. Also converts test_libvirt_config to use XMLMatches, to demonstrate its use. Change-Id: I7821557a73eb8b5aca823cfccd02b4b660e0ffdb
* | | | | | | | | | | | | | | | | Merge "Autodetect nbd devices."Jenkins2012-12-123-39/+52
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Autodetect nbd devices.Michael Still2012-12-123-39/+52
| | |_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This means we don't need to the max_nbd_devices flag any more at all. This patch also moves the internal representation of the list of available nbd devices to not including the leading /dev/, but that is not exposed as a change in the interface to the class. Resolves bug 861504 and its duplicate 1088339. DocImpact. Change-Id: I5c6218122ab09781d8a2ecd6d8b76a74be4a6e91