Merge "Add RPC version aliases for Newton"

nova/cells/rpcapi.py

@@ -114,7 +114,7 @@ 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 and Mitaka support message version 1.37.  So, any
+        ... Liberty, Mitaka and Newton 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.
@@ -128,6 +128,7 @@ class CellsAPI(object):
         'kilo': '1.34',
         'liberty': '1.37',
         'mitaka': '1.37',
+        'newton': '1.37',
     }
 
     def __init__(self):

nova/cert/rpcapi.py

@@ -38,8 +38,8 @@ class CertAPI(object):
 
         2.0 - Major API rev for Icehouse
 
-        ... Icehouse, Juno, Kilo, Liberty, and Mitaka support message version
+        ... Icehouse, Juno, Kilo, Liberty, Mitaka, and Newton support message
-        2.0.  So, any changes to existing methods in 2.x after that
+        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 CertAPI(object):
         'kilo': '2.0',
         'liberty': '2.0',
         'mitaka': '2.0',
+        'newton': '2.0',
     }
 
     def __init__(self):

nova/compute/rpcapi.py

@@ -313,6 +313,10 @@ 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
+        existing methods in 4.x after that point should be done so that they
+        can handle the version_cap being set to 4.13
     '''
 
     VERSION_ALIASES = {
@@ -321,6 +325,7 @@ class ComputeAPI(object):
         'kilo': '4.0',
         'liberty': '4.5',
         'mitaka': '4.11',
+        'newton': '4.13',
     }
 
     def __init__(self):

nova/conductor/rpcapi.py

@@ -188,8 +188,8 @@ class ConductorAPI(object):
 
     * 3.0  - Drop backwards compatibility
 
-    ... Liberty and Mitaka support message version 3.0.  So, any changes to
+    ... Liberty, Mitaka, and Newton support message version 3.0.  So, any
-    existing methods in 3.x after that point should be done such
+    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()
@@ -203,6 +203,7 @@ class ConductorAPI(object):
         'kilo': '2.1',
         'liberty': '3.0',
         'mitaka': '3.0',
+        'newton': '3.0',
     }
 
     def __init__(self):

nova/console/rpcapi.py

@@ -38,9 +38,9 @@ class ConsoleAPI(object):
 
         2.0 - Major API rev for Icehouse
 
-        ... Icehouse, Juno, Kilo, Liberty, Mitaka support message version 2.0.
+        ... Icehouse, Juno, Kilo, Liberty, Mitaka, and Newton support message
-        So, any changes to existing methods in 2.x after that point
+        version 2.0. So, any changes to existing methods in 2.x after that
-        should be done such that they can handle the version_cap being
+        point should be done such that they can handle the version_cap being
         set to 2.0.
 
     '''
@@ -53,6 +53,7 @@ class ConsoleAPI(object):
         'kilo': '2.0',
         'liberty': '2.0',
         'mitaka': '2.0',
+        'newton': '2.0',
     }
 
     def __init__(self, topic=None, server=None):

nova/consoleauth/rpcapi.py

@@ -46,8 +46,8 @@ class ConsoleAuthAPI(object):
 
         * 2.1 - Added access_url to authorize_console
 
-        ... Kilo, Liberty and Mitaka support message version 2.1.  So, any
+        ... Kilo, Liberty, Mitaka, and Newton support message version 2.1.
-        changes to existing methods in 2.x after that point should be
+        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.
 
@@ -61,6 +61,7 @@ class ConsoleAuthAPI(object):
         'kilo': '2.1',
         'liberty': '2.1',
         'mitaka': '2.1',
+        'newton': '2.1',
     }
 
     def __init__(self):

nova/network/rpcapi.py

@@ -101,11 +101,15 @@ 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
+        ... Mitaka 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.
 
         * 1.17 - Add method release_dhcp()
+
+        ... Newton supports 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.
     '''
 
     VERSION_ALIASES = {
@@ -116,6 +120,7 @@ class NetworkAPI(object):
         'kilo': '1.13',
         'liberty': '1.15',
         'mitaka': '1.16',
+        'newton': '1.17',
     }
 
     def __init__(self, topic=None):

nova/scheduler/rpcapi.py

@@ -88,7 +88,7 @@ class SchedulerAPI(object):
         * 4.3 - Modify select_destinations() signature by providing a
                 RequestSpec obj
 
-        ... Mitaka supports message version 4.3. So, any changes to
+        ... Mitaka and Newton 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.
 
@@ -102,6 +102,7 @@ class SchedulerAPI(object):
         'kilo': '4.2',
         'liberty': '4.2',
         'mitaka': '4.3',
+        'newton': '4.3',
     }
 
     def __init__(self):