openstack
/
nova
Code Issues Proposed changes

Merge "Fresh resource provider in RT must have generation 0" into stable/newton

This commit is contained in:
Jenkins 2017-03-07 12:44:33 +00:00 committed by Gerrit Code Review
parent dff8f7fd7f 7644e051d6
commit cc532c6e09
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nova/scheduler/client/report.py
View File

@ -251,7 +251,7 @@ class SchedulerReportClient(object):
return objects.ResourceProvider(
uuid=uuid,
name=name,
generation=1,
generation=0,
)
elif resp.status_code == 409:
# Another thread concurrently created a resource provider with the

2
nova/tests/unit/scheduler/client/test_report.py
View File

@ -316,7 +316,7 @@ class SchedulerReportClientTestCase(test.NoDBTestCase):
expected_provider = objects.ResourceProvider(
uuid=uuid,
name=name,
generation=1,
generation=0,
)
expected_url = '/resource_providers'
self.ks_sess_mock.post.assert_called_once_with(