Skip to content

C
CONF
Commit 34fee683 authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

Fixed name bug

parent 624a3dbd
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 104 deletions
drip-api/doc/apidocs/index.html
View file @ 34fee683
...@@ -177,12 +177,10 @@ provisopned based on a TOSCA description.</span> ...@@ -177,12 +177,10 @@ provisopned based on a TOSCA description.</span>
</td> </td>
<td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="resource-path">/user/v1.0/provisioner/ids</span> <td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="resource-path">/user/v1.0/provisioner/ids</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/provision</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/provision</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/sample</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/{id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/{id}</span>
</samp></li></ul></td> </samp></li></ul></td>
<td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="label label-default resource-method">GET</span> <td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="label label-default resource-method">GET</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span> </samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li><li><samp> <span class="label label-default resource-method">GET</span>
</samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span> </samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span>
</samp></li></ul></td> </samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for obtaining resources from cloud providers <td> <span class="resource-description">This controller is responsible for obtaining resources from cloud providers
......
drip-api/doc/apidocs/json_CloudCredentials.html
View file @ 34fee683
...@@ -167,7 +167,7 @@ provisoner to request for resources.</p> ...@@ -167,7 +167,7 @@ provisoner to request for resources.</p>
}, { }, {
&quot;name&quot; : &quot;...&quot;, &quot;name&quot; : &quot;...&quot;,
&quot;id&quot; : &quot;...&quot;, &quot;id&quot; : &quot;...&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;type&quot; : &quot;PUBLIC&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;...&quot;, &quot;property1&quot; : &quot;...&quot;,
&quot;property2&quot; : &quot;...&quot; &quot;property2&quot; : &quot;...&quot;
......
drip-api/doc/apidocs/resource_CloudCredentialsController.html
View file @ 34fee683
...@@ -174,7 +174,7 @@ Accept: application/json ...@@ -174,7 +174,7 @@ Accept: application/json
}, { }, {
&quot;name&quot; : &quot;...&quot;, &quot;name&quot; : &quot;...&quot;,
&quot;id&quot; : &quot;...&quot;, &quot;id&quot; : &quot;...&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;type&quot; : &quot;PUBLIC&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;...&quot;, &quot;property1&quot; : &quot;...&quot;,
&quot;property2&quot; : &quot;...&quot; &quot;property2&quot; : &quot;...&quot;
......
drip-api/doc/apidocs/resource_ProvisionController.html
View file @ 34fee683
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
<ul class="nav nav-sidebar"> <ul class="nav nav-sidebar">
<li><a href="#resource_ProvisionController_getIds_GET">GET /user/v1.0/provisioner/ids</a></li> <li><a href="#resource_ProvisionController_getIds_GET">GET /user/v1.0/provisioner/ids</a></li>
<li><a href="#resource_ProvisionController_provision_POST"><abbr title="POST /user/v1.0/provisioner/provision">POST /user/v1.0/provisioner/pr...</abbr></a></li> <li><a href="#resource_ProvisionController_provision_POST"><abbr title="POST /user/v1.0/provisioner/provision">POST /user/v1.0/provisioner/pr...</abbr></a></li>
<li><a href="#resource_ProvisionController_getSample_GET"><abbr title="GET /user/v1.0/provisioner/sample">GET /user/v1.0/provisioner/sam...</abbr></a></li>
<li><a href="#resource_ProvisionController_delete_DELETE"><abbr title="DELETE /user/v1.0/provisioner/{id}">DELETE /user/v1.0/provisioner/...</abbr></a></li> <li><a href="#resource_ProvisionController_delete_DELETE"><abbr title="DELETE /user/v1.0/provisioner/{id}">DELETE /user/v1.0/provisioner/...</abbr></a></li>
<li><a href="#resource_ProvisionController_get_GET"><abbr title="GET /user/v1.0/provisioner/{id}">GET /user/v1.0/provisioner/{id...</abbr></a></li> <li><a href="#resource_ProvisionController_get_GET"><abbr title="GET /user/v1.0/provisioner/{id}">GET /user/v1.0/provisioner/{id...</abbr></a></li>
<li class="divider"></li> <li class="divider"></li>
...@@ -241,86 +240,6 @@ Content-Type: application/json ...@@ -241,86 +240,6 @@ Content-Type: application/json
</div> </div>
</div> </div>
<div id="resource_ProvisionController_getSample_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/provisioner/sample <a href="../user/v1.0/provisioner/sample" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Returns a sample ProvisionInfo request</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
<dd>ADMIN, USER</dd>
</dl>
<table class="table resource-response-body">
<caption>Response Body</caption>
<thead>
<tr>
<th>media type</th>
<th>data type</th>
</tr>
</thead>
<tbody>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference"><a href="json_ProvisionInfo.html">ProvisionInfo</a>
(JSON)</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
<td><span class="datatype-reference"><a href="xml_ns0_provisionInfo.html">provisionInfo</a>
(XML)</span></td>
</tr>
</tbody>
</table>
<h4>Example</h4>
<div class="container-fluid example panel">
<div class="row panel-body">
<div class="col-md-6">
<h5>Request</h5>
<pre>
GET /user/v1.0/provisioner/sample
Accept: application/json
</pre>
</div>
<div class="col-md-6">
<h5>Response</h5>
<pre>
HTTP/1.1 200 Looks Good
Content-Type: application/json
<code class="prettyprint language-js">
{
&quot;cloudCredentialsID&quot; : &quot;...&quot;,
&quot;planID&quot; : &quot;...&quot;,
&quot;scriptID&quot; : &quot;...&quot;,
&quot;userKeyID&quot; : &quot;...&quot;,
&quot;deployParameters&quot; : [ {
&quot;cloudCertificateName&quot; : &quot;...&quot;,
&quot;IP&quot; : &quot;...&quot;,
&quot;user&quot; : &quot;...&quot;,
&quot;role&quot; : &quot;...&quot;
}, {
&quot;cloudCertificateName&quot; : &quot;...&quot;,
&quot;IP&quot; : &quot;...&quot;,
&quot;user&quot; : &quot;...&quot;,
&quot;role&quot; : &quot;...&quot;
} ],
&quot;keyValue&quot; : {
&quot;property1&quot; : { },
&quot;property2&quot; : { }
},
&quot;id&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;...&quot;
}
</code>
</pre>
</div>
</div>
</div>
</div>
<div id="resource_ProvisionController_delete_DELETE"> <div id="resource_ProvisionController_delete_DELETE">
<h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/provisioner/{id} <a href="../user/v1.0/provisioner/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3> <h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/provisioner/{id} <a href="../user/v1.0/provisioner/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
......
drip-api/doc/apidocs/resources.html
View file @ 34fee683
...@@ -169,12 +169,10 @@ provisopned based on a TOSCA description.</span> ...@@ -169,12 +169,10 @@ provisopned based on a TOSCA description.</span>
</td> </td>
<td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="resource-path">/user/v1.0/provisioner/ids</span> <td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="resource-path">/user/v1.0/provisioner/ids</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/provision</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/provision</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/sample</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/{id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/provisioner/{id}</span>
</samp></li></ul></td> </samp></li></ul></td>
<td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="label label-default resource-method">GET</span> <td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="label label-default resource-method">GET</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span> </samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li><li><samp> <span class="label label-default resource-method">GET</span>
</samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span> </samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span>
</samp></li></ul></td> </samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for obtaining resources from cloud providers <td> <span class="resource-description">This controller is responsible for obtaining resources from cloud providers
......
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java
View file @ 34fee683
...@@ -127,21 +127,5 @@ public class ProvisionController { ...@@ -127,21 +127,5 @@ public class ProvisionController {
return null; return null;
} }
/**
* Returns a sample ProvisionInfo request
*
* @return
*/
@RequestMapping(value = "/sample", method = RequestMethod.GET)
@RolesAllowed({UserService.USER, UserService.ADMIN})
public @ResponseBody
ProvisionInfo getSample() {
ProvisionInfo info = new ProvisionInfo();
info.setCloudCredentialsID("58c6a6556dd4bd2f0d71e6fb");
info.setPlanID("58c6b17b65d4d03b29e7db0e");
info.setScriptID("58c6a6556dd4bd2f0d71e6fb");
info.setUserKeyID("58c6b12b65d4d03b29e7db0c");
return info;
}
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment