summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | Define default mode and device_id_string in MountYun Mao2012-08-251-0/+2
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | self.mode is not a valid class member in the Mount abstract class, but used in map_dev(). Although all the subclasses define it so there is no runtime bug, define it to avoid confusion and better readability. Do the same thing for device_id_string as precaution too. Partially fix bug 1037183 Change-Id: Ica32db1ca17c6ed967f2c310b1d54adeb5f4247c
* | | | | | | | | Merge "Add missing import webob.exc"Jenkins2012-08-251-0/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing import webob.excYun Mao2012-08-241-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Used in line 55 Partially fix bug 1037183 Change-Id: I8b5482b3e29c9099b7bc5203b23048f4e81d6eb4
* | | | | | | | | | Merge "Remove duplicated test_migrate_disk_and_power_off()"Jenkins2012-08-251-8/+0
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / |/| | | | | | | | |
| * | | | | | | | | Remove duplicated test_migrate_disk_and_power_off()Yun Mao2012-08-241-8/+0
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_migrate_disk_and_power_off() is written exactly twice Partially fix bug 1037183 Change-Id: Ic1f3448d304a5fa64d14fd76a0215c4fb5895774
* | | | | | | | | Merge "Remove duplicated method VM_migrate_send"Jenkins2012-08-251-4/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Remove duplicated method VM_migrate_sendYun Mao2012-08-241-4/+0
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct signature is defined in line 653 later in the code. Partially fix bug 1037183 Change-Id: Ib6904ea962da2bcef391416be4a09801976d8bcd
* | | | | | | | Merge "Fix broken SimpleScheduler.schedule_run_instance()"Jenkins2012-08-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix broken SimpleScheduler.schedule_run_instance()Maru Newby2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The fix for 1037829 broke SimpleScheduler by unnecessarily including the 'self' parameter in the invocation of the parent's schedule_run_instance(). This change removes the 'self' parameter. * Addresses bug 1041385 Change-Id: I95b28fce9b17b6c1d9ca2f19cd83608cde8479ee
* | | | | | | | | Merge "Add missing user_id in revoke_certs_by_user_and_project()"Jenkins2012-08-251-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add missing user_id in revoke_certs_by_user_and_project()Yun Mao2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The correct function signature is revoke_certs_by_user_and_project(user_id, project_id) Partially fix bug 1037183 Change-Id: Ia0cf350da9b6d8cab5e43c9897a1614b1b9918e1
* | | | | | | | | | Merge "Rename class_name to project_id"Jenkins2012-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Rename class_name to project_idYun Mao2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | project_id is the variable used in the actual code, which is not defined without this patch. This bug is never caught because quota_usage_update seems to be no longer in use. Partially fix bug 1037183 Change-Id: I42a279489de75128e7acf09fd05873e73846d272
* | | | | | | | | | | Merge "Use the compute_rpcapi instance not the module"Jenkins2012-08-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Use the compute_rpcapi instance not the moduleYun Mao2012-08-241-1/+1
| | |_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | compute_rpcapi.get_console_pool_info is only available from the ComputeAPI object, not nova.compute.rpcapi module. Partially fix bug 1037183 Change-Id: I57df710389bf349c7ba1dd7980105222918bff92
* | | | | | | | | | | Merge "Add missing context argument to start_transfer calls"Jenkins2012-08-241-3/+4
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add missing context argument to start_transfer callsYun Mao2012-08-241-3/+4
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The first argument of start_transfer is context. Apparently it is missing. Partially fix bug 1037183 Change-Id: I83b30a8f7d275d7675d11bd8dcad76dd7a893deb
* | | | | | | | | | Merge "Make pre block migration create correct disk files."Jenkins2012-08-241-1/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Make pre block migration create correct disk files.Yaguang Tang2012-08-251-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug lp:1039356 Change-Id: Iede2c6d2ec2b1a68c37d1e8f8735fd2e5d273c67
* | | | | | | | | | | Merge "Remove unused and old methods in hyperv and powervm driver."Jenkins2012-08-243-20/+0
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Remove unused and old methods in hyperv and powervm driver.Yaguang Tang2012-08-253-20/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix bug lp:1040758 Change-Id: I0376384a2481e62f55a51e4a877d12c596aadaa1
* | | | | | | | | | | Merge "Trap iscsiadm error"Jenkins2012-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Trap iscsiadm errorChuck Short2012-08-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the iscsitarget was previously deleted and the user tries to delete the iscsi target again, then you get a nasty traceback in the logfiles. According to the iscsiadm man page, iscsiadm returns an error 21, ISCSI_ERR_NO_OBJS_FOUND if there is no records/targets/sessions/portals found to execute the operation on. LP: #1011166 Change-Id: I3087c1a114fe91bd7361d92688d4f926bc3f8951 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | | | Merge "Check volume status before detaching."Jenkins2012-08-241-0/+4
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Check volume status before detaching.Chuck Short2012-08-241-0/+4
| |/ / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If the volume is already detached previously, check the volume status before preforming the detach. Otherwise you get a nasty traceback because the instance_uuid no longer exists. Change-Id: I0df4240fb6500d5f99a20d63d82fd258fccdc9fc Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | | | Merge "Simplify network create logic"Jenkins2012-08-241-17/+15
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Simplify network create logicMark McLoughlin2012-08-241-17/+15
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The logic to determine default values for num_networks and network_size is currently overly convoluted. Simplify it in order to make the intent more clear, without actually changing the behaviour. Change-Id: Iadb83b1a45aaf52822ee34b972b3f004cef65ef3
* | | | | | | | | | | Merge "Clean up network create exception handling"Jenkins2012-08-241-7/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Clean up network create exception handlingMark McLoughlin2012-08-241-7/+1
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The NetworkManager code will not raise webob exceptions, so there's no point in explicitly catching those. Also, the contrib.networks module is unused in nova-manage. Change-Id: I5f9fe7fa7f4365f44e7a70b3d9536da8f10b8fa7
* | | | | | | | | | | Merge "Ensure hairpin_mode is set whenever vifs is added to bridge."Jenkins2012-08-241-7/+5
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ensure hairpin_mode is set whenever vifs is added to bridge.Yaguang Tang2012-08-241-7/+5
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the bug that when create a snapshot of an instance, the instance cann't ping it's floating ip. fix bug lp:1040537 Change-Id: I25aa1a323fa84e8c72f969cb56ada4dffa509150
* | | | | | | | | | | Merge "Returns hypervisor_hostname in xml of extension"Jenkins2012-08-244-3/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Returns hypervisor_hostname in xml of extensionVishvananda Ishaya2012-08-234-3/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The extended_server_attributes extension returns hypervisor_hostname in json output, but it was inadvertently omitted from xml. This makes the output consistent between the two. Tests included. Fixes bug 1039276 Change-Id: Ib8cd71cd5bfb65785a02085061fea5e515a0568c
* | | | | | | | | | | | Merge "Adds integration testing for api samples"Jenkins2012-08-2428-0/+812
|\| | | | | | | | | | | | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Adds integration testing for api samplesVishvananda Ishaya2012-08-2328-0/+812
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We have no validation the the samples at api.openstack.org are actually correct. This creates a framework to validate the request and response samples through integration tests. Adds a bit of stubbing in fake_network to return simple network_info along with instance records and adds a call in image/fake to get av valid image. It will create non-templated versions of the samples when the tests are running if GENERATE_SAMPLES is set in the environment when running nova/tests/integrated/test_api_samples.py Change-Id: Id134af0b23f0d0932c8789697439ce94bbe2834b
* | | | | | | | | | | Merge "Adding indexes to frequently joined database columns."Jenkins2012-08-2414-0/+840
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Adding indexes to frequently joined database columns.Justin Shepherd2012-08-2414-0/+840
| | |/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1006624 Change-Id: I0f1f6903a29cb8d3573987b88f62cd895a11c100
* | | | | | | | | | | Merge "Return actual availability zones"Jenkins2012-08-242-28/+73
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Return actual availability zonesMichael Still2012-08-232-28/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Report on real availability zones, not a hard coded "nova" zone in the output of ec2 DescribeAvailabilityZones when the output is verbose. Resolves bug 1032890. Change-Id: Ie85cfa1c3638fc490f52f48c8238b3162732647d
* | | | | | | | | | | | Merge "Check association when removing floating ip."Jenkins2012-08-242-1/+35
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Check association when removing floating ip.Lianhao Lu2012-08-232-1/+35
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1032558 and returns 404 when trying to delete a floating ip from an instance to which it is not associated. Change-Id: I30b4d8a318597d38c7afc01ee6d2e6842b999157
* | | | | | | | | | | Merge "Remove test_instance_update_with_instance_id test"Jenkins2012-08-241-23/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Remove test_instance_update_with_instance_id testYun Mao2012-08-231-23/+0
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | test_instance_update_with_instance_id is identical to test_instance_update_with_instance_uuid due to uuid conversion. Remove it for simpilcity. Change-Id: Ib348522900a62d6f7340357cac5f4a03c6163016
* | | | | | | | | | | Merge "Ensure log formats are quoted in sample conf"Jenkins2012-08-241-0/+2
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Ensure log formats are quoted in sample confMark McLoughlin2012-08-231-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1040583 This ensures the sample conf has: # instance_format="[instance: %(uuid)s] " rather than: # instance_format=[instance: %(uuid)s] Fix suggested by Vish. Change-Id: If20aa7276d6868a6885abc85f046733adc40331f DocImpact: update nova.conf docs
* | | | | | | | | | | | Merge "Don't include hostname and IP in generated sample conf"Jenkins2012-08-241-6/+26
|\| | | | | | | | | | |
| * | | | | | | | | | | Don't include hostname and IP in generated sample confMark McLoughlin2012-08-231-6/+26
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Avoid including the hostname and IP address of the machine generating the sample config file. Change-Id: Idf791efef8b0bf760c4c95f6f5f53d20bdf5ee7a
* | | | | | | | | | | Merge "Add two prereq pkgs to nova devref env guide"Jenkins2012-08-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Add two prereq pkgs to nova devref env guideTom Fifield2012-08-231-1/+1
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 1024903 As noted in the bug report, without libxml2-dev and libxslt-dev installed on ubuntu 12.04, the virtualenv creation will fail. This fix simply adds the packages to the first "Install the prerequisite packages." line Change-Id: I588ce14f63fa75d54405562f83d202d05c8a05c6
* | | | | | | | | | Merge "XCP-XAPI version fix"Jenkins2012-08-243-14/+97
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | |