Skip to content

Commit 8750c4e

Browse files
stephenfinstephenfin
committed
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 <[email protected]>
1 parent f72c9e5 commit 8750c4e

File tree

114 files changed

+206
-230
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

114 files changed

+206
-230
lines changed

‎doc/api_samples/os-rescue/server-get-resp-rescue.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,6 @@
5555
"config_drive": "",
5656
"OS-DCF:diskConfig": "AUTO",
5757
"OS-EXT-AZ:availability_zone": "us-west",
58-
"OS-EXT-SRV-ATTR:host": "b8b357f7100d4391828f2177c922ef93",
59-
"OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini",
60-
"OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
6158
"OS-EXT-STS:power_state": 4,
6259
"OS-EXT-STS:task_state": null,
6360
"OS-EXT-STS:vm_state": "rescued",

‎doc/api_samples/os-rescue/server-get-resp-unrescue.json‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,9 +56,6 @@
5656
"config_drive": "",
5757
"OS-DCF:diskConfig": "AUTO",
5858
"OS-EXT-AZ:availability_zone": "us-west",
59-
"OS-EXT-SRV-ATTR:host": "b8b357f7100d4391828f2177c922ef93",
60-
"OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini",
61-
"OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
6259
"OS-EXT-STS:power_state": 1,
6360
"OS-EXT-STS:task_state": null,
6461
"OS-EXT-STS:vm_state": "active",

‎doc/api_samples/os-rescue/server-unrescue-req.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
22
"unrescue": null
3-
}
3+
}

‎doc/api_samples/os-rescue/v2.87/server-get-resp-rescue.json‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
"server": {
33
"OS-DCF:diskConfig": "AUTO",
44
"OS-EXT-AZ:availability_zone": "us-west",
5-
"OS-EXT-SRV-ATTR:host": "compute",
6-
"OS-EXT-SRV-ATTR:hostname": "new-server-test",
7-
"OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini",
8-
"OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
9-
"OS-EXT-SRV-ATTR:kernel_id": "",
10-
"OS-EXT-SRV-ATTR:launch_index": 0,
11-
"OS-EXT-SRV-ATTR:ramdisk_id": "",
12-
"OS-EXT-SRV-ATTR:reservation_id": "r-d0bls59j",
13-
"OS-EXT-SRV-ATTR:root_device_name": "/dev/sda",
14-
"OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
155
"OS-EXT-STS:power_state": 4,
166
"OS-EXT-STS:task_state": null,
177
"OS-EXT-STS:vm_state": "rescued",
@@ -42,7 +32,6 @@
4232
"vcpus": 1
4333
},
4434
"hostId": "2091634baaccdc4c5a1d57069c833e402921df696b7f970791b12ec6",
45-
"host_status": "UP",
4635
"id": "69bebe1c-3bdb-4feb-9b79-afa3d4782d95",
4736
"image": {
4837
"id": "70a599e0-31e7-49b7-b260-868f441e862b",
@@ -84,4 +73,4 @@
8473
"updated": "2020-02-07T17:39:49Z",
8574
"user_id": "fake"
8675
}
87-
}
76+
}

‎doc/api_samples/os-rescue/v2.87/server-get-resp-unrescue.json‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,6 @@
22
"server": {
33
"OS-DCF:diskConfig": "AUTO",
44
"OS-EXT-AZ:availability_zone": "us-west",
5-
"OS-EXT-SRV-ATTR:host": "compute",
6-
"OS-EXT-SRV-ATTR:hostname": "new-server-test",
7-
"OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini",
8-
"OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
9-
"OS-EXT-SRV-ATTR:kernel_id": "",
10-
"OS-EXT-SRV-ATTR:launch_index": 0,
11-
"OS-EXT-SRV-ATTR:ramdisk_id": "",
12-
"OS-EXT-SRV-ATTR:reservation_id": "r-g20x6pwt",
13-
"OS-EXT-SRV-ATTR:root_device_name": "/dev/sda",
14-
"OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
155
"OS-EXT-STS:power_state": 1,
166
"OS-EXT-STS:task_state": null,
177
"OS-EXT-STS:vm_state": "active",
@@ -42,7 +32,6 @@
4232
"vcpus": 1
4333
},
4434
"hostId": "2091634baaccdc4c5a1d57069c833e402921df696b7f970791b12ec6",
45-
"host_status": "UP",
4635
"id": "5a0ffa96-ae59-4f82-b7a6-e0c9007cd576",
4736
"image": {
4837
"id": "70a599e0-31e7-49b7-b260-868f441e862b",
@@ -85,4 +74,4 @@
8574
"updated": "2020-02-07T17:39:56Z",
8675
"user_id": "fake"
8776
}
88-
}
77+
}

‎doc/api_samples/os-server-tags/v2.26/server-tags-show-details-resp.json‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -59,16 +59,6 @@
5959
"config_drive": "",
6060
"OS-DCF:diskConfig": "AUTO",
6161
"OS-EXT-AZ:availability_zone": "us-west",
62-
"OS-EXT-SRV-ATTR:host": "b8b357f7100d4391828f2177c922ef93",
63-
"OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini",
64-
"OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
65-
"OS-EXT-SRV-ATTR:reservation_id": "r-00000001",
66-
"OS-EXT-SRV-ATTR:launch_index": 0,
67-
"OS-EXT-SRV-ATTR:kernel_id": "",
68-
"OS-EXT-SRV-ATTR:ramdisk_id": "",
69-
"OS-EXT-SRV-ATTR:hostname": "fake-hostname",
70-
"OS-EXT-SRV-ATTR:root_device_name": "/dev/sda",
71-
"OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
7262
"OS-EXT-STS:power_state": 1,
7363
"OS-EXT-STS:task_state": null,
7464
"OS-EXT-STS:vm_state": "active",
@@ -79,7 +69,6 @@
7969
{
8070
"name": "default"
8171
}
82-
],
83-
"host_status": "UP"
72+
]
8473
}
8574
}

‎doc/api_samples/os-server-tags/v2.26/servers-tags-details-resp.json‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -60,16 +60,6 @@
6060
"config_drive": "",
6161
"OS-DCF:diskConfig": "AUTO",
6262
"OS-EXT-AZ:availability_zone": "us-west",
63-
"OS-EXT-SRV-ATTR:host": "c3f14e9812ad496baf92ccfb3c61e15f",
64-
"OS-EXT-SRV-ATTR:hypervisor_hostname": "fake-mini",
65-
"OS-EXT-SRV-ATTR:instance_name": "instance-00000001",
66-
"OS-EXT-SRV-ATTR:reservation_id": "r-00000001",
67-
"OS-EXT-SRV-ATTR:launch_index": 0,
68-
"OS-EXT-SRV-ATTR:kernel_id": "",
69-
"OS-EXT-SRV-ATTR:ramdisk_id": "",
70-
"OS-EXT-SRV-ATTR:hostname": "fake-hostname",
71-
"OS-EXT-SRV-ATTR:root_device_name": "/dev/sda",
72-
"OS-EXT-SRV-ATTR:user_data": "IyEvYmluL2Jhc2gKL2Jpbi9zdQplY2hvICJJIGFtIGluIHlvdSEiCg==",
7363
"OS-EXT-STS:power_state": 1,
7464
"OS-EXT-STS:task_state": null,
7565
"OS-EXT-STS:vm_state": "active",
@@ -80,8 +70,7 @@
8070
{
8171
"name": "default"
8272
}
83-
],
84-
"host_status": "UP"
73+
]
8574
}
8675
]
8776
}

‎doc/api_samples/servers/server-action-rebuild-resp.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,6 @@
5151
"status": "ACTIVE",
5252
"tenant_id": "6f70656e737461636b20342065766572",
5353
"updated": "2013-11-14T06:29:02Z",
54-
"user_id": "fake"
54+
"user_id": "admin"
5555
}
5656
}

‎doc/api_samples/servers/server-get-resp.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,6 @@
7676
"status": "ACTIVE",
7777
"tenant_id": "6f70656e737461636b20342065766572",
7878
"updated": "2013-09-03T04:01:33Z",
79-
"user_id": "fake"
79+
"user_id": "admin"
8080
}
8181
}

‎doc/api_samples/servers/server-update-resp.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,6 @@
5050
"status": "ACTIVE",
5151
"tenant_id": "6f70656e737461636b20342065766572",
5252
"updated": "2012-12-02T02:11:58Z",
53-
"user_id": "fake"
53+
"user_id": "admin"
5454
}
5555
}

0 commit comments

Comments
 (0)