Share multiple create server tests between v2 and v2.1

Currently v2 and v2.1 have separate functional tests and their corresponding sample files. As v2 and v2.1 are supposed to be identical, there is overhead to maintain two set of functional tests and sample files. We can have one set of tests which can run for both v2 and v2.1. This commit merges multiple create servers functional tests. Change-Id: I6c19fa5365b7c7e05e75dffb3dcb806fb5f004db
2015-04-13 15:22:35 +09:00
parent f713c7c7b5
commit 5aad375727
12 changed files with 19 additions and 145 deletions
--- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json
+++ b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json
@@ -1,18 +0,0 @@
-{
-    "server" : {
-        "name" : "new-server-test",
-        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
-        "metadata" : {
-            "My Server Name" : "Apache1"
-        },
-        "min_count": "2",
-        "max_count": "3",
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}
--- a/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
+++ b/doc/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
@@ -1,16 +0,0 @@
-{
-    "server": {
-        "adminPass": "wfksH3GTTseP",
-        "id": "440cf918-3ee0-4143-b289-f63e1d2000e6",
-        "links": [
-            {
-                "href": "http://openstack.example.com/v2/openstack/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
-                "rel": "self"
-            },
-            {
-                "href": "http://openstack.example.com/openstack/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
-                "rel": "bookmark"
-            }
-        ]
-    }
-}
--- a/doc/api_samples/os-multiple-create/multiple-create-post-req.json
+++ b/doc/api_samples/os-multiple-create/multiple-create-post-req.json
@@ -1,19 +0,0 @@
-{
-    "server" : {
-        "name" : "new-server-test",
-        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
-        "metadata" : {
-            "My Server Name" : "Apache1"
-        },
-        "return_reservation_id": "True",
-        "min_count": "2",
-        "max_count": "3",
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}
--- a/doc/api_samples/os-multiple-create/multiple-create-post-resp.json
+++ b/doc/api_samples/os-multiple-create/multiple-create-post-resp.json
@@ -1,3 +0,0 @@
-{
-    "reservation_id": "r-3fhpjulh"
-}
--- a/doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
+++ b/doc/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json
@@ -4,11 +4,11 @@
        "id": "440cf918-3ee0-4143-b289-f63e1d2000e6",
        "links": [
            {
-                "href": "http://openstack.example.com/v3/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
+                "href": "http://openstack.example.com/v2/openstack/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
                "rel": "self"
            },
            {
-                "href": "http://openstack.example.com/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
+                "href": "http://openstack.example.com/openstack/servers/440cf918-3ee0-4143-b289-f63e1d2000e6",
                "rel": "bookmark"
            }
        ]
--- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl
+++ b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-req.json.tpl
@@ -1,18 +0,0 @@
-{
-    "server" : {
-        "name" : "new-server-test",
-        "imageRef" : "%(host)s/openstack/images/%(image_id)s",
-        "flavorRef" : "%(host)s/openstack/flavors/1",
-        "metadata" : {
-            "My Server Name" : "Apache1"
-        },
-        "min_count": "%(min_count)s",
-        "max_count": "%(max_count)s",
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}
--- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl
+++ b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl
@@ -1,16 +0,0 @@
-{
-    "server": {
-        "adminPass": "%(password)s",
-        "id": "%(id)s",
-        "links": [
-            {
-                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
-                "rel": "self"
-            },
-            {
-                "href": "%(host)s/openstack/servers/%(uuid)s",
-                "rel": "bookmark"
-            }
-        ]
-    }
-}
--- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-req.json.tpl
+++ b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-req.json.tpl
@@ -1,19 +0,0 @@
-{
-    "server" : {
-        "name" : "new-server-test",
-        "imageRef" : "%(host)s/openstack/images/%(image_id)s",
-        "flavorRef" : "%(host)s/openstack/flavors/1",
-        "metadata" : {
-            "My Server Name" : "Apache1"
-        },
-        "return_reservation_id": "True",
-        "min_count": "%(min_count)s",
-        "max_count": "%(max_count)s",
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ]
-    }
-}
--- a/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl
+++ b/nova/tests/functional/api_samples/os-multiple-create/multiple-create-post-resp.json.tpl
@@ -1,3 +0,0 @@
-{
-    "reservation_id": "%(reservation_id)s"
-}
--- a/nova/tests/functional/test_api_samples.py
+++ b/nova/tests/functional/test_api_samples.py
@@ -1002,35 +1002,6 @@ class UsedLimitsForAdminSamplesJsonTest(ApiSampleTestBaseV2):
                                     response, 200)


-class MultipleCreateJsonTest(ServersSampleBase):
-    extension_name = ("nova.api.openstack.compute.contrib.multiple_create."
-                      "Multiple_create")
-
-    def test_multiple_create(self):
-        subs = {
-            'image_id': fake.get_valid_image_id(),
-            'host': self._get_host(),
-            'min_count': "2",
-            'max_count': "3"
-        }
-        response = self._do_post('servers', 'multiple-create-post-req', subs)
-        subs.update(self._get_regexes())
-        self._verify_response('multiple-create-post-resp', subs, response, 202)
-
-    def test_multiple_create_without_reservation_id(self):
-        subs = {
-            'image_id': fake.get_valid_image_id(),
-            'host': self._get_host(),
-            'min_count': "2",
-            'max_count': "3"
-        }
-        response = self._do_post('servers', 'multiple-create-no-resv-post-req',
-                                  subs)
-        subs.update(self._get_regexes())
-        self._verify_response('multiple-create-no-resv-post-resp', subs,
-                              response, 202)
-
-
 class ServicesJsonTest(ApiSampleTestBaseV2):
    extension_name = "nova.api.openstack.compute.contrib.services.Services"
    ADMIN_API = True
--- a/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl
+++ b/nova/tests/functional/v3/api_samples/os-multiple-create/multiple-create-no-resv-post-resp.json.tpl
@@ -4,11 +4,11 @@
        "id": "%(id)s",
        "links": [
            {
-                "href": "%(host)s/v3/servers/%(uuid)s",
+                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
                "rel": "self"
            },
            {
-                "href": "%(host)s/servers/%(uuid)s",
+                "href": "%(host)s/openstack/servers/%(uuid)s",
                "rel": "bookmark"
            }
        ]
--- a/nova/tests/functional/v3/test_multiple_create.py
+++ b/nova/tests/functional/v3/test_multiple_create.py
@@ -13,12 +13,27 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.

+from oslo_config import cfg
+
 from nova.tests.functional.v3 import test_servers
 from nova.tests.unit.image import fake

+CONF = cfg.CONF
+CONF.import_opt('osapi_compute_extension',
+                'nova.api.openstack.compute.extensions')
+

 class MultipleCreateJsonTest(test_servers.ServersSampleBase):
    extension_name = "os-multiple-create"
+    _api_version = 'v2'
+
+    def _get_flags(self):
+        f = super(MultipleCreateJsonTest, self)._get_flags()
+        f['osapi_compute_extension'] = CONF.osapi_compute_extension[:]
+        f['osapi_compute_extension'].append(
+            'nova.api.openstack.compute.contrib.multiple_create.'
+            'Multiple_create')
+        return f

    def test_multiple_create(self):
        subs = {