Merge "Fix data error in api samples doc"

6 files changed, 18 insertions, 18 deletions

diff --git a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-get.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-get.json.tpl
index 0db052a295..e58010e345 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-get.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-get.json.tpl
@@ -11,10 +11,10 @@
         "status": "running",
         "memory_total_bytes": 123456,
         "memory_processed_bytes": 12345,
-        "memory_remaining_bytes": 120000,
+        "memory_remaining_bytes": 111111,
         "disk_total_bytes": 234567,
         "disk_processed_bytes": 23456,
-        "disk_remaining_bytes": 230000,
+        "disk_remaining_bytes": 211111,
         "updated_at": "2016-01-29T13:42:02.000000"
     }
 }
diff --git a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-index.json.tpl b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-index.json.tpl
index 24f60beb6a..b3b099b934 100644
--- a/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-index.json.tpl
+++ b/nova/tests/functional/api_sample_tests/api_samples/server-migrations/v2.23/migrations-index.json.tpl
@@ -12,10 +12,10 @@
             "status": "running",
             "memory_total_bytes": 123456,
             "memory_processed_bytes": 12345,
-            "memory_remaining_bytes": 120000,
+            "memory_remaining_bytes": 111111,
             "disk_total_bytes": 234567,
             "disk_processed_bytes": 23456,
-            "disk_remaining_bytes": 230000,
+            "disk_remaining_bytes": 211111,
             "updated_at": "2016-01-29T13:42:02.000000"
         }
     ]
diff --git a/nova/tests/functional/api_sample_tests/test_server_migrations.py b/nova/tests/functional/api_sample_tests/test_server_migrations.py
index 768ce8094c..128a4d660d 100644
--- a/nova/tests/functional/api_sample_tests/test_server_migrations.py
+++ b/nova/tests/functional/api_sample_tests/test_server_migrations.py
@@ -85,10 +85,10 @@ class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase):
             'hidden': False,
             'memory_total': 123456,
             'memory_processed': 12345,
-            'memory_remaining': 120000,
+            'memory_remaining': 111111,
             'disk_total': 234567,
             'disk_processed': 23456,
-            'disk_remaining': 230000,
+            'disk_remaining': 211111,
             'created_at': datetime.datetime(2016, 0o1, 29, 13, 42, 2),
             'updated_at': datetime.datetime(2016, 0o1, 29, 13, 42, 2),
             'deleted_at': None,
@@ -106,10 +106,10 @@ class ServerMigrationsSamplesJsonTestV2_23(test_servers.ServersSampleBase):
             'hidden': False,
             'memory_total': 456789,
             'memory_processed': 56789,
-            'memory_remaining': 45000,
+            'memory_remaining': 400000,
             'disk_total': 96789,
             'disk_processed': 6789,
-            'disk_remaining': 96000,
+            'disk_remaining': 90000,
             'created_at': datetime.datetime(2016, 0o1, 22, 13, 42, 2),
             'updated_at': datetime.datetime(2016, 0o1, 22, 13, 42, 2),
             'deleted_at': None,
diff --git a/nova/tests/unit/api/openstack/compute/test_migrations.py b/nova/tests/unit/api/openstack/compute/test_migrations.py
index cfb8092f4d..969c2e2b49 100644
--- a/nova/tests/unit/api/openstack/compute/test_migrations.py
+++ b/nova/tests/unit/api/openstack/compute/test_migrations.py
@@ -44,10 +44,10 @@ fake_migrations = [
         'hidden': False,
         'memory_total': 123456,
         'memory_processed': 12345,
-        'memory_remaining': 120000,
+        'memory_remaining': 111111,
         'disk_total': 234567,
         'disk_processed': 23456,
-        'disk_remaining': 230000,
+        'disk_remaining': 211111,
         'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
         'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
         'deleted_at': None,
@@ -69,10 +69,10 @@ fake_migrations = [
         'hidden': False,
         'memory_total': 123456,
         'memory_processed': 12345,
-        'memory_remaining': 120000,
+        'memory_remaining': 111111,
         'disk_total': 234567,
         'disk_processed': 23456,
-        'disk_remaining': 230000,
+        'disk_remaining': 211111,
         'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
         'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
         'deleted_at': None,
diff --git a/nova/tests/unit/api/openstack/compute/test_server_migrations.py b/nova/tests/unit/api/openstack/compute/test_server_migrations.py
index 3b5419cb19..5611928324 100644
--- a/nova/tests/unit/api/openstack/compute/test_server_migrations.py
+++ b/nova/tests/unit/api/openstack/compute/test_server_migrations.py
@@ -45,10 +45,10 @@ fake_migrations = [
         'hidden': False,
         'memory_total': 123456,
         'memory_processed': 12345,
-        'memory_remaining': 120000,
+        'memory_remaining': 111111,
         'disk_total': 234567,
         'disk_processed': 23456,
-        'disk_remaining': 230000,
+        'disk_remaining': 211111,
         'created_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
         'updated_at': datetime.datetime(2012, 10, 29, 13, 42, 2),
         'deleted_at': None,
@@ -69,10 +69,10 @@ fake_migrations = [
         'hidden': False,
         'memory_total': 456789,
         'memory_processed': 56789,
-        'memory_remaining': 45000,
+        'memory_remaining': 400000,
         'disk_total': 96789,
         'disk_processed': 6789,
-        'disk_remaining': 96000,
+        'disk_remaining': 90000,
         'created_at': datetime.datetime(2013, 10, 22, 13, 42, 2),
         'updated_at': datetime.datetime(2013, 10, 22, 13, 42, 2),
         'deleted_at': None,
diff --git a/nova/tests/unit/objects/test_migration.py b/nova/tests/unit/objects/test_migration.py
index e514cb6e44..5dc5530b03 100644
--- a/nova/tests/unit/objects/test_migration.py
+++ b/nova/tests/unit/objects/test_migration.py
@@ -48,10 +48,10 @@ def fake_db_migration(**updates):
         'hidden': False,
         'memory_total': 123456,
         'memory_processed': 12345,
-        'memory_remaining': 120000,
+        'memory_remaining': 111111,
         'disk_total': 234567,
         'disk_processed': 23456,
-        'disk_remaining': 230000,
+        'disk_remaining': 211111,
     }
 
     if updates: