added boolean for maintaining new line in yml

724dcf64 · Spiros Koulouzis · 352deb9e · 724dcf64 · 724dcf64 · 724dcf64
Commit 724dcf64 authored May 11, 2017 by Spiros Koulouzis
72 changed files
--- a/docs/apidocs/downloads.html
+++ b/docs/apidocs/downloads.html
@@ -116,12 +116,12 @@
    <tbody data-link="row" class="rowlink">
    <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-size">22.63K</span></td>
+      <td><span class="downloadfile-size">22.62K</span></td>
      <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
    </tr>
    <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-size">17.24K</span></td>
+      <td><span class="downloadfile-size">17.23K</span></td>
      <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
    </tr>
    </tbody>
@@ -144,12 +144,12 @@
    <tbody data-link="row" class="rowlink">
    <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-size">25.38K</span></td>
+      <td><span class="downloadfile-size">25.36K</span></td>
      <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
    </tr>
    <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-size">21.29K</span></td>
+      <td><span class="downloadfile-size">21.26K</span></td>
      <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
    </tr>
    </tbody>
@@ -213,7 +213,7 @@
    <tbody data-link="row" class="rowlink">
    <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-size">8.28K</span></td>
+      <td><span class="downloadfile-size">8.15K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
@@ -245,7 +245,7 @@
    <tbody data-link="row" class="rowlink">
    <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-size">9.27K</span></td>
+      <td><span class="downloadfile-size">9.17K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>

--- a/docs/apidocs/drip-api-gwt-json-overlay.jar
+++ b/docs/apidocs/drip-api-gwt-json-overlay.jar
--- a/docs/apidocs/drip-api-js.zip
+++ b/docs/apidocs/drip-api-js.zip
--- a/docs/apidocs/drip-api-json-client-json-sources.jar
+++ b/docs/apidocs/drip-api-json-client-json-sources.jar
--- a/docs/apidocs/drip-api-json-client.jar
+++ b/docs/apidocs/drip-api-json-client.jar
--- a/docs/apidocs/drip-api-php.zip
+++ b/docs/apidocs/drip-api-php.zip
--- a/docs/apidocs/drip-api-xml-client-xml-sources.jar
+++ b/docs/apidocs/drip-api-xml-client-xml-sources.jar
--- a/docs/apidocs/drip-api-xml-client.jar
+++ b/docs/apidocs/drip-api-xml-client.jar
--- a/docs/apidocs/drip-api.rb
+++ b/docs/apidocs/drip-api.rb
--- a/docs/apidocs/json_AnsibleOutput.html
+++ b/docs/apidocs/json_AnsibleOutput.html
@@ -139,13 +139,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -164,21 +164,21 @@
      <pre class="prettyprint language-js example">{
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;delta&quot; : &quot;...&quot;,
    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;stdout&quot; : &quot;...&quot;,
    &quot;msg&quot; : &quot;...&quot;,
-    &quot;end&quot; : &quot;...&quot;,
+    &quot;start&quot; : &quot;...&quot;,
+    &quot;stdout&quot; : &quot;...&quot;,
    &quot;changed&quot; : true,
-    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-    &quot;delta&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;
+    &quot;end&quot; : &quot;...&quot;,
+    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_AnsibleResult.html
+++ b/docs/apidocs/json_AnsibleResult.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">stderr</span>
+          <td>  <span class="property-name">delta</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stdout</span>
+          <td>  <span class="property-name">stderr</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -107,7 +107,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">start</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -116,25 +116,25 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">changed</span>
+          <td>  <span class="property-name">stdout</span>
 </td>
-          <td>  <span class="datatype-reference">boolean
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">cmd</span>
+          <td>  <span class="property-name">changed</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">boolean
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">end</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -143,9 +143,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">cmd</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -157,14 +157,14 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
+  &quot;delta&quot; : &quot;...&quot;,
  &quot;stderr&quot; : &quot;...&quot;,
-  &quot;stdout&quot; : &quot;...&quot;,
  &quot;msg&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
+  &quot;start&quot; : &quot;...&quot;,
+  &quot;stdout&quot; : &quot;...&quot;,
  &quot;changed&quot; : true,
-  &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;start&quot; : &quot;...&quot;
+  &quot;end&quot; : &quot;...&quot;,
+  &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_BenchmarkResult.html
+++ b/docs/apidocs/json_BenchmarkResult.html
@@ -91,7 +91,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">vmType</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -100,7 +100,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">cloudDeploymentDomain</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -109,7 +109,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">vmType</span>
+          <td>  <span class="property-name">end</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -118,7 +118,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">delta</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -141,13 +141,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -165,13 +165,13 @@
      
      <pre class="prettyprint language-js example">{
  &quot;host&quot; : &quot;...&quot;,
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
+  &quot;delta&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_CloudCredentials.html
+++ b/docs/apidocs/json_CloudCredentials.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">secretKey</span>
+          <td>  <span class="property-name">accessKeyId</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,9 +89,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">attributes</span>
+          <td>  <span class="property-name">secretKey</span>
 </td>
-          <td>  <span class="datatype-reference">map of object
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -107,9 +107,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">accessKeyId</span>
+          <td>  <span class="property-name">attributes</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">map of object
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -121,13 +121,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -144,15 +144,15 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
+  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;attributes&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_DeployParameter.html
+++ b/docs/apidocs/json_DeployParameter.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">user</span>
+          <td>  <span class="property-name">IP</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">IP</span>
+          <td>  <span class="property-name">user</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -112,8 +112,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;user&quot; : &quot;vm_user&quot;,
  &quot;IP&quot; : &quot;52.73.245.157&quot;,
+  &quot;user&quot; : &quot;vm_user&quot;,
  &quot;role&quot; : &quot;slave&quot;
 }</pre>


--- a/docs/apidocs/json_DeployRequest.html
+++ b/docs/apidocs/json_DeployRequest.html
@@ -82,7 +82,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">provisionID</span>
+          <td>  <span class="property-name">configurationID</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -100,7 +100,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">configurationID</span>
+          <td>  <span class="property-name">provisionID</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -114,13 +114,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -137,11 +137,11 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_DeployResponse.html
+++ b/docs/apidocs/json_DeployResponse.html
--- a/docs/apidocs/json_Key.html
+++ b/docs/apidocs/json_Key.html
@@ -80,34 +80,34 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">attributes</span>
+          <td>  <span class="property-name">name</span>
 </td>
-          <td>  <span class="datatype-reference">map of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">key</span>
+          <td>  <span class="property-name">type</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference"><a href="json_KeyType.html">KeyType</a>
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">type</span>
+          <td>  <span class="property-name">attributes</span>
 </td>
-          <td>  <span class="datatype-reference"><a href="json_KeyType.html">KeyType</a>
+          <td>  <span class="datatype-reference">map of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">name</span>
+          <td>  <span class="property-name">key</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -121,13 +121,13 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
+  &quot;name&quot; : &quot;id_dsa.pub&quot;,
+  &quot;type&quot; : &quot;PRIVATE&quot;,
  &quot;attributes&quot; : {
    &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
    &quot;property2&quot; : &quot;domain_name:Virginia&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;type&quot; : &quot;PRIVATE&quot;,
-  &quot;name&quot; : &quot;id_dsa.pub&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;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_KeyPair.html
+++ b/docs/apidocs/json_KeyPair.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">privateKey</span>
+          <td>  <span class="property-name">publicKey</span>
 </td>
          <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">publicKey</span>
+          <td>  <span class="property-name">privateKey</span>
 </td>
          <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
@@ -112,13 +112,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -135,27 +135,27 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;privateKey&quot; : {
+  &quot;publicKey&quot; : {
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
    &quot;attributes&quot; : {
      &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
      &quot;property2&quot; : &quot;domain_name:Virginia&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;type&quot; : &quot;PRIVATE&quot;,
-    &quot;name&quot; : &quot;id_dsa.pub&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;publicKey&quot; : {
+  &quot;privateKey&quot; : {
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
    &quot;attributes&quot; : {
      &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
      &quot;property2&quot; : &quot;domain_name:Virginia&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;type&quot; : &quot;PRIVATE&quot;,
-    &quot;name&quot; : &quot;id_dsa.pub&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;keyPairId&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_KeyValueHolder.html
+++ b/docs/apidocs/json_KeyValueHolder.html
@@ -96,13 +96,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -123,8 +123,8 @@
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_OwnedObject.html
+++ b/docs/apidocs/json_OwnedObject.html
@@ -68,7 +68,7 @@

      <dl class="dl-horizontal">
        <dt>Subtypes</dt>
-        <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>
+        <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>
      </dl>

      <table class="table datatype-properties">
@@ -82,7 +82,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">owner</span>
+          <td>  <span class="property-name">id</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -91,7 +91,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">id</span>
+          <td>  <span class="property-name">owner</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -114,8 +114,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_PlanRequest.html
+++ b/docs/apidocs/json_PlanRequest.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">toscaID</span>
+          <td>  <span class="property-name">osType</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">osType</span>
+          <td>  <span class="property-name">managerType</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -107,7 +107,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">managerType</span>
+          <td>  <span class="property-name">toscaID</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -139,10 +139,10 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;toscaID&quot; : &quot;...&quot;,
  &quot;osType&quot; : &quot;...&quot;,
-  &quot;vmUserName&quot; : &quot;...&quot;,
  &quot;managerType&quot; : &quot;...&quot;,
+  &quot;vmUserName&quot; : &quot;...&quot;,
+  &quot;toscaID&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;domain&quot; : &quot;...&quot;
 }</pre>

--- a/docs/apidocs/json_PlanResponse.html
+++ b/docs/apidocs/json_PlanResponse.html
@@ -89,9 +89,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">loweLevelPlanIDs</span>
+          <td>  <span class="property-name">name</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -107,9 +107,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">name</span>
+          <td>  <span class="property-name">loweLevelPlanIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -132,13 +132,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -156,15 +156,15 @@
      
      <pre class="prettyprint language-js example">{
  &quot;level&quot; : 0,
-  &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
-  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;name&quot; : &quot;planner_output_all.yml&quot;,
+  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_PlaybookRepresentation.html
+++ b/docs/apidocs/json_PlaybookRepresentation.html
@@ -96,13 +96,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -123,8 +123,8 @@
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_ProvisionRequest.html
+++ b/docs/apidocs/json_ProvisionRequest.html
@@ -82,7 +82,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">cloudCredentialsIDs</span>
+          <td>  <span class="property-name">userKeyPairIDs</span>
 </td>
          <td>  <span class="datatype-reference">array of string
 </span>
@@ -91,25 +91,25 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">planID</span>
+          <td>  <span class="property-name">deployerKeyPairIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">deployerKeyPairIDs</span>
+          <td>  <span class="property-name">planID</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">userKeyPairIDs</span>
+          <td>  <span class="property-name">cloudCredentialsIDs</span>
 </td>
          <td>  <span class="datatype-reference">array of string
 </span>
@@ -134,13 +134,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -157,16 +157,16 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_ProvisionResponse.html
+++ b/docs/apidocs/json_ProvisionResponse.html
@@ -80,18 +80,18 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">cloudKeyPairIDs</span>
+          <td>  <span class="property-name">deployParameters</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">array of <a href="json_DeployParameter.html">DeployParameter</a>
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">deployParameters</span>
+          <td>  <span class="property-name">cloudKeyPairIDs</span>
 </td>
-          <td>  <span class="datatype-reference">array of <a href="json_DeployParameter.html">DeployParameter</a>
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -103,25 +103,25 @@
        </tr>
        <tbody>
        <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
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">planID</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">deployerKeyPairIDs</span></td>
+          <td><span class="datatype-reference">array of string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">deployerKeyPairIDs</span></td>
-          <td><span class="datatype-reference">array of string
+          <td><span class="property-name">planID</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">userKeyPairIDs</span></td>
+          <td><span class="property-name">cloudCredentialsIDs</span></td>
          <td><span class="datatype-reference">array of string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -143,13 +143,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -166,26 +166,26 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;deployParameters&quot; : [ {
-    &quot;user&quot; : &quot;vm_user&quot;,
    &quot;IP&quot; : &quot;52.73.245.157&quot;,
+    &quot;user&quot; : &quot;vm_user&quot;,
    &quot;role&quot; : &quot;slave&quot;
  }, {
-    &quot;user&quot; : &quot;...&quot;,
    &quot;IP&quot; : &quot;...&quot;,
+    &quot;user&quot; : &quot;...&quot;,
    &quot;role&quot; : &quot;...&quot;
  } ],
-  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_Script.html
+++ b/docs/apidocs/json_Script.html
@@ -103,13 +103,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -128,8 +128,8 @@
      <pre class="prettyprint language-js example">{
  &quot;name&quot; : &quot;config.sh&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;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_SysbenchCPUBenchmark.html
+++ b/docs/apidocs/json_SysbenchCPUBenchmark.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">minExecutionTimePerRequest</span>
+          <td>  <span class="property-name">numberOfThreads</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">totalNumberOfEvents</span>
+          <td>  <span class="property-name">approx95Percentile</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -98,16 +98,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">numberOfThreads</span>
+          <td>  <span class="property-name">sysbenchVersion</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">approx95Percentile</span>
+          <td>  <span class="property-name">stddevEventsPerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -116,7 +116,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgExecTimePerThread</span>
+          <td>  <span class="property-name">stddevExecTimePerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -125,16 +125,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">sysbenchVersion</span>
+          <td>  <span class="property-name">minExecutionTimePerRequest</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
+          <td>  <span class="property-name">avgExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -143,7 +143,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgExecutionTimePerRequest</span>
+          <td>  <span class="property-name">avgEventsPerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -152,7 +152,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stddevExecTimePerThread</span>
+          <td>  <span class="property-name">executionTime</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -161,25 +161,25 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">executionTime</span>
+          <td>  <span class="property-name">ansibleOutputID</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">ansibleOutputID</span>
+          <td>  <span class="property-name">totalNumberOfEvents</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stddevEventsPerThread</span>
+          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -188,7 +188,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgEventsPerThread</span>
+          <td>  <span class="property-name">avgExecTimePerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -208,25 +208,25 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">delta</span></td>
+          <td><span class="property-name">vmType</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">end</span></td>
+          <td><span class="property-name">cloudDeploymentDomain</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">vmType</span></td>
+          <td><span class="property-name">end</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">cloudDeploymentDomain</span></td>
+          <td><span class="property-name">delta</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -243,13 +243,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -266,27 +266,27 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;minExecutionTimePerRequest&quot; : 12345.0,
-  &quot;totalNumberOfEvents&quot; : 12345,
  &quot;numberOfThreads&quot; : 12345,
  &quot;approx95Percentile&quot; : 12345.0,
-  &quot;avgExecTimePerThread&quot; : 12345.0,
  &quot;sysbenchVersion&quot; : &quot;...&quot;,
-  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
-  &quot;avgExecutionTimePerRequest&quot; : 12345.0,
+  &quot;stddevEventsPerThread&quot; : 12345.0,
  &quot;stddevExecTimePerThread&quot; : 12345.0,
+  &quot;minExecutionTimePerRequest&quot; : 12345.0,
+  &quot;avgExecutionTimePerRequest&quot; : 12345.0,
+  &quot;avgEventsPerThread&quot; : 12345.0,
  &quot;executionTime&quot; : 12345.0,
  &quot;ansibleOutputID&quot; : &quot;...&quot;,
-  &quot;stddevEventsPerThread&quot; : 12345.0,
-  &quot;avgEventsPerThread&quot; : 12345.0,
+  &quot;totalNumberOfEvents&quot; : 12345,
+  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
+  &quot;avgExecTimePerThread&quot; : 12345.0,
  &quot;host&quot; : &quot;...&quot;,
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
+  &quot;delta&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_ToscaRepresentation.html
+++ b/docs/apidocs/json_ToscaRepresentation.html
@@ -105,13 +105,13 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">owner</span></td>
+          <td><span class="property-name">id</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -133,8 +133,8 @@
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }</pre>


--- a/docs/apidocs/json_User.html
+++ b/docs/apidocs/json_User.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">username</span>
+          <td>  <span class="property-name">password</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,16 +89,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">accountNonExpired</span>
+          <td>  <span class="property-name">username</span>
 </td>
-          <td>  <span class="datatype-reference">boolean
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">enabled</span>
+          <td>  <span class="property-name">accountNonLocked</span>
 </td>
          <td>  <span class="datatype-reference">boolean
 </span>
@@ -107,36 +107,36 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">accountNonLocked</span>
+          <td>  <span class="property-name">id</span>
 </td>
-          <td>  <span class="datatype-reference">boolean
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">roles</span>
+          <td>  <span class="property-name">enabled</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">boolean
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">id</span>
+          <td>  <span class="property-name">accountNonExpired</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">boolean
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">password</span>
+          <td>  <span class="property-name">roles</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -157,13 +157,13 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
+  &quot;password&quot; : &quot;...&quot;,
  &quot;username&quot; : &quot;user&quot;,
-  &quot;accountNonExpired&quot; : true,
-  &quot;enabled&quot; : true,
  &quot;accountNonLocked&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;password&quot; : &quot;...&quot;,
+  &quot;enabled&quot; : true,
+  &quot;accountNonExpired&quot; : true,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;credentialsNonExpired&quot; : true
 }</pre>


--- a/docs/apidocs/ns0.xsd
+++ b/docs/apidocs/ns0.xsd
--- a/docs/apidocs/resource_AnsibleOutputController.html
+++ b/docs/apidocs/resource_AnsibleOutputController.html
@@ -160,21 +160,21 @@ Content-Type: application/json
 [ {
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;delta&quot; : &quot;...&quot;,
    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;stdout&quot; : &quot;...&quot;,
    &quot;msg&quot; : &quot;...&quot;,
-    &quot;end&quot; : &quot;...&quot;,
+    &quot;start&quot; : &quot;...&quot;,
+    &quot;stdout&quot; : &quot;...&quot;,
    &quot;changed&quot; : true,
-    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-    &quot;delta&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;
+    &quot;end&quot; : &quot;...&quot;,
+    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 } ]
                </code>
@@ -585,21 +585,21 @@ Content-Type: application/json
 {
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;delta&quot; : &quot;...&quot;,
    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;stdout&quot; : &quot;...&quot;,
    &quot;msg&quot; : &quot;...&quot;,
-    &quot;end&quot; : &quot;...&quot;,
+    &quot;start&quot; : &quot;...&quot;,
+    &quot;stdout&quot; : &quot;...&quot;,
    &quot;changed&quot; : true,
-    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-    &quot;delta&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;
+    &quot;end&quot; : &quot;...&quot;,
+    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>

--- a/docs/apidocs/resource_BenchmarkController.html
+++ b/docs/apidocs/resource_BenchmarkController.html
@@ -140,13 +140,13 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 [ {
  &quot;host&quot; : &quot;...&quot;,
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
+  &quot;delta&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 } ]
                </code>
@@ -482,13 +482,13 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 {
  &quot;host&quot; : &quot;...&quot;,
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
+  &quot;delta&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>

--- a/docs/apidocs/resource_CloudConfigurationController0.html
+++ b/docs/apidocs/resource_CloudConfigurationController0.html
@@ -131,16 +131,16 @@ Accept: application/json

                <code class="prettyprint language-xml">
 &lt;configure&gt;
-  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt;
+  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
+  &lt;user&gt;user&lt;/user&gt;
+  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
+  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
+  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
  &lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
+  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
+  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&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;pwd&gt;123&lt;/pwd&gt;
-  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
-  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
-  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
-  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
-  &lt;user&gt;user&lt;/user&gt;
-  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
 &lt;/configure&gt;

                </code>
@@ -222,16 +222,16 @@ Accept: application/json

                <code class="prettyprint language-xml">
 &lt;configure&gt;
-  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt;
+  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
+  &lt;user&gt;user&lt;/user&gt;
+  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
+  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
+  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
  &lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
+  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
+  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&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;pwd&gt;123&lt;/pwd&gt;
-  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
-  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
-  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
-  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
-  &lt;user&gt;user&lt;/user&gt;
-  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
 &lt;/configure&gt;

                </code>

--- a/docs/apidocs/resource_CloudCredentialsController.html
+++ b/docs/apidocs/resource_CloudCredentialsController.html
@@ -163,15 +163,15 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
+  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;attributes&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -409,15 +409,15 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
+  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;attributes&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -608,15 +608,15 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
+  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;attributes&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>

--- a/docs/apidocs/resource_DeployController.html
+++ b/docs/apidocs/resource_DeployController.html
@@ -230,11 +230,11 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
-  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -396,11 +396,11 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
-  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -587,36 +587,36 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
+  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;keyPair&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;property1&quot; : &quot;domain_name:Virginia&quot;,
        &quot;property2&quot; : &quot;domain_name:Virginia&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;type&quot; : &quot;PRIVATE&quot;,
-      &quot;name&quot; : &quot;id_dsa.pub&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;publicKey&quot; : {
+    &quot;privateKey&quot; : {
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
      &quot;attributes&quot; : {
        &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
        &quot;property2&quot; : &quot;domain_name:Virginia&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;type&quot; : &quot;PRIVATE&quot;,
-      &quot;name&quot; : &quot;id_dsa.pub&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;keyPairId&quot; : &quot;...&quot;,
-    &quot;owner&quot; : &quot;user1&quot;,
    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;owner&quot; : &quot;user1&quot;,
    &quot;timestamp&quot; : 12345
  },
-  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>

--- a/docs/apidocs/resource_DeployController0.html
+++ b/docs/apidocs/resource_DeployController0.html
@@ -126,9 +126,9 @@ Accept: text/xml

                <code class="prettyprint language-xml">
 &lt;deploy&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/deploy&gt;

                </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml

                <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
  &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;

                </code>
@@ -210,9 +210,9 @@ Accept: text/xml

                <code class="prettyprint language-xml">
 &lt;deploy&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/deploy&gt;

                </code>
@@ -226,9 +226,9 @@ Content-Type: text/xml

                <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
  &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;

                </code>

--- a/docs/apidocs/resource_KeyPairController.html
+++ b/docs/apidocs/resource_KeyPairController.html
--- a/docs/apidocs/resource_PlannerController.html
+++ b/docs/apidocs/resource_PlannerController.html
@@ -309,10 +309,10 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
-  &quot;toscaID&quot; : &quot;...&quot;,
  &quot;osType&quot; : &quot;...&quot;,
-  &quot;vmUserName&quot; : &quot;...&quot;,
  &quot;managerType&quot; : &quot;...&quot;,
+  &quot;vmUserName&quot; : &quot;...&quot;,
+  &quot;toscaID&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;domain&quot; : &quot;...&quot;
 }

--- a/docs/apidocs/resource_PlannerController0.html
+++ b/docs/apidocs/resource_PlannerController0.html
@@ -142,9 +142,9 @@ Content-Type: text/xml

                <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
  &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;

                </code>

--- a/docs/apidocs/resource_ProvisionController.html
+++ b/docs/apidocs/resource_ProvisionController.html
@@ -308,16 +308,16 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
-  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -405,16 +405,16 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
-  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -605,26 +605,26 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
-  &quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;deployParameters&quot; : [ {
-    &quot;user&quot; : &quot;vm_user&quot;,
    &quot;IP&quot; : &quot;52.73.245.157&quot;,
+    &quot;user&quot; : &quot;vm_user&quot;,
    &quot;role&quot; : &quot;slave&quot;
  }, {
-    &quot;user&quot; : &quot;...&quot;,
    &quot;IP&quot; : &quot;...&quot;,
+    &quot;user&quot; : &quot;...&quot;,
    &quot;role&quot; : &quot;...&quot;
  } ],
-  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>

--- a/docs/apidocs/resource_ProvisionController0.html
+++ b/docs/apidocs/resource_ProvisionController0.html
@@ -126,9 +126,9 @@ Accept: text/xml

                <code class="prettyprint language-xml">
 &lt;execute&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/execute&gt;

                </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml

                <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
  &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;

                </code>

--- a/docs/apidocs/resource_ScriptController.html
+++ b/docs/apidocs/resource_ScriptController.html
@@ -159,8 +159,8 @@ Accept: application/json
 {
  &quot;name&quot; : &quot;config.sh&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;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -395,8 +395,8 @@ Content-Type: application/json
 {
  &quot;name&quot; : &quot;config.sh&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;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>
@@ -681,8 +681,8 @@ Content-Type: application/json
 {
  &quot;name&quot; : &quot;config.sh&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;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;timestamp&quot; : 12345
 }
                </code>

--- a/docs/apidocs/resource_UserController.html
+++ b/docs/apidocs/resource_UserController.html
@@ -140,13 +140,13 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 [ {
+  &quot;password&quot; : &quot;...&quot;,
  &quot;username&quot; : &quot;user&quot;,
-  &quot;accountNonExpired&quot; : true,
-  &quot;enabled&quot; : true,
  &quot;accountNonLocked&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;password&quot; : &quot;...&quot;,
+  &quot;enabled&quot; : true,
+  &quot;accountNonExpired&quot; : true,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;credentialsNonExpired&quot; : true
 } ]
                </code>
@@ -314,13 +314,13 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
+  &quot;password&quot; : &quot;...&quot;,
  &quot;username&quot; : &quot;user&quot;,
-  &quot;accountNonExpired&quot; : true,
-  &quot;enabled&quot; : true,
  &quot;accountNonLocked&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;password&quot; : &quot;...&quot;,
+  &quot;enabled&quot; : true,
+  &quot;accountNonExpired&quot; : true,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;credentialsNonExpired&quot; : true
 }
                </code>
@@ -428,13 +428,13 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
+  &quot;password&quot; : &quot;...&quot;,
  &quot;username&quot; : &quot;user&quot;,
-  &quot;accountNonExpired&quot; : true,
-  &quot;enabled&quot; : true,
  &quot;accountNonLocked&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;password&quot; : &quot;...&quot;,
+  &quot;enabled&quot; : true,
+  &quot;accountNonExpired&quot; : true,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;credentialsNonExpired&quot; : true
 }
                </code>
@@ -636,13 +636,13 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
+  &quot;password&quot; : &quot;...&quot;,
  &quot;username&quot; : &quot;user&quot;,
-  &quot;accountNonExpired&quot; : true,
-  &quot;enabled&quot; : true,
  &quot;accountNonLocked&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;password&quot; : &quot;...&quot;,
+  &quot;enabled&quot; : true,
+  &quot;accountNonExpired&quot; : true,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;credentialsNonExpired&quot; : true
 }
                </code>

--- a/docs/apidocs/resource_UserPublicKeysController0.html
+++ b/docs/apidocs/resource_UserPublicKeysController0.html
@@ -132,9 +132,9 @@ Accept: application/json
                <code class="prettyprint language-xml">
 &lt;confUserKey&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;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/confUserKey&gt;

                </code>

--- a/docs/apidocs/resource_UserScriptController0.html
+++ b/docs/apidocs/resource_UserScriptController0.html
@@ -131,9 +131,9 @@ Accept: application/json
                <code class="prettyprint language-xml">
 &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;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/confScript&gt;

                </code>

--- a/docs/apidocs/xml_ns0_ansibleOutput.html
+++ b/docs/apidocs/xml_ns0_ansibleOutput.html
@@ -211,11 +211,11 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;a-----&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
  &lt;host&gt;...&lt;/host&gt;
+  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
  &lt;provisionID&gt;...&lt;/provisionID&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
  &lt;cloudProvider&gt;...&lt;/cloudProvider&gt;
-  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/a-----&gt;

--- a/docs/apidocs/xml_ns0_benchmarkResult.html
+++ b/docs/apidocs/xml_ns0_benchmarkResult.html
@@ -231,12 +231,12 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;b-----&gt;
+  &lt;start&gt;...&lt;/start&gt;
  &lt;host&gt;...&lt;/host&gt;
-  &lt;end&gt;...&lt;/end&gt;
  &lt;delta&gt;...&lt;/delta&gt;
-  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
  &lt;vmType&gt;...&lt;/vmType&gt;
-  &lt;start&gt;...&lt;/start&gt;
+  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
+  &lt;end&gt;...&lt;/end&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/b-----&gt;

--- a/docs/apidocs/xml_ns0_cloudCredentials.html
+++ b/docs/apidocs/xml_ns0_cloudCredentials.html
@@ -193,10 +193,10 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;c-----&gt;
-  &lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
  &lt;cloudProviderName&gt;ec2&lt;/cloudProviderName&gt;
-  &lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
+  &lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
  &lt;attributes&gt;...&lt;/attributes&gt;
+  &lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/c-----&gt;

--- a/docs/apidocs/xml_ns0_confScript.html
+++ b/docs/apidocs/xml_ns0_confScript.html
@@ -152,9 +152,9 @@
      
      <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;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/confScript&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_confUserKey.html
+++ b/docs/apidocs/xml_ns0_confUserKey.html
@@ -152,9 +152,9 @@
      
      <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;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/confUserKey&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_configure.html
+++ b/docs/apidocs/xml_ns0_configure.html
@@ -272,16 +272,16 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;configure&gt;
-  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt;
+  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
+  &lt;user&gt;user&lt;/user&gt;
+  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
+  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
+  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
  &lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
+  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
+  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&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;pwd&gt;123&lt;/pwd&gt;
-  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
-  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
-  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
-  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
-  &lt;user&gt;user&lt;/user&gt;
-  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
 &lt;/configure&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_deploy.html
+++ b/docs/apidocs/xml_ns0_deploy.html
@@ -133,9 +133,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;deploy&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/deploy&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_deployParameter.html
+++ b/docs/apidocs/xml_ns0_deployParameter.html
@@ -146,8 +146,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;IP&gt;52.73.245.157&lt;/IP&gt;
  &lt;user&gt;vm_user&lt;/user&gt;
+  &lt;IP&gt;52.73.245.157&lt;/IP&gt;
  &lt;role&gt;slave&lt;/role&gt;
 &lt;/d-----&gt;
 </pre>

--- a/docs/apidocs/xml_ns0_deployRequest.html
+++ b/docs/apidocs/xml_ns0_deployRequest.html
@@ -177,8 +177,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;managerType&gt;ansible&lt;/managerType&gt;
  &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;
+  &lt;managerType&gt;ansible&lt;/managerType&gt;
  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;

--- a/docs/apidocs/xml_ns0_deployResponse.html
+++ b/docs/apidocs/xml_ns0_deployResponse.html
@@ -181,8 +181,8 @@
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
  &lt;ansibleOutputList&gt;...&lt;/ansibleOutputList&gt;
-  &lt;managerType&gt;ansible&lt;/managerType&gt;
  &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;
+  &lt;managerType&gt;ansible&lt;/managerType&gt;
  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;

--- a/docs/apidocs/xml_ns0_execute.html
+++ b/docs/apidocs/xml_ns0_execute.html
@@ -148,9 +148,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;execute&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/execute&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_key.html
+++ b/docs/apidocs/xml_ns0_key.html
@@ -164,10 +164,10 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;k-----&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;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;type&gt;PRIVATE&lt;/type&gt;
 &lt;/k-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_keyPair.html
+++ b/docs/apidocs/xml_ns0_keyPair.html
@@ -175,18 +175,18 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;k-----&gt;
-  &lt;publicKey&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;/publicKey&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;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;type&gt;PRIVATE&lt;/type&gt;
  &lt;/privateKey&gt;
+  &lt;publicKey&gt;
+    &lt;attributes&gt;domain_name:Virginia&lt;/attributes&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;type&gt;PRIVATE&lt;/type&gt;
+  &lt;/publicKey&gt;
  &lt;keyPairId&gt;...&lt;/keyPairId&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;

--- a/docs/apidocs/xml_ns0_planRequest.html
+++ b/docs/apidocs/xml_ns0_planRequest.html
@@ -200,12 +200,12 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
+  &lt;osType&gt;...&lt;/osType&gt;
+  &lt;cloudProvider&gt;...&lt;/cloudProvider&gt;
+  &lt;toscaID&gt;...&lt;/toscaID&gt;
  &lt;managerType&gt;...&lt;/managerType&gt;
  &lt;domain&gt;...&lt;/domain&gt;
-  &lt;cloudProvider&gt;...&lt;/cloudProvider&gt;
-  &lt;osType&gt;...&lt;/osType&gt;
  &lt;vmUserName&gt;...&lt;/vmUserName&gt;
-  &lt;toscaID&gt;...&lt;/toscaID&gt;
 &lt;/p-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_planResponse.html
+++ b/docs/apidocs/xml_ns0_planResponse.html
@@ -175,9 +175,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
+  &lt;name&gt;planner_output_all.yml&lt;/name&gt;
  &lt;level&gt;0&lt;/level&gt;
  &lt;toscaID&gt;58e3946e0fb4f562d84ba1ad&lt;/toscaID&gt;
-  &lt;name&gt;planner_output_all.yml&lt;/name&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/p-----&gt;

--- a/docs/apidocs/xml_ns0_provisionRequest.html
+++ b/docs/apidocs/xml_ns0_provisionRequest.html
@@ -195,10 +195,10 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
-  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
  &lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
  &lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt;
  &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/p-----&gt;

--- a/docs/apidocs/xml_ns0_provisionResponse.html
+++ b/docs/apidocs/xml_ns0_provisionResponse.html
@@ -210,16 +210,16 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
+  &lt;cloudKeyPairIDs&gt;...&lt;/cloudKeyPairIDs&gt;
  &lt;deployParameters&gt;
-    &lt;IP&gt;52.73.245.157&lt;/IP&gt;
    &lt;user&gt;vm_user&lt;/user&gt;
+    &lt;IP&gt;52.73.245.157&lt;/IP&gt;
    &lt;role&gt;slave&lt;/role&gt;
  &lt;/deployParameters&gt;
-  &lt;cloudKeyPairIDs&gt;...&lt;/cloudKeyPairIDs&gt;
-  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
  &lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
  &lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt;
  &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
 &lt;/p-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_result.html
+++ b/docs/apidocs/xml_ns0_result.html
@@ -146,9 +146,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
  &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_sysbenchCPUBenchmark.html
+++ b/docs/apidocs/xml_ns0_sysbenchCPUBenchmark.html
@@ -432,25 +432,25 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;s-----&gt;
-  &lt;avgExecutionTimePerRequest&gt;...&lt;/avgExecutionTimePerRequest&gt;
+  &lt;minExecutionTimePerRequest&gt;...&lt;/minExecutionTimePerRequest&gt;
  &lt;ansibleOutputID&gt;...&lt;/ansibleOutputID&gt;
  &lt;totalNumberOfEvents&gt;...&lt;/totalNumberOfEvents&gt;
-  &lt;minExecutionTimePerRequest&gt;...&lt;/minExecutionTimePerRequest&gt;
-  &lt;avgEventsPerThread&gt;...&lt;/avgEventsPerThread&gt;
  &lt;approx95Percentile&gt;...&lt;/approx95Percentile&gt;
+  &lt;stddevExecTimePerThread&gt;...&lt;/stddevExecTimePerThread&gt;
+  &lt;sysbenchVersion&gt;...&lt;/sysbenchVersion&gt;
+  &lt;avgExecutionTimePerRequest&gt;...&lt;/avgExecutionTimePerRequest&gt;
+  &lt;executionTime&gt;...&lt;/executionTime&gt;
+  &lt;maxExecutionTimePerRequest&gt;...&lt;/maxExecutionTimePerRequest&gt;
  &lt;stddevEventsPerThread&gt;...&lt;/stddevEventsPerThread&gt;
  &lt;numberOfThreads&gt;...&lt;/numberOfThreads&gt;
-  &lt;maxExecutionTimePerRequest&gt;...&lt;/maxExecutionTimePerRequest&gt;
-  &lt;executionTime&gt;...&lt;/executionTime&gt;
-  &lt;sysbenchVersion&gt;...&lt;/sysbenchVersion&gt;
-  &lt;stddevExecTimePerThread&gt;...&lt;/stddevExecTimePerThread&gt;
  &lt;avgExecTimePerThread&gt;...&lt;/avgExecTimePerThread&gt;
+  &lt;avgEventsPerThread&gt;...&lt;/avgEventsPerThread&gt;
+  &lt;start&gt;...&lt;/start&gt;
  &lt;host&gt;...&lt;/host&gt;
-  &lt;end&gt;...&lt;/end&gt;
  &lt;delta&gt;...&lt;/delta&gt;
-  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
  &lt;vmType&gt;...&lt;/vmType&gt;
-  &lt;start&gt;...&lt;/start&gt;
+  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
+  &lt;end&gt;...&lt;/end&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/s-----&gt;

--- a/docs/apidocs/xml_ns0_user.html
+++ b/docs/apidocs/xml_ns0_user.html
@@ -236,14 +236,14 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;u-----&gt;
+  &lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt;
  &lt;credentialsNonExpired&gt;true&lt;/credentialsNonExpired&gt;
  &lt;username&gt;user&lt;/username&gt;
-  &lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
  &lt;roles&gt;[&quot;ADMIN&quot;,&quot;USER&quot;]&lt;/roles&gt;
-  &lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt;
-  &lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt;
  &lt;enabled&gt;true&lt;/enabled&gt;
+  &lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt;
  &lt;password&gt;...&lt;/password&gt;
+  &lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
 &lt;/u-----&gt;
 </pre>


--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java
@@ -226,7 +226,7 @@ public class PlannerService {
    }

    public String saveStringContents(String ymlContents, Integer level, String name) {
-        Map<String, Object> map = Converter.cleanStringContents(ymlContents);
+        Map<String, Object> map = Converter.cleanStringContents(ymlContents,true);
        PlanResponse pr = new PlanResponse();
        pr.setKvMap(map);
        pr.setLevel(level);

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlaybookService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlaybookService.java
@@ -116,7 +116,7 @@ public class PlaybookService {
    }

    public String saveStringContents(String playbookContents) throws IOException {
-        Map<String, Object> map = Converter.cleanStringContents(playbookContents);        
+        Map<String, Object> map = Converter.cleanStringContents(playbookContents,false);        
        PlaybookRepresentation t = new PlaybookRepresentation();
        t.setKvMap(map);
        save(t);

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java
@@ -120,7 +120,7 @@ public class ToscaService {

    public String saveStringContents(String toscaContents, String name) throws IOException {

-        Map<String, Object> map = Converter.cleanStringContents(toscaContents);
+        Map<String, Object> map = Converter.cleanStringContents(toscaContents,true);

        ToscaRepresentation t = new ToscaRepresentation();
        t.setName(name);

--- a/drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
+++ b/drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
@@ -210,9 +210,10 @@ public class Converter {
        return p1;
    }

-    public static Map<String, Object> cleanStringContents(String toscaContents) {
+    public static Map<String, Object> cleanStringContents(String ymlContents, boolean removeNewLine) {
+        if (removeNewLine) {
            //Remove '\' and 'n' if they are together and replace them with '\n'
-        char[] array = toscaContents.toCharArray();
+            char[] array = ymlContents.toCharArray();
            StringBuilder sb = new StringBuilder();
            int prevChar = -1;
            for (int i = 0; i < array.length; i++) {
@@ -220,21 +221,23 @@ public class Converter {
                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];
            }
-        toscaContents = sb.toString();
-        toscaContents = toscaContents.replaceAll("(?m)^[ \t]*\r?\n", "");
+            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];
-            toscaContents = toscaContents.replaceAll(String.valueOf((char) hex), "");
+            ymlContents = ymlContents.replaceAll(String.valueOf((char) hex), "");
        }

-        toscaContents = toscaContents.replaceAll("\\.", "\uff0E");
-        Map<String, Object> map = Converter.ymlString2Map(toscaContents);
+        ymlContents = ymlContents.replaceAll("\\.", "\uff0E");
+        Map<String, Object> map = null;
+        map = Converter.ymlString2Map(ymlContents);
        return map;
    }


--- a/drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/v1/external/CloudCredentials.java
+++ b/drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/v1/external/CloudCredentials.java
@@ -17,7 +17,6 @@ package nl.uva.sne.drip.drip.commons.data.v1.external;

 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.webcohesion.enunciate.metadata.DocumentationExample;
-import java.util.List;
 import java.util.Map;
 import org.springframework.data.mongodb.core.mapping.Document;


--- a/drip-deployer/playbooks/euroago_cong.yml
+++ b/drip-deployer/playbooks/euroago_cong.yml
 ---
 - hosts: all
  tasks:
-  - name: install sysbench
+  - name: install pre-req
    apt: name="{{ item }}" update_cache=yes state=latest
    with_items: [python, tcsh, expect]
    become: true
@@ -9,8 +9,20 @@
      dest=/tmp/'}
  - {name: Install irods, apt: deb=/tmp/irods-icommands-4.1.10-ubuntu14-x86_64.deb,
    become: true}
-  - {name: Copy file, copy: src=/tmp/scripts/ArgoDiffusion/scripts dest=/tmp/scripts owner=vm_user group=vm_user mode=755}
+  - {name: Copy scripts, copy: src=/tmp/scripts/ArgoDiffusion/scripts dest=/tmp/scripts owner=vm_user group=vm_user mode=755}
  - {name: create dir, file: path=/home/vm_user/.irods/ state=directory owner=vm_user group=vm_user}
-  - {name: Copy file, copy: src=/tmp/conf/irods_environment.json dest=/home/vm_user/.irods/ owner=vm_user group=vm_user mode=755}
-  - {name: Run iinit, command: expect -c "spawn iinit; expect \"Enter your current iRODS password\"; send \"PASSWORD\n\";interact;", register: streamoutput}
+  - {name: Copy irods_environment, copy: src=/tmp/conf/irods_environment.json dest=/home/vm_user/.irods/ owner=vm_user group=vm_user mode=755}
+  - {name: Run iinit, command: expect -c "spawn iinit; expect \"Enter your current iRODS password\"; send \"PASSWORD\n\";interact;", register: streamoutput, become: yes,  become_user: vm_user}
  - debug: msg="{{ streamoutput.stdout }}"
+  - {name: create dir, file: path=/mnt/data/ state=directory owner=vm_user group=vm_user}
+  - {name: create dir, file: path=/mnt/data/source/ state=directory owner=vm_user group=vm_user}
+  - {name: create dir, file: path=/mnt/data/source/output state=directory owner=vm_user group=vm_user}
+  - {name: create dir, file: path=/mnt/data/irods/ state=directory owner=vm_user group=vm_user}
+  - {name: Run irodsFs, command: irodsFs /mnt/data/irods/, register: streamoutput, become: yes,  become_user: vm_user}
+  - debug: msg="{{ streamoutput.stdout }}"
+  - {name: Copy from tmp, command: cp /tmp/scripts/scripts/ar_bigmetadata.json /mnt/data/source/, become: yes,  become_user: vm_user}  
+  - {name: Copy from irods, command: ln -s /mnt/data/irods/monthly /mnt/data/source/input, become: yes,  become_user: vm_user}
+  - {name: Copy from irods, command: cp /mnt/data/irods/action/argo_model.py /mnt/data/source/, become: yes,  become_user: vm_user}
+  - {name: Copy from irods, command: cp /mnt/data/irods/action/configuration.json /mnt/data/source/, become: yes,  become_user: vm_user}    
+  - {name: Copy from irods, command: cp /mnt/data/irods/action/generation_argo_big_data.py /mnt/data/source/, become: yes,  become_user: vm_user}
+  - {name: Copy from irods, command: cp /mnt/data/irods/action/generation_argo_big_data.sh /mnt/data/source/, become: yes,  become_user: vm_user}       
\ No newline at end of file
--- a/drip-deployer/playbooks/euroago_run.yml
+++ b/drip-deployer/playbooks/euroago_run.yml
+---
+- hosts: all
+  tasks:
+  - {name: Run generation_argo_big_data, command: /usr/bin/python /mnt/data/source/generation_argo_big_data.py /mnt/data/source/configuration.json, register: streamoutput, become: yes,  become_user: vm_user}
+  - debug: msg="{{ streamoutput.stdout }}"
\ No newline at end of file