From feb982547afe26be4e885b75d82fa5d51a784c0e Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Sun, 26 Apr 2020 20:14:37 +1200
Subject: [PATCH] Remove volume-types API

Change-Id: Ib0064d4ee9bf05f9c8e159482f5118756a1d3c09
---
 trove/common/api.py          | 13 -------------
 trove/volume_type/service.py | 36 ------------------------------------
 2 files changed, 49 deletions(-)
 delete mode 100644 trove/volume_type/service.py

diff --git a/trove/common/api.py b/trove/common/api.py
index eee7a9a3cc..5dfa0935f7 100644
--- a/trove/common/api.py
+++ b/trove/common/api.py
@@ -25,7 +25,6 @@ from trove.instance.service import InstanceController
 from trove.limits.service import LimitsController
 from trove.module.service import ModuleController
 from trove.versions import VersionsController
-from trove.volume_type.service import VolumeTypesController
 
 
 class API(wsgi.Router):
@@ -37,7 +36,6 @@ class API(wsgi.Router):
         self._cluster_router(mapper)
         self._datastore_router(mapper)
         self._flavor_router(mapper)
-        self._volume_type_router(mapper)
         self._versions_router(mapper)
         self._limits_router(mapper)
         self._backups_router(mapper)
@@ -181,17 +179,6 @@ class API(wsgi.Router):
                        action="show",
                        conditions={'method': ['GET']})
 
-    def _volume_type_router(self, mapper):
-        volume_type_resource = VolumeTypesController().create_resource()
-        mapper.connect("/{tenant_id}/volume-types",
-                       controller=volume_type_resource,
-                       action="index",
-                       conditions={'method': ['GET']})
-        mapper.connect("/{tenant_id}/volume-types/{id}",
-                       controller=volume_type_resource,
-                       action="show",
-                       conditions={'method': ['GET']})
-
     def _limits_router(self, mapper):
         limits_resource = LimitsController().create_resource()
         mapper.connect("/{tenant_id}/limits",
diff --git a/trove/volume_type/service.py b/trove/volume_type/service.py
deleted file mode 100644
index d265fb7c9f..0000000000
--- a/trove/volume_type/service.py
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2016 Tesora, Inc
-#
-# All Rights Reserved.
-#
-#    Licensed under the Apache License, Version 2.0 (the "License"); you may
-#    not use this file except in compliance with the License. You may obtain
-#    a copy of the License at
-#
-#         http://www.apache.org/licenses/LICENSE-2.0
-#
-#    Unless required by applicable law or agreed to in writing, software
-#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-#    License for the specific language governing permissions and limitations
-#    under the License.
-
-from trove.common import wsgi
-from trove.volume_type import models
-from trove.volume_type import views
-
-
-class VolumeTypesController(wsgi.Controller):
-    """A controller for the Cinder Volume Types functionality."""
-
-    def show(self, req, tenant_id, id):
-        """Return a single volume type."""
-        context = req.environ[wsgi.CONTEXT_KEY]
-        volume_type = models.VolumeType.load(id, context=context)
-        return wsgi.Result(views.VolumeTypeView(volume_type, req).data(), 200)
-
-    def index(self, req, tenant_id):
-        """Return all volume types."""
-        context = req.environ[wsgi.CONTEXT_KEY]
-        volume_types = models.VolumeTypes(context=context)
-        return wsgi.Result(views.VolumeTypesView(volume_types,
-                                                 req).data(), 200)