[Kimchi-devel] [PATCHv7 7/8] storage target: Update controller and json schema

[lvroyce0210 at gmail.com]

From: Royce Lv <lvroyce at linux.vnet.ibm.com>

Add json schema to validate mandatory param of target_type,
also update controller.py.
Reload the get_list function because we don't need to query each target.

Signed-off-by: Royce Lv <lvroyce at linux.vnet.ibm.com>
---
 src/kimchi/API.json                 | 10 ++++++++++
 src/kimchi/control/storageserver.py | 24 ++++++++++++++++++++++++
 2 files changed, 34 insertions(+)

diff --git a/src/kimchi/API.json b/src/kimchi/API.json
index d951696..2c76446 100644
--- a/src/kimchi/API.json
+++ b/src/kimchi/API.json
@@ -224,6 +224,16 @@
                 }
             }
         },
+        "storagetargets_get_list": {
+            "type": "object",
+            "properties": {
+                "target_type": {
+                    "description": "List storage servers of given type",
+                    "type": "string",
+                    "pattern": "^netfs$"
+                }
+            }
+         },
         "template_update": {
             "type": "object",
             "properties": {
diff --git a/src/kimchi/control/storageserver.py b/src/kimchi/control/storageserver.py
index 0d4cb05..364f3d0 100644
--- a/src/kimchi/control/storageserver.py
+++ b/src/kimchi/control/storageserver.py
@@ -21,6 +21,9 @@
 # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301 USA
 
 from kimchi.control.base import Collection, Resource
+from kimchi.control.utils import parse_param, validate_params
+from kimchi.control.utils import get_class_name, model_fn
+import kimchi.template
 
 
 class StorageServers(Collection):
@@ -36,3 +39,24 @@ class StorageServer(Resource):
     @property
     def data(self):
         return self.info
+
+    def _cp_dispatch(self, vpath):
+        if vpath:
+            subcollection = vpath.pop(0)
+            if subcollection == 'storagetargets':
+                # incoming text, from URL, is not unicode, need decode
+                return StorageTargets(self.model, self.ident.decode("utf-8"))
+
+
+class StorageTargets(Collection):
+    def __init__(self, model, server):
+        super(StorageTargets, self).__init__(model)
+        self.server = server
+        self.resource_args = [self.server, ]
+        self.model_args = [self.server, ]
+
+    def get(self, filter_params):
+        res_list = []
+        get_list = getattr(self.model, model_fn(self, 'get_list'))
+        res_list = get_list(*self.model_args, **filter_params)
+        return kimchi.template.render(get_class_name(self), res_list)
-- 
1.8.1.2