nova/nova
Dan Smith 526853ea20 Fix FloatingIP.save() passing FixedIP object to sqlalchemy
This prevents the FloatingIP.save() method from passing the
calculated FixedIP object to the sqlalchemy floating_ip_update()
function, which would expect it to be an SA object. It also
aborts any attempt to save the object with a modified fixed_ip_id
linkage, as associate/disassociate should be used for that.

This also fixes a bug where FloatingIP expects the result of
floating_ip_update() to be a FloatingIp SA object.

Added missing import to allow tests to work in stable/icehouse.

Change-Id: I065caedf4d81c8583a3b390934a1d403cf2e87bd
Closes-bug: #1334164
(cherry picked from commit 48de2895b9)
2014-08-07 23:48:15 -04:00
..
api Merge "Do not pass instances without host to compute API" into stable/icehouse 2014-07-31 18:53:22 +00:00
CA
cells Merge "Cells: Send instance object for instance_delete_everywhere" 2014-03-20 02:50:52 +00:00
cert Remove vi modelines 2014-02-03 14:19:44 +00:00
cloudpipe Remove vi modelines 2014-02-03 14:19:44 +00:00
cmd Fix the wrong dest of 'vlan' option and add new 'vlan_start' option 2014-06-30 01:16:56 +00:00
compute Merge "Prevent clean-up of migrating instances on compute init" into stable/icehouse 2014-08-01 16:21:43 +00:00
conductor InvalidCPUInfo exception added to except block 2014-04-22 13:55:37 -04:00
console Enable flake8 H404 checking 2014-02-27 11:15:55 +04:00
consoleauth Move consoleauth_manager option into nova.service and fix imports 2014-02-15 08:38:42 -08:00
db Fix FloatingIP.save() passing FixedIP object to sqlalchemy 2014-08-07 23:48:15 -04:00
hacking Revert "Adding image multiple location support" 2014-03-12 08:27:20 -07:00
image GlanceImageService static methods to module scope 2014-03-18 16:31:22 -04:00
ipv6 Remove vi modelines 2014-02-03 14:19:44 +00:00
keymgr Enable flake8 H404 checking 2014-02-27 11:15:55 +04:00
locale Fix Jenkins translation jobs 2014-04-08 11:03:04 +02:00
network Merge "Neutronv2 api does not support neutron without port quota" into stable/icehouse 2014-07-31 17:16:11 +00:00
objects Fix FloatingIP.save() passing FixedIP object to sqlalchemy 2014-08-07 23:48:15 -04:00
objectstore Add HEAD api response for test s3 server BucketHandler 2014-02-09 01:16:33 +08:00
openstack Reap child processes gracefully if greenlet thread gets killed 2014-05-19 02:52:28 -07:00
pci Enable flake8 H404 checking 2014-02-27 11:15:55 +04:00
rdp Adds RDP console support 2014-02-07 21:20:08 +02:00
scheduler Scheduler: enable scheduler hint to pass the group name 2014-07-07 09:45:27 -04:00
servicegroup Change initial delay for servicegroup api reporting 2014-03-19 12:13:57 -06:00
spice Remove vi modelines 2014-02-03 14:19:44 +00:00
storage Remove vi modelines 2014-02-03 14:19:44 +00:00
tests Fix FloatingIP.save() passing FixedIP object to sqlalchemy 2014-08-07 23:48:15 -04:00
virt Mask block_device_info auth_password in virt driver debug logs 2014-08-05 13:26:44 +08:00
vnc Remove vi modelines 2014-02-03 14:19:44 +00:00
volume Set the volume access mode during volume attach 2014-06-05 17:01:58 -04:00
__init__.py Remove vi modelines 2014-02-03 14:19:44 +00:00
availability_zones.py Merge "Fixing availability-zone not take effect error" 2014-02-02 08:08:40 +00:00
baserpc.py Port to oslo.messaging 2014-02-01 09:53:24 +00:00
block_device.py Fix BDM legacy usage with objects 2014-03-06 13:17:27 -08:00
config.py Re-work how debugger CLI opts are registered 2014-03-25 06:44:50 -04:00
context.py Enable flake8 H404 checking 2014-02-27 11:15:55 +04:00
crypto.py Remove vi modelines 2014-02-03 14:19:44 +00:00
debugger.py Re-work how debugger CLI opts are registered 2014-03-25 06:44:50 -04:00
exception.py Require admin context for interfaces on ext network 2014-04-07 17:10:49 -04:00
filters.py
hooks.py Remove vi modelines 2014-02-03 14:19:44 +00:00
loadables.py
manager.py add support for host driver cleanup during shutdown 2014-03-14 12:01:34 -04:00
netconf.py Enable flake8 H404 checking 2014-02-27 11:15:55 +04:00
notifications.py Remove vi modelines 2014-02-03 14:19:44 +00:00
paths.py Reverts change to default state_path 2014-03-12 17:49:42 +00:00
policy.py Adds unit test for etc/nova/policy.json data 2014-02-28 07:24:32 +01:00
quota.py Enable flake8 H404 checking 2014-02-27 11:15:55 +04:00
rpc.py Serialize the notification payload in json 2014-02-20 11:42:40 +01:00
safe_utils.py Remove vi modelines 2014-02-03 14:19:44 +00:00
service.py Handle service creation race by service workers 2014-07-21 16:14:42 +01:00
test.py Turn periodic tasks off in all unit tests 2014-07-24 20:45:44 +00:00
utils.py Avoid possible timing attack in metadata api 2014-07-23 12:45:06 +10:00
version.py Remove vi modelines 2014-02-03 14:19:44 +00:00
weights.py Using six.add_metaclass 2014-02-11 09:45:20 +08:00
wsgi.py Make webob.exc.HTTPForbidden return correct message 2014-02-24 19:22:35 +09:00