diff --git a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json
index 3b5372cad2..2b90c412aa 100644
--- a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json
+++ b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 10,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "10",
         "links": [
             {
@@ -16,7 +16,7 @@
         ],
         "name": "test_flavor",
         "ram": 1024,
-        "swap": "",
+        "swap": 0,
         "vcpus": 2
     }
 }
\ No newline at end of file
diff --git a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml
index 9eb5c86b2d..c1db11c7c7 100644
--- a/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml
+++ b/doc/v3/api_samples/flavor-manage/flavor-create-post-resp.xml
@@ -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="test_flavor" ram="1024" ephemeral="" disabled="False" vcpus="2" swap="" disk="10" id="10">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10">
   <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/doc/v3/api_samples/flavors/flavor-get-resp.json b/doc/v3/api_samples/flavors/flavor-get-resp.json
index b3d12c974d..cd4589bcd6 100644
--- a/doc/v3/api_samples/flavors/flavor-get-resp.json
+++ b/doc/v3/api_samples/flavors/flavor-get-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 1,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "1",
         "links": [
             {
@@ -16,7 +16,7 @@
         ],
         "name": "m1.tiny",
         "ram": 512,
-        "swap": "",
+        "swap": 0,
         "vcpus": 1
     }
 }
\ No newline at end of file
diff --git a/doc/v3/api_samples/flavors/flavor-get-resp.xml b/doc/v3/api_samples/flavors/flavor-get-resp.xml
index 76ddabef74..62ce0969e8 100644
--- a/doc/v3/api_samples/flavors/flavor-get-resp.xml
+++ b/doc/v3/api_samples/flavors/flavor-get-resp.xml
@@ -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" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" 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" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
   <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/doc/v3/api_samples/flavors/flavors-detail-resp.json b/doc/v3/api_samples/flavors/flavors-detail-resp.json
index ced3ec0789..5e204f3696 100644
--- a/doc/v3/api_samples/flavors/flavors-detail-resp.json
+++ b/doc/v3/api_samples/flavors/flavors-detail-resp.json
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -17,13 +17,13 @@
             ],
             "name": "m1.tiny",
             "ram": 512,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -37,13 +37,13 @@
             ],
             "name": "m1.small",
             "ram": 2048,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -57,13 +57,13 @@
             ],
             "name": "m1.medium",
             "ram": 4096,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -77,13 +77,13 @@
             ],
             "name": "m1.large",
             "ram": 8192,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -97,7 +97,7 @@
             ],
             "name": "m1.xlarge",
             "ram": 16384,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8
         }
     ]
diff --git a/doc/v3/api_samples/flavors/flavors-detail-resp.xml b/doc/v3/api_samples/flavors/flavors-detail-resp.xml
index c27d906fb5..2c74e6da22 100644
--- a/doc/v3/api_samples/flavors/flavors-detail-resp.xml
+++ b/doc/v3/api_samples/flavors/flavors-detail-resp.xml
@@ -1,22 +1,22 @@
 <?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 name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
     <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2">
     <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3">
     <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4">
     <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5">
     <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
   </flavor>
diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json b/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json
index e53389f933..2a3f87526e 100644
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 10,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "10",
         "links": [
             {
@@ -17,7 +17,7 @@
         "name": "test_flavor",
         "os-flavor-access:is_public": false,
         "ram": 1024,
-        "swap": "",
+        "swap": 0,
         "vcpus": 2
     }
 }
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml b/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml
index 9ec27997aa..0fe92c1795 100644
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="" disabled="False" vcpus="2" swap="" disk="10" id="10" os-flavor-access:is_public="False">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="test_flavor" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="10" os-flavor-access:is_public="False">
   <atom:link href="http://openstack.example.com/v3/flavors/10" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/10" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json b/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json
index f1b0caa2fd..8b1dac90a5 100644
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -18,13 +18,13 @@
             "name": "m1.tiny",
             "os-flavor-access:is_public": true,
             "ram": 512,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -39,13 +39,13 @@
             "name": "m1.small",
             "os-flavor-access:is_public": true,
             "ram": 2048,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -60,13 +60,13 @@
             "name": "m1.medium",
             "os-flavor-access:is_public": true,
             "ram": 4096,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -81,13 +81,13 @@
             "name": "m1.large",
             "os-flavor-access:is_public": true,
             "ram": 8192,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -102,7 +102,7 @@
             "name": "m1.xlarge",
             "os-flavor-access:is_public": true,
             "ram": 16384,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8
         }
     ]
diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml b/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml
index 110e6d347e..b9682318be 100644
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml
@@ -1,22 +1,22 @@
 <?xml version='1.0' encoding='UTF-8'?>
 <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" os-flavor-access:is_public="True">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
     <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" os-flavor-access:is_public="True">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" os-flavor-access:is_public="True">
     <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" os-flavor-access:is_public="True">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" os-flavor-access:is_public="True">
     <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" os-flavor-access:is_public="True">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" os-flavor-access:is_public="True">
     <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" os-flavor-access:is_public="True">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" os-flavor-access:is_public="True">
     <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
   </flavor>
diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json b/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json
index 3fb35aad8c..0bdb4cbb7a 100644
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 1,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "1",
         "links": [
             {
@@ -17,7 +17,7 @@
         "name": "m1.tiny",
         "os-flavor-access:is_public": true,
         "ram": 512,
-        "swap": "",
+        "swap": 0,
         "vcpus": 1
     }
 }
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml b/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml
index 74d96b725f..5fd938f5c0 100644
--- a/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml
+++ b/doc/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml
@@ -1,5 +1,5 @@
 <?xml version='1.0' encoding='UTF-8'?>
-<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" os-flavor-access:is_public="True">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
   <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
index 589bca049b..5cd8f19cf4 100644
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 1,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "1",
         "links": [
             {
@@ -17,7 +17,7 @@
         "name": "m1.tiny",
         "ram": 512,
         "rxtx_factor": 1.0,
-        "swap": "",
+        "swap": 0,
         "vcpus": 1
     }
 }
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
index ce276ef9fb..111c872279 100644
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml
@@ -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" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
   <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
index 1865c8e77b..53436703a8 100644
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -18,13 +18,13 @@
             "name": "m1.tiny",
             "ram": 512,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -39,13 +39,13 @@
             "name": "m1.small",
             "ram": 2048,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -60,13 +60,13 @@
             "name": "m1.medium",
             "ram": 4096,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -81,13 +81,13 @@
             "name": "m1.large",
             "ram": 8192,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -102,7 +102,7 @@
             "name": "m1.xlarge",
             "ram": 16384,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8
         }
     ]
diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
index 74b66eaae2..a741e6b2ce 100644
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml
@@ -1,22 +1,22 @@
 <?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 name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" rxtx_factor="1.0">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" rxtx_factor="1.0">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" rxtx_factor="1.0">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" rxtx_factor="1.0">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
   </flavor>
diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
index ee9c70b33a..e910ac406f 100644
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 10,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "100",
         "links": [
             {
@@ -17,7 +17,7 @@
         "name": "flavortest",
         "ram": 1024,
         "rxtx_factor": 2.0,
-        "swap": "",
+        "swap": 0,
         "vcpus": 2
     }
 }
\ No newline at end of file
diff --git a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
index 4e5bbe0408..2e74911618 100644
--- a/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
+++ b/doc/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml
@@ -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="flavortest" ram="1024" ephemeral="" disabled="False" vcpus="2" swap="" disk="10" id="100" rxtx_factor="2.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="flavortest" ram="1024" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="10" id="100" rxtx_factor="2.0">
   <atom:link href="http://openstack.example.com/v3/flavors/100" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/100" rel="bookmark"/>
 </flavor>
\ No newline at end of file
diff --git a/nova/api/openstack/compute/plugins/v3/flavors.py b/nova/api/openstack/compute/plugins/v3/flavors.py
index 9250d9b68e..f1ac3a5822 100644
--- a/nova/api/openstack/compute/plugins/v3/flavors.py
+++ b/nova/api/openstack/compute/plugins/v3/flavors.py
@@ -34,10 +34,9 @@ def make_flavor(elem, detailed=False):
     if detailed:
         elem.set('ram')
         elem.set('disk')
-        elem.set('vcpus', xmlutil.EmptyStringSelector('vcpus'))
-        # NOTE(vish): this was originally added without a namespace
-        elem.set('swap', xmlutil.EmptyStringSelector('swap'))
-        elem.set('ephemeral', xmlutil.EmptyStringSelector('ephemeral'))
+        elem.set('vcpus')
+        elem.set('swap')
+        elem.set('ephemeral')
         elem.set('disabled')
 
     xmlutil.make_links(elem, 'links')
diff --git a/nova/api/openstack/compute/views/flavors.py b/nova/api/openstack/compute/views/flavors.py
index bc83d67819..5a82f32113 100644
--- a/nova/api/openstack/compute/views/flavors.py
+++ b/nova/api/openstack/compute/views/flavors.py
@@ -76,8 +76,9 @@ class V3ViewBuilder(ViewBuilder):
     def show(self, request, flavor):
         flavor_dict = super(V3ViewBuilder, self).show(request, flavor)
         flavor_dict['flavor'].update({
-            "swap": flavor.get("swap") or "",
-            "ephemeral": flavor.get("ephemeral_gb") or "",
-            "disabled": flavor.get("disabled", False)
+            "swap": flavor["swap"],
+            "ephemeral": flavor["ephemeral_gb"],
+            "disabled": flavor["disabled"],
+            "vcpus": flavor["vcpus"],
         })
         return flavor_dict
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_rxtx.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_rxtx.py
index e357e68c72..bcbd69b5fd 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_flavor_rxtx.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavor_rxtx.py
@@ -27,6 +27,10 @@ FAKE_FLAVORS = {
         "memory_mb": '256',
         "root_gb": '10',
         "rxtx_factor": '1.0',
+        "swap": 0,
+        "ephemeral_gb": 0,
+        "vcpus": 1,
+        "disabled": False,
     },
     'flavor 2': {
         "flavorid": '2',
@@ -34,6 +38,10 @@ FAKE_FLAVORS = {
         "memory_mb": '512',
         "root_gb": '10',
         "rxtx_factor": None,
+        "swap": 0,
+        "vcpus": 1,
+        "ephemeral_gb": 0,
+        "disabled": False,
     },
 }
 
diff --git a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
index c600b29642..34894abac6 100644
--- a/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
+++ b/nova/tests/api/openstack/compute/plugins/v3/test_flavors.py
@@ -42,8 +42,9 @@ FAKE_FLAVORS = {
         "name": 'flavor 1',
         "memory_mb": '256',
         "root_gb": '10',
-        "swap": '512',
-        "ephemeral_gb": '1',
+        "swap": 0,
+        "ephemeral_gb": 0,
+        "vcpus": 0,
         "disabled": False,
     },
     'flavor 2': {
@@ -51,8 +52,9 @@ FAKE_FLAVORS = {
         "name": 'flavor 2',
         "memory_mb": '512',
         "root_gb": '20',
-        "swap": '1024',
-        "ephemeral_gb": '10',
+        "swap": 1024,
+        "ephemeral_gb": 10,
+        "vcpus": 0,
         "disabled": True,
     },
 }
@@ -133,9 +135,9 @@ class FlavorsTest(test.TestCase):
                 "name": "flavor 1",
                 "ram": "256",
                 "disk": "10",
-                "vcpus": "",
-                "swap": '512',
-                "ephemeral": "1",
+                "vcpus": 0,
+                "swap": 0,
+                "ephemeral": 0,
                 "disabled": False,
                 "links": [
                     {
@@ -162,9 +164,9 @@ class FlavorsTest(test.TestCase):
                 "name": "flavor 1",
                 "ram": "256",
                 "disk": "10",
-                "vcpus": "",
-                "swap": '512',
-                "ephemeral": "1",
+                "vcpus": 0,
+                "swap": 0,
+                "ephemeral": 0,
                 "disabled": False,
                 "links": [
                     {
@@ -331,9 +333,9 @@ class FlavorsTest(test.TestCase):
                     "name": "flavor 1",
                     "ram": "256",
                     "disk": "10",
-                    "vcpus": "",
-                    "swap": '512',
-                    "ephemeral": "1",
+                    "vcpus": 0,
+                    "swap": 0,
+                    "ephemeral": 0,
                     "disabled": False,
                     "links": [
                         {
@@ -351,9 +353,9 @@ class FlavorsTest(test.TestCase):
                     "name": "flavor 2",
                     "ram": "512",
                     "disk": "20",
-                    "vcpus": "",
-                    "swap": '1024',
-                    "ephemeral": "10",
+                    "vcpus": 0,
+                    "swap": 1024,
+                    "ephemeral": 10,
                     "disabled": True,
                     "links": [
                         {
@@ -453,9 +455,9 @@ class FlavorsTest(test.TestCase):
                     "name": "flavor 2",
                     "ram": "512",
                     "disk": "20",
-                    "vcpus": "",
-                    "swap": '1024',
-                    "ephemeral": "10",
+                    "vcpus": 0,
+                    "swap": 1024,
+                    "ephemeral": 10,
                     "disabled": True,
                     "links": [
                         {
@@ -539,7 +541,7 @@ class FlavorsXMLSerializationTest(test.TestCase):
                 "name": "asdf",
                 "ram": "256",
                 "disk": "10",
-                "vcpus": "",
+                "vcpus": 0,
                 "swap": "512",
                 "ephemeral": "512",
                 "disabled": False,
diff --git a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl
index a8bddbdbf6..42825dcc44 100644
--- a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.json.tpl
@@ -16,7 +16,7 @@
         "ram": 1024,
         "vcpus": 2,
         "disabled": false,
-        "ephemeral": "",
-        "swap": ""
+        "ephemeral": 0,
+        "swap": 0
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl
index 5550529fad..e4910b4971 100644
--- a/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/flavor-manage/flavor-create-post-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="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="" swap="">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="0" swap="0">
   <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl
index 73657dbb29..e6415aa619 100644
--- a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.json.tpl
@@ -16,7 +16,7 @@
         "ram": 512,
         "vcpus": 1,
         "disabled": false,
-        "ephemeral": "",
-        "swap": ""
+        "ephemeral": 0,
+        "swap": 0
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl
index aab6ecf14f..25f79e51da 100644
--- a/nova/tests/integrated/v3/api_samples/flavors/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/flavors/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="1" id="1" disabled="False" ephemeral="" swap="">
+<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" disabled="False" ephemeral="0" swap="0">
   <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
   <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl
index b523b517d4..34bc739c03 100644
--- a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.json.tpl
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -17,13 +17,13 @@
             ],
             "name": "m1.tiny",
             "ram": 512,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -37,13 +37,13 @@
             ],
             "name": "m1.small",
             "ram": 2048,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -57,13 +57,13 @@
             ],
             "name": "m1.medium",
             "ram": 4096,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -77,13 +77,13 @@
             ],
             "name": "m1.large",
             "ram": 8192,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -97,7 +97,7 @@
             ],
             "name": "m1.xlarge",
             "ram": 16384,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8
         }
     ]
diff --git a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl
index a25ff99444..20508af049 100644
--- a/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/flavors/flavors-detail-resp.xml.tpl
@@ -1,22 +1,22 @@
 <?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 name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1">
     <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
     <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2">
     <atom:link href="%(host)s/v3/flavors/2" rel="self"/>
     <atom:link href="%(host)s/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3">
     <atom:link href="%(host)s/v3/flavors/3" rel="self"/>
     <atom:link href="%(host)s/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4">
     <atom:link href="%(host)s/v3/flavors/4" rel="self"/>
     <atom:link href="%(host)s/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5">
     <atom:link href="%(host)s/v3/flavors/5" rel="self"/>
     <atom:link href="%(host)s/flavors/5" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl
index 16cdfc4cb6..1e1f0cd4d0 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.json.tpl
@@ -17,7 +17,7 @@
         "ram": 1024,
         "vcpus": 2,
         "disabled": false,
-        "ephemeral": "",
-        "swap": ""
+        "ephemeral": 0,
+        "swap": 0
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl
index 4405a19e3f..4cbf2a96c6 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-create-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/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" os-flavor-access:is_public="False" disabled="False" ephemeral="" swap="">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" os-flavor-access:is_public="False" disabled="False" ephemeral="0" swap="0">
   <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
index 88104204de..c3c0eacea8 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.json.tpl
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -18,13 +18,13 @@
             "name": "m1.tiny",
             "os-flavor-access:is_public": true,
             "ram": 512,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -39,13 +39,13 @@
             "name": "m1.small",
             "os-flavor-access:is_public": true,
             "ram": 2048,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -60,13 +60,13 @@
             "name": "m1.medium",
             "os-flavor-access:is_public": true,
             "ram": 4096,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -81,13 +81,13 @@
             "name": "m1.large",
             "os-flavor-access:is_public": true,
             "ram": 8192,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -102,7 +102,7 @@
             "name": "m1.xlarge",
             "os-flavor-access:is_public": true,
             "ram": 16384,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8
         }
     ]
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
index 098c7bd8ac..7ff85f9da5 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-detail-resp.xml.tpl
@@ -1,22 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <flavors xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
-  <flavor name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" os-flavor-access:is_public="True">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
     <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" os-flavor-access:is_public="True">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v3/flavors/2" rel="self"/>
     <atom:link href="%(host)s/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" os-flavor-access:is_public="True">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v3/flavors/3" rel="self"/>
     <atom:link href="%(host)s/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" os-flavor-access:is_public="True">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v3/flavors/4" rel="self"/>
     <atom:link href="%(host)s/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" os-flavor-access:is_public="True">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" os-flavor-access:is_public="True">
     <atom:link href="%(host)s/v3/flavors/5" rel="self"/>
     <atom:link href="%(host)s/flavors/5" rel="bookmark"/>
   </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
index ffe309be48..771e9a58fa 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.json.tpl
@@ -17,7 +17,7 @@
         "ram": 512,
         "vcpus": 1,
         "disabled": false,
-        "ephemeral": "",
-        "swap": ""
+        "ephemeral": 0,
+        "swap": 0
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
index 73c9a69a81..dc67551ba6 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-access/flavor-access-show-resp.xml.tpl
+++ b/nova/tests/integrated/v3/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/os-flavor-access/api/v3" 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" disabled="False" ephemeral="" swap="" os-flavor-access:is_public="True">
+<flavor xmlns:os-flavor-access="http://docs.openstack.org/compute/ext/os-flavor-access/api/v3" 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" disabled="False" ephemeral="0" swap="0" os-flavor-access:is_public="True">
   <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.json.tpl
index 4fa78396b7..427febfbe5 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.json.tpl
@@ -16,8 +16,8 @@
         "ram": 512,
         "vcpus": 1,
         "disabled": false,
-        "ephemeral": "",
-        "swap": "",
+        "ephemeral": 0,
+        "swap": 0,
         "rxtx_factor": 1.0
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.xml.tpl
index 75a10a519d..2cbcc53376 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-get-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/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="1" id="1" disabled="False" ephemeral="" swap="" rxtx_factor="1.0">
+<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" disabled="False" ephemeral="0" swap="0" rxtx_factor="1.0">
   <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
   <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
index 589bca049b..b9d1375be1 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.json.tpl
@@ -2,7 +2,7 @@
     "flavor": {
         "disabled": false,
         "disk": 1,
-        "ephemeral": "",
+        "ephemeral": 0,
         "id": "1",
         "links": [
             {
@@ -17,7 +17,7 @@
         "name": "m1.tiny",
         "ram": 512,
         "rxtx_factor": 1.0,
-        "swap": "",
+        "swap": 0,
         "vcpus": 1
     }
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
index ce276ef9fb..ae0324d3e1 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-get-resp.xml.tpl
+++ b/nova/tests/integrated/v3/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" name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
   <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
   <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
-</flavor>
\ No newline at end of file
+</flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
index 1865c8e77b..d4fe93a815 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.json.tpl
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -18,13 +18,13 @@
             "name": "m1.tiny",
             "ram": 512,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -39,13 +39,13 @@
             "name": "m1.small",
             "ram": 2048,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -60,13 +60,13 @@
             "name": "m1.medium",
             "ram": 4096,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -81,13 +81,13 @@
             "name": "m1.large",
             "ram": 8192,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -102,8 +102,8 @@
             "name": "m1.xlarge",
             "ram": 16384,
             "rxtx_factor": 1.0,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
index 74b66eaae2..475fd4a717 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-list-resp.xml.tpl
@@ -1,23 +1,23 @@
 <?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 name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/1" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" rxtx_factor="1.0">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/2" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" rxtx_factor="1.0">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/3" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" rxtx_factor="1.0">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/4" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" rxtx_factor="1.0">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
     <atom:link href="http://openstack.example.com/v3/flavors/5" rel="self"/>
     <atom:link href="http://openstack.example.com/flavors/5" rel="bookmark"/>
   </flavor>
-</flavors>
\ No newline at end of file
+</flavors>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl
index bda2aa6f9f..69bf80ebf6 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.json.tpl
@@ -17,7 +17,7 @@
         "rxtx_factor": 2.0,
         "vcpus": 2,
         "disabled": false,
-        "ephemeral": "",
-        "swap": ""
+        "ephemeral": 0,
+        "swap": 0
     }
 }
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl
index 2ad1dfe739..b0a0e30b61 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavor-rxtx-post-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="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="" swap="" rxtx_factor="2.0">
+<flavor xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" disk="10" vcpus="2" ram="1024" name="%(flavor_name)s" id="%(flavor_id)s" disabled="False" ephemeral="0" swap="0" rxtx_factor="2.0">
   <atom:link href="%(host)s/v3/flavors/%(flavor_id)s" rel="self"/>
   <atom:link href="%(host)s/flavors/%(flavor_id)s" rel="bookmark"/>
 </flavor>
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.json.tpl
index 5a28eba436..cc49efe9f4 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.json.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.json.tpl
@@ -3,7 +3,7 @@
         {
             "disabled": false,
             "disk": 1,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "1",
             "links": [
                 {
@@ -17,14 +17,14 @@
             ],
             "name": "m1.tiny",
             "ram": 512,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1,
             "rxtx_factor": 1.0
         },
         {
             "disabled": false,
             "disk": 20,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "2",
             "links": [
                 {
@@ -38,14 +38,14 @@
             ],
             "name": "m1.small",
             "ram": 2048,
-            "swap": "",
+            "swap": 0,
             "vcpus": 1,
             "rxtx_factor": 1.0
         },
         {
             "disabled": false,
             "disk": 40,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "3",
             "links": [
                 {
@@ -59,14 +59,14 @@
             ],
             "name": "m1.medium",
             "ram": 4096,
-            "swap": "",
+            "swap": 0,
             "vcpus": 2,
             "rxtx_factor": 1.0
         },
         {
             "disabled": false,
             "disk": 80,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "4",
             "links": [
                 {
@@ -80,14 +80,14 @@
             ],
             "name": "m1.large",
             "ram": 8192,
-            "swap": "",
+            "swap": 0,
             "vcpus": 4,
             "rxtx_factor": 1.0
         },
         {
             "disabled": false,
             "disk": 160,
-            "ephemeral": "",
+            "ephemeral": 0,
             "id": "5",
             "links": [
                 {
@@ -101,7 +101,7 @@
             ],
             "name": "m1.xlarge",
             "ram": 16384,
-            "swap": "",
+            "swap": 0,
             "vcpus": 8,
             "rxtx_factor": 1.0
         }
diff --git a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.xml.tpl
index 80612ecca7..8ec762a2a2 100644
--- a/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.xml.tpl
+++ b/nova/tests/integrated/v3/api_samples/os-flavor-rxtx/flavors-detail-resp.xml.tpl
@@ -1,22 +1,22 @@
 <?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 name="m1.tiny" ram="512" ephemeral="" disabled="False" vcpus="1" swap="" disk="1" id="1" rxtx_factor="1.0">
+  <flavor name="m1.tiny" ram="512" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="1" id="1" rxtx_factor="1.0">
     <atom:link href="%(host)s/v3/flavors/1" rel="self"/>
     <atom:link href="%(host)s/flavors/1" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.small" ram="2048" ephemeral="" disabled="False" vcpus="1" swap="" disk="20" id="2" rxtx_factor="1.0">
+  <flavor name="m1.small" ram="2048" ephemeral="0" disabled="False" vcpus="1" swap="0" disk="20" id="2" rxtx_factor="1.0">
     <atom:link href="%(host)s/v3/flavors/2" rel="self"/>
     <atom:link href="%(host)s/flavors/2" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.medium" ram="4096" ephemeral="" disabled="False" vcpus="2" swap="" disk="40" id="3" rxtx_factor="1.0">
+  <flavor name="m1.medium" ram="4096" ephemeral="0" disabled="False" vcpus="2" swap="0" disk="40" id="3" rxtx_factor="1.0">
     <atom:link href="%(host)s/v3/flavors/3" rel="self"/>
     <atom:link href="%(host)s/flavors/3" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.large" ram="8192" ephemeral="" disabled="False" vcpus="4" swap="" disk="80" id="4" rxtx_factor="1.0">
+  <flavor name="m1.large" ram="8192" ephemeral="0" disabled="False" vcpus="4" swap="0" disk="80" id="4" rxtx_factor="1.0">
     <atom:link href="%(host)s/v3/flavors/4" rel="self"/>
     <atom:link href="%(host)s/flavors/4" rel="bookmark"/>
   </flavor>
-  <flavor name="m1.xlarge" ram="16384" ephemeral="" disabled="False" vcpus="8" swap="" disk="160" id="5" rxtx_factor="1.0">
+  <flavor name="m1.xlarge" ram="16384" ephemeral="0" disabled="False" vcpus="8" swap="0" disk="160" id="5" rxtx_factor="1.0">
     <atom:link href="%(host)s/v3/flavors/5" rel="self"/>
     <atom:link href="%(host)s/flavors/5" rel="bookmark"/>
   </flavor>