diff --git a/doc/source/index.rst b/doc/source/index.rst index e80274936..bdbce90c4 100644 --- a/doc/source/index.rst +++ b/doc/source/index.rst @@ -72,11 +72,11 @@ The process for command deprecation is: 3. Example: ``_ - This change was made while the Nova 2015.2 Liberty release was in + This change was made while the Nova 12.0.0 Liberty release was in development. The current version of python-novaclient at the time was 2.25.0. Once the change was merged, python-novaclient 2.26.0 was released. - Since there was less than six months before 2015.2 would be released, the - deprecation cycle ran through the 2016.1 Nova server release. + Since there was less than six months before 12.0.0 would be released, the + deprecation cycle ran through the 13.0.0 Nova server release. Man Page diff --git a/novaclient/v2/shell.py b/novaclient/v2/shell.py index 7af3fa8ab..32ba61164 100644 --- a/novaclient/v2/shell.py +++ b/novaclient/v2/shell.py @@ -62,10 +62,10 @@ CLIENT_BDM2_KEYS = { # NOTE(mriedem): Remove this along with the deprecated commands in the first -# python-novaclient release AFTER the nova server 2016.1 'M' release. +# python-novaclient release AFTER the nova server 13.0.0 'M' release. def emit_volume_deprecation_warning(command_name): print('WARNING: Command %s is deprecated and will be removed after Nova ' - '2016.1 is released. Use python-cinderclient or openstackclient ' + '13.0.0 is released. Use python-cinderclient or openstackclient ' 'instead.' % command_name, file=sys.stderr) diff --git a/novaclient/v2/volume_snapshots.py b/novaclient/v2/volume_snapshots.py index 8ca1971ac..ffdb812c0 100644 --- a/novaclient/v2/volume_snapshots.py +++ b/novaclient/v2/volume_snapshots.py @@ -58,7 +58,7 @@ class SnapshotManager(base.ManagerWithFind): :rtype: :class:`Snapshot` """ warnings.warn('The novaclient.v2.volume_snapshots module is ' - 'deprecated and will be removed after Nova 2016.1 is ' + 'deprecated and will be removed after Nova 13.0.0 is ' 'released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): @@ -76,7 +76,7 @@ class SnapshotManager(base.ManagerWithFind): :rtype: :class:`Snapshot` """ warnings.warn('The novaclient.v2.volume_snapshots module is ' - 'deprecated and will be removed after Nova 2016.1 is ' + 'deprecated and will be removed after Nova 13.0.0 is ' 'released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): @@ -89,7 +89,7 @@ class SnapshotManager(base.ManagerWithFind): :rtype: list of :class:`Snapshot` """ warnings.warn('The novaclient.v2.volume_snapshots module is ' - 'deprecated and will be removed after Nova 2016.1 is ' + 'deprecated and will be removed after Nova 13.0.0 is ' 'released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): @@ -105,7 +105,7 @@ class SnapshotManager(base.ManagerWithFind): :param snapshot: The :class:`Snapshot` to delete. """ warnings.warn('The novaclient.v2.volume_snapshots module is ' - 'deprecated and will be removed after Nova 2016.1 is ' + 'deprecated and will be removed after Nova 13.0.0 is ' 'released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): diff --git a/novaclient/v2/volume_types.py b/novaclient/v2/volume_types.py index fd9268775..861c4a357 100644 --- a/novaclient/v2/volume_types.py +++ b/novaclient/v2/volume_types.py @@ -44,7 +44,7 @@ class VolumeTypeManager(base.ManagerWithFind): :rtype: list of :class:`VolumeType`. """ warnings.warn('The novaclient.v2.volume_types module is deprecated ' - 'and will be removed after Nova 2016.1 is released. Use ' + 'and will be removed after Nova 13.0.0 is released. Use ' 'python-cinderclient or python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): @@ -58,7 +58,7 @@ class VolumeTypeManager(base.ManagerWithFind): :rtype: :class:`VolumeType` """ warnings.warn('The novaclient.v2.volume_types module is deprecated ' - 'and will be removed after Nova 2016.1 is released. Use ' + 'and will be removed after Nova 13.0.0 is released. Use ' 'python-cinderclient or python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): @@ -72,7 +72,7 @@ class VolumeTypeManager(base.ManagerWithFind): :param volume_type: The ID of the :class:`VolumeType` to get. """ warnings.warn('The novaclient.v2.volume_types module is deprecated ' - 'and will be removed after Nova 2016.1 is released. Use ' + 'and will be removed after Nova 13.0.0 is released. Use ' 'python-cinderclient or python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): @@ -86,7 +86,7 @@ class VolumeTypeManager(base.ManagerWithFind): :rtype: :class:`VolumeType` """ warnings.warn('The novaclient.v2.volume_types module is deprecated ' - 'and will be removed after Nova 2016.1 is released. Use ' + 'and will be removed after Nova 13.0.0 is released. Use ' 'python-cinderclient or python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): diff --git a/novaclient/v2/volumes.py b/novaclient/v2/volumes.py index b5f2ae687..f0403af63 100644 --- a/novaclient/v2/volumes.py +++ b/novaclient/v2/volumes.py @@ -65,7 +65,7 @@ class VolumeManager(base.ManagerWithFind): """ warnings.warn('The novaclient.v2.volumes.VolumeManager.create() ' 'method is deprecated and will be removed after Nova ' - '2016.1 is released. Use python-cinderclient or ' + '13.0.0 is released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) # NOTE(melwitt): Ensure we use the volume endpoint for this call with self.alternate_service_type('volume'): @@ -87,7 +87,7 @@ class VolumeManager(base.ManagerWithFind): """ warnings.warn('The novaclient.v2.volumes.VolumeManager.get() ' 'method is deprecated and will be removed after Nova ' - '2016.1 is released. Use python-cinderclient or ' + '13.0.0 is released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): return self._get("/volumes/%s" % volume_id, "volume") @@ -100,7 +100,7 @@ class VolumeManager(base.ManagerWithFind): """ warnings.warn('The novaclient.v2.volumes.VolumeManager.list() ' 'method is deprecated and will be removed after Nova ' - '2016.1 is released. Use python-cinderclient or ' + '13.0.0 is released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): search_opts = search_opts or {} @@ -126,7 +126,7 @@ class VolumeManager(base.ManagerWithFind): """ warnings.warn('The novaclient.v2.volumes.VolumeManager.delete() ' 'method is deprecated and will be removed after Nova ' - '2016.1 is released. Use python-cinderclient or ' + '13.0.0 is released. Use python-cinderclient or ' 'python-openstacksdk instead.', DeprecationWarning) with self.alternate_service_type('volume'): self._delete("/volumes/%s" % base.getid(volume))