From 80d4a0c515cf064b50fc20dfab09d65dbaf88512 Mon Sep 17 00:00:00 2001
From: Julia Kreger <juliaashleykreger@gmail.com>
Date: Mon, 22 Mar 2021 10:24:11 -0700
Subject: [PATCH] Version 17.0 mapping/doc updates

Change-Id: I3a144aaaca60ce195ba22fa5af2d9c1e7b4d4bf4
---
 .../contributor/webapi-version-history.rst    |  9 ++++----
 ironic/common/release_mappings.py             | 22 +++++++++++++++++--
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/doc/source/contributor/webapi-version-history.rst b/doc/source/contributor/webapi-version-history.rst
index 56912bd554..e5bf5f750f 100644
--- a/doc/source/contributor/webapi-version-history.rst
+++ b/doc/source/contributor/webapi-version-history.rst
@@ -2,20 +2,19 @@
 REST API Version History
 ========================
 
-1.71 (Wallaby)
---------------
+1.71 (Wallaby, 17.0)
+----------------------
 
 Signifier of the API supporting keystone ``system`` scoped roles and
 access controls. This is an informational flag for clients to be aware of
 the server's capability.
 
-1.70 (Wallaby)
---------------
+1.70 (Wallaby, 17.0)
+----------------------
 
 Add support for ``disable_ramdisk`` parameter to provisioning endpoint
 ``/v1/nodes/{node_ident}/states/provision``.
 
-
 1.69 (Wallaby, 16.2)
 ----------------------
 
diff --git a/ironic/common/release_mappings.py b/ironic/common/release_mappings.py
index 0c19113b87..d0bc46637e 100644
--- a/ironic/common/release_mappings.py
+++ b/ironic/common/release_mappings.py
@@ -301,6 +301,24 @@ RELEASE_MAPPING = {
             'VolumeTarget': ['1.0'],
         }
     },
+    '17.0': {
+        'api': '1.71',
+        'rpc': '1.53',
+        'objects': {
+            'Allocation': ['1.1'],
+            'Node': ['1.35'],
+            'Conductor': ['1.3'],
+            'Chassis': ['1.3'],
+            'Deployment': ['1.0'],
+            'DeployTemplate': ['1.1'],
+            'Port': ['1.10'],
+            'Portgroup': ['1.4'],
+            'Trait': ['1.0'],
+            'TraitList': ['1.0'],
+            'VolumeConnector': ['1.0'],
+            'VolumeTarget': ['1.0'],
+        }
+    },
     'master': {
         'api': '1.71',
         'rpc': '1.53',
@@ -334,9 +352,9 @@ RELEASE_MAPPING = {
 #
 #            There should be at most two named mappings here.
 
-# NOTE(mgoddard): remove Ussuri prior to the Wallaby release.
-RELEASE_MAPPING['ussuri'] = RELEASE_MAPPING['15.0']
+# NOTE(mgoddard): remove victoria prior to the xena release.
 RELEASE_MAPPING['victoria'] = RELEASE_MAPPING['16.0']
+RELEASE_MAPPING['wallaby'] = RELEASE_MAPPING['17.0']
 
 # List of available versions with named versions first; 'master' is excluded.
 RELEASE_VERSIONS = sorted(set(RELEASE_MAPPING) - {'master'}, reverse=True)