summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | Condense multiple authorizers into a single one.Andrew Laski2013-01-301-12/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reduces code duplication by creating a single authorizer and passing in the action that should be checked against policy. Change-Id: I33cfee8695ddfbba39038fbc608c6c74d258745f
* | | | | | | | | | | | | | | | | | | Merge "Extend extension_authorizer to enable cleaner code."Jenkins2013-02-021-3/+6
|\| | | | | | | | | | | | | | | | | | | |_|_|_|_|/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Extend extension_authorizer to enable cleaner code.Andrew Laski2013-01-301-3/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I have seen and used two different methods for authorizing multiple methods in a class, and both use code duplication that won't be necessary with this patch. The first method involves creating multiple authorizers, which can get out of hand quickly. i.e.: authorize_attach_index = extensions.extension_authorizer('compute', 'volume_attachments:index') authorize_attach_show = extensions.extension_authorizer('compute', 'volume_attachments:show') The second method involves creating an intermediate method in the extension like: def authorize(context, action_name): action = 'os-networksv2:%s' % action_name extensions.extension_authorizer('compute', action)(context) but this ends up getting duplicated in each file. This patch allows extensions to use the authorizers they already have but gives them finer control by passing something like "action='index'" to the authorizer. Change-Id: I6371b2c631acc9345ee6ca4672afa1f49781f22b
* | | | | | | | | | | | | | | | | | Merge "fix nova-baremetal-manage version printing"Jenkins2013-02-021-3/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | fix nova-baremetal-manage version printingPádraig Brady2013-01-281-3/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | version.version_string_with_vcs is no longer present Change-Id: Iaecf793b82c030f7095de7e42222e28869d1cf33
* | | | | | | | | | | | | | | | | | | Merge "populate dnsmasq lease db with valid leases"Jenkins2013-02-023-10/+60
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | populate dnsmasq lease db with valid leasesChet Burgess2013-01-253-10/+60
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At start dnsmasq retrieves its lease db by calling the nova-dhcpbridge script with the init action. Previously we were returning all allocated IPs in the network and calculating the lease exirpation time based upon instances.updated_at or instances.created_at. Now we are only returning entries for IPs that are allocated and leased. Additionally we set the lease expiration time to be i now + CONF.dhcp_lease_time Change-Id: Ie3b4fafd38094dc01ceea592ab5229e581193512 Fixes: bug #1103260
* | | | | | | | | | | | | | | | | | | | Merge "Refactoring/cleanup of compute and db apis"Jenkins2013-02-024-63/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Refactoring/cleanup of compute and db apisHans Lindgren2013-01-284-63/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Refactor db call usage and remove some unused code. Change-Id: I49466f7ab54dd6dbf0fc78bab3d2df44392ba3ee
* | | | | | | | | | | | | | | | | | | | | Merge "Quantum metadata handler now uses X-Forwarded-For"Jenkins2013-02-022-11/+35
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Quantum metadata handler now uses X-Forwarded-ForMark McClain2013-01-312-11/+35
| | |_|_|_|/ / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fixes bug 1097524 The guest IP address was not properly forwarded from the Quantum metadata proxy. This patch adds support in Nova for reading this X-Forwarded-For header. Previously, the internal proxy IP was mistakenly used exposing internal infrastructure details. Change-Id: I6d7d21e2aea4ca5debf1ca4ba6802012537f78a5
* | | | | | | | | | | | | | | | | | | | | Merge "Postgres does not like empty strings for type inet"Jenkins2013-02-021-0/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Postgres does not like empty strings for type inetDavanum Srinivas2013-02-011-0/+5
| | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Check for empty string and explicitly set address to None Fixes LP# 1112536 Change-Id: Ib6f1ca9ab4dd11a53e2ab8057664136166b4c616
* | | | | | | | | | | | | | | | | | | | | Merge "Remove deprecation notice in LibvirtBridgeDriver"Jenkins2013-02-021-10/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | / / / / / / / / / / | | |_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Remove deprecation notice in LibvirtBridgeDriverDaniel P. Berrange2013-01-301-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | After further discussions with Quantum team, it was agreed not to deprecate the existing libvirt VIF drivers until the Havana release, to allow more time for Quantum plugins to be updated. Blueprint: libvirt-vif-driver Change-Id: I0226c4117630de489543d35662a8ee6b6c7729f9 Signed-off-by: Daniel P. Berrange <berrange@redhat.com>
* | | | | | | | | | | | | | | | | | | | Merge "VMware Compute Driver Glance improvement"Jenkins2013-02-011-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | VMware Compute Driver Glance improvementSean Chen2013-01-241-4/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | blueprint vmware-compute-driver Glance change to fix image download to ESX The current glance code downloads files in a blocking/synchronous manner, the fix improves it to work with ESX glance file reader in a non-blocking manner. This allows ESX glance file reader to read items from the returned queue. Change-Id: I05ab7ac00878aeeea3bbcd7546b05398f2630dd3
* | | | | | | | | | | | | | | | | | | | Merge "Split floating ip functionality into new file."Jenkins2013-02-016-636/+675
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Split floating ip functionality into new file.Vishvananda Ishaya2013-01-316-636/+675
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is to prepare for moving this code into network.api. There was one minor change made to associate_floating_ip. It no longer checks access to the fixed ip's network before associating the floating ip to the fixed ip. The calling side was already verifying access to the instance so this is unnecessary. A note was added to the method call to ensure future usage of associate_floating keeps this in mind. Part of blueprint optimize-nova-network Change-Id: I4fcda82eebee46d167e028bb68c8fedf2c3e03a1
* | | | | | | | | | | | | | | | | | | | | Merge "Optimize network calls by moving them to api"Jenkins2013-02-015-24/+546
|\| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Optimize network calls by moving them to apiVishvananda Ishaya2013-01-315-24/+546
| | |/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now that quantumv2 replaces api, there is no need for many of the network calls to go over rpc. This patch optimizes them by moving the implementation into the api class. Note that the old methods are left in place to keep rpcapi compatibility. This patch also adds api_deprecated in case anyone is using a custom out-of-tree manager class. It is possible to set: network_api_class=nova.network.api_deprecated.API to get the old functionality. Part of blueprint optimize-nova-network Change-Id: I130908df060246e8a5f3711cf16d1c49ee3e2664
* | | | | | | | | | | | | | | | | | | | Merge "Add 'not in' test to tools/hacking.py"Jenkins2013-02-011-0/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | Add 'not in' test to tools/hacking.pyJoe Gordon2013-01-311-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | N901: Use the 'not in' operator for collection membership evaluation Change-Id: Ie156359d85dd089d68eb214f1569f27577800e17
* | | | | | | | | | | | | | | | | | | | | Merge "Removes retry of set_admin_password"Jenkins2013-02-014-61/+59
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | Removes retry of set_admin_passwordAmir Sadoughi2013-01-284-61/+59
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * An RPC timeout may occur if an agent is missing and set_admin_password is invoked. This causes 500 errors in the OpenStack API. * Implemented a 501 error in API if the password set fails. * Modified xenapi agent to use NotImplementedError instead of Exception in set_admin_password. * Updated test code around set_admin_password to accept different exceptions. * Fixes bug 1061045 Change-Id: If7fab56c20f12e0490f4774e00004ed1d94242b9
* | | | | | | | | | | | | | | | | | | | | | Merge "Add support for compressing qcow2 snapshots"Jenkins2013-01-311-5/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Add support for compressing qcow2 snapshotsRafi Khardalian2013-01-301-5/+16
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes bug 1109923 Adds a new configuration option: libvirt_snapshot_compression=False (Default) When set to True and the snapshot output format is qcow2, we pass the -c option into qemu-img, which enables compression. This patch also refactors the extract_image function to make construction of the whole qemu-img command more dynamic. Change-Id: I7a7ebcf41a91a8a9cb14be79e9bb79c22acb136e Flags: DocImpact
* | | | | | | | | | | | | | | | | | | | | | Merge "Use conductor for instance_info_cache_update."Jenkins2013-01-315-42/+39
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Use conductor for instance_info_cache_update.Russell Bryant2013-01-315-42/+39
| | |_|_|_|/ / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch updates the network API to be able to use the conductor API to be able to update the instance info cache. A previous commit, 5731852f91c32fe09db541888d3fee9e3139fc43, updated the compute manager to use this method from conductor when getting network info. This patch builds on that by moving the conductor usage down to the network API and using it in more places. Specifically, the network API calls used by the compute manager that use the refresh_cache decorator were updated. The refresh_cache decorator now checks for a conductor_api kwarg and will use the conductor to update the cache if it's not there. Otherwise it goes back to default behavior of using the db directly. Change-Id: Ib5e17f5f8fb4ee14e3ed305057d18d40f2e905e5
* | | | | | | | | | | | | | | | | | | | | | Merge "Fixes FloatingIPDNS extension 'show' method."Jenkins2013-01-312-48/+109
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fixes FloatingIPDNS extension 'show' method.Tiago Mello2013-01-312-48/+109
| | |_|_|/ / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changes the 'show' method to also work when 'id' is actually an IP and calls the right method to return a list of DNS entries for a given domain and IP when the called method is 'v2/{tenant_id}/os-floating-ip-dns/{domain}/entries/{ip}'. Fixes bug 1089410 Change-Id: I4c424e091209624324754c548e55bbbb304cf79f
* | | | | | | | | | | | | | | | | | | | | | Merge "Fixes unhandled exception in detach_volume"Jenkins2013-01-313-3/+89
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Fixes unhandled exception in detach_volumeTushar Patil2013-01-313-3/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Fixes the use case where an exception should have been raised when libvirtd goes down and a volume is being detached. * Added unit tests for detach_volume, but skipped one unit test for compute cells as it is giving an error (TypeError: detach_volume() takes exactly 3 arguments (4 given)) Fixes bug #1101079 Change-Id: I6d83947a0344c5f2d91014de6a2052a881198bb4
* | | | | | | | | | | | | | | | | | | | | | Merge "Fix rebuild with volumes attached"Jenkins2013-01-315-64/+92
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Fix rebuild with volumes attachedRick Harris2013-01-305-64/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch assumes that the correct behavior for instance rebuild is to maintain attached volumes across a rebuild operation. Two important changes are: 1) Detaching all volumes during a rebuild so that they won't be 'in-use' when prep_block_devices is called to reattach them. 2) xenapi: Allowing additional volumes, not just root volumes, to be attached before boot. To handle this, we cycle through all block-device-mappings, not just the root-device, create the VDI, and later, create the VBD. Small changes include: * Using `connection_data` instead of `dev_params` (to match other parts of the code base) * Renaming `get_vdis_for_boot_from_vol` to `get_vdi_uuid_for_volume` to reflect its more general and simpler semantics. Fixes bug 1071547 Change-Id: Ie54a16be4bae2a718ed7d506f32777d0847b9089
* | | | | | | | | | | | | | | | | | | | | | | Merge "DRYing up volume_in_mapping code."Jenkins2013-01-316-103/+75
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | DRYing up volume_in_mapping code.Rick Harris2013-01-306-103/+75
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Libvirt, VMWare, and Xen drivers all reimplement this method. This refactors the code into the `block_device` module so all drivers can share it. Future Work: Refactor xen so that strip_prefix doesn't need to be passed to `volume_in_mapping`. Change-Id: I026b655f2eb7ea9cebe84058749c05ce93bcb7d4
* | | | | | | | | | | | | | | | | | | | | | | Merge "Use _prep_block_device in rebuild."Jenkins2013-01-311-7/+14
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Use _prep_block_device in rebuild.Rick Harris2013-01-301-7/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This patch makes rebuild slightly more similar to build by calling the same function to prep block devices. Change-Id: I3040b49578ad0351be7819c29a449799f50c82a9
* | | | | | | | | | | | | | | | | | | | | | | Merge "xenapi: Ax unecessary `block_device_info` params"Jenkins2013-01-311-11/+12
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | xenapi: Ax unecessary `block_device_info` paramsRick Harris2013-01-301-11/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The xenapi driver uses the 'osvol' other_config to determine which volumes to detach, making `block_device_info` unecessary for internal functions. `destroy` still needs to accept the param since it's part of the virt-driver API. Change-Id: I1bbd69f41f9a1e18d4759d0ef3c6de027d3c9981
* | | | | | | | | | | | | | | | | | | | | | | Merge "Code cleanup for rebuild block device mapping"Jenkins2013-01-314-335/+239
|\| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Code cleanup for rebuild block device mappingRick Harris2013-01-304-335/+239
| | |_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Removes extra call to get block-device-mappings when detaching during recreate. * Untangle network handling from block-device handling in rebuild * DRYs up evacuate hosts tests * Temporary mutation supports dicts as well as objs * Make instance recreate exceptions more specific to aid testing Change-Id: I242f9f6a7d329f27b06b7e81b9a418e01682c82e
* | | | | | | | | | | | | | | | | | | | | | Merge "Add api samples to fping extension"Jenkins2013-01-3117-1/+208
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Add api samples to fping extensionMauro S. M. Rodrigues2013-01-2917-1/+208
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Partially implements bp nova-api-samples Fix bug 1091747 Change-Id: Ic0060b8ea2a01a304c337a31dc276cbf395c2e5d
* | | | | | | | | | | | | | | | | | | | | Merge "Fixes 'not in' operator usage"Jenkins2013-01-3130-53/+65
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Fixes 'not in' operator usageZhongyue Luo2013-01-3130-53/+65
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I1e26a8fcb9fa564308e63c11a72aaa55119e4eee
* | | | | | | | | | | | | | | | | | | | Merge "Pass parameter 'filter' back to model layer"Jenkins2013-01-312-1/+18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Pass parameter 'filter' back to model layerStephen Gran2013-01-292-1/+18
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the API to pass back additional arguments to filter search results by. This will be useful for resource tagging or other filters. DocImpact: Adds 'Filter' parameter to DescribeInstance (see http://docs.aws.amazon.com/AWSEC2/latest/APIReference/ApiReference-query-DescribeInstances.html) Fixes: bug #922835 Change-Id: I58cc12df650829ed7eb685184a22186d8a5406f4 Signed-off-by: Stephen Gran <stephen.gran@guardian.co.uk>
* | | | | | | | | | | | | | | | | | | Merge "Fixes "is not" usage"Jenkins2013-01-315-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | |