summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | tests: fix LdapDNS to allow running test_network in isolationPádraig Brady2012-02-151-0/+7
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * nova/tests/test_network.py (LdapDNSTestCase): Since the ldapdns module imports ldap unconditionally, the following will not run on a system without python-ldap installed ./run_tests.sh test_network Therefore ensure the fake ldap module is used, as is the case when running the full test suite. Change-Id: If92c613bf2684c25cdadf2ac7f53f2005979b2b6
* | | | | / / / / / / / / / misc networking fixesTrey Morris2012-02-1510-98/+121
| |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o fixed dns bug where dns was gotten from the wrong subnet o project_id passed to get_instance_nw_info for when context.project_id is null o removed line breaks around quantum client request to improve readability o project_id passed into vif creation instead of using context o exception handling around get_attached_ports in quantum connection o updated object id generation to start with 1 in network_fake o updated the fake subnets returned in the network_fake o added proper v6 address generation to network_fake o improved get_instance_nw_info test o update api.openstack.compute.test_servers around improved network fake Change-Id: I74d0a9dbfcbd38e2fbc7d7fefc2587e578980b6e
* | | | | | | | | | | | | Merge "Move connection pool back into impl_kombu/qpid."Jenkins2012-02-154-63/+63
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Move connection pool back into impl_kombu/qpid.Russell Bryant2012-02-084-63/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix bug 928996. This patch moves the creation of the connection pool from nova.rpc.amqp back into nova.rpc.impl_kombu and nova.rpc.impl_qpid. The pool now gets passed into nova.rpc.amqp using arguments as needed. The previous method worked fine unless both rpc implementations got loaded into the same Python instance. In that case, whichever one got loaded 2nd had control over what type of connections nova.rpc.amqp would create. With these changes in place, this conflict between impl_kombu and impl_qpid is resolved. Change-Id: I72bc0c95bfc04ccdfb89d3456332f622ca5ffa42
* | | | | | | | | | | | | | Merge "Expand Quantum Manager Unit Tests + Associated Fixes"Jenkins2012-02-155-308/+478
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Expand Quantum Manager Unit Tests + Associated FixesDan Wendlandt2012-02-155-308/+478
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Add fake quantum client to support more complete testing of Quantum Mgr - Fix issue related to filters not being appended to Quantum queries - Expand unit tests to check for # vifs, ports created, nic order. - Add direct unit tests for quantum_connection class. - improve error reporting for get_port_by_attachment - remove invalid comment about not supporting floating IPs - Remove E-3 hack that only allowed L3 gateway if DHCP was enabled. Proper way to disable L3 gateway is to use the nova.network.l3.NullL3 driver. - fix delete_network to properly find UUIDs for project specific networks - fix issue with 'requested_networks' not working properly for a provider network. - remove dead chunk of code that is unused because all networks in quantum currently correspond to an entry in the nova db. - make sure validate_networks allows both provider + tenant networks. Update: incorporated feedback from first round of reviews. Change-Id: Id63d27d457c63efe7ea27a7fbd7470a0a5709125
* | | | | | | | | | | | | | | Merge "LOG.exception only works while in an exception handler"Jenkins2012-02-154-7/+6
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | LOG.exception only works while in an exception handlerJohannes Erdfelt2012-02-144-7/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It's also unnecessary to set exc_info to sys.exc_info since it does this for you Change-Id: Idd8844d18d4945c029f25dd70de7c842bd9a8305
* | | | | | | | | | | | | | | | Catch httplib.HTTPException as wellJohannes Erdfelt2012-02-151-0/+4
| |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 932927 None of the httplib exceptions will get converted into urllib2 exceptions Change-Id: Iad72821fa1ed54fdb213b371223e94e183dec334
* | | | | | | | | | | | | | | Merge "bw_usage takes a MAC address now."Jenkins2012-02-151-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | bw_usage takes a MAC address now.Josh Kearney2012-02-151-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ia54a1e21903b96d4f5a07c0513a3dce5ae9f589e
* | | | | | | | | | | | | | | | Merge "Prevent Duplicate VLAN IDs"Jenkins2012-02-154-0/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Prevent Duplicate VLAN IDsAndrew Clay Shafer2012-02-154-0/+20
| | |_|/ / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Addresses Bug 708278 Add check for duplicates in api.py Add DuplicateVlan to exception.py Add test to raise DuplicateVlan in test_db_api.py Add to Authors Change-Id: I9d68d7b7c886071e38df3c9d7d53724758bdd84c
* | | | | | | | | | | | | | | Merge "Fix the description of the --vnc_enabled option"Jenkins2012-02-151-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix the description of the --vnc_enabled optionAlvaro Lopez Garcia2012-02-151-2/+2
| |/ / / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If03c8613ec11e6f95f830ef48dd3978e874ecf5d
* | | | | | | | | | | | | | Merge "Update migration 076 so it supports PostgreSQL."Jenkins2012-02-153-15/+32
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Update migration 076 so it supports PostgreSQL.Dan Prince2012-02-143-15/+32
| | |_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes LP Bug #32154. Change-Id: I9d6ddfedcc39308811ff5264879b45b4847ec4a8
* | | | | | | | | | | | | Merge "Changing nova-manage error message"Jenkins2012-02-153-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Changing nova-manage error messageDerek Higgins2012-02-143-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CA filesystem now created by nova-cert Also changing Author details Change-Id: I456d985810d6f0312a7ef94b21637f347e933303
* | | | | | | | | | | | | Merge "Added resize support for Libvirt/KVM."Jenkins2012-02-159-13/+443
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Added resize support for Libvirt/KVM.Nachi Ueno2012-02-149-13/+443
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements blueprint libvirt-resize This implmenation using scp to copy VM image, so scp command and ssh-pub-key s Change-Id: I6450e5bbc5a33abc9ef55cf04366280bd1c5241e
* | | | | | | | | | | | | Merge "Resolve bug/931794 -- add uuid to fake."Jenkins2012-02-141-1/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Resolve bug/931794 -- add uuid to fake.Michael Still2012-02-141-1/+2
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I07b7b5588f35c05ddd7cb0afa866ecca69aac26d
* | | | | | | | | | | | | Merge "_() works best with string literals"Jenkins2012-02-141-3/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | _() works best with string literalsJohannes Erdfelt2012-02-141-3/+3
| | |/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise the tools will miss this string and it won't be internationalized Change-Id: I1969e4514adf08f3d67dc9048bf7d44b78700056
* | | | | | | | | | | | Merge "Don't query database with an empty list for IN clause"Jenkins2012-02-143-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Don't query database with an empty list for IN clauseJohannes Erdfelt2012-02-133-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 931687 Change-Id: Ieec2c43c1d56c8d54d5bce606db9909b2ef5d6d4
* | | | | | | | | | | | | Remove unnecessary constructors for exceptionsJohannes Erdfelt2012-02-142-14/+4
| |/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | They are unnecessary and end up just adding extra code Change-Id: I1aa6e7be7640dfc0e5fb05a2d662fa42d2cd82c3
* | | | | | | | | | | | Merge "Add support for LXC volumes."Jenkins2012-02-143-2/+99
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Add support for LXC volumes.Chuck Short2012-02-083-2/+99
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This introduces volume support for LXC containers in Nova. The way that this works is that when a device is attached to an LXC container is that, the xml is parsed to find out which device to connect to the LXC container, binds the device to the LXC container, and allow the device through cgroups. This bug fixes LP: #924601. Change-Id: I00b41426ae8354b3cd4212655ecb48319a63aa9b Signed-off-by: Chuck Short <chuck.short@canonical.com>
* | | | | | | | | | | | | Merge "Replace ApiError with new exceptions"Jenkins2012-02-1435-230/+238
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Replace ApiError with new exceptionsBrian Waldon2012-02-1435-230/+238
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Convert ApiError to EC2APIError * Add new exceptions to replace ApiError where it didn't belong * Fixes bug 926250 Change-Id: Ia711440ee0313faf8ea8c87e2c0a2f5b39cc55a2
* | | | | | | | | | | | | | Merge "e2fsck needs -y"Jenkins2012-02-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | e2fsck needs -yRick Harris2012-02-141-1/+1
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 932257 Change-Id: I396c3498bca8f3e1a5131db81e6e0d1900b6f09f
* / | | | | | | | | | | | Standardize logging delaration and useJason Kölker2012-02-14219-269/+325
|/ / / / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Make modules use getLogger(__name__) and log to the result Change-Id: Ib6d69b4be140ec89affc86ed11e65e422d551df1
* | | | | | | | | | | | Merge "Fix WADL/PDF docs referenced in describedby links"Jenkins2012-02-143-28/+36
|\ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Fix WADL/PDF docs referenced in describedby linksEoghan Glynn2012-02-143-28/+36
| | |_|/ / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These compute API links were broken, previously referring to Rackspace URLs with s/v1.0/v1.1/ The links now correctly reference long-lived locations on docs.openstack.org. Change-Id: I10efca2868a05982a1783688e374060acf1d0a69
* | | | | | | | | | | Merge "clean pyc files before running unit tests"Jenkins2012-02-141-0/+3
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | clean pyc files before running unit testsJoe Gordon2012-02-131-0/+3
| | |_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If7ad58f131d8b780125df7ecb5c4081014064f72
* | | | | | | | | | | Merge "typo fix"Jenkins2012-02-141-1/+1
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | typo fixJoe Gordon2012-02-131-1/+1
| |/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I001b5d18c50b71e68fe6277d5f8558551a0ad377
* | | | | | | | | | Merge "Changes for supporting fast cloning on Xenserver. Implements ↵Jenkins2012-02-149-20/+268
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | | | | | | | | | | blueprint fast-cloning-for-xenserver 1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 2. image-id is used to tag an image which has already been streamed from glance. 3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host."
| * | | | | | | | | Changes for supporting fast cloning on Xenserver.Devdeep Singh2012-02-139-20/+268
| | |_|_|/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Implements blueprint fast-cloning-for-xenserver 1. use_cow_images flag is reused for xenserver to check if copy on write images should be used. 2. image-id is used to tag an image which has already been streamed from glance. 3. If cow is true, when an instance of an image is created for the first time on a given xenserver, the image is streamed from glance and copy on write disk is created for the instance. 4. For subsequent instance creation requests (of the same image), a copy on write disk is created from the base image that is already present on the host. 5. If cow is false, when an instance of an image is created for the first time on a host, the image is streamed from glance and its copy is made to create a virtual disk for the instance. 6. For subsequent instance creation requests, a copy of disk is made for creating the disk for the instance. 7. Snapshot creation code was updated to handle cow=true. Now there can be upto 3 disks in the chain. The base disk needs to be uploaded too. 8. Also added a cache_images flag. Depending on whether the flag is turned on on not, images will be cached on the host. Change-Id: I54838a24b061c134877f3479c925c6ee78da14bc
* | | | | | | | | Merge "get_user behavior in ldapdriver"Jenkins2012-02-142-1/+11
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | get_user behavior in ldapdriverjohn-griffith2012-02-132-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Addresses bug 744462 Rather than ldapdriver.get_user() returning None for non-existent user, this change implements exception.LDAPUserNotFound to more closely match the behavior of other drivers (db). Change was made in public method only, and _check_user_exists() which uses get_user() now catches and returns None if applicable. Implemented test of NotFound exception in base auth test class. Change-Id: Ia13af759931ca0c7327d54184730537bafbe52ae
* | | | | | | | | | Merge "Fsck disk before removing journal"Jenkins2012-02-141-10/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fsck disk before removing journalRick Harris2012-02-131-10/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 931743 Change-Id: Ibf257ca74432f8e6387ffae58f6b38477de59272
* | | | | | | | | | Merge "Handle refactoring of libvirt image caching."Jenkins2012-02-142-64/+167
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Handle refactoring of libvirt image caching.Michael Still2012-02-092-64/+167
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch handles the refactored image caching for libvirt. The new scheme keeps multiple copies of an image: <fingerprint>: the image from glance <fingerprint>_<size>: the resized image The resized image is then copied or CoW'd across to the instance disk. We also want to keep original images from glance longer than we keep the resized images, as they're smaller and this reduces the load on glance. Therefore a new flag to handle the differing rules has been added. Change-Id: If6d9471b3d67cb8fac3f168b1b4a3cd57b9cc9a7
* | | | | | | | | | | Merge "bug 929428: pep8 validation on all xapi plugins"Jenkins2012-02-141-2/+4
|\ \ \ \ \ \ \ \ \ \ \