openstack
/
nova
Code Issues Proposed changes

Merge "Not use project table for user table"

This commit is contained in:
Zuul 2018-08-07 01:11:39 +00:00 committed by Gerrit Code Review
parent 1d97b663d3 e13b765e55
commit 5f3b4aa44f
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/api/openstack/placement/objects/resource_provider.py
View File

@ -1774,7 +1774,7 @@ def _get_allocations_by_provider_id(ctx, rp_id):
allocs = sa.alias(_ALLOC_TBL, name="a")
consumers = sa.alias(_CONSUMER_TBL, name="c")
projects = sa.alias(_PROJECT_TBL, name="p")
users = sa.alias(_PROJECT_TBL, name="u")
users = sa.alias(_USER_TBL, name="u")
cols = [
allocs.c.id,
allocs.c.resource_class_id,

11
nova/tests/functional/api/openstack/placement/gabbits/with-allocations.yaml
View File

@ -30,17 +30,14 @@ tests:
response_headers:
content-type: /application/json/
response_json_paths:
# Bug#1785382: It doesn't show all the consumers
# on the resource provider
# $.allocations.`len`: 3
$.allocations.`len`: 2
$.allocations.`len`: 3
$.allocations["$ENVIRON['CONSUMER_0']"].resources:
DISK_GB: 1000
$.allocations["$ENVIRON['CONSUMER_ID']"].resources:
VCPU: 6
# $.allocations["$ENVIRON['ALT_CONSUMER_ID']"].resources:
# VCPU: 1
# DISK_GB: 20
$.allocations["$ENVIRON['ALT_CONSUMER_ID']"].resources:
VCPU: 1
DISK_GB: 20
$.resource_provider_generation: 5
- name: fail to delete resource provider