Update rpc version aliases for juno

Update all of the rpc client API classes to include a version alias
for the latest version implemented in Juno.  This alias is needed when
doing rolling upgrades from Juno to Kilo.  With this in place, you can
ensure all services only send messages that both Juno and Kilo will
understand.

Closes-bug: #1378786
Change-Id: Ia81538130bf8530b70b5f55c7a3d565903ff54b4
(cherry picked from commit f98d725103c53e767a1cddb0b7e2c3822309db17)

8 files changed, 26 insertions, 4 deletions

diff --git a/nova/cells/rpcapi.py b/nova/cells/rpcapi.py
index 7ff0c74615..bc061221a1 100644
--- a/nova/cells/rpcapi.py
+++ b/nova/cells/rpcapi.py
@@ -97,12 +97,17 @@ class CellsAPI(object):
 
         * 1.28 - Make bdm_update_or_create_at_top and use bdm objects
         * 1.29 - Adds set_admin_password()
+
+        ... Juno supports message version 1.29.  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.29.
     '''
 
     VERSION_ALIASES = {
         'grizzly': '1.6',
         'havana': '1.24',
         'icehouse': '1.27',
+        'juno': '1.29',
     }
 
     def __init__(self):
diff --git a/nova/cert/rpcapi.py b/nova/cert/rpcapi.py
index 65b69ef107..aa84a23aa2 100644
--- a/nova/cert/rpcapi.py
+++ b/nova/cert/rpcapi.py
@@ -49,7 +49,7 @@ class CertAPI(object):
 
         2.0 - Major API rev for Icehouse
 
-        ... Icehouse supports message version 2.0.  So, any changes to
+        ... Icehouse and Juno 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.
     '''
@@ -58,6 +58,7 @@ class CertAPI(object):
         'grizzly': '1.1',
         'havana': '1.1',
         'icehouse': '2.0',
+        'juno': '2.0',
     }
 
     def __init__(self):
diff --git a/nova/compute/rpcapi.py b/nova/compute/rpcapi.py
index 096242cef8..109cdd2c57 100644
--- a/nova/compute/rpcapi.py
+++ b/nova/compute/rpcapi.py
@@ -271,10 +271,14 @@ class ComputeAPI(object):
         * 3.34 - Add get_serial_console method
         * 3.35 - Make reserve_block_device_name return a BDM object
 
+        ... Juno supports message version 3.35.  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.35.
     '''
 
     VERSION_ALIASES = {
         'icehouse': '3.23',
+        'juno': '3.35',
     }
 
     def __init__(self):
diff --git a/nova/conductor/rpcapi.py b/nova/conductor/rpcapi.py
index 4a82e72ae0..d6c2b75d77 100644
--- a/nova/conductor/rpcapi.py
+++ b/nova/conductor/rpcapi.py
@@ -151,12 +151,17 @@ class ConductorAPI(object):
     * Remove instance_get_by_uuid()
     * Remove agent_build_get_by_triple()
 
+    ... Juno supports 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.
+
     """
 
     VERSION_ALIASES = {
         'grizzly': '1.48',
         'havana': '1.58',
         'icehouse': '2.0',
+        'juno': '2.0',
     }
 
     def __init__(self):
diff --git a/nova/console/rpcapi.py b/nova/console/rpcapi.py
index a09c5e804d..97671a4abe 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 supports message version 2.0.  So, any changes to
+        ... Icehouse and Juno 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.
     '''
@@ -58,6 +58,7 @@ class ConsoleAPI(object):
         'grizzly': '1.1',
         'havana': '1.1',
         'icehouse': '2.0',
+        'juno': '2.0',
     }
 
     def __init__(self, topic=None, server=None):
diff --git a/nova/consoleauth/rpcapi.py b/nova/consoleauth/rpcapi.py
index 2bba0f8c96..aa1d6447c1 100644
--- a/nova/consoleauth/rpcapi.py
+++ b/nova/consoleauth/rpcapi.py
@@ -44,7 +44,7 @@ class ConsoleAuthAPI(object):
 
         * 2.0 - Major API rev for Icehouse
 
-        ... Icehouse supports message version 2.0.  So, any changes to
+        ... Icehouse and Juno 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.
     '''
@@ -53,6 +53,7 @@ class ConsoleAuthAPI(object):
         'grizzly': '1.2',
         'havana': '1.2',
         'icehouse': '2.0',
+        'juno': '2.0',
     }
 
     def __init__(self):
diff --git a/nova/network/rpcapi.py b/nova/network/rpcapi.py
index 5000d9b67d..6208d20943 100644
--- a/nova/network/rpcapi.py
+++ b/nova/network/rpcapi.py
@@ -84,12 +84,16 @@ class NetworkAPI(object):
         * 1.13 - Convert allocate_for_instance()
                  to use NetworkRequestList objects
 
+        ... Juno supports message version 1.13.  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.13.
     '''
 
     VERSION_ALIASES = {
         'grizzly': '1.9',
         'havana': '1.10',
         'icehouse': '1.12',
+        'juno': '1.13',
     }
 
     def __init__(self, topic=None):
diff --git a/nova/scheduler/rpcapi.py b/nova/scheduler/rpcapi.py
index 125f4bbc35..cab09631fd 100644
--- a/nova/scheduler/rpcapi.py
+++ b/nova/scheduler/rpcapi.py
@@ -80,7 +80,7 @@ class SchedulerAPI(object):
 
         3.0 - Removed backwards compat
 
-        ... Icehouse supports message version 3.0.  So, any changes to
+        ... Icehouse and Juno 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.
 
@@ -90,6 +90,7 @@ class SchedulerAPI(object):
         'grizzly': '2.6',
         'havana': '2.9',
         'icehouse': '3.0',
+        'juno': '3.0',
     }
 
     def __init__(self):