Add unit test for Coriolis api v1 views

coriolis/api/v1/diagnostics.py

@@ -23,7 +23,7 @@ def index(self, req):
             diagnostics.get_diagnostics_policy_label("get"))
 
         return diagnostic_view.collection(
-            req, self._diag_api.get(context))
+            self._diag_api.get(context))
 
 
 def create_resource():

coriolis/api/v1/endpoint_destination_minion_pool_options.py

@@ -37,7 +37,6 @@ def index(self, req, endpoint_id):
 
         return (endpoint_options_view.
                 destination_minion_pool_options_collection)(
-            req,
             (self._minion_pool_options_api.
              get_endpoint_destination_minion_pool_options)(
                 context, endpoint_id, env=env, option_names=options))

coriolis/api/v1/endpoint_destination_options.py

@@ -36,7 +36,6 @@ def index(self, req, endpoint_id):
             options = {}
 
         return endpoint_options_view.destination_options_collection(
-            req,
             self._destination_options_api.get_endpoint_destination_options(
                 context, endpoint_id, env=env, option_names=options))
 

coriolis/api/v1/endpoint_instances.py

@@ -32,7 +32,7 @@ def index(self, req, endpoint_id):
             env = {}
 
         return endpoint_resources_view.instances_collection(
-            req, self._instance_api.get_endpoint_instances(
+            self._instance_api.get_endpoint_instances(
                 context, endpoint_id, env, marker, limit,
                 instance_name_pattern))
 
@@ -52,7 +52,7 @@ def show(self, req, endpoint_id, id):
             env = {}
 
         return endpoint_resources_view.instance_single(
-            req, self._instance_api.get_endpoint_instance(
+            self._instance_api.get_endpoint_instance(
                 req.environ['coriolis.context'], endpoint_id, env, id))
 
 

coriolis/api/v1/endpoint_networks.py

@@ -28,7 +28,7 @@ def index(self, req, endpoint_id):
             env = {}
 
         return endpoint_resources_view.networks_collection(
-            req, self._network_api.get_endpoint_networks(
+            self._network_api.get_endpoint_networks(
                 context, endpoint_id, env))
 
 

coriolis/api/v1/endpoint_source_minion_pool_options.py

@@ -36,7 +36,6 @@ def index(self, req, endpoint_id):
             options = {}
 
         return endpoint_options_view.source_minion_pool_options_collection(
-            req,
             (self._minion_pool_options_api.
              get_endpoint_source_minion_pool_options)(
                 context, endpoint_id, env=env, option_names=options))

coriolis/api/v1/endpoint_source_options.py

@@ -36,7 +36,6 @@ def index(self, req, endpoint_id):
             options = {}
 
         return endpoint_options_view.source_options_collection(
-            req,
             self._source_options_api.get_endpoint_source_options(
                 context, endpoint_id, env=env, option_names=options))
 

coriolis/api/v1/endpoint_storage.py

@@ -28,7 +28,7 @@ def index(self, req, endpoint_id):
             env = {}
 
         return endpoint_resources_view.storage_collection(
-            req, self._storage_api.get_endpoint_storage(
+            self._storage_api.get_endpoint_storage(
                 context, endpoint_id, env))
 
 

coriolis/api/v1/endpoints.py

@@ -27,13 +27,13 @@ def show(self, req, id):
         if not endpoint:
             raise exc.HTTPNotFound()
 
-        return endpoint_view.single(req, endpoint)
+        return endpoint_view.single(endpoint)
 
     def index(self, req):
         context = req.environ["coriolis.context"]
         context.can(endpoint_policies.get_endpoints_policy_label("list"))
         return endpoint_view.collection(
-            req, self._endpoint_api.get_endpoints(context))
+            self._endpoint_api.get_endpoints(context))
 
     @api_utils.format_keyerror_message(resource='endpoint', method='create')
     def _validate_create_body(self, body):
@@ -52,7 +52,7 @@ def create(self, req, body):
         context.can(endpoint_policies.get_endpoints_policy_label("create"))
         (name, endpoint_type, description,
          connection_info, mapped_regions) = self._validate_create_body(body)
-        return endpoint_view.single(req, self._endpoint_api.create(
+        return endpoint_view.single(self._endpoint_api.create(
             context, name, endpoint_type, description, connection_info,
             mapped_regions))
 
@@ -69,7 +69,7 @@ def update(self, req, id, body):
         context = req.environ["coriolis.context"]
         context.can(endpoint_policies.get_endpoints_policy_label("update"))
         updated_values = self._validate_update_body(body)
-        return endpoint_view.single(req, self._endpoint_api.update(
+        return endpoint_view.single(self._endpoint_api.update(
             req.environ['coriolis.context'], id, updated_values))
 
     def delete(self, req, id):

coriolis/api/v1/migrations.py

@@ -41,7 +41,7 @@ def show(self, req, id):
         if not migration:
             raise exc.HTTPNotFound()
 
-        return migration_view.single(req, migration)
+        return migration_view.single(migration)
 
     def _list(self, req):
         show_deleted = api_utils._get_show_deleted(
@@ -50,7 +50,7 @@ def _list(self, req):
         context.show_deleted = show_deleted
         context.can(migration_policies.get_migrations_policy_label("list"))
         return migration_view.collection(
-            req, self._migration_api.get_migrations(
+            self._migration_api.get_migrations(
                 context,
                 include_tasks=CONF.api.include_task_info_in_migrations_api,
                 include_task_info=CONF.api.include_task_info_in_migrations_api
@@ -173,7 +173,7 @@ def create(self, req, body):
                 skip_os_morphing=skip_os_morphing,
                 user_scripts=user_scripts)
 
-        return migration_view.single(req, migration)
+        return migration_view.single(migration)
 
     def delete(self, req, id):
         context = req.environ['coriolis.context']

coriolis/api/v1/minion_pool_actions.py

@@ -23,7 +23,7 @@ def _allocate_pool(self, req, id, body):
                 "allocate"))
         try:
             return minion_pool_view.single(
-                req, self.minion_pool_api.allocate_minion_pool(
+                self.minion_pool_api.allocate_minion_pool(
                     context, id))
         except exception.NotFound as ex:
             raise exc.HTTPNotFound(explanation=ex.msg)
@@ -38,7 +38,7 @@ def _refresh_pool(self, req, id, body):
                 "refresh"))
         try:
             return minion_pool_view.single(
-                req, self.minion_pool_api.refresh_minion_pool(
+                self.minion_pool_api.refresh_minion_pool(
                     context, id))
         except exception.NotFound as ex:
             raise exc.HTTPNotFound(explanation=ex.msg)
@@ -54,7 +54,7 @@ def _deallocate_pool(self, req, id, body):
         force = (body["deallocate"] or {}).get("force", False)
         try:
             return minion_pool_view.single(
-                req, self.minion_pool_api.deallocate_minion_pool(
+                self.minion_pool_api.deallocate_minion_pool(
                     context, id, force=force))
         except exception.NotFound as ex:
             raise exc.HTTPNotFound(explanation=ex.msg)

coriolis/api/v1/minion_pools.py

@@ -29,13 +29,13 @@ def show(self, req, id):
         if not minion_pool:
             raise exc.HTTPNotFound()
 
-        return minion_pool_view.single(req, minion_pool)
+        return minion_pool_view.single(minion_pool)
 
     def index(self, req):
         context = req.environ["coriolis.context"]
         context.can(pools_policies.get_minion_pools_policy_label("list"))
         return minion_pool_view.collection(
-            req, self._minion_pool_api.get_minion_pools(context))
+            self._minion_pool_api.get_minion_pools(context))
 
     def _check_pool_retention_strategy(self, pool_retention_strategy):
         if not pool_retention_strategy:
@@ -137,7 +137,7 @@ def create(self, req, body):
          minimum_minions, maximum_minions, minion_max_idle_time,
          minion_retention_strategy, notes, skip_allocation) = (
             self._validate_create_body(context, body))
-        return minion_pool_view.single(req, self._minion_pool_api.create(
+        return minion_pool_view.single(self._minion_pool_api.create(
             context, name, endpoint_id, pool_platform, pool_os_type,
             environment_options, minimum_minions, maximum_minions,
             minion_max_idle_time, minion_retention_strategy, notes=notes,
@@ -197,7 +197,7 @@ def update(self, req, id, body):
         context.can(pools_policies.get_minion_pools_policy_label("update"))
         updated_values = self._validate_update_body(id, context, body)
         return minion_pool_view.single(
-            req, self._minion_pool_api.update(
+            self._minion_pool_api.update(
                 req.environ['coriolis.context'], id, updated_values))
 
     def delete(self, req, id):

coriolis/api/v1/regions.py

@@ -26,13 +26,13 @@ def show(self, req, id):
         if not region:
             raise exc.HTTPNotFound()
 
-        return region_view.single(req, region)
+        return region_view.single(region)
 
     def index(self, req):
         context = req.environ["coriolis.context"]
         context.can(region_policies.get_regions_policy_label("list"))
         return region_view.collection(
-            req, self._region_api.get_regions(context))
+            self._region_api.get_regions(context))
 
     @api_utils.format_keyerror_message(resource='region', method='create')
     def _validate_create_body(self, body):
@@ -46,7 +46,7 @@ def create(self, req, body):
         context = req.environ["coriolis.context"]
         context.can(region_policies.get_regions_policy_label("create"))
         (name, description, enabled) = self._validate_create_body(body)
-        return region_view.single(req, self._region_api.create(
+        return region_view.single(self._region_api.create(
             context, region_name=name, description=description,
             enabled=enabled))
 
@@ -60,7 +60,7 @@ def update(self, req, id, body):
         context = req.environ["coriolis.context"]
         context.can(region_policies.get_regions_policy_label("update"))
         updated_values = self._validate_update_body(body)
-        return region_view.single(req, self._region_api.update(
+        return region_view.single(self._region_api.update(
             req.environ['coriolis.context'], id, updated_values))
 
     def delete(self, req, id):

coriolis/api/v1/replica_actions.py

@@ -22,7 +22,7 @@ def _delete_disks(self, req, id, body):
             replica_policies.get_replicas_policy_label("delete_disks"))
         try:
             return replica_tasks_execution_view.single(
-                req, self._replica_api.delete_disks(context, id))
+                self._replica_api.delete_disks(context, id))
         except exception.NotFound as ex:
             raise exc.HTTPNotFound(explanation=ex.msg)
         except exception.InvalidParameterValue as ex:

coriolis/api/v1/replica_schedules.py

@@ -31,7 +31,7 @@ def show(self, req, replica_id, id):
         if not schedule:
             raise exc.HTTPNotFound()
 
-        return replica_schedule_view.single(req, schedule)
+        return replica_schedule_view.single(schedule)
 
     def index(self, req, replica_id):
         context = req.environ["coriolis.context"]
@@ -41,7 +41,7 @@ def index(self, req, replica_id):
         show_expired = strutils.bool_from_string(
             req.GET.get("show_expired", True), strict=True)
         return replica_schedule_view.collection(
-            req, self._schedule_api.get_schedules(
+            self._schedule_api.get_schedules(
                 context, replica_id, expired=show_expired))
 
     def _validate_schedule(self, schedule):
@@ -112,7 +112,7 @@ def create(self, req, replica_id, body):
         except Exception as err:
             raise exception.InvalidInput(err)
 
-        return replica_schedule_view.single(req, self._schedule_api.create(
+        return replica_schedule_view.single(self._schedule_api.create(
             context, replica_id, schedule, enabled, exp_date, shutdown))
 
     def update(self, req, replica_id, id, body):
@@ -128,7 +128,7 @@ def update(self, req, replica_id, id, body):
         except Exception as err:
             raise exception.InvalidInput(err)
 
-        return replica_schedule_view.single(req, self._schedule_api.update(
+        return replica_schedule_view.single(self._schedule_api.update(
             context, replica_id, id, update_values))
 
     def delete(self, req, replica_id, id):

coriolis/api/v1/replica_tasks_executions.py

@@ -24,15 +24,15 @@ def show(self, req, replica_id, id):
         if not execution:
             raise exc.HTTPNotFound()
 
-        return replica_tasks_execution_view.single(req, execution)
+        return replica_tasks_execution_view.single(execution)
 
     def index(self, req, replica_id):
         context = req.environ["coriolis.context"]
         context.can(
             executions_policies.get_replica_executions_policy_label("list"))
 
         return replica_tasks_execution_view.collection(
-            req, self._replica_tasks_execution_api.get_executions(
+            self._replica_tasks_execution_api.get_executions(
                 context, replica_id, include_tasks=False))
 
     def detail(self, req, replica_id):
@@ -41,7 +41,7 @@ def detail(self, req, replica_id):
             executions_policies.get_replica_executions_policy_label("show"))
 
         return replica_tasks_execution_view.collection(
-            req, self._replica_tasks_execution_api.get_executions(
+            self._replica_tasks_execution_api.get_executions(
                 context, replica_id, include_tasks=True))
 
     def create(self, req, replica_id, body):
@@ -55,7 +55,7 @@ def create(self, req, replica_id, body):
         shutdown_instances = execution_body.get("shutdown_instances", False)
 
         return replica_tasks_execution_view.single(
-            req, self._replica_tasks_execution_api.create(
+            self._replica_tasks_execution_api.create(
                 context, replica_id, shutdown_instances))
 
     def delete(self, req, replica_id, id):

coriolis/api/v1/replicas.py

@@ -41,7 +41,7 @@ def show(self, req, id):
         if not replica:
             raise exc.HTTPNotFound()
 
-        return replica_view.single(req, replica)
+        return replica_view.single(replica)
 
     def _list(self, req):
         show_deleted = api_utils._get_show_deleted(
@@ -51,7 +51,7 @@ def _list(self, req):
         context.can(replica_policies.get_replicas_policy_label("list"))
         include_task_info = CONF.api.include_task_info_in_replicas_api
         return replica_view.collection(
-            req, self._replica_api.get_replicas(
+            self._replica_api.get_replicas(
                 context,
                 include_tasks_executions=include_task_info,
                 include_task_info=include_task_info))
@@ -135,7 +135,7 @@ def create(self, req, body):
          instance_osmorphing_minion_pool_mappings, user_scripts) = (
             self._validate_create_body(context, body))
 
-        return replica_view.single(req, self._replica_api.create(
+        return replica_view.single(self._replica_api.create(
             context, origin_endpoint_id, destination_endpoint_id,
             origin_minion_pool_id, destination_minion_pool_id,
             instance_osmorphing_minion_pool_mappings, source_environment,
@@ -342,8 +342,8 @@ def update(self, req, id, body):
         updated_values = self._validate_update_body(id, context, body)
         try:
             return replica_tasks_execution_view.single(
-                req, self._replica_api.update(req.environ['coriolis.context'],
-                                              id, updated_values))
+                self._replica_api.update(req.environ['coriolis.context'],
+                                         id, updated_values))
         except exception.NotFound as ex:
             raise exc.HTTPNotFound(explanation=ex.msg)
         except exception.InvalidParameterValue as ex:

coriolis/api/v1/services.py

@@ -26,13 +26,13 @@ def show(self, req, id):
         if not service:
             raise exc.HTTPNotFound()
 
-        return service_view.single(req, service)
+        return service_view.single(service)
 
     def index(self, req):
         context = req.environ["coriolis.context"]
         context.can(service_policies.get_services_policy_label("list"))
         return service_view.collection(
-            req, self._service_api.get_services(context))
+            self._service_api.get_services(context))
 
     @api_utils.format_keyerror_message(resource='service', method='create')
     def _validate_create_body(self, body):
@@ -49,7 +49,7 @@ def create(self, req, body):
         context.can(service_policies.get_services_policy_label("create"))
         (host, binary, topic, mapped_regions, enabled) = (
             self._validate_create_body(body))
-        return service_view.single(req, self._service_api.create(
+        return service_view.single(self._service_api.create(
             context, host=host, binary=binary, topic=topic,
             mapped_regions=mapped_regions, enabled=enabled))
 
@@ -63,7 +63,7 @@ def update(self, req, id, body):
         context = req.environ["coriolis.context"]
         context.can(service_policies.get_services_policy_label("update"))
         updated_values = self._validate_update_body(body)
-        return service_view.single(req, self._service_api.update(
+        return service_view.single(self._service_api.update(
             req.environ['coriolis.context'], id, updated_values))
 
     def delete(self, req, id):

coriolis/api/v1/views/diagnostic_view.py

@@ -2,9 +2,9 @@
 # All Rights Reserved.
 
 
-def single(req, diag):
+def single(diag):
     return {"diagnostic": diag}
 
 
-def collection(req, diag):
+def collection(diag):
     return {'diagnostics': diag}