Make create server schema 'additionalProperties' False

Nova V2.1 API has strong input validation by making validation through JSON schema. This patch makes create server schema 'additionalProperties' to False as all create server extensions are implemented in V2.1. After this, V2.1 will not allow extra arg for create server. This patch also fix the API sample files which were passing extra arg in create request body. Partially implements blueprint v2-on-v3-api Change-Id: Ib2a4272cbacb3011b800776577233545af3d9d4b
2014-12-15 15:00:11 +09:00
parent f3b9fefd77
commit 5ba9301c34
29 changed files with 30 additions and 203 deletions
--- a/doc/v3/api_samples/os-access-ips/server-post-req.json
+++ b/doc/v3/api_samples/os-access-ips/server-post-req.json
@@ -7,12 +7,6 @@
        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-availability-zone/server-post-req.json
+++ b/doc/v3/api_samples/os-availability-zone/server-post-req.json
@@ -6,12 +6,6 @@
        "availability_zone" : "test"
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-create-backup/server-post-req.json
+++ b/doc/v3/api_samples/os-create-backup/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-disk-config/server-post-req.json
+++ b/doc/v3/api_samples/os-disk-config/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-fping/server-post-req.json
+++ b/doc/v3/api_samples/os-fping/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
        "metadata": {
            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-lock-server/server-post-req.json
+++ b/doc/v3/api_samples/os-lock-server/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json
+++ b/doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json
@@ -7,12 +7,6 @@
            "My Server Name": "Apache1"
        },
        "min_count": "2",
-        "max_count": "3",
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        "max_count": "3"
    }
 }
--- a/doc/v3/api_samples/os-multiple-create/multiple-create-post-req.json
+++ b/doc/v3/api_samples/os-multiple-create/multiple-create-post-req.json
@@ -8,12 +8,6 @@
        },
        "return_reservation_id": "True",
        "min_count": "2",
-        "max_count": "3",
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        "max_count": "3"
    }
 }
--- a/doc/v3/api_samples/os-pause-server/server-post-req.json
+++ b/doc/v3/api_samples/os-pause-server/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-pci/server-post-req.json
+++ b/doc/v3/api_samples/os-pci/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-shelve/server-post-req.json
+++ b/doc/v3/api_samples/os-shelve/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.json
+++ b/doc/v3/api_samples/os-simple-tenant-usage/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-virtual-interfaces/server-post-req.json
+++ b/doc/v3/api_samples/os-virtual-interfaces/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
        "metadata": {
            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/doc/v3/api_samples/os-volumes/server-post-req.json
+++ b/doc/v3/api_samples/os-volumes/server-post-req.json
@@ -5,12 +5,6 @@
        "flavorRef": "http://openstack.example.com/openstack/flavors/1",
        "metadata": {
            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/api/openstack/compute/schemas/v3/servers.py
+++ b/nova/api/openstack/compute/schemas/v3/servers.py
@@ -49,16 +49,11 @@ base_create = {
                }
            },
            'required': ['name', 'flavorRef'],
-            # TODO(oomichi): After all extension schema patches are merged,
-            # this code should be enabled. If enabling before merger, API
-            # extension parameters would be considered as bad parameters.
-            # 'additionalProperties': False,
+            'additionalProperties': False,
        },
    },
    'required': ['server'],
-    # TODO(oomichi): Now v3 code will be used for v2.1 only and v2.1 needs
-    # to allow additionalProperties for some extensions.
-    # 'additionalProperties': False,
+    'additionalProperties': False,
 }

 base_update = {
--- a/nova/tests/functional/v3/api_samples/os-access-ips/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-access-ips/server-post-req.json.tpl
@@ -7,12 +7,6 @@
        "flavorRef" : "%(host)s/openstack/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-availability-zone/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-availability-zone/server-post-req.json.tpl
@@ -6,12 +6,6 @@
        "availability_zone": "nova",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-create-backup/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-create-backup/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef" : "%(host)s/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-disk-config/server-post-req.json.tpl
@@ -6,12 +6,6 @@
        "flavorRef" : "%(host)s/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-fping/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-fping/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef": "%(host)s/openstack/flavors/1",
        "metadata": {
            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-lock-server/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-lock-server/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef" : "%(host)s/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl
@@ -7,12 +7,6 @@
            "My Server Name": "Apache1"
        },
        "min_count": "%(min_count)s",
-        "max_count": "%(max_count)s",
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        "max_count": "%(max_count)s"
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-post-req.json.tpl
@@ -8,12 +8,6 @@
        },
        "return_reservation_id": "True",
        "min_count": "%(min_count)s",
-        "max_count": "%(max_count)s",
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        "max_count": "%(max_count)s"
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-pause-server/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-pause-server/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef" : "%(host)s/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-pci/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-pci/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef" : "%(host)s/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-shelve/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-shelve/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef" : "%(host)s/openstack/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-simple-tenant-usage/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef" : "%(host)s/openstack/flavors/1",
        "metadata" : {
            "My Server Name" : "Apache1"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-virtual-interfaces/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-virtual-interfaces/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef": "%(host)s/openstack/flavors/1",
        "metadata": {
            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }
--- a/nova/tests/functional/v3/api_samples/os-volumes/server-post-req.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-volumes/server-post-req.json.tpl
@@ -5,12 +5,6 @@
        "flavorRef": "%(host)s/openstack/flavors/1",
        "metadata": {
            "My Server Name": "Apache1"
-        },
-        "personality": [
-            {
-                "path": "/etc/banner.txt",
-                "contents": "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
+        }
    }
 }