Useless return statement in validate_sort_dir

In watcher/api/controllers/v1/utils.py, in
the validate_sort_dir method has a return statement,
however the return value is exactly the parameter's value.

This is misleading, so I removed it.

Change-Id: I18c5c7853a5afedac88431347712a4348c9fd5dd
Closes-Bug: #1546917

watcher/api/controllers/v1/action.py

@@ -254,7 +254,7 @@ class ActionsController(rest.RestController):
                                 resource_url=None,
                                 action_plan_uuid=None, audit_uuid=None):
         limit = api_utils.validate_limit(limit)
-        sort_dir = api_utils.validate_sort_dir(sort_dir)
+        api_utils.validate_sort_dir(sort_dir)
 
         marker_obj = None
         if marker:

watcher/api/controllers/v1/action_plan.py

@@ -283,7 +283,7 @@ class ActionPlansController(rest.RestController):
                                      resource_url=None, audit_uuid=None):
 
         limit = api_utils.validate_limit(limit)
-        sort_dir = api_utils.validate_sort_dir(sort_dir)
+        api_utils.validate_sort_dir(sort_dir)
 
         marker_obj = None
         if marker:

watcher/api/controllers/v1/audit.py

@@ -263,7 +263,7 @@ class AuditsController(rest.RestController):
                                sort_key, sort_dir, expand=False,
                                resource_url=None, audit_template=None):
         limit = api_utils.validate_limit(limit)
-        sort_dir = api_utils.validate_sort_dir(sort_dir)
+        api_utils.validate_sort_dir(sort_dir)
 
         marker_obj = None
         if marker:

watcher/api/controllers/v1/audit_template.py

@@ -203,7 +203,7 @@ class AuditTemplatesController(rest.RestController):
         api_utils.validate_search_filters(
             filters, objects.audit_template.AuditTemplate.fields.keys())
         limit = api_utils.validate_limit(limit)
-        sort_dir = api_utils.validate_sort_dir(sort_dir)
+        api_utils.validate_sort_dir(sort_dir)
 
         marker_obj = None
         if marker:

watcher/api/controllers/v1/goal.py

@@ -159,7 +159,7 @@ class GoalsController(rest.RestController):
                               resource_url=None, goal_name=None):
 
         limit = api_utils.validate_limit(limit)
-        sort_dir = api_utils.validate_sort_dir(sort_dir)
+        api_utils.validate_sort_dir(sort_dir)
 
         goals = []
 

watcher/api/controllers/v1/utils.py

@@ -47,7 +47,6 @@ def validate_sort_dir(sort_dir):
         raise wsme.exc.ClientSideError(_("Invalid sort direction: %s. "
                                          "Acceptable values are "
                                          "'asc' or 'desc'") % sort_dir)
-    return sort_dir
 
 
 def validate_search_filters(filters, allowed_fields):

watcher/tests/api/v1/test_utils.py

@@ -40,8 +40,11 @@ class TestApiUtils(base.TestCase):
         self.assertRaises(wsme.exc.ClientSideError, utils.validate_limit, 0)
 
     def test_validate_sort_dir(self):
-        sort_dir = utils.validate_sort_dir('asc')
-        self.assertEqual('asc', sort_dir)
+        # if sort_dir is valid, nothing should happen
+        try:
+            utils.validate_sort_dir('asc')
+        except Exception as exc:
+            self.fail(exc)
 
         # invalid sort_dir parameter
         self.assertRaises(wsme.exc.ClientSideError,