functional: Enable real policy fixture by default

Enable the policy fixture by default, which should yield more realistic
functional tests. We need to update some tests to use admin APIs where
policy dictates they are necessary. Note that we're currently testing
the legacy policy - not the updated, scoped policy - since the legacy
policy is the default one currently.

Note that we also need to modify the 'SingleCellSimple' fixture in this
change to use the same project ID as the 'OSAPIFixture'.

Change-Id: Ia3dea78f16cb3c7081714c4db36e20d5ee76ed7d
Signed-off-by: Stephen Finucane <stephenfin@redhat.com>
This commit is contained in:
Stephen Finucane
2020-08-11 10:40:01 +01:00
parent f72c9e59fb
commit 8750c4e173
114 changed files with 206 additions and 230 deletions
@@ -51,6 +51,6 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-11-14T06:29:02Z",
"user_id": "fake"
"user_id": "admin"
}
}
+1 -1
View File
@@ -76,6 +76,6 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-03T04:01:33Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -50,6 +50,6 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2012-12-02T02:11:58Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -77,7 +77,7 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-03T04:01:32Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -87,6 +87,6 @@
"host_status": "UP",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-16T02:55:08Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -88,7 +88,7 @@
"host_status": "UP",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-16T02:55:05Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -53,6 +53,6 @@
"OS-DCF:diskConfig": "AUTO",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-11-14T06:29:02Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -88,6 +88,6 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2015-12-07T17:24:15Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -52,6 +52,6 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2015-12-07T19:19:36Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -89,7 +89,7 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2015-12-07T19:54:49Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -51,7 +51,7 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-11-14T06:29:02Z",
"user_id": "fake",
"user_id": "admin",
"locked": false,
"description" : "description of foobar",
"tags": ["tag1", "tag2"]
@@ -85,6 +85,6 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-03T04:01:33Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -86,7 +86,7 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-03T04:01:32Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -54,6 +54,6 @@
"tags": [],
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-11-14T06:29:02Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -91,6 +91,6 @@
"tags": [],
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2017-02-14T19:24:00Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -53,6 +53,6 @@
"tags": [],
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2012-12-02T02:11:58Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -92,7 +92,7 @@
"tags": [],
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2017-02-14T19:24:43Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -89,6 +89,6 @@
"tags": ["tag1", "tag2"],
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2017-02-14T19:24:00Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -90,7 +90,7 @@
"tags": ["tag1", "tag2"],
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2017-02-14T19:24:43Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -54,7 +54,7 @@
"OS-DCF:diskConfig": "AUTO",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-11-14T06:29:02Z",
"user_id": "fake",
"user_id": "admin",
"tags": []
}
}
@@ -54,7 +54,7 @@
"OS-DCF:diskConfig": "AUTO",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-11-14T06:29:02Z",
"user_id": "fake",
"user_id": "admin",
"tags": [],
"user_data": "ZWNobyAiaGVsbG8gd29ybGQi"
}
@@ -62,7 +62,7 @@
"674736e3-f25c-405c-8362-bbf991e0ce0a"
],
"updated": "2017-10-10T16:06:03Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -86,6 +86,6 @@
"674736e3-f25c-405c-8362-bbf991e0ce0a"
],
"updated": "2017-02-14T19:24:00Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -59,6 +59,6 @@
"674736e3-f25c-405c-8362-bbf991e0ce0a"
],
"updated": "2012-12-02T02:11:58Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -87,7 +87,7 @@
"674736e3-f25c-405c-8362-bbf991e0ce0a"
],
"updated": "2017-10-10T15:49:09Z",
"user_id": "fake"
"user_id": "admin"
}
],
"servers_links": [
@@ -87,7 +87,7 @@
"674736e3-f25c-405c-8362-bbf991e0ce0a"
],
"updated": "2018-10-10T15:49:09Z",
"user_id": "fake"
"user_id": "admin"
}
]
}
@@ -23,8 +23,8 @@
]
},
"status": "UNKNOWN",
"tenant_id": "project",
"user_id": "fake",
"tenant_id": "6f70656e737461636b20342065766572",
"user_id": "admin",
"links": [
{
"href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/33748c23-38dd-4f70-b774-522fc69e7b67",
@@ -36,4 +36,4 @@
}
]
}
}
}
@@ -60,6 +60,6 @@
"trusted_image_certificates": null,
"updated": "2019-02-28T03:16:20Z",
"user_data": "ZWNobyAiaGVsbG8gd29ybGQi",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -26,8 +26,8 @@
"f3d86fe6-4246-4be8-b87c-eb894626c741"
],
"status": "UNKNOWN",
"tenant_id": "project",
"user_id": "fake",
"tenant_id": "6f70656e737461636b20342065766572",
"user_id": "admin",
"links": [
{
"href": "http://openstack.example.com/v2.1/6f70656e737461636b20342065766572/servers/2669556b-b4a3-41f1-a0c1-f9c7ff75e53c",
@@ -84,6 +84,6 @@
"tenant_id": "6f70656e737461636b20342065766572",
"trusted_image_certificates": null,
"updated": "2019-02-28T03:16:19Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -6,6 +6,6 @@
"policy": "affinity",
"project_id": "6f70656e737461636b20342065766572",
"rules": {},
"user_id": "fake"
"user_id": "admin"
}
}
@@ -57,6 +57,6 @@
"tenant_id": "6f70656e737461636b20342065766572",
"trusted_image_certificates": null,
"updated": "2019-02-28T03:16:19Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -59,6 +59,6 @@
"trusted_image_certificates": null,
"updated": "2019-04-23T17:10:24Z",
"user_data": "ZWNobyAiaGVsbG8gd29ybGQi",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -83,6 +83,6 @@
"tenant_id": "6f70656e737461636b20342065766572",
"trusted_image_certificates": null,
"updated": "2019-04-23T15:19:11Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -56,6 +56,6 @@
"tenant_id": "6f70656e737461636b20342065766572",
"trusted_image_certificates": null,
"updated": "2019-04-23T17:37:48Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -83,7 +83,7 @@
"tenant_id": "6f70656e737461636b20342065766572",
"trusted_image_certificates": null,
"updated": "2019-04-23T15:19:15Z",
"user_id": "fake"
"user_id": "admin"
}
]
}
@@ -84,6 +84,6 @@
"trusted_image_certificates": null,
"updated": "2019-04-23T17:10:24Z",
"user_data": "ZWNobyAiaGVsbG8gd29ybGQi",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -83,6 +83,6 @@
"tenant_id": "6f70656e737461636b20342065766572",
"trusted_image_certificates": null,
"updated": "2012-12-02T02:11:58Z",
"user_id": "fake"
"user_id": "admin"
}
}
@@ -85,7 +85,7 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-03T04:01:33Z",
"user_id": "fake",
"user_id": "admin",
"locked": false
}
}
@@ -86,7 +86,7 @@
"status": "ACTIVE",
"tenant_id": "6f70656e737461636b20342065766572",
"updated": "2013-09-03T04:01:32Z",
"user_id": "fake",
"user_id": "admin",
"locked": false
}
],