Merge "placement project_id, user_id in PUT /allocations"

nova/tests/fixtures.py

@@ -1440,7 +1440,7 @@ class PlacementFixture(fixtures.Fixture):
             headers={'x-auth-token': self.token},
             raise_exc=False)
 
-    def _fake_put(self, *args):
+    def _fake_put(self, *args, **kwargs):
         (url, data) = args[1:]
         # NOTE(sdague): using json= instead of data= sets the
         # media type to application/json for us. Placement API is

nova/tests/functional/api/openstack/placement/fixtures.py

@@ -77,6 +77,8 @@ class APIFixture(fixture.GabbiFixture):
         os.environ['RP_UUID'] = uuidutils.generate_uuid()
         os.environ['RP_NAME'] = uuidutils.generate_uuid()
         os.environ['CUSTOM_RES_CLASS'] = 'CUSTOM_IRON_NFV'
+        os.environ['PROJECT_ID'] = uuidutils.generate_uuid()
+        os.environ['USER_ID'] = uuidutils.generate_uuid()
 
     def stop_fixture(self):
         self.api_db_fixture.cleanup()

nova/tests/functional/api/openstack/placement/gabbits/allocations-1-8.yaml

@@ -0,0 +1,152 @@
+fixtures:
+    - APIFixture
+
+defaults:
+    request_headers:
+        x-auth-token: admin
+        accept: application/json
+        OpenStack-API-Version: placement 1.8
+
+tests:
+
+- name: put an allocation no project_id or user_id
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+  status: 400
+  response_strings:
+      - Failed validating 'required' in schema
+
+- name: put an allocation no project_id
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+      user_id: $ENVIRON['USER_ID']
+  status: 400
+  response_strings:
+      - Failed validating 'required' in schema
+
+- name: put an allocation no user_id
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+      project_id: $ENVIRON['PROJECT_ID']
+  status: 400
+  response_strings:
+      - Failed validating 'required' in schema
+
+- name: put an allocation project_id less than min length
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+      project_id: ""
+      user_id: $ENVIRON['USER_ID']
+  status: 400
+  response_strings:
+      - "Failed validating 'minLength'"
+
+- name: put an allocation user_id less than min length
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+      project_id: $ENVIRON['PROJECT_ID']
+      user_id: ""
+  status: 400
+  response_strings:
+      - "Failed validating 'minLength'"
+
+- name: put an allocation project_id exceeds max length
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+      project_id: 78725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b1
+      user_id: $ENVIRON['USER_ID']
+  status: 400
+  response_strings:
+      - "Failed validating 'maxLength'"
+
+- name: put an allocation user_id exceeds max length
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+              DISK_GB: 10
+      project_id: $ENVIRON['PROJECT_ID']
+      user_id: 78725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b178725f09-5c01-4c9e-97a5-98d75e1e32b1
+  status: 400
+  response_strings:
+      - "Failed validating 'maxLength'"
+
+- name: create the resource provider
+  POST: /resource_providers
+  request_headers:
+      content-type: application/json
+  data:
+      name: $ENVIRON['RP_NAME']
+      uuid: $ENVIRON['RP_UUID']
+  status: 201
+
+- name: post some inventory
+  POST: /resource_providers/$ENVIRON['RP_UUID']/inventories
+  request_headers:
+      content-type: application/json
+  data:
+      resource_class: DISK_GB
+      total: 2048
+      min_unit: 10
+      max_unit: 1024
+  status: 201
+
+- name: put an allocation
+  PUT: /allocations/599ffd2d-526a-4b2e-8683-f13ad25f9958
+  request_headers:
+      content-type: application/json
+  data:
+      allocations:
+          - resource_provider:
+                uuid: $ENVIRON['RP_UUID']
+            resources:
+                DISK_GB: 10
+      project_id: $ENVIRON['PROJECT_ID']
+      user_id: $ENVIRON['USER_ID']
+  status: 204

nova/tests/functional/api/openstack/placement/gabbits/microversion.yaml

@@ -39,13 +39,13 @@ tests:
   response_json_paths:
       $.errors[0].title: Not Acceptable
 
-- name: latest microversion is 1.7
+- name: latest microversion is 1.8
   GET: /
   request_headers:
       openstack-api-version: placement latest
   response_headers:
       vary: /OpenStack-API-Version/
-      openstack-api-version: placement 1.7
+      openstack-api-version: placement 1.8
 
 - name: other accept header bad version
   GET: /

nova/tests/functional/api/openstack/placement/test_report_client.py

@@ -76,6 +76,8 @@ class SchedulerReportClientTests(test.TestCase):
         self.instance_uuid = uuids.inst
         self.instance = objects.Instance(
             uuid=self.instance_uuid,
+            project_id = uuids.project,
+            user_id = uuids.user,
             flavor=objects.Flavor(root_gb=10,
                                   swap=1,
                                   ephemeral_gb=100,

nova/tests/unit/api/openstack/placement/test_microversion.py

@@ -74,7 +74,7 @@ class TestMicroversionIntersection(test.NoDBTestCase):
     # if you add two different versions of method 'foobar' the
     # number only goes up by one if no other version foobar yet
     # exists. This operates as a simple sanity check.
-    TOTAL_VERSIONED_METHODS = 12
+    TOTAL_VERSIONED_METHODS = 13
 
     def test_methods_versioned(self):
         methods_data = microversion.VERSIONED_METHODS