Skip to content

Commit

Permalink
Option to specify 0 disk space
Browse files Browse the repository at this point in the history
@mlowicki
mlowicki committed Oct 30, 2018
1 parent 5c1acbf commit 8bfd25d
Showing 3 changed files with 12 additions and 18 deletions.
12 changes: 5 additions & 7 deletions api/model.go
View file
Original file line number Diff line number Diff line change
@@ -119,17 +119,16 @@ var newJobSchema = schema{
"exclusiveMinimum": true,
},
"Disk": schema{
"type": "number",
"minimum": 0,
"exclusiveMinimum": true,
"type": "number",
"minimum": 0,
},
"Mem": schema{
"type": "number",
"minimum": 0,
"exclusiveMinimum": true,
},
},
"required": []string{"Group", "Project", "ID", "Schedule", "Mem", "CPUs", "Disk"},
"required": []string{"Group", "Project", "ID", "Schedule", "Mem", "CPUs"},
}

type updateJobPayload struct {
@@ -211,9 +210,8 @@ var updateJobSchema = schema{
"exclusiveMinimum": true,
},
"Disk": schema{
"type": []string{"number", "null"},
"minimum": 0,
"exclusiveMinimum": true,
"type": []string{"number", "null"},
"minimum": 0,
},
"Mem": schema{
"type": []string{"number", "null"},
8 changes: 3 additions & 5 deletions docs/api.apib
View file
Original file line number Diff line number Diff line change
@@ -229,8 +229,7 @@ Available under /api/v1/.
},
"disk": {
"type": "number",
"minimum": 0,
"exclusiveMinimum": true
"minimum": 0
},
"cmd": {
"type": "string"
@@ -251,7 +250,7 @@ Available under /api/v1/.
"type": "object"
}
},
"required": ["group", "project", "id", "schedule", "mem", "cpus", "disk"]
"required": ["group", "project", "id", "schedule", "mem", "cpus"]
}

+ Response 204
@@ -569,8 +568,7 @@ Available under /api/v1/.
},
"disk": {
"type": ["number", "null"],
"minimum": 0,
"exclusiveMinimum": true
"minimum": 0
},
"cmd": {
"type": "string"
10 changes: 4 additions & 6 deletions docs/api.html
View file
Original file line number Diff line number Diff line change
@@ -214,8 +214,7 @@ <h3 id="header-ldap">LDAP <a class="permalink" href="#header-ldap" aria-hidden="
</span>}</span>,
"<span class="hljs-attribute">disk</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"number"</span></span>,
"<span class="hljs-attribute">minimum</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
"<span class="hljs-attribute">exclusiveMinimum</span>": <span class="hljs-value"><span class="hljs-literal">true</span>
"<span class="hljs-attribute">minimum</span>": <span class="hljs-value"><span class="hljs-number">0</span>
</span>}</span>,
"<span class="hljs-attribute">cmd</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"string"</span>
@@ -236,7 +235,7 @@ <h3 id="header-ldap">LDAP <a class="permalink" href="#header-ldap" aria-hidden="
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"object"</span>
</span>}
</span>}</span>,
"<span class="hljs-attribute">required</span>": <span class="hljs-value">[<span class="hljs-string">"group"</span>, <span class="hljs-string">"project"</span>, <span class="hljs-string">"id"</span>, <span class="hljs-string">"schedule"</span>, <span class="hljs-string">"mem"</span>, <span class="hljs-string">"cpus"</span>, <span class="hljs-string">"disk"</span>]
"<span class="hljs-attribute">required</span>": <span class="hljs-value">[<span class="hljs-string">"group"</span>, <span class="hljs-string">"project"</span>, <span class="hljs-string">"id"</span>, <span class="hljs-string">"schedule"</span>, <span class="hljs-string">"mem"</span>, <span class="hljs-string">"cpus"</span>]
</span>}</code></pre><div style="height: 1px;"></div></div></div><div class="title"><strong>Response&nbsp;&nbsp;<code>204</code></strong></div></div></div><div id="api-v1-group-s-jobs" class="resource"><h3 class="resource-heading">Group's jobs <a href="#api-v1-group-s-jobs" class="permalink">&nbsp;&para;</a></h3><div id="api-v1-group-s-jobs-get" class="action get"><h4 class="action-heading"><div class="name">List all group's jobs</div><a href="#api-v1-group-s-jobs-get" class="method get">GET</a><code class="uri">/api/v1/jobs/{group}</code></h4><h4>Example URI</h4><div class="definition"><span class="method get">GET</span>&nbsp;<span class="uri"><span class="hostname"></span>/api/v1/jobs/<span class="hljs-attribute" title="group">a</span></span></div><div class="title"><strong>URI Parameters</strong><div class="collapse-button show"><span class="close">Hide</span><span class="open">Show</span></div></div><div class="collapse-content"><dl class="inner"><dt>group</dt><dd><code>string</code>&nbsp;<span class="required">(required)</span>&nbsp;<span class="text-muted example"><strong>Example:&nbsp;</strong><span>a</span></span><p>ID of the group</p>
</dd></dl></div><div class="title"><strong>Response&nbsp;&nbsp;<code>200</code></strong><div class="collapse-button"><span class="close">Hide</span><span class="open">Show</span></div></div><div class="collapse-content"><div class="inner"><h5>Headers</h5><pre><code><span class="hljs-attribute">Content-Type</span>: <span class="hljs-string">application/json</span></code></pre><div style="height: 1px;"></div><h5>Body</h5><pre><code>[
{
@@ -502,8 +501,7 @@ <h3 id="header-ldap">LDAP <a class="permalink" href="#header-ldap" aria-hidden="
</span>}</span>,
"<span class="hljs-attribute">disk</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value">[<span class="hljs-string">"number"</span>, <span class="hljs-string">"null"</span>]</span>,
"<span class="hljs-attribute">minimum</span>": <span class="hljs-value"><span class="hljs-number">0</span></span>,
"<span class="hljs-attribute">exclusiveMinimum</span>": <span class="hljs-value"><span class="hljs-literal">true</span>
"<span class="hljs-attribute">minimum</span>": <span class="hljs-value"><span class="hljs-number">0</span>
</span>}</span>,
"<span class="hljs-attribute">cmd</span>": <span class="hljs-value">{
"<span class="hljs-attribute">type</span>": <span class="hljs-value"><span class="hljs-string">"string"</span>
@@ -537,7 +535,7 @@ <h3 id="header-ldap">LDAP <a class="permalink" href="#header-ldap" aria-hidden="
"<span class="hljs-attribute">ServerTime</span>": <span class="hljs-value"><span class="hljs-string">"Wed Oct 24 20:54:08 CEST 2018"</span></span>,
"<span class="hljs-attribute">Version</span>": <span class="hljs-value"><span class="hljs-string">"0.2"</span></span>,
"<span class="hljs-attribute">Leader</span>": <span class="hljs-value"><span class="hljs-literal">true</span>
</span>}</code></pre><div style="height: 1px;"></div></div></div></div></div></section></div></div></div><p style="text-align: center;" class="text-muted">Generated by&nbsp;<a href="https://github.com/danielgtaylor/aglio" class="aglio">aglio</a>&nbsp;on 28 Oct 2018</p><script>/* eslint-env browser */
</span>}</code></pre><div style="height: 1px;"></div></div></div></div></div></section></div></div></div><p style="text-align: center;" class="text-muted">Generated by&nbsp;<a href="https://github.com/danielgtaylor/aglio" class="aglio">aglio</a>&nbsp;on 30 Oct 2018</p><script>/* eslint-env browser */
/* eslint quotes: [2, "single"] */
'use strict';

0 comments on commit 8bfd25d

Please sign in to comment.