diff --git a/doc/api_samples/os-networks/network-show-resp.json b/doc/api_samples/os-networks/network-show-resp.json index f3d7a18ce84b..afe315561fb5 100644 --- a/doc/api_samples/os-networks/network-show-resp.json +++ b/doc/api_samples/os-networks/network-show-resp.json @@ -5,7 +5,7 @@ "broadcast": "10.0.0.7", "cidr": "10.0.0.0/29", "cidr_v6": null, - "created_at": "2011-08-15 06:19:19.387525", + "created_at": "2011-08-15T06:19:19.387525", "deleted": false, "deleted_at": null, "dhcp_start": "10.0.0.3", @@ -23,7 +23,7 @@ "priority": null, "project_id": "1234", "rxtx_base": null, - "updated_at": "2011-08-16 09:26:13.048257", + "updated_at": "2011-08-16T09:26:13.048257", "vlan": 100, "vpn_private_address": "10.0.0.2", "vpn_public_address": "127.0.0.1", diff --git a/doc/api_samples/os-networks/networks-list-resp.json b/doc/api_samples/os-networks/networks-list-resp.json index 90da7c15d458..2c11618a4916 100644 --- a/doc/api_samples/os-networks/networks-list-resp.json +++ b/doc/api_samples/os-networks/networks-list-resp.json @@ -6,7 +6,7 @@ "broadcast": "10.0.0.7", "cidr": "10.0.0.0/29", "cidr_v6": null, - "created_at": "2011-08-15 06:19:19.387525", + "created_at": "2011-08-15T06:19:19.387525", "deleted": false, "deleted_at": null, "dhcp_start": "10.0.0.3", @@ -24,7 +24,7 @@ "priority": null, "project_id": "1234", "rxtx_base": null, - "updated_at": "2011-08-16 09:26:13.048257", + "updated_at": "2011-08-16T09:26:13.048257", "vlan": 100, "vpn_private_address": "10.0.0.2", "vpn_public_address": "127.0.0.1", @@ -36,7 +36,7 @@ "broadcast": "10.0.0.15", "cidr": "10.0.0.10/29", "cidr_v6": null, - "created_at": "2011-08-15 06:19:19.885495", + "created_at": "2011-08-15T06:19:19.885495", "deleted": false, "deleted_at": null, "dhcp_start": "10.0.0.11", diff --git a/nova/tests/api/openstack/compute/contrib/test_networks.py b/nova/tests/api/openstack/compute/contrib/test_networks.py index 732b42b4ca6a..a01edbcbf692 100644 --- a/nova/tests/api/openstack/compute/contrib/test_networks.py +++ b/nova/tests/api/openstack/compute/contrib/test_networks.py @@ -15,6 +15,7 @@ # under the License. import copy +import datetime import math import uuid @@ -36,7 +37,7 @@ FAKE_NETWORKS = [ { 'bridge': 'br100', 'vpn_public_port': 1000, 'dhcp_start': '10.0.0.3', 'bridge_interface': 'eth0', - 'updated_at': '2011-08-16 09:26:13.048257', + 'updated_at': datetime.datetime(2011, 8, 16, 9, 26, 13, 48257), 'id': 1, 'uuid': '20c8acc0-f747-4d71-a389-46d078ebf047', 'cidr_v6': None, 'deleted_at': None, 'gateway': '10.0.0.1', 'label': 'mynet_0', @@ -48,7 +49,7 @@ FAKE_NETWORKS = [ 'vpn_public_address': '127.0.0.1', 'multi_host': False, 'dns1': None, 'dns2': None, 'host': 'nsokolov-desktop', 'gateway_v6': None, 'netmask_v6': None, 'priority': None, - 'created_at': '2011-08-15 06:19:19.387525', + 'created_at': datetime.datetime(2011, 8, 15, 6, 19, 19, 387525), }, { 'bridge': 'br101', 'vpn_public_port': 1001, @@ -63,7 +64,7 @@ FAKE_NETWORKS = [ 'cidr': '10.0.0.10/29', 'vpn_public_address': None, 'multi_host': False, 'dns1': None, 'dns2': None, 'host': None, 'gateway_v6': None, 'netmask_v6': None, 'priority': None, - 'created_at': '2011-08-15 06:19:19.885495', + 'created_at': datetime.datetime(2011, 8, 15, 6, 19, 19, 885495), }, ]