From 1969d89d407668b3582c8eee33e377ea48c860c4 Mon Sep 17 00:00:00 2001 From: Dan Smith Date: Wed, 16 Mar 2016 09:54:49 -0700 Subject: [PATCH] Set RPC version aliases for Mitaka Per our usual procedure, this sets version aliases for the current RPC versions of all our internal RPC APIs for mitaka. Change-Id: I455f3b80a9b64dfea42ee1c74685d11ae0178513 --- nova/cells/rpcapi.py | 8 +++++--- nova/cert/rpcapi.py | 3 ++- nova/compute/rpcapi.py | 5 +++++ nova/conductor/rpcapi.py | 3 ++- nova/console/rpcapi.py | 3 ++- nova/consoleauth/rpcapi.py | 3 ++- nova/network/rpcapi.py | 5 +++++ nova/scheduler/rpcapi.py | 5 +++++ 8 files changed, 28 insertions(+), 7 deletions(-) diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py index 2c63b57ae283..f95c56444c03 100644 --- a/nova/cells/rpcapi.py +++ b/nova/cells/rpcapi.py @@ -114,9 +114,10 @@ class CellsAPI(object): * 1.36 - Added 'delete_type' parameter to terminate_instance() * 1.37 - Add get_keypair_at_top to fetch keypair from api cell - ... Liberty supports message version 1.37. So, any changes to - existing methods in 1.x after that point should be done such that they - can handle the version_cap being set to 1.37. + ... Liberty and Mitaka support message version 1.37. So, any + changes to existing methods in 1.x after that point should be + done such that they can handle the version_cap being set to + 1.37. ''' VERSION_ALIASES = { @@ -126,6 +127,7 @@ class CellsAPI(object): 'juno': '1.29', 'kilo': '1.34', 'liberty': '1.37', + 'mitaka': '1.37', } def __init__(self): diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index 537b715d2e42..2345494b76f7 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -38,7 +38,7 @@ class CertAPI(object): 2.0 - Major API rev for Icehouse - ... Icehouse, Juno, Kilo, and Liberty support message version + ... Icehouse, Juno, Kilo, Liberty, and Mitaka support message version 2.0. So, any changes to existing methods in 2.x after that point should be done such that they can handle the version_cap being set to 2.0. @@ -52,6 +52,7 @@ class CertAPI(object): 'juno': '2.0', 'kilo': '2.0', 'liberty': '2.0', + 'mitaka': '2.0', } def __init__(self): diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index ac3cc643d545..dc63973710f6 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -328,6 +328,10 @@ class ComputeAPI(object): * 4.9 - Add live_migration_force_complete() * 4.10 - Add live_migration_abort() * 4.11 - Allow block_migration and disk_over_commit be None + + ... Mitaka supports messaging version 4.11. So, any changes to + existing methods in 4.x after that point should be done so that they + can handle the version_cap being set to 4.11 ''' VERSION_ALIASES = { @@ -335,6 +339,7 @@ class ComputeAPI(object): 'juno': '3.35', 'kilo': '4.0', 'liberty': '4.5', + 'mitaka': '4.11', } def __init__(self): diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py index 0a300ce6f4d9..912973c40bf0 100644 --- a/nova/conductor/rpcapi.py +++ b/nova/conductor/rpcapi.py @@ -193,7 +193,7 @@ class ConductorAPI(object): * 3.0 - Drop backwards compatibility - ... Liberty supports message version 3.0. So, any changes to + ... Liberty and Mitaka support message version 3.0. So, any changes to existing methods in 3.x after that point should be done such that they can handle the version_cap being set to 3.0. @@ -207,6 +207,7 @@ class ConductorAPI(object): 'juno': '2.0', 'kilo': '2.1', 'liberty': '3.0', + 'mitaka': '3.0', } def __init__(self): diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 82038f228b15..2f4b5085b0f6 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -49,7 +49,7 @@ class ConsoleAPI(object): 2.0 - Major API rev for Icehouse - ... Icehouse, Juno, Kilo, Liberty support message version 2.0. + ... Icehouse, Juno, Kilo, Liberty, Mitaka support message version 2.0. So, any changes to existing methods in 2.x after that point should be done such that they can handle the version_cap being set to 2.0. @@ -63,6 +63,7 @@ class ConsoleAPI(object): 'juno': '2.0', 'kilo': '2.0', 'liberty': '2.0', + 'mitaka': '2.0', } def __init__(self, topic=None, server=None): diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index 5d365350781f..32bed3e92339 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -50,7 +50,7 @@ class ConsoleAuthAPI(object): * 2.1 - Added access_url to authorize_console - ... Kilo and Liberty support message version 2.1. So, any + ... Kilo, Liberty and Mitaka support message version 2.1. So, any changes to existing methods in 2.x after that point should be done such that they can handle the version_cap being set to 2.1. @@ -64,6 +64,7 @@ class ConsoleAuthAPI(object): 'juno': '2.0', 'kilo': '2.1', 'liberty': '2.1', + 'mitaka': '2.1', } def __init__(self): diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index 316fe74ea1a6..53e05e67438f 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -113,6 +113,10 @@ class NetworkAPI(object): * 1.16 - Transfer instance in addition to instance_id in setup_networks_on_host + + ... Liberty supports message version 1.16. So, any changes to + existing methods in 1.x after that point should be done such that they + can handle the version_cap being set to 1.16. ''' VERSION_ALIASES = { @@ -122,6 +126,7 @@ class NetworkAPI(object): 'juno': '1.13', 'kilo': '1.13', 'liberty': '1.15', + 'mitaka': '1.16', } def __init__(self, topic=None): diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index cb02a5e0f097..71affc757541 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -88,6 +88,10 @@ class SchedulerAPI(object): * 4.3 - Modify select_destinations() signature by providing a RequestSpec obj + ... Mitaka supports message version 4.3. So, any changes to + existing methods in 4.x after that point should be done such + that they can handle the version_cap being set to 4.3. + ''' VERSION_ALIASES = { @@ -97,6 +101,7 @@ class SchedulerAPI(object): 'juno': '3.0', 'kilo': '4.2', 'liberty': '4.2', + 'mitaka': '4.3', } def __init__(self):