After the two fixes above, I see failures from the following 87 test cases which need resolving nova.tests.api.ec2.test_cloud.CloudTestCase test_describe_instances_with_filters_tags FAIL nova.tests.api.openstack.compute.contrib.test_availability_zone.AvailabilityZoneApiTest test_availability_zone_detail FAIL nova.tests.api.openstack.compute.contrib.test_flavor_access.FlavorAccessSerializerTest test_serializer FAIL nova.tests.api.openstack.compute.plugins.v3.test_availability_zone.AvailabilityZoneApiTest test_availability_zone_detail FAIL nova.tests.api.openstack.compute.plugins.v3.test_keypairs.KeypairsTest test_keypair_create_with_empty_name FAIL nova.tests.api.openstack.compute.test_versions.VersionsTest test_multi_choice_image FAIL test_multi_choice_server FAIL nova.tests.api.openstack.test_xmlutil.SelectorTest test_empty_selector FAIL nova.tests.api.openstack.compute.test_versions.VersionsTest test_multi_choice_image_xml FAIL nova.tests.api.openstack.test_xmlutil.MiscellaneousXMLUtilTests test_make_flat_dict FAIL nova.tests.image.test_glance.TestGlanceSerializer test_serialize FAIL nova.tests.integrated.test_api_samples.AggregatesSampleXmlTest test_add_host FAIL test_add_metadata FAIL test_aggregate_get FAIL test_remove_host FAIL test_update_aggregate FAIL nova.tests.integrated.test_api_samples.DiskConfigXmlTest test_get_image FAIL nova.tests.integrated.test_api_samples.DiskConfigJsonTest test_get_image FAIL nova.tests.integrated.test_api_samples.ImageSizeSampleXmlTests test_show FAIL nova.tests.integrated.test_api_samples.ImagesSampleJsonTest test_image_get FAIL nova.tests.integrated.test_api_samples.ImagesSampleXmlTest test_image_metadata_post FAIL nova.tests.integrated.test_api_samples.ImageSizeSampleJsonTests test_show FAIL nova.tests.integrated.test_api_samples.ImagesSampleJsonTest test_image_metadata_get FAIL test_image_metadata_post FAIL nova.tests.integrated.test_api_samples.ImagesSampleXmlTest test_image_get FAIL test_image_metadata_get FAIL nova.tests.integrated.test_api_samples.ServersActionsAllJsonTest test_server_confirm_resize FAIL nova.tests.integrated.test_api_samples.ServersActionsAllJsonTest test_server_create_image FAIL nova.tests.integrated.test_api_samples.ServersActionsAllJsonTest test_server_password FAIL test_server_reboot_hard FAIL test_server_reboot_soft FAIL test_server_rebuild FAIL nova.tests.integrated.test_api_samples.ServersActionsAllXmlTest test_server_password FAIL nova.tests.integrated.test_api_samples.ServersActionsAllJsonTest test_server_resize FAIL nova.tests.integrated.test_api_samples.ServersActionsAllXmlTest test_server_reboot_soft FAIL nova.tests.integrated.test_api_samples.ServersActionsAllJsonTest test_server_revert_resize FAIL nova.tests.integrated.test_api_samples.ServersActionsAllXmlTest test_server_rebuild FAIL test_server_confirm_resize FAIL test_server_resize FAIL test_server_create_image FAIL test_server_revert_resize FAIL test_server_reboot_hard FAIL nova.tests.integrated.test_api_samples.ServersSampleAllExtensionJsonTest test_servers_details FAIL test_servers_list FAIL test_servers_get FAIL test_servers_post FAIL nova.tests.integrated.test_api_samples.ServersSampleAllExtensionXmlTest test_servers_post FAIL test_servers_details FAIL nova.tests.integrated.test_api_samples.ServersSampleAllExtensionXmlTest test_servers_get FAIL nova.tests.integrated.test_api_samples.ServersSampleAllExtensionXmlTest test_servers_list FAIL nova.tests.integrated.v3.test_access_ips.AccessIPsSampleJsonTest test_servers_rebuild FAIL nova.tests.network.security_group.test_neutron_driver.TestNeutronDriver test_instances_security_group_bindings FAIL test_instances_security_group_bindings_less_than_max FAIL test_instances_security_group_bindings_more_then_max FAIL test_instances_security_group_bindings_with_hidden_sg FAIL nova.tests.network.test_linux_net.LinuxNetworkTestCase test_dnsmasq_execute_dns_servers FAIL nova.tests.network.security_group.test_neutron_driver.TestNeutronDriver test_instances_security_group_bindings_max FAIL nova.tests.objects.test_instance.TestInstanceObject test_datetime_deserialization FAIL test_ip_deserialization FAIL nova.tests.objects.test_instance.TestRemoteInstanceObject test_datetime_deserialization FAIL test_ip_deserialization FAIL nova.tests.objects.test_objects.TestObjectVersions test_versions FAIL nova.tests.objects.test_objects.TestObject test_base_attributes FAIL nova.tests.objects.test_objects.TestRemoteObject test_base_attributes FAIL nova.tests.test_availability_zones.AvailabilityZoneTestCases test_get_availability_zones FAIL nova.tests.test_iptables_network.IptablesManagerTestCase test_iptables_preserve_order FAIL test_iptables_bottom_order FAIL test_iptables_top_order FAIL test_remove_rules_regex FAIL nova.tests.test_matchers.TestIsSubDictOf test__str__ FAIL nova.tests.virt.disk.test_inject.VirtDiskTest test_inject_metadata FAIL nova.tests.virt.vmwareapi.test_driver_api.VMwareAPIVCDriverTestCase test_get_available_resource FAIL test_image_aging_not_aged FAIL test_image_aging_image_marked_for_deletion FAIL nova.tests.virt.vmwareapi.test_vm_util.VMwareVMUtilTestCase test_get_cdrom_attach_config_spec FAIL test_get_vnc_config_spec FAIL nova.tests.virt.vmwareapi.test_driver_api.VMwareAPIVMTestCase test_image_aging_aged FAIL test_image_aging_not_aged FAIL test_image_aging_image_marked_for_deletion FAIL test_timestamp_file_removed_aging FAIL test_timestamp_file_removed_spawn FAIL nova.tests.virt.vmwareapi.test_vm_util.VMwareVMUtilTestCase test_get_network_attach_config_spec_dvs FAIL test_get_network_attach_config_spec_opaque FAIL test_get_network_detach_config_spec FAIL test_get_vm_create_spec FAIL nova.tests.virt.xenapi.test_xenapi.XenAPIVMTestCase test_spawn_netinject_file FAIL test_spawn_netinject_xenstore FAIL