Merge preserve_ephemeral_rebuild tests between v2 & 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 preserve_ephemeral_rebuild functional tests. Also verifying the response with sample file. In V2.1 os-access-ip is separate plugin where in v2 it was mixed in server plugin itself. So os-access-ip extension is enabled to run merged functional tests for both v2 and v2.1. Change-Id: Id4a2f6d27bb0c1f1930186f97af208a2b20fc542
2015-04-14 21:08:12 +09:00
parent 5115a8d219
commit 48264179fa
7 changed files with 40 additions and 161 deletions
@@ -1,55 +0,0 @@
-{
-    "server": {
-        "accessIPv4": "1.2.3.4",
-        "accessIPv6": "fe80::100",
-        "addresses": {
-            "private": [
-                {
-                    "addr": "192.168.0.3",
-                    "version": 4
-                }
-            ]
-        },
-        "adminPass": "seekr3t",
-        "created": "2013-12-30T12:28:14Z",
-        "flavor": {
-            "id": "1",
-            "links": [
-                {
-                    "href": "http://openstack.example.com/openstack/flavors/1",
-                    "rel": "bookmark"
-                }
-            ]
-        },
-        "hostId": "ee8ea077f8548ce25c59c2d5020d0f82810c815c210fd68194a5c0f8",
-        "id": "810e78d5-47fe-48bf-9559-bfe5dc918685",
-        "image": {
-            "id": "70a599e0-31e7-49b7-b260-868f441e862b",
-            "links": [
-                {
-                    "href": "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
-                    "rel": "bookmark"
-                }
-            ]
-        },
-        "links": [
-            {
-                "href": "http://openstack.example.com/v2/openstack/servers/810e78d5-47fe-48bf-9559-bfe5dc918685",
-                "rel": "self"
-            },
-            {
-                "href": "http://openstack.example.com/openstack/servers/810e78d5-47fe-48bf-9559-bfe5dc918685",
-                "rel": "bookmark"
-            }
-        ],
-        "metadata": {
-            "meta var": "meta val"
-        },
-        "name": "foobar",
-        "progress": 0,
-        "status": "ACTIVE",
-        "tenant_id": "openstack",
-        "updated": "2013-12-30T12:28:15Z",
-        "user_id": "fake"
-    }
-}
@@ -1,19 +0,0 @@
-{
-    "rebuild" : {
-        "imageRef" : "http://openstack.example.com/v2/32278/images/70a599e0-31e7-49b7-b260-868f441e862b",
-        "name" : "new-server-test",
-        "adminPass" : "seekr3t",
-        "accessIPv4" : "1.2.3.4",
-        "accessIPv6" : "fe80::100",
-        "metadata" : {
-            "meta var" : "meta val"
-        },
-        "personality" : [
-            {
-                "path" : "/etc/banner.txt",
-                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6 b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
-            }
-        ],
-        "preserve_ephemeral": true
-    }
-}