Skip to content

Commit

Permalink
switched app_id to function_name for volume mounts
Browse files Browse the repository at this point in the history
  • Loading branch information
msneddon committed Jun 10, 2016
1 parent a99ebfc commit 0715095
Show file tree
Hide file tree
Showing 12 changed files with 624 additions and 235 deletions.
8 changes: 4 additions & 4 deletions catalog.spec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -717,10 +717,10 @@ module Catalog {
boolean read_only;
} VolumeMount;

/* for a module, app, and client group, set mount configurations */
/* for a module, function, and client group, set mount configurations */
typedef structure {
string module_name;
string app_id;
string function_name;
string client_group;

list <VolumeMount> volume_mounts;
Expand All @@ -729,7 +729,7 @@ module Catalog {
/* must specify all properties of the VolumeMountConfig */
funcdef set_volume_mount(VolumeMountConfig config) returns () authentication required;

/* must specify module_name, app_id, client_group and this method will delete any configured mounts */
/* must specify module_name, function_name, client_group and this method will delete any configured mounts */
funcdef remove_volume_mount(VolumeMountConfig config) returns () authentication required;

/*
Expand All @@ -741,7 +741,7 @@ module Catalog {
*/
typedef structure {
string module_name;
string app_id;
string function_name;
string client_group;
} VolumeMountFilter;

Expand Down
266 changes: 252 additions & 14 deletions lib/Bio/KBase/Catalog/Client.pm
View file

Large diffs are not rendered by default.

214 changes: 143 additions & 71 deletions lib/biokbase/catalog/Client.py
View file

Large diffs are not rendered by default.

216 changes: 144 additions & 72 deletions lib/biokbase/catalog/Impl.py
View file

Large diffs are not rendered by default.

32 changes: 18 additions & 14 deletions lib/biokbase/catalog/controller.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1238,11 +1238,11 @@ def set_volume_mount(self, username, config):
raise ValueError('module_name parameter field must be a string')
record['module_name'] = config['module_name'].strip()

if 'app_id' not in config:
raise ValueError('app_id parameter field is required')
if not isinstance(config['app_id'],basestring):
raise ValueError('app_id parameter field must be a string')
record['app_id'] = config['app_id'].strip()
if 'function_name' not in config:
raise ValueError('function_name parameter field is required')
if not isinstance(config['function_name'],basestring):
raise ValueError('function_name parameter field must be a string')
record['function_name'] = config['function_name'].strip()

if 'client_group' not in config:
raise ValueError('client_group parameter field is required')
Expand Down Expand Up @@ -1302,11 +1302,11 @@ def remove_volume_mount(self, username, config):
raise ValueError('module_name parameter field must be a string')
selection['module_name'] = config['module_name'].strip()

if 'app_id' not in config:
raise ValueError('app_id parameter field is required')
if not isinstance(config['app_id'],basestring):
raise ValueError('app_id parameter field must be a string')
selection['app_id'] = config['app_id'].strip()
if 'function_name' not in config:
raise ValueError('function_name parameter field is required')
if not isinstance(config['function_name'],basestring):
raise ValueError('function_name parameter field must be a string')
selection['function_name'] = config['function_name'].strip()

if 'client_group' not in config:
raise ValueError('client_group parameter field is required')
Expand All @@ -1331,16 +1331,20 @@ def list_volume_mounts(self, username, filter):
raise ValueError('module_name parameter field must be a string')
processed_filter['module_name'] = filter['module_name'].strip()

if 'app_id' in filter:
if not isinstance(filter['app_id'],basestring):
raise ValueError('app_id parameter field must be a string')
processed_filter['app_id'] = filter['app_id'].strip()
if 'function_name' in filter:
if not isinstance(filter['function_name'],basestring):
raise ValueError('function_name parameter field must be a string')
processed_filter['function_name'] = filter['function_name'].strip()

if 'client_group' in filter:
if not isinstance(filter['client_group'],basestring):
raise ValueError('client_group parameter field must be a string')
processed_filter['client_group'] = filter['client_group'].strip()

if 'app_id' in filter:
raise ValueError('cannot filter by app_id - use function_name instead')


return self.db.list_volume_mounts(processed_filter)


Expand Down
6 changes: 3 additions & 3 deletions lib/biokbase/catalog/db.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@ def __init__(self, mongo_host, mongo_db, mongo_user, mongo_psswd):

self.volume_mounts.ensure_index([('client_group', ASCENDING),
('module_name_lc', ASCENDING),
('app_id', ASCENDING)],
('function_name', ASCENDING)],
unique=True, sparse=False)


Expand Down Expand Up @@ -1004,7 +1004,7 @@ def set_volume_mount(self, volume_mount):
return self._check_update_result(self.volume_mounts.update(
{
'module_name_lc':volume_mount['module_name_lc'],
'app_id':volume_mount['app_id'],
'function_name':volume_mount['function_name'],
'client_group':volume_mount['client_group']
},
volume_mount,
Expand All @@ -1016,7 +1016,7 @@ def remove_volume_mount(self, volume_mount):
return self._check_update_result(self.volume_mounts.remove(
{
'module_name_lc':volume_mount['module_name_lc'],
'app_id':volume_mount['app_id'],
'function_name':volume_mount['function_name'],
'client_group':volume_mount['client_group']
}))

Expand Down
2 changes: 1 addition & 1 deletion lib/java/us/kbase/catalog/CatalogClient.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -827,7 +827,7 @@ public void setVolumeMount(VolumeMountConfig config, RpcContext... jsonRpcContex
/**
* <p>Original spec-file function name: remove_volume_mount</p>
* <pre>
* must specify module_name, app_id, client_group and this method will delete any configured mounts
* must specify module_name, function_name, client_group and this method will delete any configured mounts
* </pre>
* @param config instance of type {@link us.kbase.catalog.VolumeMountConfig VolumeMountConfig}
* @throws IOException if an IO exception occurs
Expand Down
16 changes: 8 additions & 8 deletions lib/java/us/kbase/catalog/Function.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@ public class Function {
@JsonProperty("place")
private FunctionPlace place;
@JsonProperty("input")
private List<us.kbase.catalog.Parameter> input;
private List<Parameter> input;
@JsonProperty("output")
private List<us.kbase.catalog.Parameter> output;
private List<Parameter> output;
private Map<String, Object> additionalProperties = new HashMap<String, Object>();

@JsonProperty("name")
Expand Down Expand Up @@ -101,31 +101,31 @@ public Function withPlace(FunctionPlace place) {
}

@JsonProperty("input")
public List<us.kbase.catalog.Parameter> getInput() {
public List<Parameter> getInput() {
return input;
}

@JsonProperty("input")
public void setInput(List<us.kbase.catalog.Parameter> input) {
public void setInput(List<Parameter> input) {
this.input = input;
}

public Function withInput(List<us.kbase.catalog.Parameter> input) {
public Function withInput(List<Parameter> input) {
this.input = input;
return this;
}

@JsonProperty("output")
public List<us.kbase.catalog.Parameter> getOutput() {
public List<Parameter> getOutput() {
return output;
}

@JsonProperty("output")
public void setOutput(List<us.kbase.catalog.Parameter> output) {
public void setOutput(List<Parameter> output) {
this.output = output;
}

public Function withOutput(List<us.kbase.catalog.Parameter> output) {
public Function withOutput(List<Parameter> output) {
this.output = output;
return this;
}
Expand Down
26 changes: 13 additions & 13 deletions lib/java/us/kbase/catalog/VolumeMountConfig.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,24 +15,24 @@
/**
* <p>Original spec-file type: VolumeMountConfig</p>
* <pre>
* for a module, app, and client group, set mount configurations
* for a module, function, and client group, set mount configurations
* </pre>
*
*/
@JsonInclude(JsonInclude.Include.NON_NULL)
@Generated("com.googlecode.jsonschema2pojo")
@JsonPropertyOrder({
"module_name",
"app_id",
"function_name",
"client_group",
"volume_mounts"
})
public class VolumeMountConfig {

@JsonProperty("module_name")
private String moduleName;
@JsonProperty("app_id")
private String appId;
@JsonProperty("function_name")
private String functionName;
@JsonProperty("client_group")
private String clientGroup;
@JsonProperty("volume_mounts")
Expand All @@ -54,18 +54,18 @@ public VolumeMountConfig withModuleName(String moduleName) {
return this;
}

@JsonProperty("app_id")
public String getAppId() {
return appId;
@JsonProperty("function_name")
public String getFunctionName() {
return functionName;
}

@JsonProperty("app_id")
public void setAppId(String appId) {
this.appId = appId;
@JsonProperty("function_name")
public void setFunctionName(String functionName) {
this.functionName = functionName;
}

public VolumeMountConfig withAppId(String appId) {
this.appId = appId;
public VolumeMountConfig withFunctionName(String functionName) {
this.functionName = functionName;
return this;
}

Expand Down Expand Up @@ -111,7 +111,7 @@ public void setAdditionalProperties(String name, Object value) {

@Override
public String toString() {
return ((((((((((("VolumeMountConfig"+" [moduleName=")+ moduleName)+", appId=")+ appId)+", clientGroup=")+ clientGroup)+", volumeMounts=")+ volumeMounts)+", additionalProperties=")+ additionalProperties)+"]");
return ((((((((((("VolumeMountConfig"+" [moduleName=")+ moduleName)+", functionName=")+ functionName)+", clientGroup=")+ clientGroup)+", volumeMounts=")+ volumeMounts)+", additionalProperties=")+ additionalProperties)+"]");
}

}
24 changes: 12 additions & 12 deletions lib/java/us/kbase/catalog/VolumeMountFilter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@
@Generated("com.googlecode.jsonschema2pojo")
@JsonPropertyOrder({
"module_name",
"app_id",
"function_name",
"client_group"
})
public class VolumeMountFilter {

@JsonProperty("module_name")
private String moduleName;
@JsonProperty("app_id")
private String appId;
@JsonProperty("function_name")
private String functionName;
@JsonProperty("client_group")
private String clientGroup;
private Map<String, Object> additionalProperties = new HashMap<String, Object>();
Expand All @@ -54,18 +54,18 @@ public VolumeMountFilter withModuleName(String moduleName) {
return this;
}

@JsonProperty("app_id")
public String getAppId() {
return appId;
@JsonProperty("function_name")
public String getFunctionName() {
return functionName;
}

@JsonProperty("app_id")
public void setAppId(String appId) {
this.appId = appId;
@JsonProperty("function_name")
public void setFunctionName(String functionName) {
this.functionName = functionName;
}

public VolumeMountFilter withAppId(String appId) {
this.appId = appId;
public VolumeMountFilter withFunctionName(String functionName) {
this.functionName = functionName;
return this;
}

Expand Down Expand Up @@ -96,7 +96,7 @@ public void setAdditionalProperties(String name, Object value) {

@Override
public String toString() {
return ((((((((("VolumeMountFilter"+" [moduleName=")+ moduleName)+", appId=")+ appId)+", clientGroup=")+ clientGroup)+", additionalProperties=")+ additionalProperties)+"]");
return ((((((((("VolumeMountFilter"+" [moduleName=")+ moduleName)+", functionName=")+ functionName)+", clientGroup=")+ clientGroup)+", additionalProperties=")+ additionalProperties)+"]");
}

}
Loading

0 comments on commit 0715095

Please sign in to comment.