`nova-manage fixed list` fails if network has been deleted

Bug 754900 fixes a long standing issue of not deleting from fixed_ips when a network is deleted. However, the manner in which it "deletes" a fixed_ip (by setting the deleted column to true) is inconsistent with how the network is deleted (by actually deleting the record). Running `nova-manage fixed list` does not seem to honor the deleted column of fixed_ips, and proceeds to complain about the non-existent network.

The networks table has a deleted column, but it doesn't seem to be used. For the sake of audit-ability (hence the deleted column), shouldn't deleting a network just mark it as deleted, and all tools modified to honor the deleted state? If audit-ability is handled in another manner, shouldn't the fixed_ips records be deleted, as the associated network is?

Step to reproduce:

$ sudo nova-manage network list

id IPv4 IPv6 start address DNS1 DNS2 VlanID project uuid
1 10.0.19.0/24 None 10.0.19.3 None None 100 tenant1 99658bf1-f2fc-46ce-9adf-83bd7f7cdb72
2 10.1.19.0/24 None 10.1.19.3 None None 101 tenant2 dd660168-81b8-4b6f-b054-a5d1b8d5b293

$ sudo nova-manage network modify 10.0.19.0/24 --disassociate-project
$ sudo nova-manage network delete 10.0.19.0/24
$ sudo nova-manage network list

id IPv4 IPv6 start address DNS1 DNS2 VlanID project uuid
2 10.1.19.0/24 None 10.1.19.3 None None 101 tenant2 dd660168-81b8-4b6f-b054-a5d1b8d5b293

$ sudo nova-manage fixed list

network IP address hostname host
Command failed, please check log for more info
2012-07-06 11:04:31 CRITICAL nova [req-1de63acb-5a4b-40f0-9aee-53e86806dbee None None] Network 1 could not be found.
2012-07-06 11:04:31 TRACE nova Traceback (most recent call last):
2012-07-06 11:04:31 TRACE nova File "/usr/bin/nova-manage", line 1746, in <module>
2012-07-06 11:04:31 TRACE nova main()
2012-07-06 11:04:31 TRACE nova File "/usr/bin/nova-manage", line 1733, in main
2012-07-06 11:04:31 TRACE nova fn(*fn_args, **fn_kwargs)
2012-07-06 11:04:31 TRACE nova File "/usr/bin/nova-manage", line 584, in list
2012-07-06 11:04:31 TRACE nova fixed_ip['network_id'])
2012-07-06 11:04:31 TRACE nova File "/usr/lib/python2.7/dist-packages/nova/db/api.py", line 755, in network_get
2012-07-06 11:04:31 TRACE nova return IMPL.network_get(context, network_id)
2012-07-06 11:04:31 TRACE nova File "/usr/lib/python2.7/dist-packages/nova/db/sqlalchemy/api.py", line 120, in wrapper
2012-07-06 11:04:31 TRACE nova return f(*args, **kwargs)
2012-07-06 11:04:31 TRACE nova File "/usr/lib/python2.7/dist-packages/nova/db/sqlalchemy/api.py", line 1933, in network_get
2012-07-06 11:04:31 TRACE nova raise exception.NetworkNotFound(network_id=network_id)
2012-07-06 11:04:31 TRACE nova NetworkNotFound: Network 1 could not be found.
2012-07-06 11:04:31 TRACE nova

Versions:

Ubuntu - 12.04 LTS
Nova - 2012.1+stable~20120612-3ee026e-0ubuntu1.1