openstack/nova
Code Issues Proposed changes

Merge "Fix data error in api samples doc"

Browse Source
This commit is contained in:
Jenkins 2016-11-17 01:11:26 +00:00 committed by Gerrit Code Review
commit 6a2b1e2c99
8 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/api_samples/server-migrations/v2.23/migrations-get.json
View File

@ -11,10 +11,10 @@
"status": "running", "status": "running",
"memory_total_bytes": 123456, "memory_total_bytes": 123456,
"memory_processed_bytes": 12345, "memory_processed_bytes": 12345,
"memory_remaining_bytes": 120000, "memory_remaining_bytes": 111111,
"disk_total_bytes": 234567, "disk_total_bytes": 234567,
"disk_processed_bytes": 23456, "disk_processed_bytes": 23456,
"disk_remaining_bytes": 230000, "disk_remaining_bytes": 211111,
"updated_at": "2016-01-29T13:42:02.000000" "updated_at": "2016-01-29T13:42:02.000000"
} }
} }

4
doc/api_samples/server-migrations/v2.23/migrations-index.json
View File

@ -12,10 +12,10 @@
"status": "running", "status": "running",
"memory_total_bytes": 123456, "memory_total_bytes": 123456,
"memory_processed_bytes": 12345, "memory_processed_bytes": 12345,
"memory_remaining_bytes": 120000, "memory_remaining_bytes": 111111,
"disk_total_bytes": 234567, "disk_total_bytes": 234567,
"disk_processed_bytes": 23456, "disk_processed_bytes": 23456,
"disk_remaining_bytes": 230000, "disk_remaining_bytes": 211111,
"updated_at": "2016-01-29T13:42:02.000000" "updated_at": "2016-01-29T13:42:02.000000"
} }
] ]

4
nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-get.json.tpl
View File

@ -11,10 +11,10 @@
"status": "running", "status": "running",
"memory_total_bytes": 123456, "memory_total_bytes": 123456,
"memory_processed_bytes": 12345, "memory_processed_bytes": 12345,
"memory_remaining_bytes": 120000, "memory_remaining_bytes": 111111,
"disk_total_bytes": 234567, "disk_total_bytes": 234567,
"disk_processed_bytes": 23456, "disk_processed_bytes": 23456,
"disk_remaining_bytes": 230000, "disk_remaining_bytes": 211111,
"updated_at": "2016-01-29T13:42:02.000000" "updated_at": "2016-01-29T13:42:02.000000"
} }
} }

4
nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-index.json.tpl
View File

@ -12,10 +12,10 @@
"status": "running", "status": "running",
"memory_total_bytes": 123456, "memory_total_bytes": 123456,
"memory_processed_bytes": 12345, "memory_processed_bytes": 12345,
"memory_remaining_bytes": 120000, "memory_remaining_bytes": 111111,
"disk_total_bytes": 234567, "disk_total_bytes": 234567,
"disk_processed_bytes": 23456, "disk_processed_bytes": 23456,
"disk_remaining_bytes": 230000, "disk_remaining_bytes": 211111,
"updated_at": "2016-01-29T13:42:02.000000" "updated_at": "2016-01-29T13:42:02.000000"
} }
] ]

8
nova/tests/functional/api_sample_tests/test_server_migrations.py
View File

@ -85,10 +85,10 @@ class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase):
'hidden': False, 'hidden': False,
'memory_total': 123456, 'memory_total': 123456,
'memory_processed': 12345, 'memory_processed': 12345,
'memory_remaining': 120000, 'memory_remaining': 111111,
'disk_total': 234567, 'disk_total': 234567,
'disk_processed': 23456, 'disk_processed': 23456,
'disk_remaining': 230000, 'disk_remaining': 211111,
'created_at': datetime.datetime(2016, 0o1, 29, 13, 42, 2), 'created_at': datetime.datetime(2016, 0o1, 29, 13, 42, 2),
'updated_at': datetime.datetime(2016, 0o1, 29, 13, 42, 2), 'updated_at': datetime.datetime(2016, 0o1, 29, 13, 42, 2),
'deleted_at': None, 'deleted_at': None,
@ -106,10 +106,10 @@ class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase):
'hidden': False, 'hidden': False,
'memory_total': 456789, 'memory_total': 456789,
'memory_processed': 56789, 'memory_processed': 56789,
'memory_remaining': 45000, 'memory_remaining': 400000,
'disk_total': 96789, 'disk_total': 96789,
'disk_processed': 6789, 'disk_processed': 6789,
'disk_remaining': 96000, 'disk_remaining': 90000,
'created_at': datetime.datetime(2016, 0o1, 22, 13, 42, 2), 'created_at': datetime.datetime(2016, 0o1, 22, 13, 42, 2),
'updated_at': datetime.datetime(2016, 0o1, 22, 13, 42, 2), 'updated_at': datetime.datetime(2016, 0o1, 22, 13, 42, 2),
'deleted_at': None, 'deleted_at': None,

8
nova/tests/unit/api/openstack/compute/test_migrations.py
View File

@ -44,10 +44,10 @@ fake_migrations = [
'hidden': False, 'hidden': False,
'memory_total': 123456, 'memory_total': 123456,
'memory_processed': 12345, 'memory_processed': 12345,
'memory_remaining': 120000, 'memory_remaining': 111111,
'disk_total': 234567, 'disk_total': 234567,
'disk_processed': 23456, 'disk_processed': 23456,
'disk_remaining': 230000, 'disk_remaining': 211111,
'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2), 'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2), 'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
'deleted_at': None, 'deleted_at': None,
@ -69,10 +69,10 @@ fake_migrations = [
'hidden': False, 'hidden': False,
'memory_total': 123456, 'memory_total': 123456,
'memory_processed': 12345, 'memory_processed': 12345,
'memory_remaining': 120000, 'memory_remaining': 111111,
'disk_total': 234567, 'disk_total': 234567,
'disk_processed': 23456, 'disk_processed': 23456,
'disk_remaining': 230000, 'disk_remaining': 211111,
'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2), 'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2), 'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
'deleted_at': None, 'deleted_at': None,

8
nova/tests/unit/api/openstack/compute/test_server_migrations.py
View File

@ -45,10 +45,10 @@ fake_migrations = [
'hidden': False, 'hidden': False,
'memory_total': 123456, 'memory_total': 123456,
'memory_processed': 12345, 'memory_processed': 12345,
'memory_remaining': 120000, 'memory_remaining': 111111,
'disk_total': 234567, 'disk_total': 234567,
'disk_processed': 23456, 'disk_processed': 23456,
'disk_remaining': 230000, 'disk_remaining': 211111,
'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2), 'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2), 'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
'deleted_at': None, 'deleted_at': None,
@ -69,10 +69,10 @@ fake_migrations = [
'hidden': False, 'hidden': False,
'memory_total': 456789, 'memory_total': 456789,
'memory_processed': 56789, 'memory_processed': 56789,
'memory_remaining': 45000, 'memory_remaining': 400000,
'disk_total': 96789, 'disk_total': 96789,
'disk_processed': 6789, 'disk_processed': 6789,
'disk_remaining': 96000, 'disk_remaining': 90000,
'created_at': datetime.datetime(2013, 10, 22, 13, 42, 2), 'created_at': datetime.datetime(2013, 10, 22, 13, 42, 2),
'updated_at': datetime.datetime(2013, 10, 22, 13, 42, 2), 'updated_at': datetime.datetime(2013, 10, 22, 13, 42, 2),
'deleted_at': None, 'deleted_at': None,

4
nova/tests/unit/objects/test_migration.py
View File

@ -48,10 +48,10 @@ def fake_db_migration(**updates):
'hidden': False, 'hidden': False,
'memory_total': 123456, 'memory_total': 123456,
'memory_processed': 12345, 'memory_processed': 12345,
'memory_remaining': 120000, 'memory_remaining': 111111,
'disk_total': 234567, 'disk_total': 234567,
'disk_processed': 23456, 'disk_processed': 23456,
'disk_remaining': 230000, 'disk_remaining': 211111,
} }
if updates: if updates: