From d8749f9148f2a78f28e91c58e698779735eae4dc Mon Sep 17 00:00:00 2001
From: Jens Rosenboom <j.rosenboom@x-ion.de>
Date: Thu, 5 Jan 2017 12:34:43 +0100
Subject: [PATCH] Fix creating a private flavor with ID auto

When a private flavor is created with ID auto (=default) and a project
is specified for it, instead of trying to add the project to the flavor
called "auto" the ID of the newly created project should be used.

Change-Id: I19f7a0ec26bd5d147f00ecba3312240e3601567e
Closes-Bug: 1654221
---
 openstackclient/compute/v2/flavor.py                 | 2 +-
 openstackclient/tests/unit/compute/v2/test_flavor.py | 5 ++---
 releasenotes/notes/bug-1654221-a564ab75a6afc332.yaml | 6 ++++++
 3 files changed, 9 insertions(+), 4 deletions(-)
 create mode 100644 releasenotes/notes/bug-1654221-a564ab75a6afc332.yaml

diff --git a/openstackclient/compute/v2/flavor.py b/openstackclient/compute/v2/flavor.py
index f20d154b2..e562cd40c 100644
--- a/openstackclient/compute/v2/flavor.py
+++ b/openstackclient/compute/v2/flavor.py
@@ -167,7 +167,7 @@ class CreateFlavor(command.ShowOne):
                     parsed_args.project_domain,
                 ).id
                 compute_client.flavor_access.add_tenant_access(
-                    parsed_args.id, project_id)
+                    flavor.id, project_id)
             except Exception as e:
                 msg = _("Failed to add project %(project)s access to "
                         "flavor: %(e)s")
diff --git a/openstackclient/tests/unit/compute/v2/test_flavor.py b/openstackclient/tests/unit/compute/v2/test_flavor.py
index 93ad9d14c..632fcda12 100644
--- a/openstackclient/tests/unit/compute/v2/test_flavor.py
+++ b/openstackclient/tests/unit/compute/v2/test_flavor.py
@@ -160,7 +160,7 @@ class TestFlavorCreate(TestFlavor):
 
         self.flavor.is_public = False
         arglist = [
-            '--id', self.flavor.id,
+            '--id', 'auto',
             '--ram', str(self.flavor.ram),
             '--disk', str(self.flavor.disk),
             '--ephemeral', str(self.flavor.ephemeral),
@@ -174,7 +174,6 @@ class TestFlavorCreate(TestFlavor):
             self.flavor.name,
         ]
         verifylist = [
-            ('id', self.flavor.id),
             ('ram', self.flavor.ram),
             ('disk', self.flavor.disk),
             ('ephemeral', self.flavor.ephemeral),
@@ -193,7 +192,7 @@ class TestFlavorCreate(TestFlavor):
             self.flavor.ram,
             self.flavor.vcpus,
             self.flavor.disk,
-            self.flavor.id,
+            'auto',
             self.flavor.ephemeral,
             self.flavor.swap,
             self.flavor.rxtx_factor,
diff --git a/releasenotes/notes/bug-1654221-a564ab75a6afc332.yaml b/releasenotes/notes/bug-1654221-a564ab75a6afc332.yaml
new file mode 100644
index 000000000..5f7132ff8
--- /dev/null
+++ b/releasenotes/notes/bug-1654221-a564ab75a6afc332.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fix ``--project`` option for ``flavor create`` command when the
+    ID for the new flavor is auto generated.
+    [Bug `1654221 <https://bugs.launchpad.net/bugs/1654221>`_]