From 55266512cb41902082dfee5d4bb70d7666cfa940 Mon Sep 17 00:00:00 2001
From: Roman Vasilets <rvasilets@mirantis.com>
Date: Tue, 9 Jun 2015 17:29:14 +0300
Subject: [PATCH] Remove deprecated code

Remove:
  * '$rally use' cli command entirely
  * Depraceted api: create_deploy, destroy_deploy, recreate_deploy,
    task_template_render, create_task, task_validate, start_task, abort_task,
    delete_task, verify, install_tempest.
  * Deployment cli parameter --uuid. '$rally deployment --uuid'
  * Task cli parameters --deploy-id, --uuid.
  * Show cli parameters --deploy-id.
  * Verify cli parameter --deploy-id.
  * Manage cli parameter --deploy-id.
  * Deprecated parameter from objects/endpoints.py admin_port.
  * FailureRateDeprecated class from plugins/common/sla/failure_rate.py
  * Depraceted parameters min_size, max_size, volime_size at plugins/
    openstack/scenarios/cinder/volumes.py. Now U should use size dict argument instead.
  * Functional test for 'use' cli comamnd tests/functional/test_cli_use.py

Fix unit tests after this work was done.

Change-Id: Ibac6cdac49fa8afeaefd299fa3c0c6b0952abfb0
---
 etc/rally.bash_completion                       |  3 ---
 .../openstack/scenarios/cinder/volumes.py       | 17 -----------------
 2 files changed, 20 deletions(-)

diff --git a/etc/rally.bash_completion b/etc/rally.bash_completion
index cabee714..49a649ac 100644
--- a/etc/rally.bash_completion
+++ b/etc/rally.bash_completion
@@ -36,9 +36,6 @@ _rally()
     OPTS["task_status"]="--uuid"
     OPTS["task_use"]="--task"
     OPTS["task_validate"]="--deployment --task --task-args --task-args-file"
-    OPTS["use_deployment"]="--deployment"
-    OPTS["use_task"]="--uuid"
-    OPTS["use_verification"]="--uuid"
     OPTS["verify_compare"]="--uuid-1 --uuid-2 --csv --html --json --output-file --threshold"
     OPTS["verify_detailed"]="--uuid --sort-by"
     OPTS["verify_list"]=""
diff --git a/rally/plugins/openstack/scenarios/cinder/volumes.py b/rally/plugins/openstack/scenarios/cinder/volumes.py
index a7015892..b7102c17 100644
--- a/rally/plugins/openstack/scenarios/cinder/volumes.py
+++ b/rally/plugins/openstack/scenarios/cinder/volumes.py
@@ -301,17 +301,6 @@ class CinderVolumes(utils.CinderScenario,
         :param kwargs: Optional parameters used during volume
                        snapshot creation.
         """
-        if "min_size" in kwargs or "max_size" in kwargs:
-            import warnings
-            warnings.warn("'min_size' and 'max_size' arguments "
-                          "are deprecated. You should use 'size', with "
-                          "keys 'min' and 'max' instead.")
-        if "volume_size" in kwargs:
-            import warnings
-            warnings.warn("'volume_size' argument is deprecated. You should "
-                          "use 'size' instead.")
-            size = kwargs["volume_size"]
-
         if size is None:
             size = {"min": 1, "max": 5}
         selected_type = None
@@ -362,12 +351,6 @@ class CinderVolumes(utils.CinderScenario,
         :param kwargs: Optional parameters used during volume
                        snapshot creation.
         """
-        if "volume_size" in kwargs:
-            import warnings
-            warnings.warn("'volume_size' argument is deprecated. You should "
-                          "use 'size' instead.")
-            size = kwargs["volume_size"]
-
         if size is None:
             size = {"min": 1, "max": 5}
         if nested_level is None: