summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | Update to simplified common oslo version code.Monty Taylor2013-02-107-176/+197
| | |_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Based on https://review.openstack.org/#/c/19957/ Change-Id: Ieefee2af8812d0217e95eeffb3cf53d8e55c8fe6
* | | | | | | | | | | | | | | | | | | Merge "Adds _(prerun|check)_134 functions to test_migrations"Jenkins2013-02-121-0/+55
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Adds _(prerun|check)_134 functions to test_migrationsTiago Mello2013-02-071-0/+55
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The _prerun_134 function populates the 'bw_usage_cache' table with real data, different in some critical ways, before migrating it. _check_134 function certifies that things were properly migrated. Partially implements bp migration-testing-with-data Change-Id: I4100c8aa3e1c9d2ff4fdb095dba4cb084b5df279
* | | | | | | | | | | | | | | | | | | Merge "Fixes a bug in attaching volumes on Hyper-V"Jenkins2013-02-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Fixes a bug in attaching volumes on Hyper-VAlessandro Pilotti2013-02-111-3/+4
| | |_|_|_|_|/ / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug: #1122264 The CIM v2 WMI context needs to be instantiated by the BaseVolumeUtils class and not passed by the caller of get_iscsi_initiator(). Change-Id: I811b5bd0117b0035c18e5c90169b25a095bc54e9
* | | | | | | | | | | | | | | | | | | Merge "Update .coveragerc"Jenkins2013-02-121-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | Update .coveragercAlessio Ababilov2013-02-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set up proper source and omit options. Change-Id: I28e95c5dde5d906dc2bf44b647017f8cff5981f6 Implements: blueprint update-coveragerc
* | | | | | | | | | | | | | | | | | | | Merge "Fix check instance host for instance action"Jenkins2013-02-126-12/+90
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Fix check instance host for instance actionZhou ShaoYu2013-02-056-12/+90
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When instance has no host, actions such as get_console_output, start_stop_instance cause HTTP 500 response. Here change to HTTPConflict when action called before host set. Fix LP# 1116012 Change-Id: I6153a03f449d9fad8d0d8fb7295bdea4d2b2c2b1
* | | | | | | | | | | | | | | | | | | | | Merge "lxc: virDomainGetVcpus is not supported by driver"Jenkins2013-02-121-7/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | lxc: virDomainGetVcpus is not supported by driverChuck Short2013-02-041-7/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | virDomainGetVcpus is not supported by the libvirt lxc driver, so it results in a nasty traceback. Trap the error and return the number of vcpus. Fixes LP: #1106960 Change-Id: I4e81dedad74ce3c58fcdf3ee064dfa0b9aa9a755 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix boto capabilities check"Jenkins2013-02-121-3/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix boto capabilities checkStanislaw Pitucha2013-01-301-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In commit 4845fc27 a capability check for the boto library has been accidentally broken. boto.connection existed in all versions and it was HTTPResponse class that should cause the ImportError. Exception will not happen on the import line anymore, so check the capabilities using hasattr() instead. Change-Id: Ic9bff71b91de685a958400f12836322c7ca996c4
* | | | | | | | | | | | | | | | | | | | | | | Merge "Implement ZooKeeper driver for ServiceGroup API."Jenkins2013-02-124-1/+229
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Implement ZooKeeper driver for ServiceGroup API.Yun Mao2013-02-074-1/+229
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The ZooKeeper driver uses ephemeral nodes in ZooKeeper to keep track of node liveness in a service group. The Implementation is based on the evzookeeper library to combine zookeeper and eventlet. Part of blueprint zk-service-heartbeat DocImpact: new driver Change-Id: Ia20519de2b4964007f8b91ea5d56d1875510d40f
* | | | | | | | | | | | | | | | | | | | | | | Merge "support reloctable venv roots in testing framework"Jenkins2013-02-113-38/+76
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | support reloctable venv roots in testing frameworkChet Burgess2013-02-073-38/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | run_tests.sh, with_venv.sh, and the install_venv.py scripts now support relocating the venv root to another location. All 3 scripts now support new envinroment variables to configure the location of the venv and the tools directory. To maintain compatability the defaults are set to the current values. venv_path = Location of the virtualenv directory Default: $(pwd) venv_name = Name of the virtualenv directory Default: .venv tools_path = Location of the tools directory Default: $(pwd) Additionally the run_tests.sh script also takes these value as arguments and will pass them along accordingly. --virtual-env-path <path> Location of the virtualenv directory Default: $(pwd) --virtual-env-name <name> Name of the virtualenv directory Default: .venv --tools-path <dir> Location of the tools directory Default: $(pwd) DocImpact Change-Id: I1be036058227206ecca342f692cd3d6aadb24069 Fixes: bug #1116942
* | | | | | | | | | | | | | | | | | | | | | | Ensure 'subunit2pyunit' is run in venv from run_tests.shDaniel P. Berrange2013-02-111-1/+1
| |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The run_tests.sh script invokes bash -c "${wrapper} $TESTRTESTS | subunit2pyunit" where '${wrapper}' expands to 'tools/with_venv.sh'. Due to shell precedence rules, this only applies to '$TESTRTESTS' not the 'subunit2pyunit' part of the command. The 'subunit2pyunit' binary though may only be available from the .venv Change-Id: I5972c8f77b3f50a3713881e6ca1acbaeabbd47d4 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | | | | | | | | | | | Merge "Imported Translations from Transifex"OpenStack Jenkins2013-02-111-817/+855
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Imported Translations from TransifexOpenStack Jenkins2013-02-111-817/+855
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I50ee55cb39464f83d414110f3604cd7740c2648c
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix spelling in comment"Jenkins2013-02-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix spelling in commentAaron Rosen2013-02-101-2/+2
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I659b31631f06a7bc50dac609d482fde92a6334d5
* | | | | | | | | | | | | | | | | | | | | | Merge "Add control-M to list of characters to strip out"Jenkins2013-02-111-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add control-M to list of characters to strip outChuck Short2013-02-101-1/+1
| |/ / / / / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adds ^M to list of characters to strip out. Fixes LP: #1108820 Change-Id: I070fa566afaafdb932a21b198c669628c56b284b Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | | | | | | | | | | | | | Merge "Parse testr output through subunit2pyunit."Jenkins2013-02-111-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Parse testr output through subunit2pyunit.Monty Taylor2013-02-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When running through run_tests.sh, filter the testr output through subunit2pyunit so that incremental progress can be seen. Should be a step towards folks seeing incremental test progress. Change-Id: Ic90669acabaa1c8b64aae80349bff3d3deaf59fa
* | | | | | | | | | | | | | | | | | | | | | Merge "xenapi: Cleanup detach_volume code"Jenkins2013-02-102-55/+42
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | xenapi: Cleanup detach_volume codeRick Harris2013-02-072-55/+42
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactors `detach_volume` so that it uses the same code to detach that detaching all volumes uses. Change-Id: Idb7acb136367d8ad512d4b14c775c69404f6f6b0
* | | | | | | | | | | | | | | | | | | | | | Merge "Allow connecting to self-signed quantum endpoints"Jenkins2013-02-103-3/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Allow connecting to self-signed quantum endpointsStanislaw Pitucha2013-02-053-3/+10
| | |_|_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new option 'quantum_api_insecure', matching the existing 'glance_api_insecure'. It skips the SSL validation in quantumclient. DocImpact Change-Id: I275517179929710bedcef5086a040b9396c0e932
* | | | | | | | | | | | | | | | | | | | | | Merge "Flavor Extra Specs should require admin privileges"Jenkins2013-02-103-13/+51
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Flavor Extra Specs should require admin privilegesLi Chen2013-02-063-13/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The previous fix added admin check in policy.json, but code still can't recorginize the detailed actions. This fix edited "authorize" function for flavor_extra_specs, to make sure it will check the admin privileges in policy.json. Also, together with the code, this fix edit old test case with admin privileges, and added new non-admin privileges test case. Fixes bug 1094142 Change-Id: Ia286aedb4846383ad51bd54b0984dd1feddfbf81
* | | | | | | | | | | | | | | | | | | | | | | Merge "Change to support custom nw filters."Jenkins2013-02-101-6/+19
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | Change to support custom nw filters.Ed Bak2013-02-071-6/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change is a refactoring of NWFilterFirewall to create a distinct function to define base nw filters. The new function is called get_base_filter_list. This provides a convenient way to subclass NWFilterFirewall and redefine get_base_filter_list to add your own custom base filters. Change-Id: Ida94148fcb870830ae675839ab4f900ad798d9bb Fixes: bug #1103086
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Add api-samples to multinic extension"Jenkins2013-02-1017-1/+170
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Add api-samples to multinic extensionMauro S. M. Rodrigues2013-01-2517-1/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements bp nova-api-samples Fixes bug 1070169 Change-Id: I923054bf92840a7fe81f78c97aa77a9201e94bdc
* | | | | | | | | | | | | | | | | | | | | | | | Merge "Introduce support for 802.1qbg and 802.1qbh to Nova VIF model"Jenkins2013-02-106-2/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Introduce support for 802.1qbg and 802.1qbh to Nova VIF modelDaniel P. Berrange2013-02-076-2/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Define the nova network VIF model properties for supporting 802.1qbg / 802.1qbh networking in hypervisor drivers. Also wire up support to the libvirt driver for these new modes Blueprint: libvirt-vif-driver Change-Id: I91039790900170bfd698ea484d5f8a22445806ae Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "Merge LibvirtHybridOVSBridgeDriver into LibvirtGenericVIFDriver"Jenkins2013-02-102-79/+127
|\| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | Merge LibvirtHybridOVSBridgeDriver into LibvirtGenericVIFDriverDaniel P. Berrange2013-02-072-79/+127
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The LibvirtHybridOVSBridgeDriver VIF driver and the LibvirtOpenVswitchDriver VIF driver both support OpenVswitch based guest configs. The difference is that the hybrid driver does not connect the VM directly to the OVS bridge. Instead it connects the guest to a private Linux bridge, connected to the OVS bridge via a veth pair. This allows iptables firewall rules to be applied to the guest VIF. The hybrid driver should always be used unless the admin has disabled Nova firewalls using the NoopFirewallDriver impl. Rather than require the admin to figure this out themselves, pick the right impl automatically based on the configured firewall driver. When Quantum gains support for firewalling, it will need to be able to inform Nova whether it has got a filtering applied to the VIFs, and thus let Nova intelligently skip its own attempt at filtering. The LibvirtGenericVIFDriver class can use the 'vif_type' mapping field to determine whether an OVS network configuration is required. In combination with a check against the firewall driver, a dedicated driver for OVS hybrid setup is no longer required. The LibvirtHybridOVSBridgeDriver class functionality is merged into LibvirtGenericVIFDriver. For backwards compatibility with the Folsom release, the existing LibvirtHybridOVSBridgeDriver class is made to inherit from LibvirtGenericVIFDriver and directly call the bridge specific setup APIs. This eases migration to the new VIF impl during the Grizzly deployment lifecycle, with an expectation that the LibvirtHybridOVSBridgeDriver stub will be deleted after the Havana release. Bug: 1050433 Blueprint: libvirt-vif-driver Change-Id: I93294409a75aaa15d297471ab3e600c3c124bcde Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | | | | | | | | | | | | | | Merge "fix VM power state to be NOSTATE when instance not found"Jenkins2013-02-102-2/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | fix VM power state to be NOSTATE when instance not foundPádraig Brady2013-02-092-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nova/compute/manager.py (_sync_power_states): Revert what looks like an inadvertent change that was part of commit 95e77703. Also log the condition. Fixes bug: 1085771 Change-Id: Ic6eeb9207323f05b93f0b613bd1bddd681ad8ce5
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Simplify libvirt snapshot code path"Jenkins2013-02-096-121/+56
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Simplify libvirt snapshot code pathRafi Khardalian2013-02-096-121/+56
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The "cold" snapshot code path was unnecessarily complex. We were traversing 3 layers of abstraction to reach 3 lines of code. I've completely eliminated snapshot.py by moving all "cold" snapshot functions into imagebackend.py and adjusting the libvirt driver accordingly. This is the first pass of several I intend to make against imagebackend.py, as it is far too difficult to read given how basic the basic level of functionality it is intended to provide. Change-Id: Idfacffb7210ae61193ee4f2360d4b38f330a177c
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Sync latest db and importutils from oslo"Jenkins2013-02-092-7/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | Sync latest db and importutils from osloMark McLoughlin2013-02-052-7/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes include: 7c0e25a Use importutils.try_import() for MySQLdb 33b12d3 Implement importutils.try_import. cf705c5 Make project pyflakes clean. Change-Id: I448f5208919d06ca0af54d2057b8f5e042862cd6
* | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "l3.py,add_floating_ip: setup NAT before binding"Jenkins2013-02-092-2/+38
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | l3.py,add_floating_ip: setup NAT before bindingmingyan bao2013-02-082-2/+38
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix for bug 1100435 Change-Id: Iad022f61297fe26edb230ba7b9e31d73df99b5a5
* | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update jsonutils from oslo-incubator"Jenkins2013-02-091-22/+14
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | Update jsonutils from oslo-incubatorJoe Gordon2013-02-081-22/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change: a878193 Allow to_primitive to ignore datetimes Change-Id: I2c83b259c24768a546c3090a72cfecef2d6c4d1a