From 7ba0b7ad5f4302d4501fcf48760d152e3e5b60d3 Mon Sep 17 00:00:00 2001
From: Rafael Folco <rfolco@br.ibm.com>
Date: Mon, 12 Jun 2017 13:11:32 +0000
Subject: [PATCH] [placement] Increase test coverage

Increase test coverage for deleting all inventory for a
resource provider. These new tests check if the inventory
was deleted for both DELETE and PUT methods, and check if
the new resource generation has been correctly updated as
expected.

The DELETE method is implemented by the following change:
I1ecb12c888f873e8330367c8411d5a2ef0458495.
These tests have been originally proposed in this change:
I626ca4a821b5ab0ebcaa79937a31771fbae5b8d9, however, since
these tests do not have anything about the client side code,
I broke it down into a separate change.

Change-Id: I73aff37aaecf1f3755f0445ab9edb8f6454cf6c3
---
 .../placement/gabbits/inventory.yaml          | 51 ++++++++++++++++---
 1 file changed, 45 insertions(+), 6 deletions(-)

diff --git a/nova/tests/functional/api/openstack/placement/gabbits/inventory.yaml b/nova/tests/functional/api/openstack/placement/gabbits/inventory.yaml
index 8080a75bcb21..0e59eeddf85a 100644
--- a/nova/tests/functional/api/openstack/placement/gabbits/inventory.yaml
+++ b/nova/tests/functional/api/openstack/placement/gabbits/inventory.yaml
@@ -642,18 +642,57 @@ tests:
       openstack-api-version: placement 1.5
   status: 204
 
-- name: get inventories after deletion
-  GET: /resource_providers/$ENVIRON['RP_UUID']/inventories
-  response_json_paths:
-      $.resource_provider_generation: 7
-      $.inventories: {}
-
 - name: delete empty inventories
   DELETE: /resource_providers/$ENVIRON['RP_UUID']/inventories
   request_headers:
       openstack-api-version: placement 1.5
   status: 204
 
+- name: get inventories after deletions
+  GET: /resource_providers/$ENVIRON['RP_UUID']/inventories
+  response_json_paths:
+      $.resource_provider_generation: 8
+      $.inventories: {}
+
+- name: post an inventory again
+  POST: /resource_providers/$ENVIRON['RP_UUID']/inventories
+  request_headers:
+      content-type: application/json
+  data:
+      resource_class: DISK_GB
+      total: 2048
+      reserved: 512
+      min_unit: 10
+      max_unit: 1024
+      step_size: 10
+      allocation_ratio: 1.0
+  status: 201
+  response_headers:
+      location: $SCHEME://$NETLOC/resource_providers/$ENVIRON['RP_UUID']/inventories/DISK_GB
+  response_json_paths:
+      $.resource_provider_generation: 9
+      $.total: 2048
+      $.reserved: 512
+
+- name: delete all inventory with put
+  PUT: /resource_providers/$ENVIRON['RP_UUID']/inventories
+  request_headers:
+      content-type: application/json
+      openstack-api-version: placement 1.4
+  data:
+      resource_provider_generation: 9
+      inventories: {}
+  response_json_paths:
+      $.resource_provider_generation: 10
+      $.inventories: {}
+  status: 200
+
+- name: get generation after deletion
+  GET: /resource_providers/$ENVIRON['RP_UUID']/inventories
+  response_json_paths:
+      $.resource_provider_generation: 10
+      $.inventories: {}
+
 - name: delete inventories earlier version
   DELETE: /resource_providers/$ENVIRON['RP_UUID']/inventories
   request_headers: