summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | | Merge "Fake requests in tests should be to v1"Jenkins2012-09-073-9/+9
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fake requests in tests should be to v1Mike Perez2012-09-073-9/+9
| |/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | v2 does not exist, yet. (cherry-picked from cinder commit ac1b465) Change-Id: Id3a332c4d78c87882a7db1a8b98479a3881b0a5f
* | | | | | | | | | | Merge "Implement paginate query use marker in nova-api"Jenkins2012-09-0710-37/+243
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Implement paginate query use marker in nova-apipengyuwei2012-09-0710-37/+243
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1.add limit and marker param to db.instance_get_all_by_filters() 2.set the filter use marker 3.execute limit before sqlarchmy get_all() 4.add testcase 'test_db_api.test_instance_get_all_by_filters_paginate' 5.related testcase: test_get_servers_with_marker() test_get_servers_with_limit_and_marker() in nova/tests/api/openstack/compute/test_servers.py test_instance_get_all_by_filters_paginate() in nova/tests/test_db_api.py 6.add InvalidSortkey exception Implement bp:efficient-limiting. Change-Id: Iea3eeb7b51194b6017d624506aafc6469d7338e4
* | | | | | | | | | Merge "Add a tunable to control how many ARPs are sent."Jenkins2012-09-071-8/+19
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Add a tunable to control how many ARPs are sent.Brian Haley2012-09-051-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This new flag, send_arp_for_ha_count, controls how many ARPs are sent when binding a floating IP address to an instance. Also increased the default number to 3 from 1, to make this more robust and guarantee other network devices see them. Fixes bug 1043796. Change-Id: Ib9118fcc5334ef4a8c5d7a5e765364e26fea68da
* | | | | | | | | | Merge "Fix EC2 cinder volume creation as an admin user."Jenkins2012-09-071-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix EC2 cinder volume creation as an admin user.Dan Prince2012-09-061-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Updates the EC2 API _format_volume function so that it only tries to add project_id and host to responses if those keys are present. This resolves a KeyError that would occur when using Cinder because volumes from it don't contain this information. Fixes LP Bug #1046464. Change-Id: I56b977cfd1ae482f2559a3f1fda8d1543d3ea227
* | | | | | | | | | | Fix typo in tgtadm LOG.error() callChuck Short2012-09-071-1/+1
| |_|/ / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1046875 Fix typo in LOG.error, it should be vol_id rather than volume_id. (cherry picked from cinder commit d6a5d0f) Change-Id: Id162c6f185a110b63e8f9f509f5cde75f3626cbf Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | Merge "Simplify setting up test notifier"Jenkins2012-09-075-9/+7
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Simplify setting up test notifierMark McLoughlin2012-09-075-9/+7
| | |_|_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rather than duplicating the test notifier module name, just use the __name__ attribute on the module itself. Also, where we were using stubout to set the notification_driver flag, switch to using cfg's set_override() mechanism. Change-Id: I46f705f71a4a220c235618491e06602fa4ea7a47
* | | | | | | | | | Merge "Fix synchronized decorator path cleanup"Jenkins2012-09-071-0/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix synchronized decorator path cleanupJoe Gordon2012-09-061-0/+1
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1047029 nova/tests/nova.compute.manager/ folder was being left behind during tests Change-Id: If56f719ebcb1f5d1d57a2a36c5f4cb59c7a1e285
* | | | | | | | | Merge "Allow cinder catalog match values to be configured"Jenkins2012-09-061-1/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow cinder catalog match values to be configuredVishvananda Ishaya2012-09-061-1/+15
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Depending on how a deployments keystone catalog is set up, the default values passed in to the cinder client may be incorrect. This adds a configuration option to specify exactly where to look for the cinder endpoint in the service catalog. Fixes bug 1047033 Change-Id: I93324b6930f384306311b0bbac375a9224283fbc
* | | | | | / / / Generate a flavorid if needed at flavor creationAdrien Cunin2012-09-075-4/+44
| |_|_|_|_|/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When creating a new flavor, it's now possible to omit flavorid. In this case it will be automatically generated using utils.gen_uuid(). nova-manage and OS API updated accordingly. Fixes: bug #1043410 Change-Id: Ibf9229599dac953177fbf1ffac5242ed716142db
* | | | | | | | Merge "Fix xml metadata for volumes extension."Jenkins2012-09-062-9/+181
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix xml metadata for volumes extension.Matthew Treinish2012-08-302-9/+181
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1040891 Change-Id: I3a5d46af18f764e86ab457071d2b3afafdcdaa24 Signed-off-by: Matthew Treinish <treinish@linux.vnet.ibm.com>
* | | | | | | | | Merge "Move api_samples to doc dir"Jenkins2012-09-0654-3/+14
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | |
| * | | | | | | | Move api_samples to doc dirMark McLoughlin2012-09-0554-3/+14
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The generated api_samples aren't used for the tests, they're only included in git so that they can be synced into the docs. Move them to the doc/ dir to make that more clear since I keep forgetting. Change-Id: I0851ac0ee234dc1e8740666716733e05f856ddec
* | | | | | | | Merge "Fix and cleanup compute node stat tracking"Jenkins2012-09-065-78/+121
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | |
| * | | | | | | Fix and cleanup compute node stat trackingBrian Elliott2012-09-065-78/+121
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix an issue where compute node stats are not reported correctly if the instance's state was modified from outside of the compute host. (e.g. nova-api server changing task_state prior to invoking a rebuild_instance on the compute manager) Also did some general cleanup on the stats code. bug 1046591 Change-Id: I5d9fc78f22df6854777c5957cbc69c8dd5ec10d3
* | | | | | | | Merge "Add missing argument to novncproxy websockify call"Jenkins2012-09-061-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Add missing argument to novncproxy websockify callThierry Carrez2012-09-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Current websockify constructor in nova-novncproxy requires target_path to be explicitely set. This commit adds the missing parameter. Fixes bug 1031998. Change-Id: I05e346b5df5bc1501b55ff606fc4cefdda889d60
* | | | | | | | | Merge "avoid the buffer cache when copying volumes"Jenkins2012-09-061-1/+12
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / |/| | | | | | | |
| * | | | | | | | avoid the buffer cache when copying volumesPádraig Brady2012-09-061-1/+12
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The dd process when clearing volumes, was seen to starve the system when writing to an iSCSI SAN connected over GigE. So use O_DIRECT within the dd process so that the system buffer cache is not impacted, which is generally the best thing to do when streaming large amounts of data. Also one could drop the I/O priority of the dd process by prepending "ionice -c3". That would change the priority from "normal" (best effort) to "idle", which means zeroing will only proceed when there is no other I/O on the system. It was thought best to leave scheduling decisions to the system however, rather than specifying them explicitly. Fixes bug: 937694 Change-Id: Ic842d7b83209c41d8ff05075990ed12e6f86283a
* | | | | | | | Merge "Fix creation of iscsi targets"Jenkins2012-09-066-140/+203
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix creation of iscsi targetsChuck Short2012-09-046-140/+203
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously when creating iscsi volumes, we were using tgt-admin -e -c <config file> --update volume-id Unfortunately the side affect of this is that tgt-admin removed other volumes that wasnt connected to an iscsi connector. Which is obvlously not what we want. In order to fix this we create the targets.conf for the volume but we call tgt-admin --update icssi qualified name. We also set the tid in the configuration file now as well. Fixes LP: #1038062 Change-Id: I23719390fbfaea5b55389a5c8ebaa8966cc283a8 Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | Merge "Fixing call to hasManagedSaveImage"Jenkins2012-09-063-16/+39
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fixing call to hasManagedSaveImageDerek Higgins2012-09-053-16/+39
| | |_|/ / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1044090 hasManagedSaveImage is not implmented in the LXC libvirt driver, resulting in the following error when a vm is deleted "Error from libvirt during saved instance removal. Code=3 Error=this function is not supported by the connection driver: virDomainHasManagedSaveImage" This commit replaces the use of hasManagedSaveImage, managedSaveRemove and undefine with undefineFlags which does the work of all 3 calls and is implemented in versions of libvirt > 0.9.4. We also revert back to calling undefine if undefineFlags raises an error. Change-Id: Ib8d451aeff7767f835c3c1aab99ee4ab5e299852
* | | | | | | | | Merge "Get the extension alias to compose the path to save the api samples"Jenkins2012-09-061-1/+3
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Get the extension alias to compose the path to save the api samplesMauro S. M. Rodrigues2012-09-051-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use extension alias instead of the whole module path to compose the directory where the api-samples will be saved. Change-Id: I7a1ae1deab4aa67643d960555fe6dbdcbc4e3c45
* | | | | | | | | Merge "Use lvs instead of os.listdir in _cleanup_lvm"Jenkins2012-09-063-1/+17
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Use lvs instead of os.listdir in _cleanup_lvmBoris Filippov2012-09-063-1/+17
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Compute user may not have permission to list /dev/<VolGroup> directory. This results in error during instance cleanup and not deleted lvm images, if libvirt driver use lvm images backend. To prevent this, _cleanup_lvm use lvs command instead of os.listdir. This fixes bug 1042710 Change-Id: I82ab4ca5ba3320f50c84e23839fcf6ed8f02be8c
* | | | | | | | | Merge "Fix typo in simple_tenant_usage tests"Jenkins2012-09-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix typo in simple_tenant_usage testsMark McLoughlin2012-09-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Simple s/futrue/future/ typo fix Change-Id: I110205c2392075ac8b7f7e423e466e1a6fbfab64
* | | | | | | | | Merge "Fix simple_tenant_usage's handing of future end times"Jenkins2012-09-052-6/+27
|\| | | | | | | |
| * | | | | | | | Fix simple_tenant_usage's handing of future end timesRongzeZhu2012-09-052-6/+27
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug #1043999 simple_tenant_usage returns the usage in the range between the supplied start and end query parameters. The _hours_for() method calculates the number of hours the instance was running in this range, even if the end time is in the future. By default, python-novaclient requests usage between 4 weeks ago and tomorrow. This means we a report which accounts for 24 hours of extra running time for each currently running instance. Fix this by clamping the period of the returned report at the current time. Change-Id: I61c211fd85b729aaeaac6ef24644ee19eb5bb6b0
* | | | | | | | | Merge "Speed up creating floating ips."Jenkins2012-09-051-1/+12
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Speed up creating floating ips.Michael Still2012-09-041-1/+12
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously, we would make two separate DB calls for each floating ip we created in floating_ip_bulk_create. This was just a little slow (several hours to create a /16). This patch speeds up floating ip creation just a little: $ time bin/nova-manage floating create --ip_range=10.250.0.0/16 real 0m48.766s user 0m34.342s sys 0m1.984s Resolves bug 1023560. Change-Id: Ie3663440d414b102111178899db0c571769edba8
* | | | | | | | | Merge "Escape ec2 XML error responses"Jenkins2012-09-053-4/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Escape ec2 XML error responsesAndrew James2012-09-043-4/+10
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 978439 XML error responses to ec2 calls include user supplied data that is not escaped. This could result in returning invalid XML. This is addressed by using utils.xhtml_escape() on purposeful eC2 error responses and when handling webob.exc.HTTPException. Extended the tests for utils.xhtml_escape() to cover '&', '>', '<' and a tag look-alike. These conversions are implicit to saxutils.escape(). Change-Id: Icb3e861c6c06c0d9c3b9e2ab1a658581a0fb39c6
* | | | | | | | | Merge "Allow admins to de-allocate any floating IPs"Jenkins2012-09-052-0/+16
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Allow admins to de-allocate any floating IPsDongdong Zhou2012-09-042-0/+16
| |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 1045508 Change-Id: Ie5be3748c16a592209934cc85777f534e84842bc
* | | | | | | | | Merge "Add scope to extra_specs entries"Jenkins2012-09-054-10/+17
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Add scope to extra_specs entriesDon Dugger2012-09-054-10/+17
| | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Do to conflicts between different scheduler filters it is necessary to allow an optional scope for the different keys. This scope is a leading string followed by a ':' character, e.g.: foo:bar is the `bar' entry with scope `foo'. The Trusted filter will now use the scope `trust' and the AggregateInstanceExtraSpecs and ComputeCapabilities filters will check against any unscoped keys in the `extra_specs' table. Any new filters that utilize the `extra_specs' table will need to use a unique scope string for any keys they require. Resolves bug 1039386 Change-Id: I2466dc3d4de8e9aeb76b294eeda1c939c0413366 Signed-off-by: Don Dugger <donald.d.dugger@intel.com
* | | | | | | | Merge "Fix instances query for compute stats"Jenkins2012-09-051-2/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix instances query for compute statsBrian Elliott2012-09-021-2/+1
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix the query the compute resource stats generation uses to filter out deleted instances. bug 1046431 Change-Id: I634020d798a23ff5da97aaf9172b403005c1bd1a
* | | | | | | | Merge "fix issues with Nova security groups and Quantum"Jenkins2012-09-055-28/+183
|\ \ \ \ \ \ \ \
| * | | | | | | | fix issues with Nova security groups and QuantumDan Wendlandt2012-08-305-28/+183
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug #1039400 - make quantumv2/api.py fetch actual DHCP server address, which is needed by firewall layer (otherwise, the gateway IP is incorrectly used and all DHCP traffic is dropped). - add missing call from quantumv2/api.py to the security groups API when a VM is allocated/deallocated. - Add a vif-driver that is a hybrid of the existing Open vswitch + linux bridge drivers, which allows OVS quantum plugins to be compatible with iptables based filtering, in particular, nova security groups. - Also clean-up some docstrings in virt/libvirt/vif.py Change-Id: I7cf5cf09583202a12785b616d18db3ee4bbffee0