From f52521a253ed88e4f01f05696c77fb9cf043da8d Mon Sep 17 00:00:00 2001 From: Eric Brown Date: Thu, 26 Jan 2017 14:30:24 -0800 Subject: [PATCH] Add RPC version aliases for Ocata This adds upgrade level aliases for ocata for all of our services. Change-Id: I28b806ea98318286a02a4b319a6272170dd41689 --- nova/cells/rpcapi.py | 5 +++-- nova/cert/rpcapi.py | 7 ++++--- nova/compute/rpcapi.py | 3 ++- nova/conductor/rpcapi.py | 5 +++-- nova/console/rpcapi.py | 9 +++++---- nova/consoleauth/rpcapi.py | 8 ++++---- nova/network/rpcapi.py | 3 ++- nova/scheduler/rpcapi.py | 5 +++-- 8 files changed, 26 insertions(+), 19 deletions(-) diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py index 0ae6716449d4..6eead9ce6b27 100644 --- a/nova/cells/rpcapi.py +++ b/nova/cells/rpcapi.py @@ -116,8 +116,8 @@ 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, Mitaka and Newton support message version 1.37. So, any - changes to existing methods in 1.x after that point should be + ... Liberty, Mitaka, Newton, and Ocata 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. ''' @@ -131,6 +131,7 @@ class CellsAPI(object): 'liberty': '1.37', 'mitaka': '1.37', 'newton': '1.37', + 'ocata': '1.37', } def __init__(self): diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py index cc418844b0d7..548ae08b83d2 100644 --- a/nova/cert/rpcapi.py +++ b/nova/cert/rpcapi.py @@ -40,9 +40,9 @@ class CertAPI(object): 2.0 - Major API rev for Icehouse - ... Icehouse, Juno, Kilo, Liberty, Mitaka, and Newton 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 + ... Icehouse, Juno, Kilo, Liberty, Mitaka, Newton, and Ocata 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. ''' @@ -56,6 +56,7 @@ class CertAPI(object): 'liberty': '2.0', 'mitaka': '2.0', 'newton': '2.0', + 'ocata': '2.0', } def __init__(self): diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py index b7aa07d4fd11..e07e9a34825b 100644 --- a/nova/compute/rpcapi.py +++ b/nova/compute/rpcapi.py @@ -316,7 +316,7 @@ class ComputeAPI(object): * 4.12 - Remove migration_id from live_migration_force_complete * 4.13 - Make get_instance_diagnostics send an instance object - ... Newton supports messaging version 4.13. So, any changes to + ... Newton and Ocata support messaging version 4.13. 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.13 ''' @@ -328,6 +328,7 @@ class ComputeAPI(object): 'liberty': '4.5', 'mitaka': '4.11', 'newton': '4.13', + 'ocata': '4.13', } def __init__(self): diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py index 3b7097c257f6..706aff82ba54 100644 --- a/nova/conductor/rpcapi.py +++ b/nova/conductor/rpcapi.py @@ -190,8 +190,8 @@ class ConductorAPI(object): * 3.0 - Drop backwards compatibility - ... Liberty, Mitaka, and Newton support message version 3.0. So, any - changes to existing methods in 3.x after that point should be done such + ... Liberty, Mitaka, Newton, and Ocata 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. * Remove provider_fw_rule_get_all() @@ -206,6 +206,7 @@ class ConductorAPI(object): 'liberty': '3.0', 'mitaka': '3.0', 'newton': '3.0', + 'ocata': '3.0', } def __init__(self): diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py index 3141a7bbfa0e..4c107f4fb181 100644 --- a/nova/console/rpcapi.py +++ b/nova/console/rpcapi.py @@ -40,10 +40,10 @@ class ConsoleAPI(object): 2.0 - Major API rev for Icehouse - ... Icehouse, Juno, Kilo, Liberty, Mitaka, and Newton 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. + ... Icehouse, Juno, Kilo, Liberty, Mitaka, Newton, and Ocata 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. ''' @@ -56,6 +56,7 @@ class ConsoleAPI(object): 'liberty': '2.0', 'mitaka': '2.0', 'newton': '2.0', + 'ocata': '2.0', } def __init__(self, topic=None, server=None): diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py index 1c7dceaa5e58..1196d8464d10 100644 --- a/nova/consoleauth/rpcapi.py +++ b/nova/consoleauth/rpcapi.py @@ -48,10 +48,9 @@ class ConsoleAuthAPI(object): * 2.1 - Added access_url to authorize_console - ... Kilo, Liberty, Mitaka, and Newton 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. + ... Kilo, Liberty, Mitaka, Newton, and Ocata 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 +63,7 @@ class ConsoleAuthAPI(object): 'liberty': '2.1', 'mitaka': '2.1', 'newton': '2.1', + 'ocata': '2.1', } def __init__(self): diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py index e9ef4edd2592..51a0bf9ed146 100644 --- a/nova/network/rpcapi.py +++ b/nova/network/rpcapi.py @@ -109,7 +109,7 @@ class NetworkAPI(object): * 1.17 - Add method release_dhcp() - ... Newton supports message version 1.17. So, any changes to + ... Newton and Ocata support message version 1.17. 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.17. ''' @@ -123,6 +123,7 @@ class NetworkAPI(object): 'liberty': '1.15', 'mitaka': '1.16', 'newton': '1.17', + 'ocata': '1.17', } def __init__(self, topic=None): diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py index d776fe769976..f22e1df91ee9 100644 --- a/nova/scheduler/rpcapi.py +++ b/nova/scheduler/rpcapi.py @@ -90,8 +90,8 @@ class SchedulerAPI(object): * 4.3 - Modify select_destinations() signature by providing a RequestSpec obj - ... Mitaka and Newton support message version 4.3. So, any changes to - existing methods in 4.x after that point should be done such + ... Mitaka, Newton, and Ocata support 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. ''' @@ -105,6 +105,7 @@ class SchedulerAPI(object): 'liberty': '4.2', 'mitaka': '4.3', 'newton': '4.3', + 'ocata': '4.3', } def __init__(self):