'm1.tiny' now has root_gb=1

`root_gb=0` indicates that a disk-resize shouldn't occur which is not
something that a default flavor should have enabled. This is
especially true of one named 'tiny' since the unresized image could
potentially be very large, leading to the unexpected result of a
'tiny' instance consuming a massive amount of disk.

The no-resize behavior is still supported, so if it's being relied on
for testing, additional, non-default flavors can still be created that
enable it.

DocImpact
Fixes bug 1175383

Change-Id: Ifa5827c7f87dae95214bc4a585adce5735a05d83

29 files changed, 32 insertions, 32 deletions

diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
index d1f78c08e..04083d063 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-DISABLED:disabled": false,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
index 8d992e42d..5d73195fa 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-detail-get-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-DISABLED:disabled="False">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
index cf5fb232a..a47af7b18 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
index c7bdd1ca8..13908e2ac 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-DISABLED/flavor-show-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" OS-FLV-DISABLED:disabled="False">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
index 3422de9f5..b86db0a46 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavor": {
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
index dc143010a..da45536c3 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0">
+<flavor xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" OS-FLV-EXT-DATA:ephemeral="0">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
index 2c79efeaf..a798262f3 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavors": [
         {
             "OS-FLV-EXT-DATA:ephemeral": 0,
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
index 7108ebd79..5ba463188 100644
--- a/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/OS-FLV-EXT-DATA/flavors-extra-data-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" OS-FLV-EXT-DATA:ephemeral="0">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
index bbd681e66..b68bc3c97 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavor": {
         "OS-FLV-DISABLED:disabled": false,
         "OS-FLV-EXT-DATA:ephemeral": 0,
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
@@ -21,4 +21,4 @@
         "swap": "",
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
index 920b82e53..53f870ec4 100644
--- a/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/all_extensions/flavor-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="0" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
+<flavor xmlns:OS-FLV-DISABLED="http://docs.openstack.org/compute/ext/flavor_disabled/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns:OS-FLV-EXT-DATA="http://docs.openstack.org/compute/ext/flavor_extra_data/api/v1.1" xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" swap="" rxtx_factor="1.0" disk="1" id="1" os-flavor-access:is_public="True" OS-FLV-EXT-DATA:ephemeral="0" OS-FLV-DISABLED:disabled="False">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
index 86ff86fa1..723be2898 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/flavor-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "1",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
index ca49884f3..5925c588d 100644
--- a/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/flavor-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="0" id="1">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" vcpus="1" disk="1" id="1">
   <atom:link href="http://openstack.example.com/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
index ab86d2a52..fb9a8ff1f 100644
--- a/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/flavors-list-resp.json.tpl
@@ -71,4 +71,4 @@
             "name": "m1.xlarge"
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
index 711207d2d..b5f1eea54 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
index cdef74cce..8ee66226a 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
index 975f38661..2e991a4ce 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
index f9a3ff178..ae18daba2 100644
--- a/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/flavor_access/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="%(flavor_id)s" os-flavor-access:is_public="True">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
index a7f3a1993..241cf7c80 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
index 4feec740c..d461b443e 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
   <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
index 5b27e1385..035c860c9 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
index fb2ee09e0..ee937b974 100644
--- a/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" rxtx_factor="1.0">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
index be9afe012..9b7e57c8a 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.json.tpl
@@ -1,6 +1,6 @@
 {
     "flavor": {
-        "disk": 0,
+        "disk": 1,
         "id": "%(flavor_id)s",
         "links": [
             {
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
index 53afae086..9375b14b5 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-get-resp.xml.tpl
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="0" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap="">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="1" vcpus="1" ram="512" name="%(flavor_name)s" id="%(flavor_id)s" swap="">
   <atom:link href="%(host)s/v2/openstack/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/openstack/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
index c46a1695d..1367e75de 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.json.tpl
@@ -1,7 +1,7 @@
 {
     "flavors": [
         {
-            "disk": 0,
+            "disk": 1,
             "id": "1",
             "links": [
                 {
diff --git a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
index ced8e1779..7c9c589be 100644
--- a/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-flavor-swap/flavor-swap-list-resp.xml.tpl
@@ -1,6 +1,6 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor disk="0" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
+  <flavor disk="1" vcpus="1" ram="512" name="m1.tiny" id="1" swap="">
     <atom:link href="%(host)s/v2/openstack/flavors/1" rel="self"/>
     <atom:link href="%(host)s/openstack/flavors/1" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
index 68092f353..a12dd7157 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.json.tpl
@@ -6,7 +6,7 @@
                 "flavor": "m1.tiny",
                 "hours": 1.0,
                 "instance_id": "%(uuid)s",
-                "local_gb": 0,
+                "local_gb": 1,
                 "memory_mb": 512,
                 "name": "new-server-test",
                 "started_at": "%(timestamp)s",
@@ -20,7 +20,7 @@
         "stop": "%(timestamp)s",
         "tenant_id": "openstack",
         "total_hours": 1.0,
-        "total_local_gb_usage": 0.0,
+        "total_local_gb_usage": 1.0,
         "total_memory_mb_usage": 512.0,
         "total_vcpus_usage": 1.0
     }
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
index a8a065fa1..4a6882307 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get-specific.xml.tpl
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <tenant_usage>
   <tenant_id>openstack</tenant_id>
-  <total_local_gb_usage>0.0</total_local_gb_usage>
+  <total_local_gb_usage>1.0</total_local_gb_usage>
   <total_vcpus_usage>1.0</total_vcpus_usage>
   <total_memory_mb_usage>512.0</total_memory_mb_usage>
   <total_hours>1.0</total_hours>
@@ -13,7 +13,7 @@
       <name>new-server-test</name>
       <hours>1.0</hours>
       <memory_mb>512</memory_mb>
-      <local_gb>0</local_gb>
+      <local_gb>1</local_gb>
       <vcpus>1</vcpus>
       <tenant_id>openstack</tenant_id>
       <flavor>m1.tiny</flavor>
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
index b33ccbfc2..082e6bc90 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.json.tpl
@@ -5,7 +5,7 @@
             "stop": "%(timestamp)s",
             "tenant_id": "openstack",
             "total_hours": 1.0,
-            "total_local_gb_usage": 0.0,
+            "total_local_gb_usage": 1.0,
             "total_memory_mb_usage": 512.0,
             "total_vcpus_usage": 1.0
         }
diff --git a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
index 536e79738..4a2833da8 100644
--- a/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
+++ b/nova/tests/integrated/api_samples/os-simple-tenant-usage/simple-tenant-usage-get.xml.tpl
@@ -2,7 +2,7 @@
 <tenant_usages>
   <tenant_usage>
     <tenant_id>openstack</tenant_id>
-    <total_local_gb_usage>0.0</total_local_gb_usage>
+    <total_local_gb_usage>1.0</total_local_gb_usage>
     <total_vcpus_usage>1.0</total_vcpus_usage>
     <total_memory_mb_usage>512.0</total_memory_mb_usage>
     <total_hours>1.0</total_hours>