I was looking at this review [1] and grepping through the code on that method and found a lot of old code [2][3] that needs to be removed but can't until we bump the network API version to 2.0. I know Russell has started bumping the compute RPC API version so would something like this for the network API fall under the same blueprint? [4]. I'm not sure if the network API was also in mind for that blueprint. [1] https://review.openstack.org/#/c/60603/ [2] https://github.com/openstack/nova/blob/master/nova/network/floating_ips.py#L511 [3] https://github.com/openstack/nova/blob/master/nova/network/manager.py#L399 [4] https://blueprints.launchpad.net/nova/+spec/rpc-major-version-updates-icehouse -- Thanks, Matt Riedemann