summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | Do not run pylint by defaultJoe Gordon2012-08-281-1/+1
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | pylint creates some files, and leaves git in a detached HEAD. pylint can still be run via 'tox -epylint' Change-Id: Ic0193f2488f1c6eb4a9f0fabbe24ac9869239890
* | | | Merge "Fix PEP8 issues."Jenkins2012-08-291-2/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix PEP8 issues.lrqrun2012-08-281-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | Fix some pep8 issues in doc/ext/nova_todo.py make the code looks pretty. Change-Id: I026c873b487b507a758a2cdb70b444b64702b7fa
* | | | Merge "Accept role list from either X-Roles or X-Role"Jenkins2012-08-292-2/+74
|\ \ \ \
| * | | | Accept role list from either X-Roles or X-RoleBrian Elliott2012-08-282-2/+74
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Accept the list of roles from either the newer X-Roles header or the deprecated X-Role header. This is useful for interoperability with a software proxy in front of Nova API that performs token authentication and might use the older header. Change-Id: I47e33233edf596dd14d07b6be16b030fd6bc352d
* | | | Merge "Include launch-index in openstack style metadata."Jenkins2012-08-282-0/+4
|\ \ \ \ | |_|/ / |/| | |
| * | | Include launch-index in openstack style metadata.Michael Still2012-08-282-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | Resolves bug 1042020. Change-Id: I545b771e24a15e109b06b76e9c34a78bc1425b6c
* | | | Merge "Fix KeyError when test_servers_get fails."Jenkins2012-08-281-2/+2
|\ \ \ \
| * | | | Fix KeyError when test_servers_get fails.Dan Prince2012-08-281-2/+2
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the integrated.test_api_samples.ServersSampleAllExtensionXmlTest test_servers_get function so that it doesn't try to list the line number when the test fails. Fixes a KeyError: '\'i\' exceptions. Partial fix for LP Bug #1042709. Change-Id: I666d18c1d4585cebce4534b1f16cd327850e8cdc
* | | | Merge "Port existing code to utils.ensure_tree"Jenkins2012-08-287-39/+26
|\ \ \ \ | |/ / / |/| | |
| * | | Port existing code to utils.ensure_treeMichael Still2012-08-287-39/+26
| |/ / | | | | | | | | | | | | | | | | | | Now that we have ensure_tree in utils, port most users of os.makedirs() to use it. Change-Id: I3256cbb76bd889f99f1e6f3367bd620645f828a1
* | | Update nova.conf.sampleMark McLoughlin2012-08-281-23/+6
| | | | | | | | | | | | | | | | | | | | | | | | Regenerate to account for unused options which were removed by commit ea06eff7e7 DocImpact: update nova.conf docs Change-Id: I1082d2869d0b9d33747fb877efb6d99344074b2c
* | | Merge "Fixes backwards compatible rpc schedule_run"Jenkins2012-08-282-2/+5
|\ \ \
| * | | Fixes backwards compatible rpc schedule_runVishvananda Ishaya2012-08-272-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 8718f8e47d7d0504724495538eb320be3e209180 changed the schedule_run_instance call to create all of the db records on the compute host, but the old code path was left in for backwards compatibility. Unfortunately an extra reservations parameter was left in causing the backwards compatibility to be broken. This patch takes out the reservations parameter and commits the reservation in the backwards compatible call. Fixes bug 1042302 Change-Id: I1e710d1e9a992f59a18eeedcd7d71726ff96c485
* | | | Merge "Allow connecting to a ssl-based glance"Jenkins2012-08-286-37/+93
|\ \ \ \
| * | | | Allow connecting to a ssl-based glanceVincent Untz2012-08-276-37/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces a new glance_api_insecure setting that can be used to not verify the certificate of the glance server against the certificate authorities. Fix bug 1042081. Change-Id: I0a9f081425854e9c01e00dfd641e42276c878c67
* | | | | Merge "Add ops to aggregate_instance_extra_specs filter."Jenkins2012-08-282-245/+221
|\ \ \ \ \
| * | | | | Add ops to aggregate_instance_extra_specs filter.Jinwoo 'Joseph' Suh2012-08-272-245/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following operators on instance_type_extra_specs were added in aggregate_instance_extra_specs filter. Fixes bug 1037090. = (equal to or greater than as a number; same as vcpus case) == (equal to as a number) != (not equal to as a number) >= (greater than or equal to as a number) <= (less than or equal to as a number) s== (equal to as a string) s!= (not equal to as a string) s>= (greater than or equal to as a string) s> (greater than as a string) s<= (less than or equal to as a string) s< (less than as a string) <in> (substring) <or> (find one of these) If the first word in the instance_type_extra_spec is not one of the keywords above, a default operator "s==" is used. E.g.: ">= 5", "s== 2.1.0", "<in> gcc", and "<or> fpu <or> gpu" Change-Id: Iee9bf68011738aab146e6311a17cb3c673d7a392
* | | | | | Merge "Add the self parameter to NoopFirewallDriver methods"Jenkins2012-08-271-2/+2
|\ \ \ \ \ \
| * | | | | | Add the self parameter to NoopFirewallDriver methodsYun Mao2012-08-271-2/+2
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following the Python coding convention even though the current code works with the *args magic. Part of bug 1037183 Change-Id: I2be815a098913b5879d0d9b3563a55431408431c
* | | | | | Merge "Correct live_migration rpc call in test"Jenkins2012-08-271-5/+6
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Correct live_migration rpc call in testYun Mao2012-08-271-5/+6
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self.driver.compute_rpcapi.live_migration should be the correct way to issue live_migration call instead of compute_rpcapi.ComputeAPI.live_migration, because the ComputeAPI is a class, not an instance of the class. This technically does not matter because the method is moxed out anyway for testing, but still it is confusing. Partially fix bug 1037183 Change-Id: Id41520a44fb9cfc19e269427ee42493e5dc52f5b
* | | | | Correct utils.execute() to check 0 in check_exit_codeArata Notsu2012-08-281-9/+8
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If a process exits with returncode 0, the function always returns without raising a exception, regardless of whether its check_exit_code includes 0 or not. This patch fixes it; if check_exit_code does not includes 0 and a process exits with 0, ProcessExecutionError is raised. (No change required to caller-side since no one misses 0 in check_exit_code) Change-Id: I824a9bc5e42038e27df6757cd47c06073681c342
* | | | Merge "request_spec['instance_uuids'] as list in resize"Jenkins2012-08-273-3/+11
|\ \ \ \
| * | | | request_spec['instance_uuids'] as list in resizeClay Gerrard2012-08-273-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Wrap instance['uuid'] in a list when building request_spec in compute.api before sending it across to the scheduler on resize regression introduced in I63bbc98c285faebec53f8e62857c01548807db68 fixes bug 1041351 Change-Id: I7cad8316171798e240bf78999cb94730c587a904
* | | | | Merge "Add lintstack error checker based on pylint"Jenkins2012-08-274-1/+243
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add lintstack error checker based on pylintYun Mao2012-08-244-1/+243
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add a new silent test target lintstack based on pylint in Jenkins. lintstack will compare the pylint errors between HEAD and HEAD~1, filter out known false positives and report violations in pylint original parseable format for Jenkins to consume. Change-Id: Ic2962cb42a174bfe9535aea88475ff4ede3bf9ff
* | | | | Merge "Remove unused flags"Jenkins2012-08-273-18/+1
|\ \ \ \ \
| * | | | | Remove unused flagsJoe Gordon2012-08-233-18/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1040818 * s3_dmz * osapi_scheme * osapi_path * default_project * auth_token_ttl * powervm_vios Change-Id: I799ff4746046302e8fcfb47ba3c23efb3454b28f
* | | | | | Merge "Fix column variable typo"Jenkins2012-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | Fix column variable typoYun Mao2012-08-271-1/+1
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | attach_datetime is not available during downgrade. It's a copy/paste bug from the upgrade function. Partially fix bug 1037183 Change-Id: I97e2cf98a180a6c80e59545a9cda9852fa6ac563
* | | | | | Merge "Move ensure_tree to utils"Jenkins2012-08-2710-37/+35
|\ \ \ \ \ \
| * | | | | | Move ensure_tree to utilsMichael Still2012-08-2610-37/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Its useful to people other that virt drivers. Change-Id: I721094a1785d7a275f4bfa8994b7b114a6ec07f6
* | | | | | | Implement project specific flavors APIunicell2012-08-2720-25/+838
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint project-specific-flavors This change implements API extension to manage project specific flavor types, so that non-public flavor type can only see by projects with access rights. Change-Id: Ie2d2c605065b0c76897f843a4548a0c984a05f1a
* | | | | | Merge "Fix typo in call in cinder.API unreserve_volume"Jenkins2012-08-271-1/+1
|\ \ \ \ \ \
| * | | | | | Fix typo in call in cinder.API unreserve_volumeRongze Zhu2012-08-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1038599 def unreserve_volume(self, context, volume): - cinderclient(context).volumes.reserve(volume['id']) + cinderclient(context).volumes.unreserve(volume['id']) Change-Id: Ida96b01d93f2e82fe842fa93c1a8edbc27434279
* | | | | | | Merge "Remove test_keypair_create_quota_limit()"Jenkins2012-08-271-15/+0
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | |
| * | | | | | Remove test_keypair_create_quota_limit()Yun Mao2012-08-241-15/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_keypair_create_quota_limit() is defined twice. The two tests are not exactly the same but functionally equivallent. Remove the first definition. Partially fix bug 1037183 Change-Id: I99bd3cd54cf55ff071ced10e931025813d0c92b0
* | | | | | | Merge "Add nosehtmloutput as a test dependency."Jenkins2012-08-271-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Add nosehtmloutput as a test dependency.Clark Boylan2012-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding nosehtmloutput as a test dependency allows nose to output its results to an html file. This will be used by Jenkins to save logs on a different server. Change-Id: I45191e872a41eed8e6a9e14757675ee7a28b3836
* | | | | | | | Merge "Make instance_update_and_get_original() atomic"Jenkins2012-08-271-28/+35
|\ \ \ \ \ \ \ \
| * | | | | | | | Make instance_update_and_get_original() atomicYun Mao2012-08-231-28/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use the same session object within a transaction to retrieve and update the instance object, including metadata and system metadata. In preparation to fix bug 1037372 Change-Id: I886da12bb85f60c2b23609a35b6d9a43040216ce
* | | | | | | | | Merge "Fix deallocate_fixed_ip() call by unifying signature"Jenkins2012-08-271-6/+5
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix deallocate_fixed_ip() call by unifying signatureYun Mao2012-08-231-6/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | deallocate_fixed_ip() is defined in 3 classes with incompatible signatures: RPCAllocateFixedIP: deallocate_fixed_ip(self, context, address, host, **kwargs) NetworkManager: deallocate_fixed_ip(self, context, address, **kwargs) FlatManager: deallocate_fixed_ip(self, context, address, **kwargs) There is a non-trivial multiple inheritance relationship among them. The complication leads to incorrect function call signatures (see bug 1024789). The kwargs magic is also never used, and discarded during rpc calls anyway. This patch makes the call signature exactly the same for all deallocate_fixed_ip() definitions, drops kwargs and fixes bug 1024789. Change-Id: I9c139810d4a5c93fa9f50b89a07bfe44e73e6c8a
* | | | | | | | | | Merge "Remove unused permitted_instance_types"Jenkins2012-08-273-15/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Remove unused permitted_instance_typesJim Fehlig2012-08-243-15/+0
| | |_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Commit 5ea7db9b removed the ArchFilter and moved its functionality to the ImagePropertiesFilter, which uses 'supported_instances' from the compute nodes to determine if a node satisfies the arch, preferred hypervisor, and virtual machine mode requested by the instance. permitted_instance_types is no longer used and can be removed. Change-Id: Idf9d72746d7c3dcd2a7385913823df122eaa7cd6
* | | | | | | | | | Merge "Fix path to example extension implementation"Jenkins2012-08-271-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix path to example extension implementationTom Fifield2012-08-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 1032118 In class ExtensionManager The path for example implemetation of an extension should be nova/tests/api/openstack/volume/extensions/foxinsocks.py instead of nova/tests/api/openstack/extensions/foxinsocks/extension.py which no longer exists. This affects the documentation at: http://docs.openstack.org/developer/nova/api/nova.api.openstack.extensions.html#nova.api.openstack.extensions.ExtensionManager Change-Id: I81083b2a67a3db6e394bc919470e5f1d2dd7ac88
* | | | | | | | | | | Merge "Update .mailmap"Jenkins2012-08-261-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ / / |/| | | | | | | | | |
| * | | | | | | | | | Update .mailmapZhongyue Luo2012-08-251-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix .mailmap to follow company policy Change-Id: I0d1af90527df6e0990d0c1deec6f603ed3b92f91