Merge pull request #69 from kbase/dev-volume-mounts

Updates for client group and volume mount configs + other small fixes

README.md

@@ -11,8 +11,9 @@ Code coverage: (develop branch)
 [![Coverage Status](https://coveralls.io/repos/github/kbase/catalog/badge.svg?branch=develop)](https://coveralls.io/github/kbase/catalog?branch=develop)
 
 
-#### v2.0.4 - TBA
+#### v2.0.5 - TBA
   - Added volume mount configuration
+  - Modified client group configurations so that functions are specified, not app_ids
 
 #### v2.0.3 - 5/31/16
   - Major release to support storage of local functions and dynamic services information,

catalog.spec

@@ -87,16 +87,31 @@ module Catalog {
         boolean include_modules_with_no_name_set;
     } ListModuleParams;
 
+
+    typedef structure {
+        string git_commit_hash;
+    } VersionCommitInfo;
+
+    /*
+        git_url is always returned.  Every other field
+        may or may not exist depending on what has been registered or if
+        certain registrations have failed
+    */
     typedef structure {
         string module_name;
         string git_url;
-    } BasicModuleInfo;
-    /*
-    To Add:
-        string brief_description;
+
+        string language;
+        boolean dynamic_service;
+
         list <string> owners;
-        boolean is_released;
-    */
+
+        VersionCommitInfo dev;
+        VersionCommitInfo beta;
+        VersionCommitInfo release;
+
+        list <VersionCommitInfo> released_version_list;
+    } BasicModuleInfo;
 
     /* */
     funcdef list_basic_module_info(ListModuleParams params) returns (list<BasicModuleInfo> info_list);
@@ -700,17 +715,34 @@ module Catalog {
         list<string> client_groups;
     } AppClientGroup;
 
-    funcdef set_client_group(AppClientGroup group) returns () authentication required;
-
     /* if app_ids is empty or null, all client groups are returned */
     typedef structure {
-        list<string> app_ids;
     } GetClientGroupParams;
 
+    /* @deprecated list_client_group_configs */
     funcdef get_client_groups(GetClientGroupParams params) returns (list<AppClientGroup> groups);
 
 
 
+    typedef structure {
+        string module_name;
+        string function_name;
+        list<string> client_groups;
+    } ClientGroupConfig;
+
+    funcdef set_client_group_config(ClientGroupConfig config) returns () authentication required;
+
+    funcdef remove_client_group_config(ClientGroupConfig config) returns () authentication required;
+
+    typedef structure {
+        string module_name;
+        string function_name;
+    } ClientGroupFilter;
+
+    funcdef list_client_group_configs(ClientGroupFilter filter) returns (list<ClientGroupConfig> groups);
+
+
+
     typedef structure {
         string host_dir;
         string container_dir;