Commit 622f4480 authored by Spiros Koulouzis's avatar Spiros Koulouzis

fixed uff0E bug. Was not replacing with '.'

parent fdb737e9
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-gwt-json-overlay.jar"> <tr class="clickable-row" data-href="drip-api-gwt-json-overlay.jar">
<td><span class="downloadfile-name">drip-api-gwt-json-overlay.jar</span></td> <td><span class="downloadfile-name">drip-api-gwt-json-overlay.jar</span></td>
<td><span class="downloadfile-size">15.55K</span></td> <td><span class="downloadfile-size">15.60K</span></td>
<td><span class="downloadfile-description">The sources for the GWT JSON overlay.</span></td> <td><span class="downloadfile-description">The sources for the GWT JSON overlay.</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -116,12 +116,12 @@ ...@@ -116,12 +116,12 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-json-client.jar"> <tr class="clickable-row" data-href="drip-api-json-client.jar">
<td><span class="downloadfile-name">drip-api-json-client.jar</span></td> <td><span class="downloadfile-name">drip-api-json-client.jar</span></td>
<td><span class="downloadfile-size">21.64K</span></td> <td><span class="downloadfile-size">21.76K</span></td>
<td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td> <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
</tr> </tr>
<tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar"> <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
<td><span class="downloadfile-name">drip-api-json-client-json-sources.jar</span></td> <td><span class="downloadfile-name">drip-api-json-client-json-sources.jar</span></td>
<td><span class="downloadfile-size">16.46K</span></td> <td><span class="downloadfile-size">16.50K</span></td>
<td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td> <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -144,12 +144,12 @@ ...@@ -144,12 +144,12 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-xml-client.jar"> <tr class="clickable-row" data-href="drip-api-xml-client.jar">
<td><span class="downloadfile-name">drip-api-xml-client.jar</span></td> <td><span class="downloadfile-name">drip-api-xml-client.jar</span></td>
<td><span class="downloadfile-size">24.42K</span></td> <td><span class="downloadfile-size">24.53K</span></td>
<td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td> <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
</tr> </tr>
<tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar"> <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
<td><span class="downloadfile-name">drip-api-xml-client-xml-sources.jar</span></td> <td><span class="downloadfile-name">drip-api-xml-client-xml-sources.jar</span></td>
<td><span class="downloadfile-size">20.45K</span></td> <td><span class="downloadfile-size">20.55K</span></td>
<td><span class="downloadfile-description">The sources for the Java XML client library.</span></td> <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-js.zip"> <tr class="clickable-row" data-href="drip-api-js.zip">
<td><span class="downloadfile-name">drip-api-js.zip</span></td> <td><span class="downloadfile-name">drip-api-js.zip</span></td>
<td><span class="downloadfile-size">7.09K</span></td> <td><span class="downloadfile-size">7.07K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td> <td><span class="downloadfile-description">&nbsp;</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -213,7 +213,7 @@ ...@@ -213,7 +213,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-php.zip"> <tr class="clickable-row" data-href="drip-api-php.zip">
<td><span class="downloadfile-name">drip-api-php.zip</span></td> <td><span class="downloadfile-name">drip-api-php.zip</span></td>
<td><span class="downloadfile-size">8.09K</span></td> <td><span class="downloadfile-size">7.87K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td> <td><span class="downloadfile-description">&nbsp;</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -245,7 +245,7 @@ ...@@ -245,7 +245,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-php.zip"> <tr class="clickable-row" data-href="drip-api-php.zip">
<td><span class="downloadfile-name">drip-api-php.zip</span></td> <td><span class="downloadfile-name">drip-api-php.zip</span></td>
<td><span class="downloadfile-size">8.77K</span></td> <td><span class="downloadfile-size">8.91K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td> <td><span class="downloadfile-description">&nbsp;</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -276,7 +276,7 @@ ...@@ -276,7 +276,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api.rb"> <tr class="clickable-row" data-href="drip-api.rb">
<td><span class="downloadfile-name">drip-api.rb</span></td> <td><span class="downloadfile-name">drip-api.rb</span></td>
<td><span class="downloadfile-size">112.46K</span></td> <td><span class="downloadfile-size">113.36K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td> <td><span class="downloadfile-description">&nbsp;</span></td>
</tr> </tr>
</tbody> </tbody>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -232,13 +232,17 @@ machine the keys correspond to.</span> ...@@ -232,13 +232,17 @@ machine the keys correspond to.</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/ids</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/ids</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/{id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/{id}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/plan/{tosca_id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/plan/{tosca_id}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/post/{name}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/tosca/{id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/tosca/{id}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/post/{level}/{name}/{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">DELETE</span> <td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="label label-default resource-method">DELETE</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">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><li><samp> <span class="label label-default resource-method">GET</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">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">GET</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li></ul></td> </samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for planing the type of resources to be <td> <span class="resource-description">This controller is responsible for planing the type of resources to be
provisopned based on a TOSCA description.</span> provisopned based on a TOSCA description.</span>
......
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -142,8 +142,8 @@ ...@@ -142,8 +142,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -155,21 +155,21 @@ ...@@ -155,21 +155,21 @@
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;host&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;result&quot; : { &quot;result&quot; : {
&quot;stderr&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;start&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;end&quot; : &quot;...&quot;,
&quot;stdout&quot; : &quot;...&quot;, &quot;stderr&quot; : &quot;...&quot;,
&quot;msg&quot; : &quot;...&quot; &quot;msg&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;stdout&quot; : &quot;...&quot;
}, },
&quot;vmType&quot; : &quot;...&quot;, &quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;provisionID&quot; : &quot;...&quot;, &quot;provisionID&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,25 +80,25 @@ ...@@ -80,25 +80,25 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">stderr</span> <td> <span class="property-name">cmd</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">array of string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">changed</span> <td> <span class="property-name">start</span>
</td> </td>
<td> <span class="datatype-reference">boolean <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">start</span> <td> <span class="property-name">end</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -107,7 +107,7 @@ ...@@ -107,7 +107,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">delta</span> <td> <span class="property-name">stderr</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -116,16 +116,16 @@ ...@@ -116,16 +116,16 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">cmd</span> <td> <span class="property-name">msg</span>
</td> </td>
<td> <span class="datatype-reference">array of string <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">end</span> <td> <span class="property-name">delta</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -134,16 +134,16 @@ ...@@ -134,16 +134,16 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">stdout</span> <td> <span class="property-name">changed</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">boolean
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">msg</span> <td> <span class="property-name">stdout</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -157,14 +157,14 @@ ...@@ -157,14 +157,14 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;stderr&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;start&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;end&quot; : &quot;...&quot;,
&quot;stdout&quot; : &quot;...&quot;, &quot;stderr&quot; : &quot;...&quot;,
&quot;msg&quot; : &quot;...&quot; &quot;msg&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;stdout&quot; : &quot;...&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">vmType</span> <td> <span class="property-name">delta</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">delta</span> <td> <span class="property-name">host</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">end</span> <td> <span class="property-name">start</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">start</span> <td> <span class="property-name">end</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">cloudDeploymentDomain</span> <td> <span class="property-name">vmType</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">host</span> <td> <span class="property-name">cloudDeploymentDomain</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -141,8 +141,8 @@ ...@@ -141,8 +141,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -153,8 +153,8 @@ ...@@ -153,8 +153,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -164,15 +164,15 @@ ...@@ -164,15 +164,15 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;, &quot;delta&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;start&quot; : &quot;...&quot;, &quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;,
&quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;host&quot; : &quot;...&quot;, &quot;timestamp&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
This diff is collapsed.
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">role</span> <td> <span class="property-name">user</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">user</span> <td> <span class="property-name">role</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;role&quot; : &quot;slave&quot;,
&quot;user&quot; : &quot;vm_user&quot;, &quot;user&quot; : &quot;vm_user&quot;,
&quot;role&quot; : &quot;slave&quot;,
&quot;IP&quot; : &quot;52.73.245.157&quot; &quot;IP&quot; : &quot;52.73.245.157&quot;
}</pre> }</pre>
......
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">configurationID</span> <td> <span class="property-name">provisionID</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -100,7 +100,7 @@ ...@@ -100,7 +100,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">provisionID</span> <td> <span class="property-name">configurationID</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -114,8 +114,8 @@ ...@@ -114,8 +114,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -126,8 +126,8 @@ ...@@ -126,8 +126,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -138,11 +138,11 @@ ...@@ -138,11 +138,11 @@
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;managerType&quot; : &quot;ansible&quot;, &quot;managerType&quot; : &quot;ansible&quot;,
&quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
This diff is collapsed.
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">attributes</span> <td> <span class="property-name">name</span>
</td> </td>
<td> <span class="datatype-reference">map of string <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -98,16 +98,16 @@ ...@@ -98,16 +98,16 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">key</span> <td> <span class="property-name">attributes</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">map of string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">name</span> <td> <span class="property-name">key</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -121,13 +121,13 @@ ...@@ -121,13 +121,13 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;name&quot; : &quot;id_dsa.pub&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;domain_name:Virginia&quot;, &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
&quot;property2&quot; : &quot;domain_name:Virginia&quot; &quot;property2&quot; : &quot;domain_name:Virginia&quot;
}, },
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
&quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
&quot;name&quot; : &quot;id_dsa.pub&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">publicKey</span> <td> <span class="property-name">privateKey</span>
</td> </td>
<td> <span class="datatype-reference"><a href="json_Key.html">Key</a> <td> <span class="datatype-reference"><a href="json_Key.html">Key</a>
</span> </span>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">privateKey</span> <td> <span class="property-name">publicKey</span>
</td> </td>
<td> <span class="datatype-reference"><a href="json_Key.html">Key</a> <td> <span class="datatype-reference"><a href="json_Key.html">Key</a>
</span> </span>
...@@ -112,8 +112,8 @@ ...@@ -112,8 +112,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -124,8 +124,8 @@ ...@@ -124,8 +124,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -135,28 +135,28 @@ ...@@ -135,28 +135,28 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;publicKey&quot; : { &quot;privateKey&quot; : {
&quot;name&quot; : &quot;id_dsa.pub&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;domain_name:Virginia&quot;, &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
&quot;property2&quot; : &quot;domain_name:Virginia&quot; &quot;property2&quot; : &quot;domain_name:Virginia&quot;
}, },
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
&quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
&quot;name&quot; : &quot;id_dsa.pub&quot;
}, },
&quot;privateKey&quot; : { &quot;publicKey&quot; : {
&quot;name&quot; : &quot;id_dsa.pub&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;domain_name:Virginia&quot;, &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
&quot;property2&quot; : &quot;domain_name:Virginia&quot; &quot;property2&quot; : &quot;domain_name:Virginia&quot;
}, },
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
&quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
&quot;name&quot; : &quot;id_dsa.pub&quot;
}, },
&quot;keyPairId&quot; : &quot;...&quot;, &quot;keyPairId&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Subtypes</dt> <dt>Subtypes</dt>
<dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd> <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
</dl> </dl>
<table class="table datatype-properties"> <table class="table datatype-properties">
...@@ -82,9 +82,9 @@ ...@@ -82,9 +82,9 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">owner</span> <td> <span class="property-name">timestamp</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">number
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -100,9 +100,9 @@ ...@@ -100,9 +100,9 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">timestamp</span> <td> <span class="property-name">owner</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -114,9 +114,9 @@ ...@@ -114,9 +114,9 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,25 +80,25 @@ ...@@ -80,25 +80,25 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">name</span> <td> <span class="property-name">loweLevelPlanIDs</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">array of string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">loweLevelPlanIDs</span> <td> <span class="property-name">toscaID</span>
</td> </td>
<td> <span class="datatype-reference">array of string <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">toscaID</span> <td> <span class="property-name">name</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -132,8 +132,8 @@ ...@@ -132,8 +132,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -144,8 +144,8 @@ ...@@ -144,8 +144,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -155,17 +155,17 @@ ...@@ -155,17 +155,17 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;name&quot; : &quot;planner_output_all.yml&quot;,
&quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ], &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
&quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;name&quot; : &quot;planner_output_all.yml&quot;,
&quot;level&quot; : 0, &quot;level&quot; : 0,
&quot;keyValue&quot; : { &quot;keyValue&quot; : {
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -96,8 +96,8 @@ ...@@ -96,8 +96,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -108,8 +108,8 @@ ...@@ -108,8 +108,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -123,9 +123,9 @@ ...@@ -123,9 +123,9 @@
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -82,18 +82,18 @@ ...@@ -82,18 +82,18 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">planID</span> <td> <span class="property-name">cloudCredentialsIDs</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">array of string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">userKeyPairIDs</span> <td> <span class="property-name">planID</span>
</td> </td>
<td> <span class="datatype-reference">array of string <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">cloudCredentialsIDs</span> <td> <span class="property-name">userKeyPairIDs</span>
</td> </td>
<td> <span class="datatype-reference">array of string <td> <span class="datatype-reference">array of string
</span> </span>
...@@ -134,8 +134,8 @@ ...@@ -134,8 +134,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -146,8 +146,8 @@ ...@@ -146,8 +146,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -157,17 +157,17 @@ ...@@ -157,17 +157,17 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
&quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;, &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
&quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ], &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;keyValue&quot; : { &quot;keyValue&quot; : {
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,18 +80,18 @@ ...@@ -80,18 +80,18 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">cloudKeyPairIDs</span> <td> <span class="property-name">deployParameters</span>
</td> </td>
<td> <span class="datatype-reference">array of string <td> <span class="datatype-reference">array of <a href="json_DeployParameter.html">DeployParameter</a>
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">deployParameters</span> <td> <span class="property-name">cloudKeyPairIDs</span>
</td> </td>
<td> <span class="datatype-reference">array of <a href="json_DeployParameter.html">DeployParameter</a> <td> <span class="datatype-reference">array of string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -103,14 +103,14 @@ ...@@ -103,14 +103,14 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">planID</span></td> <td><span class="property-name">cloudCredentialsIDs</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">array of string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">userKeyPairIDs</span></td> <td><span class="property-name">planID</span></td>
<td><span class="datatype-reference">array of string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -121,7 +121,7 @@ ...@@ -121,7 +121,7 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">cloudCredentialsIDs</span></td> <td><span class="property-name">userKeyPairIDs</span></td>
<td><span class="datatype-reference">array of string <td><span class="datatype-reference">array of string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
...@@ -143,8 +143,8 @@ ...@@ -143,8 +143,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -155,8 +155,8 @@ ...@@ -155,8 +155,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -166,27 +166,27 @@ ...@@ -166,27 +166,27 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;deployParameters&quot; : [ { &quot;deployParameters&quot; : [ {
&quot;role&quot; : &quot;slave&quot;,
&quot;user&quot; : &quot;vm_user&quot;, &quot;user&quot; : &quot;vm_user&quot;,
&quot;role&quot; : &quot;slave&quot;,
&quot;IP&quot; : &quot;52.73.245.157&quot; &quot;IP&quot; : &quot;52.73.245.157&quot;
}, { }, {
&quot;role&quot; : &quot;...&quot;,
&quot;user&quot; : &quot;...&quot;, &quot;user&quot; : &quot;...&quot;,
&quot;role&quot; : &quot;...&quot;,
&quot;IP&quot; : &quot;...&quot; &quot;IP&quot; : &quot;...&quot;
} ], } ],
&quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
&quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;, &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
&quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ], &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;keyValue&quot; : { &quot;keyValue&quot; : {
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">contents</span> <td> <span class="property-name">name</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -89,7 +89,7 @@ ...@@ -89,7 +89,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">name</span> <td> <span class="property-name">contents</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -103,8 +103,8 @@ ...@@ -103,8 +103,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -115,8 +115,8 @@ ...@@ -115,8 +115,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -126,11 +126,11 @@ ...@@ -126,11 +126,11 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;name&quot; : &quot;config.sh&quot;, &quot;name&quot; : &quot;config.sh&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,7 +80,7 @@ ...@@ -80,7 +80,7 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">totalNumberOfEvents</span> <td> <span class="property-name">avgEventsPerThread</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -89,34 +89,34 @@ ...@@ -89,34 +89,34 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">sysbenchVersion</span> <td> <span class="property-name">totalNumberOfEvents</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">number
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">stddevEventsPerThread</span> <td> <span class="property-name">ansibleOutputID</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">avgEventsPerThread</span> <td> <span class="property-name">sysbenchVersion</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">avgExecutionTimePerRequest</span> <td> <span class="property-name">stddevExecTimePerThread</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -125,7 +125,7 @@ ...@@ -125,7 +125,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">maxExecutionTimePerRequest</span> <td> <span class="property-name">minExecutionTimePerRequest</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -134,7 +134,7 @@ ...@@ -134,7 +134,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">numberOfThreads</span> <td> <span class="property-name">avgExecutionTimePerRequest</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -143,7 +143,7 @@ ...@@ -143,7 +143,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">avgExecTimePerThread</span> <td> <span class="property-name">maxExecutionTimePerRequest</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -152,7 +152,7 @@ ...@@ -152,7 +152,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">approx95Percentile</span> <td> <span class="property-name">executionTime</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -161,7 +161,7 @@ ...@@ -161,7 +161,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">minExecutionTimePerRequest</span> <td> <span class="property-name">stddevEventsPerThread</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">executionTime</span> <td> <span class="property-name">avgExecTimePerThread</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -179,7 +179,7 @@ ...@@ -179,7 +179,7 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">stddevExecTimePerThread</span> <td> <span class="property-name">approx95Percentile</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -188,9 +188,9 @@ ...@@ -188,9 +188,9 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">ansibleOutputID</span> <td> <span class="property-name">numberOfThreads</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">number
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -202,37 +202,37 @@ ...@@ -202,37 +202,37 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">vmType</span></td> <td><span class="property-name">delta</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">delta</span></td> <td><span class="property-name">host</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">end</span></td> <td><span class="property-name">start</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">start</span></td> <td><span class="property-name">end</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">cloudDeploymentDomain</span></td> <td><span class="property-name">vmType</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">host</span></td> <td><span class="property-name">cloudDeploymentDomain</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
...@@ -243,8 +243,8 @@ ...@@ -243,8 +243,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -255,8 +255,8 @@ ...@@ -255,8 +255,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -266,28 +266,28 @@ ...@@ -266,28 +266,28 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;avgEventsPerThread&quot; : 12345.0,
&quot;totalNumberOfEvents&quot; : 12345, &quot;totalNumberOfEvents&quot; : 12345,
&quot;ansibleOutputID&quot; : &quot;...&quot;,
&quot;sysbenchVersion&quot; : &quot;...&quot;, &quot;sysbenchVersion&quot; : &quot;...&quot;,
&quot;stddevEventsPerThread&quot; : 12345.0, &quot;stddevExecTimePerThread&quot; : 12345.0,
&quot;avgEventsPerThread&quot; : 12345.0, &quot;minExecutionTimePerRequest&quot; : 12345.0,
&quot;avgExecutionTimePerRequest&quot; : 12345.0, &quot;avgExecutionTimePerRequest&quot; : 12345.0,
&quot;maxExecutionTimePerRequest&quot; : 12345.0, &quot;maxExecutionTimePerRequest&quot; : 12345.0,
&quot;numberOfThreads&quot; : 12345, &quot;executionTime&quot; : 12345.0,
&quot;stddevEventsPerThread&quot; : 12345.0,
&quot;avgExecTimePerThread&quot; : 12345.0, &quot;avgExecTimePerThread&quot; : 12345.0,
&quot;approx95Percentile&quot; : 12345.0, &quot;approx95Percentile&quot; : 12345.0,
&quot;minExecutionTimePerRequest&quot; : 12345.0, &quot;numberOfThreads&quot; : 12345,
&quot;executionTime&quot; : 12345.0,
&quot;stddevExecTimePerThread&quot; : 12345.0,
&quot;ansibleOutputID&quot; : &quot;...&quot;,
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;, &quot;delta&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;start&quot; : &quot;...&quot;, &quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;,
&quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;host&quot; : &quot;...&quot;, &quot;timestamp&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
</tr> </tr>
<tbody> <tbody>
<tr> <tr>
<td><span class="property-name">owner</span></td> <td><span class="property-name">timestamp</span></td>
<td><span class="datatype-reference">string <td><span class="datatype-reference">number
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -117,8 +117,8 @@ ...@@ -117,8 +117,8 @@
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
<tr> <tr>
<td><span class="property-name">timestamp</span></td> <td><span class="property-name">owner</span></td>
<td><span class="datatype-reference">number <td><span class="datatype-reference">string
</span></td> </span></td>
<td><span class="property-description"></span></td> <td><span class="property-description"></span></td>
</tr> </tr>
...@@ -133,9 +133,9 @@ ...@@ -133,9 +133,9 @@
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}</pre> }</pre>
<footer class="footer"> <footer class="footer">
......
...@@ -80,16 +80,16 @@ ...@@ -80,16 +80,16 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">enabled</span> <td> <span class="property-name">roles</span>
</td> </td>
<td> <span class="datatype-reference">boolean <td> <span class="datatype-reference">array of string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">accountNonLocked</span> <td> <span class="property-name">accountNonExpired</span>
</td> </td>
<td> <span class="datatype-reference">boolean <td> <span class="datatype-reference">boolean
</span> </span>
...@@ -98,25 +98,25 @@ ...@@ -98,25 +98,25 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">username</span> <td> <span class="property-name">enabled</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">boolean
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">id</span> <td> <span class="property-name">credentialsNonExpired</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">boolean
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">accountNonExpired</span> <td> <span class="property-name">accountNonLocked</span>
</td> </td>
<td> <span class="datatype-reference">boolean <td> <span class="datatype-reference">boolean
</span> </span>
...@@ -125,18 +125,18 @@ ...@@ -125,18 +125,18 @@
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">roles</span> <td> <span class="property-name">id</span>
</td> </td>
<td> <span class="datatype-reference">array of string <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">credentialsNonExpired</span> <td> <span class="property-name">username</span>
</td> </td>
<td> <span class="datatype-reference">boolean <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -157,13 +157,13 @@ ...@@ -157,13 +157,13 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;accountNonExpired&quot; : true,
&quot;enabled&quot; : true, &quot;enabled&quot; : true,
&quot;credentialsNonExpired&quot; : true,
&quot;accountNonLocked&quot; : true, &quot;accountNonLocked&quot; : true,
&quot;username&quot; : &quot;user&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;accountNonExpired&quot; : true, &quot;username&quot; : &quot;user&quot;,
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;credentialsNonExpired&quot; : true,
&quot;password&quot; : &quot;...&quot; &quot;password&quot; : &quot;...&quot;
}</pre> }</pre>
......
This diff is collapsed.
...@@ -160,21 +160,21 @@ Content-Type: application/json ...@@ -160,21 +160,21 @@ Content-Type: application/json
[ { [ {
&quot;host&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;result&quot; : { &quot;result&quot; : {
&quot;stderr&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;start&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;end&quot; : &quot;...&quot;,
&quot;stdout&quot; : &quot;...&quot;, &quot;stderr&quot; : &quot;...&quot;,
&quot;msg&quot; : &quot;...&quot; &quot;msg&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;stdout&quot; : &quot;...&quot;
}, },
&quot;vmType&quot; : &quot;...&quot;, &quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;provisionID&quot; : &quot;...&quot;, &quot;provisionID&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} ] } ]
</code> </code>
</pre> </pre>
...@@ -584,21 +584,21 @@ Content-Type: application/json ...@@ -584,21 +584,21 @@ Content-Type: application/json
{ {
&quot;host&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;result&quot; : { &quot;result&quot; : {
&quot;stderr&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;start&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;end&quot; : &quot;...&quot;,
&quot;stdout&quot; : &quot;...&quot;, &quot;stderr&quot; : &quot;...&quot;,
&quot;msg&quot; : &quot;...&quot; &quot;msg&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;,
&quot;changed&quot; : true,
&quot;stdout&quot; : &quot;...&quot;
}, },
&quot;vmType&quot; : &quot;...&quot;, &quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;provisionID&quot; : &quot;...&quot;, &quot;provisionID&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
......
...@@ -139,15 +139,15 @@ Content-Type: application/json ...@@ -139,15 +139,15 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
[ { [ {
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;, &quot;delta&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;start&quot; : &quot;...&quot;, &quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;,
&quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;host&quot; : &quot;...&quot;, &quot;timestamp&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} ] } ]
</code> </code>
</pre> </pre>
...@@ -481,15 +481,15 @@ Content-Type: application/json ...@@ -481,15 +481,15 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : &quot;...&quot;, &quot;delta&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;, &quot;host&quot; : &quot;...&quot;,
&quot;start&quot; : &quot;...&quot;, &quot;start&quot; : &quot;...&quot;,
&quot;end&quot; : &quot;...&quot;,
&quot;vmType&quot; : &quot;...&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
&quot;host&quot; : &quot;...&quot;, &quot;timestamp&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
......
...@@ -231,11 +231,11 @@ Accept: application/json ...@@ -231,11 +231,11 @@ Accept: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;managerType&quot; : &quot;ansible&quot;, &quot;managerType&quot; : &quot;ansible&quot;,
&quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
...@@ -397,11 +397,11 @@ Content-Type: application/json ...@@ -397,11 +397,11 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;managerType&quot; : &quot;ansible&quot;, &quot;managerType&quot; : &quot;ansible&quot;,
&quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
...@@ -587,37 +587,37 @@ Content-Type: application/json ...@@ -587,37 +587,37 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;keyPair&quot; : { &quot;keyPair&quot; : {
&quot;publicKey&quot; : { &quot;privateKey&quot; : {
&quot;name&quot; : &quot;id_dsa.pub&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;domain_name:Virginia&quot;, &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
&quot;property2&quot; : &quot;domain_name:Virginia&quot; &quot;property2&quot; : &quot;domain_name:Virginia&quot;
}, },
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
&quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
&quot;name&quot; : &quot;id_dsa.pub&quot;
}, },
&quot;privateKey&quot; : { &quot;publicKey&quot; : {
&quot;name&quot; : &quot;id_dsa.pub&quot;,
&quot;type&quot; : &quot;PRIVATE&quot;,
&quot;attributes&quot; : { &quot;attributes&quot; : {
&quot;property1&quot; : &quot;domain_name:Virginia&quot;, &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
&quot;property2&quot; : &quot;domain_name:Virginia&quot; &quot;property2&quot; : &quot;domain_name:Virginia&quot;
}, },
&quot;type&quot; : &quot;PRIVATE&quot;, &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
&quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
&quot;name&quot; : &quot;id_dsa.pub&quot;
}, },
&quot;keyPairId&quot; : &quot;...&quot;, &quot;keyPairId&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
}, },
&quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;managerType&quot; : &quot;ansible&quot;, &quot;managerType&quot; : &quot;ansible&quot;,
&quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
......
...@@ -126,9 +126,9 @@ Accept: text/xml ...@@ -126,9 +126,9 @@ Accept: text/xml
<code class="prettyprint language-xml"> <code class="prettyprint language-xml">
&lt;deploy&gt; &lt;deploy&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/deploy&gt; &lt;/deploy&gt;
</code> </code>
...@@ -210,9 +210,9 @@ Accept: text/xml ...@@ -210,9 +210,9 @@ Accept: text/xml
<code class="prettyprint language-xml"> <code class="prettyprint language-xml">
&lt;deploy&gt; &lt;deploy&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/deploy&gt; &lt;/deploy&gt;
</code> </code>
......
...@@ -308,17 +308,17 @@ Accept: application/json ...@@ -308,17 +308,17 @@ Accept: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
&quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;, &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
&quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ], &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;keyValue&quot; : { &quot;keyValue&quot; : {
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
...@@ -405,17 +405,17 @@ Content-Type: application/json ...@@ -405,17 +405,17 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
&quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;, &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
&quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ], &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;keyValue&quot; : { &quot;keyValue&quot; : {
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
...@@ -605,27 +605,27 @@ Content-Type: application/json ...@@ -605,27 +605,27 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;deployParameters&quot; : [ { &quot;deployParameters&quot; : [ {
&quot;role&quot; : &quot;slave&quot;,
&quot;user&quot; : &quot;vm_user&quot;, &quot;user&quot; : &quot;vm_user&quot;,
&quot;role&quot; : &quot;slave&quot;,
&quot;IP&quot; : &quot;52.73.245.157&quot; &quot;IP&quot; : &quot;52.73.245.157&quot;
}, { }, {
&quot;role&quot; : &quot;...&quot;,
&quot;user&quot; : &quot;...&quot;, &quot;user&quot; : &quot;...&quot;,
&quot;role&quot; : &quot;...&quot;,
&quot;IP&quot; : &quot;...&quot; &quot;IP&quot; : &quot;...&quot;
} ], } ],
&quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
&quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;, &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
&quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ], &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
&quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ], &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
&quot;keyValue&quot; : { &quot;keyValue&quot; : {
&quot;property1&quot; : { }, &quot;property1&quot; : { },
&quot;property2&quot; : { } &quot;property2&quot; : { }
}, },
&quot;owner&quot; : &quot;user1&quot;, &quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
......
...@@ -126,9 +126,9 @@ Accept: text/xml ...@@ -126,9 +126,9 @@ Accept: text/xml
<code class="prettyprint language-xml"> <code class="prettyprint language-xml">
&lt;execute&gt; &lt;execute&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/execute&gt; &lt;/execute&gt;
</code> </code>
...@@ -215,9 +215,9 @@ Accept: application/json ...@@ -215,9 +215,9 @@ Accept: application/json
<code class="prettyprint language-xml"> <code class="prettyprint language-xml">
&lt;upload&gt; &lt;upload&gt;
&lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
&lt;pwd&gt;...&lt;/pwd&gt;
&lt;user&gt;...&lt;/user&gt; &lt;user&gt;...&lt;/user&gt;
&lt;pwd&gt;...&lt;/pwd&gt;
&lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
&lt;/upload&gt; &lt;/upload&gt;
</code> </code>
......
...@@ -157,11 +157,11 @@ Accept: application/json ...@@ -157,11 +157,11 @@ Accept: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;name&quot; : &quot;config.sh&quot;, &quot;name&quot; : &quot;config.sh&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
...@@ -393,11 +393,11 @@ Content-Type: application/json ...@@ -393,11 +393,11 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;name&quot; : &quot;config.sh&quot;, &quot;name&quot; : &quot;config.sh&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
...@@ -679,11 +679,11 @@ Content-Type: application/json ...@@ -679,11 +679,11 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;name&quot; : &quot;config.sh&quot;, &quot;name&quot; : &quot;config.sh&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;contents&quot; : &quot; #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n . ~/.coolrc\\nfi&quot;,
&quot;timestamp&quot; : 12345,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 12345 &quot;owner&quot; : &quot;user1&quot;
} }
</code> </code>
</pre> </pre>
......
...@@ -140,13 +140,13 @@ Content-Type: application/json ...@@ -140,13 +140,13 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
[ { [ {
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;accountNonExpired&quot; : true,
&quot;enabled&quot; : true, &quot;enabled&quot; : true,
&quot;credentialsNonExpired&quot; : true,
&quot;accountNonLocked&quot; : true, &quot;accountNonLocked&quot; : true,
&quot;username&quot; : &quot;user&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;accountNonExpired&quot; : true, &quot;username&quot; : &quot;user&quot;,
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;credentialsNonExpired&quot; : true,
&quot;password&quot; : &quot;...&quot; &quot;password&quot; : &quot;...&quot;
} ] } ]
</code> </code>
...@@ -314,13 +314,13 @@ Accept: application/json ...@@ -314,13 +314,13 @@ Accept: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;accountNonExpired&quot; : true,
&quot;enabled&quot; : true, &quot;enabled&quot; : true,
&quot;credentialsNonExpired&quot; : true,
&quot;accountNonLocked&quot; : true, &quot;accountNonLocked&quot; : true,
&quot;username&quot; : &quot;user&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;accountNonExpired&quot; : true, &quot;username&quot; : &quot;user&quot;,
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;credentialsNonExpired&quot; : true,
&quot;password&quot; : &quot;...&quot; &quot;password&quot; : &quot;...&quot;
} }
</code> </code>
...@@ -428,13 +428,13 @@ Accept: application/json ...@@ -428,13 +428,13 @@ Accept: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;accountNonExpired&quot; : true,
&quot;enabled&quot; : true, &quot;enabled&quot; : true,
&quot;credentialsNonExpired&quot; : true,
&quot;accountNonLocked&quot; : true, &quot;accountNonLocked&quot; : true,
&quot;username&quot; : &quot;user&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;accountNonExpired&quot; : true, &quot;username&quot; : &quot;user&quot;,
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;credentialsNonExpired&quot; : true,
&quot;password&quot; : &quot;...&quot; &quot;password&quot; : &quot;...&quot;
} }
</code> </code>
...@@ -636,13 +636,13 @@ Content-Type: application/json ...@@ -636,13 +636,13 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;accountNonExpired&quot; : true,
&quot;enabled&quot; : true, &quot;enabled&quot; : true,
&quot;credentialsNonExpired&quot; : true,
&quot;accountNonLocked&quot; : true, &quot;accountNonLocked&quot; : true,
&quot;username&quot; : &quot;user&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;accountNonExpired&quot; : true, &quot;username&quot; : &quot;user&quot;,
&quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
&quot;credentialsNonExpired&quot; : true,
&quot;password&quot; : &quot;...&quot; &quot;password&quot; : &quot;...&quot;
} }
</code> </code>
......
...@@ -132,9 +132,9 @@ Accept: application/json ...@@ -132,9 +132,9 @@ Accept: application/json
<code class="prettyprint language-xml"> <code class="prettyprint language-xml">
&lt;confUserKey&gt; &lt;confUserKey&gt;
&lt;userKey level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/userKey&gt; &lt;userKey level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/userKey&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/confUserKey&gt; &lt;/confUserKey&gt;
</code> </code>
......
...@@ -131,9 +131,9 @@ Accept: application/json ...@@ -131,9 +131,9 @@ Accept: application/json
<code class="prettyprint language-xml"> <code class="prettyprint language-xml">
&lt;confScript&gt; &lt;confScript&gt;
&lt;script&gt;#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash &quot;$logstashScript&quot;\n\n\nlogLevelPath=/root/\nlogLevelFile=$logLevelPath/logstash_loglevel.csv\nremotePath=/media/lobcder/skoulouz/\nremoteLogPath=$remotePath/logs\nlocalLogPath=/root/logs\n\nmkdir $localLogPath\n\n\nfor logArchPath in $remoteLogPath/*.gz; do\n echo &quot;File -&amp;gt; $logArchPath&quot;\n if [ ! -f $logArchPath.lock ]; then\n touch $logArchPath.lock\n cp $logArchPath $localLogPath\n logArchName=$(basename $logArchPath)\n tar -xvf $localLogPath/$logArchName -C $localLogPath\n sleep 120\n modTime=-100\n while [ ! -f $logLevelFile ]\n do\n sleep 5\n done\n while [ $modTime -lt 120 ]\n do\n moddate=$(stat -c %Y $logLevelFile)\n moddate=${moddate%% *}\n now=$(date +%s)\n modTime=&quot;$(( $now - $moddate))&quot;\n echo $modTime\n sleep 5\n done\n rm $localLogPath/*.tar.gz\n rm $localLogPath/*.log\n modTime=-100\n fi\ndone\n \n\nscreen -X -S logstash quit\nsleep 5\n\nuid=`ifconfig | grep eth0 | awk &#39;{print $NF}&#39; | sed &#39;s/://g&#39;`\n\nfor csvFiles in $logLevelPath/*.csv; do\n echo $csvFiles $csvFiles$uid.csv\n mv $csvFiles $csvFiles$uid.csv\n cp $csvFiles$uid.csv $remotePath\ndone\n\nkillall java \n&lt;/script&gt; &lt;script&gt;#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash &quot;$logstashScript&quot;\n\n\nlogLevelPath=/root/\nlogLevelFile=$logLevelPath/logstash_loglevel.csv\nremotePath=/media/lobcder/skoulouz/\nremoteLogPath=$remotePath/logs\nlocalLogPath=/root/logs\n\nmkdir $localLogPath\n\n\nfor logArchPath in $remoteLogPath/*.gz; do\n echo &quot;File -&amp;gt; $logArchPath&quot;\n if [ ! -f $logArchPath.lock ]; then\n touch $logArchPath.lock\n cp $logArchPath $localLogPath\n logArchName=$(basename $logArchPath)\n tar -xvf $localLogPath/$logArchName -C $localLogPath\n sleep 120\n modTime=-100\n while [ ! -f $logLevelFile ]\n do\n sleep 5\n done\n while [ $modTime -lt 120 ]\n do\n moddate=$(stat -c %Y $logLevelFile)\n moddate=${moddate%% *}\n now=$(date +%s)\n modTime=&quot;$(( $now - $moddate))&quot;\n echo $modTime\n sleep 5\n done\n rm $localLogPath/*.tar.gz\n rm $localLogPath/*.log\n modTime=-100\n fi\ndone\n \n\nscreen -X -S logstash quit\nsleep 5\n\nuid=`ifconfig | grep eth0 | awk &#39;{print $NF}&#39; | sed &#39;s/://g&#39;`\n\nfor csvFiles in $logLevelPath/*.csv; do\n echo $csvFiles $csvFiles$uid.csv\n mv $csvFiles $csvFiles$uid.csv\n cp $csvFiles$uid.csv $remotePath\ndone\n\nkillall java \n&lt;/script&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/confScript&gt; &lt;/confScript&gt;
</code> </code>
......
...@@ -224,13 +224,17 @@ machine the keys correspond to.</span> ...@@ -224,13 +224,17 @@ machine the keys correspond to.</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/ids</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/ids</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/{id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/{id}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/plan/{tosca_id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/plan/{tosca_id}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/post/{name}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/tosca/{id}</span> </samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/tosca/{id}</span>
</samp></li><li><samp> <span class="resource-path">/user/v1.0/planner/post/{level}/{name}/{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">DELETE</span> <td class="text-nowrap"><ul class="list-unstyled"><li><samp> <span class="label label-default resource-method">DELETE</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">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><li><samp> <span class="label label-default resource-method">GET</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">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">GET</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li></ul></td> </samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for planing the type of resources to be <td> <span class="resource-description">This controller is responsible for planing the type of resources to be
provisopned based on a TOSCA description.</span> provisopned based on a TOSCA description.</span>
......
...@@ -193,12 +193,12 @@ ...@@ -193,12 +193,12 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;a-----&gt; <pre class="prettyprint language-xml example">&lt;a-----&gt;
&lt;provisionID&gt;...&lt;/provisionID&gt;
&lt;host&gt;...&lt;/host&gt;
&lt;vmType&gt;...&lt;/vmType&gt;
&lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt; &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt; &lt;vmType&gt;...&lt;/vmType&gt;
&lt;host&gt;...&lt;/host&gt;
&lt;provisionID&gt;...&lt;/provisionID&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/a-----&gt; &lt;/a-----&gt;
</pre> </pre>
......
...@@ -231,14 +231,14 @@ ...@@ -231,14 +231,14 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;b-----&gt; <pre class="prettyprint language-xml example">&lt;b-----&gt;
&lt;host&gt;...&lt;/host&gt;
&lt;vmType&gt;...&lt;/vmType&gt; &lt;vmType&gt;...&lt;/vmType&gt;
&lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;end&gt;...&lt;/end&gt; &lt;end&gt;...&lt;/end&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
&lt;start&gt;...&lt;/start&gt; &lt;start&gt;...&lt;/start&gt;
&lt;host&gt;...&lt;/host&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/b-----&gt; &lt;/b-----&gt;
</pre> </pre>
......
...@@ -100,6 +100,24 @@ ...@@ -100,6 +100,24 @@
</td> </td>
<td> <span class="property-minMaxOccurs">0/1 <td> <span class="property-minMaxOccurs">0/1
</span> </span>
</td>
<td> <span class="property-description">&nbsp;</span>
</td>
</tr>
<tr>
<td> <span class="property-name">attributes</span>
</td>
<td> <span class="datatype-reference">(custom)
</span>
</td>
<td> <span class="property-type">element
</span>
</td>
<td> <span class="property-namespaceInfo">
</span>
</td>
<td> <span class="property-minMaxOccurs">0/1
</span>
</td> </td>
<td> <span class="property-description">&nbsp;</span> <td> <span class="property-description">&nbsp;</span>
</td> </td>
...@@ -193,28 +211,29 @@ ...@@ -193,28 +211,29 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;c-----&gt; <pre class="prettyprint language-xml example">&lt;c-----&gt;
&lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
&lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
&lt;cloudProviderName&gt;ec2&lt;/cloudProviderName&gt;
&lt;keyPairs&gt; &lt;keyPairs&gt;
&lt;privateKey&gt;
&lt;type&gt;PRIVATE&lt;/type&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;/privateKey&gt;
&lt;publicKey&gt; &lt;publicKey&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;type&gt;PRIVATE&lt;/type&gt; &lt;type&gt;PRIVATE&lt;/type&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt; &lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt; &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;/publicKey&gt; &lt;/publicKey&gt;
&lt;keyPairId&gt;...&lt;/keyPairId&gt; &lt;keyPairId&gt;...&lt;/keyPairId&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt; &lt;privateKey&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;type&gt;PRIVATE&lt;/type&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;/privateKey&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/keyPairs&gt; &lt;/keyPairs&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt; &lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
&lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
&lt;cloudProviderName&gt;ec2&lt;/cloudProviderName&gt;
&lt;attributes&gt;...&lt;/attributes&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/c-----&gt; &lt;/c-----&gt;
</pre> </pre>
......
...@@ -152,9 +152,9 @@ ...@@ -152,9 +152,9 @@
<pre class="prettyprint language-xml example">&lt;confScript&gt; <pre class="prettyprint language-xml example">&lt;confScript&gt;
&lt;script&gt;#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash &quot;$logstashScript&quot;\n\n\nlogLevelPath=/root/\nlogLevelFile=$logLevelPath/logstash_loglevel.csv\nremotePath=/media/lobcder/skoulouz/\nremoteLogPath=$remotePath/logs\nlocalLogPath=/root/logs\n\nmkdir $localLogPath\n\n\nfor logArchPath in $remoteLogPath/*.gz; do\n echo &quot;File -&amp;gt; $logArchPath&quot;\n if [ ! -f $logArchPath.lock ]; then\n touch $logArchPath.lock\n cp $logArchPath $localLogPath\n logArchName=$(basename $logArchPath)\n tar -xvf $localLogPath/$logArchName -C $localLogPath\n sleep 120\n modTime=-100\n while [ ! -f $logLevelFile ]\n do\n sleep 5\n done\n while [ $modTime -lt 120 ]\n do\n moddate=$(stat -c %Y $logLevelFile)\n moddate=${moddate%% *}\n now=$(date +%s)\n modTime=&quot;$(( $now - $moddate))&quot;\n echo $modTime\n sleep 5\n done\n rm $localLogPath/*.tar.gz\n rm $localLogPath/*.log\n modTime=-100\n fi\ndone\n \n\nscreen -X -S logstash quit\nsleep 5\n\nuid=`ifconfig | grep eth0 | awk &#39;{print $NF}&#39; | sed &#39;s/://g&#39;`\n\nfor csvFiles in $logLevelPath/*.csv; do\n echo $csvFiles $csvFiles$uid.csv\n mv $csvFiles $csvFiles$uid.csv\n cp $csvFiles$uid.csv $remotePath\ndone\n\nkillall java \n&lt;/script&gt; &lt;script&gt;#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash &quot;$logstashScript&quot;\n\n\nlogLevelPath=/root/\nlogLevelFile=$logLevelPath/logstash_loglevel.csv\nremotePath=/media/lobcder/skoulouz/\nremoteLogPath=$remotePath/logs\nlocalLogPath=/root/logs\n\nmkdir $localLogPath\n\n\nfor logArchPath in $remoteLogPath/*.gz; do\n echo &quot;File -&amp;gt; $logArchPath&quot;\n if [ ! -f $logArchPath.lock ]; then\n touch $logArchPath.lock\n cp $logArchPath $localLogPath\n logArchName=$(basename $logArchPath)\n tar -xvf $localLogPath/$logArchName -C $localLogPath\n sleep 120\n modTime=-100\n while [ ! -f $logLevelFile ]\n do\n sleep 5\n done\n while [ $modTime -lt 120 ]\n do\n moddate=$(stat -c %Y $logLevelFile)\n moddate=${moddate%% *}\n now=$(date +%s)\n modTime=&quot;$(( $now - $moddate))&quot;\n echo $modTime\n sleep 5\n done\n rm $localLogPath/*.tar.gz\n rm $localLogPath/*.log\n modTime=-100\n fi\ndone\n \n\nscreen -X -S logstash quit\nsleep 5\n\nuid=`ifconfig | grep eth0 | awk &#39;{print $NF}&#39; | sed &#39;s/://g&#39;`\n\nfor csvFiles in $logLevelPath/*.csv; do\n echo $csvFiles $csvFiles$uid.csv\n mv $csvFiles $csvFiles$uid.csv\n cp $csvFiles$uid.csv $remotePath\ndone\n\nkillall java \n&lt;/script&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/confScript&gt; &lt;/confScript&gt;
</pre> </pre>
......
...@@ -152,9 +152,9 @@ ...@@ -152,9 +152,9 @@
<pre class="prettyprint language-xml example">&lt;confUserKey&gt; <pre class="prettyprint language-xml example">&lt;confUserKey&gt;
&lt;userKey level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/userKey&gt; &lt;userKey level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/userKey&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/confUserKey&gt; &lt;/confUserKey&gt;
</pre> </pre>
......
...@@ -272,16 +272,16 @@ ...@@ -272,16 +272,16 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;configure&gt; <pre class="prettyprint language-xml example">&lt;configure&gt;
&lt;pwd&gt;123&lt;/pwd&gt; &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
&lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt; &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
&lt;geniKey&gt;/u3+7QAAAAIAAAABAWuf2AAACvDCCArgwDgYKKwYBBEBAQUABIIC\npKlNUfpKLNCy0h8P4L5XeECwwIN/tezeaOVsjvzLsXeiBsB/luYv9gttoeKFbcJb/IDpZr\nfpL1tjF8Sed6g38kNoWwnVVoNZ1ILpITjESL6FkZW+gGAPS+XHp8l52/2DjeECQlx+38GlFUftWP\nn3QH9bDYD+7sRtm4P0YWnekX67ltQHMV+Cyrg0HAFm+GUzJJoxu64MccURLBMw0If9gCmTOuVoRj\nprPukU+cMY8torQ3+WmzC0S6U10HjQ2AkJ80HwM6CcS82qflHIBfQ/o7ep76rCDN22widcLGOihU\nbJiNQtNdF6KRCJk0emVIvRHDHctsmmt2ao2Qx6ub2mA/eUZtlphHMVN5VQtSxdd87tKrH9FvaOe3\nGX/irmBBopS2mfFee4LPn3FT/F5bl9YunygX3sWLGNsCl8G15hzgSSVn4As37czUulj8hks/Qpvu\nqoVpegs2+m5mXbSMmif+cUPqyJZ8UL5slIGZMKQ7MJG1XVG6vFIHk3cS+L+NpDd2j8DZqBP5FXIO\nCt/IxZxR2ZfPHHmIbOhwdnaznOoyAEGDzFTXnyTClGTDTW/6zxOe/ynNPlnBQaNqVJYqPtFG4AVs\nhrSNuvYjm1xsVDROQI5LYF/nryU4VvqMTo2sjVP2g6Qw7E5ENWiYUAl2W+bk4H6WGDTdQgLm2J65\ngdZpQTQtubzWi8Fxrptqul5eq96l0xH15XQ9lBKV0J8PEMa1jKOW/9s2U++hAtKTixssVntaNyUY\n9dnXNYHnQRKXDrQr/izerNEhvlVcz6foWDurtjAIjxafyEBbXJ5TAyT4rxmkPxDg88LPXKCzpf1x\n3WwD8MBUNBC9nfB37rHxEl7StvnK3IXBHmEksg7X6xhmUsrsQo8mfP05XDmqt+lsiYoAAAACAAVY\nLjUwOQAAAz8wggM7MIICpKADAgECAgJFBDANBgkqhkiG9w0BAQUFADCBiTEUMBIGA1UEChMLY2gu\nZ2VuaS5uZXQxEjAQBgNVBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBm\nMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5z\nQGdlbmkubmV0MB4XDTE3MDEyNTE0NTY0OVoXDTE4MDEyNTE0NTY0OVowUjEtMCsGA1UEAxMkYmY4\nYThhNTQtN2FjOS00NTEzLWIyZTItYjJjN2U2YWUwMDVkMSEwHwYJKoZIhvcNAQkBFhJzLmtvdWxv\ndXppc0B1dmEubmwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANmwnBJETSZSQm67FxQHL0s6\n84SYlYh6ltgi8DfwRu/wMA8sL5PsuupNvgKJCVHHZzPVwIrUy8JxpFrX3BItaDX+VPR+6sBJqUan\nBeb3vojU6CyEZzwCAOhn9OxB8ZFyoMD6SwsykPBOeXhGKpWsOoBwQDx8i6xpto1AP3KY8DpxAgMB\nAAGjgecwgeQwHQYDVR0OBBYEFNTBvaP5OnG0h8exiS8Ob0ZvfF8FMD4GA1UdIwQ3MDWAFHGlguYe\n8bTQK4umhY/oGl1ifTGuoRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIBAzAJBgNVHRMEAjAA\nMHgGA1UdEQRxMG+BEnMua291bG91emlzQHV2YS5ubIYqdXJuOnB1YmxpY2lkOklETitjaC5nZW5p\nLm5ldCt1c2VyK3Nrb3Vsb3V6hi11cm46dXVpZDpiZjhhOGE1NC03YWM5LTQ1MTMtYjJlMi1iMmM3\nZTZhZTAwNWQwDQYJKoZIhvcNAQEFBQADgYEAP/9ihMCaalsPRBMDozgX2Wd6eFCNYuDIMFTeNkKa\nkWJp156oQ4iAmbtP2R9r4W02gjEQRtUxvBhYI2Rp32wl1ZLdpSwnuZAE1H89dIHTct48VkiI1Zp9\n5BtV4olBUAf2K2hd46pH3ObUAYZvWQGoT+oOlfcacAaEUNp01afC8voABVguNTA5AAADUzCCA08w\nggK4oAMCAQICAQMwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLY2guZ2VuaS5uZXQwHhcNMTMw\nNTIwMTMxODI3WhcNMTgwNTE5MTMxODI3WjCBiTEUMBIGA1UEChMLY2guZ2VuaS5uZXQxEjAQBgNV\nBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBmMDlmLTk1ZjctNDUxMC1h\nMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5zQGdlbmkubmV0MIGfMA0G\nCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4LG9Xl2veo5+Zy1fDi47ajinYu+mv8QYDya2Hf8lPolQy\nlnGFFQRMx/JsbG1BBQ86FqSeUWtvANhY1nRlrozutOBeg9EEfhX+JXvVdhEKQ4/ANliC0V1UR3GO\nJHtQaj/6qoG/q01bWP7EJgf+ZPfTdCgCkJ89v8oth1m3UjCxcQIDAQABo4IBNzCCATMwHQYDVR0O\nBBYEFHGlguYe8bTQK4umhY/oGl1ifTGuMEYGA1UdIwQ/MD2AFEU22V1Y/0L1KwlqbnkdPIMEy5hR\noRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIJAJvH3dZoB97bMEcGCCsGAQUFBwEBBDswOTA3\nBhRpg8yTgKiYzKjHvbGngICqrteKG4YfaHR0cHM6Ly9jaC5nZW5pLm5ldC9jYWluZm8uaHRtbDBz\nBgNVHREEbDBqgRJjaC1hZG1pbnNAZ2VuaS5uZXSGKXVybjpwdWJsaWNpZDpJRE4rY2guZ2VuaS5u\nZXQrYXV0aG9yaXR5K21hhil1dWlkOjMxYzBmMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJj\nOTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHgrtROjbfUT6HQCZCl1XuAEZQPse3/x\nT2smC3LzAH4UUj3gEBq27VvxbqzazdBQCSeBEl2RUd+KoDzmhG5vBbAyHt8UE6s3P7Yx\ngoNYTld0JHB5wq3XFRaaGbeVgo2AuK9S/Q3whzMTRW21a58tLP5zwKGzX3oyQQUT5J\ncwv0z5NmJdAfk8Y=&lt;/geniKey&gt; &lt;user&gt;user&lt;/user&gt;
&lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt; &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt;
&lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;geniKey&gt;/u3+7QAAAAIAAAABAWuf2AAACvDCCArgwDgYKKwYBBEBAQUABIIC\npKlNUfpKLNCy0h8P4L5XeECwwIN/tezeaOVsjvzLsXeiBsB/luYv9gttoeKFbcJb/IDpZr\nfpL1tjF8Sed6g38kNoWwnVVoNZ1ILpITjESL6FkZW+gGAPS+XHp8l52/2DjeECQlx+38GlFUftWP\nn3QH9bDYD+7sRtm4P0YWnekX67ltQHMV+Cyrg0HAFm+GUzJJoxu64MccURLBMw0If9gCmTOuVoRj\nprPukU+cMY8torQ3+WmzC0S6U10HjQ2AkJ80HwM6CcS82qflHIBfQ/o7ep76rCDN22widcLGOihU\nbJiNQtNdF6KRCJk0emVIvRHDHctsmmt2ao2Qx6ub2mA/eUZtlphHMVN5VQtSxdd87tKrH9FvaOe3\nGX/irmBBopS2mfFee4LPn3FT/F5bl9YunygX3sWLGNsCl8G15hzgSSVn4As37czUulj8hks/Qpvu\nqoVpegs2+m5mXbSMmif+cUPqyJZ8UL5slIGZMKQ7MJG1XVG6vFIHk3cS+L+NpDd2j8DZqBP5FXIO\nCt/IxZxR2ZfPHHmIbOhwdnaznOoyAEGDzFTXnyTClGTDTW/6zxOe/ynNPlnBQaNqVJYqPtFG4AVs\nhrSNuvYjm1xsVDROQI5LYF/nryU4VvqMTo2sjVP2g6Qw7E5ENWiYUAl2W+bk4H6WGDTdQgLm2J65\ngdZpQTQtubzWi8Fxrptqul5eq96l0xH15XQ9lBKV0J8PEMa1jKOW/9s2U++hAtKTixssVntaNyUY\n9dnXNYHnQRKXDrQr/izerNEhvlVcz6foWDurtjAIjxafyEBbXJ5TAyT4rxmkPxDg88LPXKCzpf1x\n3WwD8MBUNBC9nfB37rHxEl7StvnK3IXBHmEksg7X6xhmUsrsQo8mfP05XDmqt+lsiYoAAAACAAVY\nLjUwOQAAAz8wggM7MIICpKADAgECAgJFBDANBgkqhkiG9w0BAQUFADCBiTEUMBIGA1UEChMLY2gu\nZ2VuaS5uZXQxEjAQBgNVBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBm\nMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5z\nQGdlbmkubmV0MB4XDTE3MDEyNTE0NTY0OVoXDTE4MDEyNTE0NTY0OVowUjEtMCsGA1UEAxMkYmY4\nYThhNTQtN2FjOS00NTEzLWIyZTItYjJjN2U2YWUwMDVkMSEwHwYJKoZIhvcNAQkBFhJzLmtvdWxv\ndXppc0B1dmEubmwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANmwnBJETSZSQm67FxQHL0s6\n84SYlYh6ltgi8DfwRu/wMA8sL5PsuupNvgKJCVHHZzPVwIrUy8JxpFrX3BItaDX+VPR+6sBJqUan\nBeb3vojU6CyEZzwCAOhn9OxB8ZFyoMD6SwsykPBOeXhGKpWsOoBwQDx8i6xpto1AP3KY8DpxAgMB\nAAGjgecwgeQwHQYDVR0OBBYEFNTBvaP5OnG0h8exiS8Ob0ZvfF8FMD4GA1UdIwQ3MDWAFHGlguYe\n8bTQK4umhY/oGl1ifTGuoRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIBAzAJBgNVHRMEAjAA\nMHgGA1UdEQRxMG+BEnMua291bG91emlzQHV2YS5ubIYqdXJuOnB1YmxpY2lkOklETitjaC5nZW5p\nLm5ldCt1c2VyK3Nrb3Vsb3V6hi11cm46dXVpZDpiZjhhOGE1NC03YWM5LTQ1MTMtYjJlMi1iMmM3\nZTZhZTAwNWQwDQYJKoZIhvcNAQEFBQADgYEAP/9ihMCaalsPRBMDozgX2Wd6eFCNYuDIMFTeNkKa\nkWJp156oQ4iAmbtP2R9r4W02gjEQRtUxvBhYI2Rp32wl1ZLdpSwnuZAE1H89dIHTct48VkiI1Zp9\n5BtV4olBUAf2K2hd46pH3ObUAYZvWQGoT+oOlfcacAaEUNp01afC8voABVguNTA5AAADUzCCA08w\nggK4oAMCAQICAQMwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLY2guZ2VuaS5uZXQwHhcNMTMw\nNTIwMTMxODI3WhcNMTgwNTE5MTMxODI3WjCBiTEUMBIGA1UEChMLY2guZ2VuaS5uZXQxEjAQBgNV\nBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBmMDlmLTk1ZjctNDUxMC1h\nMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5zQGdlbmkubmV0MIGfMA0G\nCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4LG9Xl2veo5+Zy1fDi47ajinYu+mv8QYDya2Hf8lPolQy\nlnGFFQRMx/JsbG1BBQ86FqSeUWtvANhY1nRlrozutOBeg9EEfhX+JXvVdhEKQ4/ANliC0V1UR3GO\nJHtQaj/6qoG/q01bWP7EJgf+ZPfTdCgCkJ89v8oth1m3UjCxcQIDAQABo4IBNzCCATMwHQYDVR0O\nBBYEFHGlguYe8bTQK4umhY/oGl1ifTGuMEYGA1UdIwQ/MD2AFEU22V1Y/0L1KwlqbnkdPIMEy5hR\noRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIJAJvH3dZoB97bMEcGCCsGAQUFBwEBBDswOTA3\nBhRpg8yTgKiYzKjHvbGngICqrteKG4YfaHR0cHM6Ly9jaC5nZW5pLm5ldC9jYWluZm8uaHRtbDBz\nBgNVHREEbDBqgRJjaC1hZG1pbnNAZ2VuaS5uZXSGKXVybjpwdWJsaWNpZDpJRE4rY2guZ2VuaS5u\nZXQrYXV0aG9yaXR5K21hhil1dWlkOjMxYzBmMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJj\nOTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHgrtROjbfUT6HQCZCl1XuAEZQPse3/x\nT2smC3LzAH4UUj3gEBq27VvxbqzazdBQCSeBEl2RUd+KoDzmhG5vBbAyHt8UE6s3P7Yx\ngoNYTld0JHB5wq3XFRaaGbeVgo2AuK9S/Q3whzMTRW21a58tLP5zwKGzX3oyQQUT5J\ncwv0z5NmJdAfk8Y=&lt;/geniKey&gt;
&lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt; &lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
&lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt; &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
&lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
&lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
&lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt; &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
&lt;user&gt;user&lt;/user&gt;
&lt;/configure&gt; &lt;/configure&gt;
</pre> </pre>
......
...@@ -133,9 +133,9 @@ ...@@ -133,9 +133,9 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;deploy&gt; <pre class="prettyprint language-xml example">&lt;deploy&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/deploy&gt; &lt;/deploy&gt;
</pre> </pre>
......
...@@ -147,8 +147,8 @@ ...@@ -147,8 +147,8 @@
<pre class="prettyprint language-xml example">&lt;d-----&gt; <pre class="prettyprint language-xml example">&lt;d-----&gt;
&lt;IP&gt;52.73.245.157&lt;/IP&gt; &lt;IP&gt;52.73.245.157&lt;/IP&gt;
&lt;user&gt;vm_user&lt;/user&gt;
&lt;role&gt;slave&lt;/role&gt; &lt;role&gt;slave&lt;/role&gt;
&lt;user&gt;vm_user&lt;/user&gt;
&lt;/d-----&gt; &lt;/d-----&gt;
</pre> </pre>
......
...@@ -180,8 +180,8 @@ ...@@ -180,8 +180,8 @@
&lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt; &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
&lt;managerType&gt;ansible&lt;/managerType&gt; &lt;managerType&gt;ansible&lt;/managerType&gt;
&lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt; &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/d-----&gt; &lt;/d-----&gt;
</pre> </pre>
......
...@@ -184,8 +184,8 @@ ...@@ -184,8 +184,8 @@
&lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt; &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
&lt;managerType&gt;ansible&lt;/managerType&gt; &lt;managerType&gt;ansible&lt;/managerType&gt;
&lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt; &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/d-----&gt; &lt;/d-----&gt;
</pre> </pre>
......
...@@ -148,9 +148,9 @@ ...@@ -148,9 +148,9 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;execute&gt; <pre class="prettyprint language-xml example">&lt;execute&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt; &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
&lt;user&gt;user&lt;/user&gt; &lt;user&gt;user&lt;/user&gt;
&lt;pwd&gt;123&lt;/pwd&gt;
&lt;/execute&gt; &lt;/execute&gt;
</pre> </pre>
......
...@@ -164,10 +164,10 @@ ...@@ -164,10 +164,10 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;k-----&gt; <pre class="prettyprint language-xml example">&lt;k-----&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;type&gt;PRIVATE&lt;/type&gt; &lt;type&gt;PRIVATE&lt;/type&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt; &lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt; &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;/k-----&gt; &lt;/k-----&gt;
</pre> </pre>
......
...@@ -175,21 +175,21 @@ ...@@ -175,21 +175,21 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;k-----&gt; <pre class="prettyprint language-xml example">&lt;k-----&gt;
&lt;privateKey&gt;
&lt;type&gt;PRIVATE&lt;/type&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;/privateKey&gt;
&lt;publicKey&gt; &lt;publicKey&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;type&gt;PRIVATE&lt;/type&gt; &lt;type&gt;PRIVATE&lt;/type&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt; &lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt; &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;/publicKey&gt; &lt;/publicKey&gt;
&lt;keyPairId&gt;...&lt;/keyPairId&gt; &lt;keyPairId&gt;...&lt;/keyPairId&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt; &lt;privateKey&gt;
&lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
&lt;type&gt;PRIVATE&lt;/type&gt;
&lt;name&gt;id_dsa.pub&lt;/name&gt;
&lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
&lt;/privateKey&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/k-----&gt; &lt;/k-----&gt;
</pre> </pre>
......
...@@ -123,8 +123,8 @@ ...@@ -123,8 +123,8 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;k-----&gt; <pre class="prettyprint language-xml example">&lt;k-----&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/k-----&gt; &lt;/k-----&gt;
</pre> </pre>
......
...@@ -130,8 +130,8 @@ ...@@ -130,8 +130,8 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;o-----&gt; <pre class="prettyprint language-xml example">&lt;o-----&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/o-----&gt; &lt;/o-----&gt;
</pre> </pre>
......
This diff is collapsed.
...@@ -175,11 +175,11 @@ ...@@ -175,11 +175,11 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;p-----&gt; <pre class="prettyprint language-xml example">&lt;p-----&gt;
&lt;name&gt;planner_output_all.yml&lt;/name&gt;
&lt;toscaID&gt;58e3946e0fb4f562d84ba1ad&lt;/toscaID&gt; &lt;toscaID&gt;58e3946e0fb4f562d84ba1ad&lt;/toscaID&gt;
&lt;level&gt;0&lt;/level&gt; &lt;level&gt;0&lt;/level&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt; &lt;name&gt;planner_output_all.yml&lt;/name&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/p-----&gt; &lt;/p-----&gt;
</pre> </pre>
......
...@@ -121,8 +121,8 @@ ...@@ -121,8 +121,8 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;p-----&gt; <pre class="prettyprint language-xml example">&lt;p-----&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/p-----&gt; &lt;/p-----&gt;
</pre> </pre>
......
...@@ -195,12 +195,12 @@ ...@@ -195,12 +195,12 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;p-----&gt; <pre class="prettyprint language-xml example">&lt;p-----&gt;
&lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
&lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
&lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt; &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
&lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
&lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt; &lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt; &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/p-----&gt; &lt;/p-----&gt;
</pre> </pre>
......
...@@ -210,16 +210,16 @@ ...@@ -210,16 +210,16 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;p-----&gt; <pre class="prettyprint language-xml example">&lt;p-----&gt;
&lt;cloudKeyPairIDs&gt;...&lt;/cloudKeyPairIDs&gt;
&lt;deployParameters&gt; &lt;deployParameters&gt;
&lt;IP&gt;52.73.245.157&lt;/IP&gt; &lt;IP&gt;52.73.245.157&lt;/IP&gt;
&lt;user&gt;vm_user&lt;/user&gt;
&lt;role&gt;slave&lt;/role&gt; &lt;role&gt;slave&lt;/role&gt;
&lt;user&gt;vm_user&lt;/user&gt;
&lt;/deployParameters&gt; &lt;/deployParameters&gt;
&lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt; &lt;cloudKeyPairIDs&gt;...&lt;/cloudKeyPairIDs&gt;
&lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
&lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt; &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
&lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
&lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt; &lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt;
&lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
&lt;/p-----&gt; &lt;/p-----&gt;
</pre> </pre>
......
...@@ -157,13 +157,13 @@ ...@@ -157,13 +157,13 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;s-----&gt; <pre class="prettyprint language-xml example">&lt;s-----&gt;
&lt;name&gt;config.sh&lt;/name&gt;
&lt;contents&gt; #!/bin/bash &lt;contents&gt; #!/bin/bash
echo &quot;Reading system-wide config....&quot; &amp;gt;&amp;amp;2\n. /etc/cool.cfg echo &quot;Reading system-wide config....&quot; &amp;gt;&amp;amp;2\n. /etc/cool.cfg
if [ -r ~/.coolrc ]; then if [ -r ~/.coolrc ]; then
echo &quot;Reading user config....&quot; &amp;gt;&amp;amp;2\n . ~/.coolrc\nfi&lt;/contents&gt; echo &quot;Reading user config....&quot; &amp;gt;&amp;amp;2\n . ~/.coolrc\nfi&lt;/contents&gt;
&lt;name&gt;config.sh&lt;/name&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/s-----&gt; &lt;/s-----&gt;
</pre> </pre>
......
...@@ -432,27 +432,27 @@ ...@@ -432,27 +432,27 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;s-----&gt; <pre class="prettyprint language-xml example">&lt;s-----&gt;
&lt;avgExecTimePerThread&gt;...&lt;/avgExecTimePerThread&gt; &lt;avgEventsPerThread&gt;...&lt;/avgEventsPerThread&gt;
&lt;stddevExecTimePerThread&gt;...&lt;/stddevExecTimePerThread&gt;
&lt;sysbenchVersion&gt;...&lt;/sysbenchVersion&gt;
&lt;stddevEventsPerThread&gt;...&lt;/stddevEventsPerThread&gt;
&lt;avgExecutionTimePerRequest&gt;...&lt;/avgExecutionTimePerRequest&gt; &lt;avgExecutionTimePerRequest&gt;...&lt;/avgExecutionTimePerRequest&gt;
&lt;approx95Percentile&gt;...&lt;/approx95Percentile&gt;
&lt;ansibleOutputID&gt;...&lt;/ansibleOutputID&gt;
&lt;numberOfThreads&gt;...&lt;/numberOfThreads&gt; &lt;numberOfThreads&gt;...&lt;/numberOfThreads&gt;
&lt;maxExecutionTimePerRequest&gt;...&lt;/maxExecutionTimePerRequest&gt; &lt;maxExecutionTimePerRequest&gt;...&lt;/maxExecutionTimePerRequest&gt;
&lt;approx95Percentile&gt;...&lt;/approx95Percentile&gt;
&lt;totalNumberOfEvents&gt;...&lt;/totalNumberOfEvents&gt;
&lt;executionTime&gt;...&lt;/executionTime&gt; &lt;executionTime&gt;...&lt;/executionTime&gt;
&lt;avgExecTimePerThread&gt;...&lt;/avgExecTimePerThread&gt;
&lt;totalNumberOfEvents&gt;...&lt;/totalNumberOfEvents&gt;
&lt;stddevEventsPerThread&gt;...&lt;/stddevEventsPerThread&gt;
&lt;stddevExecTimePerThread&gt;...&lt;/stddevExecTimePerThread&gt;
&lt;sysbenchVersion&gt;...&lt;/sysbenchVersion&gt;
&lt;minExecutionTimePerRequest&gt;...&lt;/minExecutionTimePerRequest&gt; &lt;minExecutionTimePerRequest&gt;...&lt;/minExecutionTimePerRequest&gt;
&lt;ansibleOutputID&gt;...&lt;/ansibleOutputID&gt; &lt;host&gt;...&lt;/host&gt;
&lt;avgEventsPerThread&gt;...&lt;/avgEventsPerThread&gt;
&lt;vmType&gt;...&lt;/vmType&gt; &lt;vmType&gt;...&lt;/vmType&gt;
&lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;end&gt;...&lt;/end&gt; &lt;end&gt;...&lt;/end&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
&lt;start&gt;...&lt;/start&gt; &lt;start&gt;...&lt;/start&gt;
&lt;host&gt;...&lt;/host&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/s-----&gt; &lt;/s-----&gt;
</pre> </pre>
......
...@@ -140,8 +140,8 @@ ...@@ -140,8 +140,8 @@
<pre class="prettyprint language-xml example">&lt;t-----&gt; <pre class="prettyprint language-xml example">&lt;t-----&gt;
&lt;name&gt;input.yml&lt;/name&gt; &lt;name&gt;input.yml&lt;/name&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;...&lt;/timestamp&gt;
&lt;/t-----&gt; &lt;/t-----&gt;
</pre> </pre>
......
...@@ -146,9 +146,9 @@ ...@@ -146,9 +146,9 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;upload&gt; <pre class="prettyprint language-xml example">&lt;upload&gt;
&lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
&lt;pwd&gt;...&lt;/pwd&gt;
&lt;user&gt;...&lt;/user&gt; &lt;user&gt;...&lt;/user&gt;
&lt;pwd&gt;...&lt;/pwd&gt;
&lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
&lt;/upload&gt; &lt;/upload&gt;
</pre> </pre>
......
...@@ -236,14 +236,14 @@ ...@@ -236,14 +236,14 @@
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;u-----&gt; <pre class="prettyprint language-xml example">&lt;u-----&gt;
&lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt; &lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt;
&lt;roles&gt;[&quot;ADMIN&quot;,&quot;USER&quot;]&lt;/roles&gt;
&lt;enabled&gt;true&lt;/enabled&gt; &lt;enabled&gt;true&lt;/enabled&gt;
&lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
&lt;password&gt;...&lt;/password&gt;
&lt;credentialsNonExpired&gt;true&lt;/credentialsNonExpired&gt; &lt;credentialsNonExpired&gt;true&lt;/credentialsNonExpired&gt;
&lt;roles&gt;[&quot;ADMIN&quot;,&quot;USER&quot;]&lt;/roles&gt;
&lt;password&gt;...&lt;/password&gt;
&lt;username&gt;user&lt;/username&gt; &lt;username&gt;user&lt;/username&gt;
&lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt; &lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
&lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt;
&lt;/u-----&gt; &lt;/u-----&gt;
</pre> </pre>
......
...@@ -42,6 +42,7 @@ public class CloudCredentialsService { ...@@ -42,6 +42,7 @@ public class CloudCredentialsService {
User user = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal(); User user = (User) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
String owner = user.getUsername(); String owner = user.getUsername();
cloudCredentials.setOwner(owner); cloudCredentials.setOwner(owner);
cloudCredentials.setTimestamp(System.currentTimeMillis());
return dao.save(cloudCredentials); return dao.save(cloudCredentials);
} }
......
...@@ -35,7 +35,6 @@ import nl.uva.sne.drip.drip.commons.data.internal.MessageParameter; ...@@ -35,7 +35,6 @@ import nl.uva.sne.drip.drip.commons.data.internal.MessageParameter;
import nl.uva.sne.drip.drip.commons.data.v1.external.PlanResponse; import nl.uva.sne.drip.drip.commons.data.v1.external.PlanResponse;
import nl.uva.sne.drip.drip.commons.data.v1.external.ToscaRepresentation; import nl.uva.sne.drip.drip.commons.data.v1.external.ToscaRepresentation;
import nl.uva.sne.drip.commons.utils.Converter; import nl.uva.sne.drip.commons.utils.Converter;
import nl.uva.sne.drip.drip.commons.data.v1.external.PlaybookRepresentation;
import nl.uva.sne.drip.drip.commons.data.v1.external.User; import nl.uva.sne.drip.drip.commons.data.v1.external.User;
import nl.uva.sne.drip.drip.converter.P2PConverter; import nl.uva.sne.drip.drip.converter.P2PConverter;
import nl.uva.sne.drip.drip.converter.SimplePlanContainer; import nl.uva.sne.drip.drip.converter.SimplePlanContainer;
...@@ -119,7 +118,7 @@ public class PlannerService { ...@@ -119,7 +118,7 @@ public class PlannerService {
} }
Map<String, Object> map = t2.getKeyValue(); Map<String, Object> map = t2.getKeyValue();
String json = Converter.map2JsonString(map); String json = Converter.map2JsonString(map);
json = json.replaceAll("\\uff0E", "\\."); json = json.replaceAll("\\uff0E", ".");
byte[] bytes = json.getBytes(); byte[] bytes = json.getBytes();
Message invokationMessage = new Message(); Message invokationMessage = new Message();
...@@ -145,24 +144,25 @@ public class PlannerService { ...@@ -145,24 +144,25 @@ public class PlannerService {
Map<String, Object> map = plan.getKeyValue(); Map<String, Object> map = plan.getKeyValue();
Set<String> ids = plan.getLoweLevelPlanIDs(); Set<String> ids = plan.getLoweLevelPlanIDs();
for (String lowID : ids) { for (String lowID : ids) {
Map<String, Object> lowLevelMap = findOne(lowID).getKeyValue(); PlanResponse ll = findOne(lowID);
Map<String, Object> lowLevelMap = ll.getKeyValue();
if (lowLevelMap != null) { if (lowLevelMap != null) {
map.putAll(lowLevelMap); map.put(ll.getName(), lowLevelMap);
} }
} }
if (fromat != null && fromat.equals("yml")) { if (fromat != null && fromat.equals("yml")) {
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
return ymlStr; return ymlStr;
} }
if (fromat != null && fromat.equals("json")) { if (fromat != null && fromat.equals("json")) {
String jsonStr = Converter.map2JsonString(map); String jsonStr = Converter.map2JsonString(map);
jsonStr = jsonStr.replaceAll("\\uff0E", "\\."); jsonStr = jsonStr.replaceAll("\\uff0E", ".");
return jsonStr; return jsonStr;
} }
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
return ymlStr; return ymlStr;
} }
...@@ -190,12 +190,11 @@ public class PlannerService { ...@@ -190,12 +190,11 @@ public class PlannerService {
} }
@PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))") @PostAuthorize("(returnObject.owner == authentication.name) or (hasRole('ROLE_ADMIN'))")
public PlanResponse findOne(String lowiID) { public PlanResponse findOne(String id) {
PlanResponse plan = planDao.findOne(lowiID); PlanResponse plan = planDao.findOne(id);
if (plan == null) { if (plan == null) {
throw new NotFoundException(); throw new NotFoundException();
} }
return plan; return plan;
} }
...@@ -214,6 +213,38 @@ public class PlannerService { ...@@ -214,6 +213,38 @@ public class PlannerService {
planDao.deleteAll(); planDao.deleteAll();
} }
public String saveStringContents(String ymlContents, Integer level, String name) {
//Remove '\' and 'n' if they are together and replace them with '\n'
char[] array = ymlContents.toCharArray();
StringBuilder sb = new StringBuilder();
int prevChar = -1;
for (int i = 0; i < array.length; i++) {
int currentChar = (int) array[i];
if (prevChar > 0 && prevChar == 92 && currentChar == 110) {
sb.delete(sb.length() - 1, sb.length());
sb.append('\n');
} else {
sb.append((char) currentChar);
}
prevChar = (int) array[i];
}
ymlContents = sb.toString();
ymlContents = ymlContents.replaceAll("(?m)^[ \t]*\r?\n", "");
for (int i = 0; i < Constants.BAD_CHARS.length; i++) {
int hex = Constants.BAD_CHARS[i];
ymlContents = ymlContents.replaceAll(String.valueOf((char) hex), "");
}
ymlContents = ymlContents.replaceAll("\\.", "\uff0E");
// ymlContents = ymlContents.replaceAll("\uff0E", ".");
Map<String, Object> map = Converter.ymlString2Map(ymlContents);
PlanResponse pr = new PlanResponse();
pr.setKvMap(map);
pr.setLevel(level);
pr.setName(name);
save(pr);
return pr.getId();
}
} }
...@@ -54,17 +54,17 @@ public class PlaybookService { ...@@ -54,17 +54,17 @@ public class PlaybookService {
if (fromat != null && fromat.toLowerCase().equals("yml")) { if (fromat != null && fromat.toLowerCase().equals("yml")) {
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
ymlStr = ymlStr.replaceAll("\'---':", "---"); ymlStr = ymlStr.replaceAll("\'---':", "---");
return ymlStr; return ymlStr;
} }
if (fromat != null && fromat.toLowerCase().equals("json")) { if (fromat != null && fromat.toLowerCase().equals("json")) {
String jsonStr = Converter.map2JsonString(map); String jsonStr = Converter.map2JsonString(map);
jsonStr = jsonStr.replaceAll("\\uff0E", "\\."); jsonStr = jsonStr.replaceAll("\\uff0E", ".");
return jsonStr; return jsonStr;
} }
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
ymlStr = ymlStr.replaceAll("\'---':", "---"); ymlStr = ymlStr.replaceAll("\'---':", "---");
return ymlStr; return ymlStr;
......
...@@ -19,12 +19,10 @@ import com.fasterxml.jackson.core.JsonParser; ...@@ -19,12 +19,10 @@ import com.fasterxml.jackson.core.JsonParser;
import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;
import java.io.ByteArrayOutputStream; import java.io.ByteArrayOutputStream;
import java.io.FileInputStream;
import java.io.FileNotFoundException; import java.io.FileNotFoundException;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap; import java.util.HashMap;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Properties; import java.util.Properties;
...@@ -231,20 +229,7 @@ public class ProvisionService { ...@@ -231,20 +229,7 @@ public class ProvisionService {
} }
private List<MessageParameter> buildTopologyParams(String planID) throws JSONException, FileNotFoundException { private List<MessageParameter> buildTopologyParams(String planID) throws JSONException, FileNotFoundException {
PlanResponse plan = new PlanResponse(); //planService.getDao().findOne(planID); PlanResponse plan = planService.getDao().findOne(planID);
plan.setLevel(0);
plan.setKvMap(
Converter.ymlStream2Map(
new FileInputStream(
System.getProperty("user.home") + "/workspace/DRIPProvisioningAgent/ES/standard2/zh_all_test.yml")
)
);
plan.setName("zh_all_test.yml");
plan.setTimestamp(System.currentTimeMillis());
Set<String> loweLevelPlansIDs = new HashSet<>();
loweLevelPlansIDs.add("ec2_zh_a.yml");
loweLevelPlansIDs.add("ec2_zh_b.yml");
plan.setLoweLevelPlansIDs(loweLevelPlansIDs);
if (plan == null) { if (plan == null) {
throw new PlanNotFoundException(); throw new PlanNotFoundException();
...@@ -252,7 +237,9 @@ public class ProvisionService { ...@@ -252,7 +237,9 @@ public class ProvisionService {
List<MessageParameter> parameters = new ArrayList(); List<MessageParameter> parameters = new ArrayList();
MessageParameter topology = new MessageParameter(); MessageParameter topology = new MessageParameter();
topology.setName("topology"); topology.setName("topology");
topology.setValue(Converter.map2YmlString(plan.getKeyValue())); String val = Converter.map2YmlString(plan.getKeyValue());
val = val.replaceAll("\\uff0E", ".");
topology.setValue(val);
Map<String, String> attributes = new HashMap<>(); Map<String, String> attributes = new HashMap<>();
attributes.put("level", String.valueOf(plan.getLevel())); attributes.put("level", String.valueOf(plan.getLevel()));
attributes.put("filename", FilenameUtils.removeExtension(plan.getName())); attributes.put("filename", FilenameUtils.removeExtension(plan.getName()));
...@@ -261,19 +248,12 @@ public class ProvisionService { ...@@ -261,19 +248,12 @@ public class ProvisionService {
Set<String> ids = plan.getLoweLevelPlanIDs(); Set<String> ids = plan.getLoweLevelPlanIDs();
for (String lowID : ids) { for (String lowID : ids) {
PlanResponse lowPlan = new PlanResponse(); //planService.getDao().findOne(lowID); PlanResponse lowPlan = planService.getDao().findOne(lowID);
lowPlan.setLevel(1);
lowPlan.setName(lowID);
lowPlan.setKvMap(Converter.ymlStream2Map(
new FileInputStream(
System.getProperty("user.home") + "/workspace/DRIPProvisioningAgent/ES/standard2/" + lowID)
)
);
lowPlan.setTimestamp(System.currentTimeMillis());
topology = new MessageParameter(); topology = new MessageParameter();
topology.setName("topology"); topology.setName("topology");
topology.setValue(Converter.map2YmlString(lowPlan.getKeyValue())); String value = Converter.map2YmlString(lowPlan.getKeyValue());
value = value.replaceAll("\\uff0E", ".");
topology.setValue(value);
attributes = new HashMap<>(); attributes = new HashMap<>();
attributes.put("level", String.valueOf(lowPlan.getLevel())); attributes.put("level", String.valueOf(lowPlan.getLevel()));
attributes.put("filename", FilenameUtils.removeExtension(lowPlan.getName())); attributes.put("filename", FilenameUtils.removeExtension(lowPlan.getName()));
......
...@@ -105,7 +105,7 @@ public class SimplePlannerService { ...@@ -105,7 +105,7 @@ public class SimplePlannerService {
} }
Map<String, Object> map = t2.getKeyValue(); Map<String, Object> map = t2.getKeyValue();
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
byte[] bytes = ymlStr.getBytes(); byte[] bytes = ymlStr.getBytes();
Message invokationMessage = new Message(); Message invokationMessage = new Message();
...@@ -145,16 +145,16 @@ public class SimplePlannerService { ...@@ -145,16 +145,16 @@ public class SimplePlannerService {
if (fromat != null && fromat.equals("yml")) { if (fromat != null && fromat.equals("yml")) {
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
return ymlStr; return ymlStr;
} }
if (fromat != null && fromat.equals("json")) { if (fromat != null && fromat.equals("json")) {
String jsonStr = Converter.map2JsonString(map); String jsonStr = Converter.map2JsonString(map);
jsonStr = jsonStr.replaceAll("\\uff0E", "\\."); jsonStr = jsonStr.replaceAll("\\uff0E", ".");
return jsonStr; return jsonStr;
} }
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
return ymlStr; return ymlStr;
} }
......
...@@ -54,16 +54,16 @@ public class ToscaService { ...@@ -54,16 +54,16 @@ public class ToscaService {
if (fromat != null && fromat.equals("yml")) { if (fromat != null && fromat.equals("yml")) {
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
return ymlStr; return ymlStr;
} }
if (fromat != null && fromat.equals("json")) { if (fromat != null && fromat.equals("json")) {
String jsonStr = Converter.map2JsonString(map); String jsonStr = Converter.map2JsonString(map);
jsonStr = jsonStr.replaceAll("\\uff0E", "\\."); jsonStr = jsonStr.replaceAll("\\uff0E", ".");
return jsonStr; return jsonStr;
} }
String ymlStr = Converter.map2YmlString(map); String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", "\\."); ymlStr = ymlStr.replaceAll("\\uff0E", ".");
return ymlStr; return ymlStr;
} }
......
...@@ -105,6 +105,7 @@ public class CloudCredentialsController { ...@@ -105,6 +105,7 @@ public class CloudCredentialsController {
* @param file * @param file
* @param id * @param id
* @return the CloudCredentials id * @return the CloudCredentials id
* @throws java.lang.Exception
*/ */
@RequestMapping(value = "/upload/{id}", method = RequestMethod.POST) @RequestMapping(value = "/upload/{id}", method = RequestMethod.POST)
@RolesAllowed({UserService.USER, UserService.ADMIN}) @RolesAllowed({UserService.USER, UserService.ADMIN})
...@@ -208,14 +209,16 @@ public class CloudCredentialsController { ...@@ -208,14 +209,16 @@ public class CloudCredentialsController {
public @ResponseBody public @ResponseBody
CloudCredentials geta() { CloudCredentials geta() {
CloudCredentials cloudCredentials = new CloudCredentials(); CloudCredentials cloudCredentials = new CloudCredentials();
cloudCredentials.setTimestamp(System.currentTimeMillis()); cloudCredentials.setAccessKeyId("AKIAITWERHZUQ6M7YBSQ");
cloudCredentials.setAccessKeyId("AKIAITY3KHZUQ6M7YBSQ");
cloudCredentials.setCloudProviderName("ec2"); cloudCredentials.setCloudProviderName("ec2");
cloudCredentials.setSecretKey("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"); cloudCredentials.setSecretKey("6J7uo99ifrff45sa6Gsy5vgb3b3ewdsdtwY6hBxtYt9y");
List<String> keyIDs = new ArrayList<>(); List<String> keyIDs = new ArrayList<>();
keyIDs.add("58da4c91f7b43a3282cacdbb"); keyIDs.add("58da4c91f7b43a3282cacdbb");
keyIDs.add("58da4d2af7b43a3282cacdbd"); keyIDs.add("58da4d2af7b43a3282cacdbd");
cloudCredentials.setKeyIDs(keyIDs); cloudCredentials.setKeyIDs(keyIDs);
Map<String, Object> attributes = new HashMap<>();
attributes.put("myProxyEndpoint", "myproxy1.egee.host.com");
cloudCredentials.setAttributes(attributes);
return cloudCredentials; return cloudCredentials;
} }
......
...@@ -19,7 +19,9 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode; ...@@ -19,7 +19,9 @@ import com.webcohesion.enunciate.metadata.rs.ResponseCode;
import com.webcohesion.enunciate.metadata.rs.StatusCodes; import com.webcohesion.enunciate.metadata.rs.StatusCodes;
import java.io.IOException; import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Set;
import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeoutException;
import java.util.logging.Level; import java.util.logging.Level;
import java.util.logging.Logger; import java.util.logging.Logger;
...@@ -146,8 +148,39 @@ public class PlannerController { ...@@ -146,8 +148,39 @@ public class PlannerController {
List<PlanResponse> all = plannerService.findAll(); List<PlanResponse> all = plannerService.findAll();
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
for (PlanResponse tr : all) { for (PlanResponse tr : all) {
ids.add(tr.getId()); if (tr.getLevel() == 0) {
ids.add(tr.getId());
}
} }
return ids; return ids;
} }
@RequestMapping(value = "/post/{name}", method = RequestMethod.POST)
@RolesAllowed({UserService.USER, UserService.ADMIN})
public @ResponseBody
String postTop(@RequestBody String toscaContents, @PathVariable("name") String name) {
return plannerService.saveStringContents(toscaContents, 0, name);
}
@RequestMapping(value = "/post/{level}/{name}/{id}", method = RequestMethod.POST)
@RolesAllowed({UserService.USER, UserService.ADMIN})
public @ResponseBody
String postLow(@RequestBody String toscaContents, @PathVariable("level") String level, @PathVariable("name") String name, @PathVariable("id") String id) {
int intLevel = Integer.valueOf(level);
if (intLevel == 0) {
return plannerService.saveStringContents(toscaContents, 0, name);
}
PlanResponse topPlan = plannerService.findOne(id);
Set<String> lowIDs = topPlan.getLoweLevelPlanIDs();
if (lowIDs == null) {
lowIDs = new HashSet<>();
}
String lowPlanID = plannerService.saveStringContents(toscaContents, intLevel, name);
lowIDs.add(lowPlanID);
topPlan.setLoweLevelPlansIDs(lowIDs);
topPlan = plannerService.save(topPlan);
return topPlan.getId();
}
} }
...@@ -15,10 +15,10 @@ ...@@ -15,10 +15,10 @@
*/ */
package nl.uva.sne.drip.drip.commons.data.v1.external; package nl.uva.sne.drip.drip.commons.data.v1.external;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude; import com.fasterxml.jackson.annotation.JsonInclude;
import com.webcohesion.enunciate.metadata.DocumentationExample; import com.webcohesion.enunciate.metadata.DocumentationExample;
import java.util.List; import java.util.List;
import java.util.Map;
import org.springframework.data.mongodb.core.mapping.Document; import org.springframework.data.mongodb.core.mapping.Document;
/** /**
...@@ -33,7 +33,6 @@ public class CloudCredentials extends OwnedObject { ...@@ -33,7 +33,6 @@ public class CloudCredentials extends OwnedObject {
public static String ACCESS_KEY_NAME = "accessKeyId"; public static String ACCESS_KEY_NAME = "accessKeyId";
public static String SECRET_KEY_NAME = "secretKey"; public static String SECRET_KEY_NAME = "secretKey";
private String secretKey; private String secretKey;
private String accessKeyId; private String accessKeyId;
...@@ -44,6 +43,8 @@ public class CloudCredentials extends OwnedObject { ...@@ -44,6 +43,8 @@ public class CloudCredentials extends OwnedObject {
private String cloudProviderName; private String cloudProviderName;
private Map<String, Object> attributes;
/** /**
* It is the secret key / password for accessing a cloud provider. * It is the secret key / password for accessing a cloud provider.
* *
...@@ -76,7 +77,7 @@ public class CloudCredentials extends OwnedObject { ...@@ -76,7 +77,7 @@ public class CloudCredentials extends OwnedObject {
} }
/** /**
* The access key ID for a cloud provider. * The access key ID / user name for a cloud provider.
* *
* @return the accessKeyId * @return the accessKeyId
*/ */
...@@ -122,4 +123,18 @@ public class CloudCredentials extends OwnedObject { ...@@ -122,4 +123,18 @@ public class CloudCredentials extends OwnedObject {
public void setKeyPairs(List<KeyPair> keyPairs) { public void setKeyPairs(List<KeyPair> keyPairs) {
this.keyPairs = keyPairs; this.keyPairs = keyPairs;
} }
/**
* @return the attributes
*/
public Map<String, Object> getAttributes() {
return attributes;
}
/**
* @param attributes the attributes to set
*/
public void setAttributes(Map<String, Object> attributes) {
this.attributes = attributes;
}
} }
...@@ -73,7 +73,9 @@ public class MessageParsing { ...@@ -73,7 +73,9 @@ public class MessageParsing {
if (fileLevel == level) { if (fileLevel == level) {
String originalFilename = (String) attributes.get("filename"); String originalFilename = (String) attributes.get("filename");
String fileName = originalFilename; String fileName = originalFilename;
if (!fileName.endsWith(".yml")) {
fileName += ".yml";
}
File topologyFile = new File(tempInputDirPath + File.separator + fileName); File topologyFile = new File(tempInputDirPath + File.separator + fileName);
topologyFile.createNewFile(); topologyFile.createNewFile();
String val = (String) param.get("value"); String val = (String) param.get("value");
......
...@@ -164,10 +164,10 @@ public class Consumer extends DefaultConsumer { ...@@ -164,10 +164,10 @@ public class Consumer extends DefaultConsumer {
String topTopologyLoadingPath = mainTopologyFile.getAbsolutePath(); String topTopologyLoadingPath = mainTopologyFile.getAbsolutePath();
List<File> topologyFiles = MessageParsing.getTopologies(parameters, tempInputDirPath, 1); List<File> topologyFiles = MessageParsing.getTopologies(parameters, tempInputDirPath, 1);
for (File lowLevelTopologyFile : topologyFiles) { // for (File lowLevelTopologyFile : topologyFiles) {
File secondaryTopologyFile = new File(tempInputDirPath + File.separator + lowLevelTopologyFile.getName() + ".yml"); // File secondaryTopologyFile = new File(tempInputDirPath + File.separator + lowLevelTopologyFile.getName() + ".yml");
FileUtils.moveFile(lowLevelTopologyFile, secondaryTopologyFile); // FileUtils.moveFile(lowLevelTopologyFile, secondaryTopologyFile);
} // }
Map<String, Object> map = MessageParsing.ymlStream2Map(new FileInputStream(topTopologyLoadingPath)); Map<String, Object> map = MessageParsing.ymlStream2Map(new FileInputStream(topTopologyLoadingPath));
String userPublicKeyName = ((String) map.get("publicKeyPath")).split("@")[1].replaceAll("\"", ""); String userPublicKeyName = ((String) map.get("publicKeyPath")).split("@")[1].replaceAll("\"", "");
...@@ -342,7 +342,7 @@ public class Consumer extends DefaultConsumer { ...@@ -342,7 +342,7 @@ public class Consumer extends DefaultConsumer {
response.setParameters(responseParameters); response.setParameters(responseParameters);
return response; return response;
} catch (Throwable ex) { } catch (Throwable ex) {
if (tam != null) { if (tam != null) {
tEngine.deleteAll(tam.wholeTopology, userCredential, userDatabase); tEngine.deleteAll(tam.wholeTopology, userCredential, userDatabase);
} }
......
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