moved data types to separate project

1574a94b · Spiros Koulouzis · d7c19801 · 1574a94b · 1574a94b · 1574a94b
Commit 1574a94b authored Apr 26, 2017 by Spiros Koulouzis
75 changed files
--- a/docs/apidocs/downloads.html
+++ b/docs/apidocs/downloads.html
@@ -91,7 +91,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-gwt-json-overlay.jar">
      <td><span class="downloadfile-name">drip-api-gwt-json-overlay.jar</span></td>
-      <td><span class="downloadfile-size">15.45K</span></td>
+      <td><span class="downloadfile-size">15.48K</span></td>
      <td><span class="downloadfile-description">The sources for the GWT JSON overlay.</span></td>
    </tr>
    </tbody>
@@ -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">21.39K</span></td>
+      <td><span class="downloadfile-size">21.47K</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">16.30K</span></td>
+      <td><span class="downloadfile-size">16.34K</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">24.08K</span></td>
+      <td><span class="downloadfile-size">24.24K</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">20.25K</span></td>
+      <td><span class="downloadfile-size">20.34K</span></td>
      <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
    </tr>
    </tbody>
@@ -184,7 +184,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-js.zip">
      <td><span class="downloadfile-name">drip-api-js.zip</span></td>
-      <td><span class="downloadfile-size">6.86K</span></td>
+      <td><span class="downloadfile-size">6.91K</span></td>
      <td><span class="downloadfile-description">&nbsp;</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">7.74K</span></td>
+      <td><span class="downloadfile-size">7.71K</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">8.56K</span></td>
+      <td><span class="downloadfile-size">8.62K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
@@ -276,7 +276,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api.rb">
      <td><span class="downloadfile-name">drip-api.rb</span></td>
-      <td><span class="downloadfile-size">109.36K</span></td>
+      <td><span class="downloadfile-size">110.43K</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
@@ -136,14 +136,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -155,21 +155,21 @@
      <pre class="prettyprint language-js example">{
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;msg&quot; : &quot;...&quot;,
+    &quot;changed&quot; : true,
+    &quot;start&quot; : &quot;...&quot;,
+    &quot;end&quot; : &quot;...&quot;,
+    &quot;delta&quot; : &quot;...&quot;,
    &quot;stdout&quot; : &quot;...&quot;,
    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-    &quot;delta&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;msg&quot; : &quot;...&quot;,
-    &quot;end&quot; : &quot;...&quot;
+    &quot;stderr&quot; : &quot;...&quot;
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

--- a/docs/apidocs/json_BenchmarkResult.html
+++ b/docs/apidocs/json_BenchmarkResult.html
@@ -82,7 +82,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">start</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -91,7 +91,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">host</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -100,7 +100,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">delta</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">cloudDeploymentDomain</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -118,7 +118,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">host</span>
+          <td>  <span class="property-name">vmType</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -127,7 +127,7 @@
 </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>
@@ -147,14 +147,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -164,15 +164,15 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_CloudCredentials.html
+++ b/docs/apidocs/json_CloudCredentials.html
@@ -79,6 +79,15 @@
        </tr>
        </thead>
        <tbody>
+        <tr>
+          <td>  <span class="property-name">keyPairs</span>
+</td>
+          <td>  <span class="datatype-reference">array of <a href="json_KeyPair.html">KeyPair</a>
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
        <tr>
          <td>  <span class="property-name">accessKeyId</span>
 </td>
@@ -127,14 +136,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -144,13 +153,58 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
+  &quot;keyPairs&quot; : [ {
+    &quot;publicKey&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;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;privateKey&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;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;owner&quot; : &quot;user1&quot;,
+    &quot;timestamp&quot; : 12345,
+    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
+  }, {
+    &quot;publicKey&quot; : {
+      &quot;name&quot; : &quot;...&quot;,
+      &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;attributes&quot; : {
+        &quot;property1&quot; : &quot;...&quot;,
+        &quot;property2&quot; : &quot;...&quot;
+      }
+    },
+    &quot;privateKey&quot; : {
+      &quot;name&quot; : &quot;...&quot;,
+      &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PUBLIC&quot;,
+      &quot;attributes&quot; : {
+        &quot;property1&quot; : &quot;...&quot;,
+        &quot;property2&quot; : &quot;...&quot;
+      }
+    },
+    &quot;owner&quot; : &quot;...&quot;,
+    &quot;timestamp&quot; : 12345,
+    &quot;id&quot; : &quot;...&quot;
+  } ],
  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

--- 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>
@@ -120,14 +120,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -137,12 +137,12 @@
      <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;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_DeployResponse.html
+++ b/docs/apidocs/json_DeployResponse.html
@@ -103,7 +103,7 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">provisionID</span></td>
+          <td><span class="property-name">configurationID</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -115,7 +115,7 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">configurationID</span></td>
+          <td><span class="property-name">provisionID</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -132,14 +132,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -152,33 +152,33 @@
  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;keyPair&quot; : {
    &quot;publicKey&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;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;privateKey&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;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;owner&quot; : &quot;user1&quot;,
-    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-    &quot;timestamp&quot; : 12345
+    &quot;timestamp&quot; : 12345,
+    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
  },
-  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

--- a/docs/apidocs/json_KeyPair.html
+++ b/docs/apidocs/json_KeyPair.html
@@ -109,14 +109,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -127,26 +127,26 @@
      
      <pre class="prettyprint language-js example">{
  &quot;publicKey&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;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;privateKey&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;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;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

--- 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_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
      </dl>

      <table class="table datatype-properties">
@@ -91,18 +91,18 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">id</span>
+          <td>  <span class="property-name">timestamp</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">timestamp</span>
+          <td>  <span class="property-name">id</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -115,8 +115,8 @@
      
      <pre class="prettyprint language-js example">{
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

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

        <footer class="footer">

--- a/docs/apidocs/json_ProvisionRequest.html
+++ b/docs/apidocs/json_ProvisionRequest.html
@@ -82,16 +82,16 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">cloudCredentialsIDs</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">keyPairIDs</span>
+          <td>  <span class="property-name">cloudCredentialsIDs</span>
 </td>
          <td>  <span class="datatype-reference">array of string
 </span>
@@ -100,9 +100,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">planID</span>
+          <td>  <span class="property-name">keyPairIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -131,14 +131,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -148,16 +148,16 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_ProvisionResponse.html
+++ b/docs/apidocs/json_ProvisionResponse.html
@@ -94,20 +94,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">cloudCredentialsIDs</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">keyPairIDs</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>
        </tr>
        <tr>
-          <td><span class="property-name">planID</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">keyPairIDs</span></td>
+          <td><span class="datatype-reference">array of string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -134,14 +134,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -152,26 +152,26 @@
      
      <pre class="prettyprint language-js example">{
  &quot;deployParameters&quot; : [ {
+    &quot;role&quot; : &quot;slave&quot;,
    &quot;IP&quot; : &quot;52.73.245.157&quot;,
-    &quot;cloudCertificateName&quot; : &quot;Virginia&quot;,
    &quot;user&quot; : &quot;vm_user&quot;,
-    &quot;role&quot; : &quot;slave&quot;
+    &quot;cloudCertificateName&quot; : &quot;Virginia&quot;
  }, {
+    &quot;role&quot; : &quot;...&quot;,
    &quot;IP&quot; : &quot;...&quot;,
-    &quot;cloudCertificateName&quot; : &quot;...&quot;,
    &quot;user&quot; : &quot;...&quot;,
-    &quot;role&quot; : &quot;...&quot;
+    &quot;cloudCertificateName&quot; : &quot;...&quot;
  } ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_Script.html
+++ b/docs/apidocs/json_Script.html
@@ -109,14 +109,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -129,8 +129,8 @@
  &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
  &quot;name&quot; : &quot;config.sh&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_SysbenchCPUBenchmark.html
+++ b/docs/apidocs/json_SysbenchCPUBenchmark.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">sysbenchVersion</span>
+          <td>  <span class="property-name">ansibleOutputID</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">approx95Percentile</span>
+          <td>  <span class="property-name">totalNumberOfEvents</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -98,7 +98,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">minExecutionTimePerRequest</span>
+          <td>  <span class="property-name">avgEventsPerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -107,7 +107,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
+          <td>  <span class="property-name">avgExecTimePerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -125,7 +125,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgEventsPerThread</span>
+          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -134,18 +134,18 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stddevExecTimePerThread</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">ansibleOutputID</span>
+          <td>  <span class="property-name">stddevExecTimePerThread</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -161,7 +161,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">totalNumberOfEvents</span>
+          <td>  <span class="property-name">avgExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -170,7 +170,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgExecutionTimePerRequest</span>
+          <td>  <span class="property-name">minExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -179,7 +179,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgExecTimePerThread</span>
+          <td>  <span class="property-name">numberOfThreads</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -188,7 +188,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">numberOfThreads</span>
+          <td>  <span class="property-name">approx95Percentile</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -202,37 +202,37 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">cloudDeploymentDomain</span></td>
+          <td><span class="property-name">start</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">host</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">start</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>
        </tr>
        <tr>
-          <td><span class="property-name">vmType</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">host</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">delta</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>
@@ -249,14 +249,14 @@
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
@@ -266,28 +266,28 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;sysbenchVersion&quot; : &quot;...&quot;,
-  &quot;approx95Percentile&quot; : 12345.0,
-  &quot;minExecutionTimePerRequest&quot; : 12345.0,
-  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
-  &quot;stddevEventsPerThread&quot; : 12345.0,
+  &quot;ansibleOutputID&quot; : &quot;...&quot;,
+  &quot;totalNumberOfEvents&quot; : 12345,
  &quot;avgEventsPerThread&quot; : 12345.0,
+  &quot;avgExecTimePerThread&quot; : 12345.0,
+  &quot;stddevEventsPerThread&quot; : 12345.0,
+  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
+  &quot;sysbenchVersion&quot; : &quot;...&quot;,
  &quot;stddevExecTimePerThread&quot; : 12345.0,
-  &quot;ansibleOutputID&quot; : &quot;...&quot;,
  &quot;executionTime&quot; : 12345.0,
-  &quot;totalNumberOfEvents&quot; : 12345,
  &quot;avgExecutionTimePerRequest&quot; : 12345.0,
-  &quot;avgExecTimePerThread&quot; : 12345.0,
+  &quot;minExecutionTimePerRequest&quot; : 12345.0,
  &quot;numberOfThreads&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
+  &quot;approx95Percentile&quot; : 12345.0,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

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

        <footer class="footer">

--- 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;msg&quot; : &quot;...&quot;,
+    &quot;changed&quot; : true,
+    &quot;start&quot; : &quot;...&quot;,
+    &quot;end&quot; : &quot;...&quot;,
+    &quot;delta&quot; : &quot;...&quot;,
    &quot;stdout&quot; : &quot;...&quot;,
    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-    &quot;delta&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;msg&quot; : &quot;...&quot;,
-    &quot;end&quot; : &quot;...&quot;
+    &quot;stderr&quot; : &quot;...&quot;
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 } ]
                </code>
              </pre>
@@ -584,21 +584,21 @@ Content-Type: application/json
 {
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;msg&quot; : &quot;...&quot;,
+    &quot;changed&quot; : true,
+    &quot;start&quot; : &quot;...&quot;,
+    &quot;end&quot; : &quot;...&quot;,
+    &quot;delta&quot; : &quot;...&quot;,
    &quot;stdout&quot; : &quot;...&quot;,
    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
-    &quot;delta&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;msg&quot; : &quot;...&quot;,
-    &quot;end&quot; : &quot;...&quot;
+    &quot;stderr&quot; : &quot;...&quot;
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- a/docs/apidocs/resource_BenchmarkController.html
+++ b/docs/apidocs/resource_BenchmarkController.html
@@ -139,15 +139,15 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 [ {
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 } ]
                </code>
              </pre>
@@ -481,15 +481,15 @@ Content-Type: application/json

                <code class="prettyprint language-js">
 {
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- a/docs/apidocs/resource_CloudConfigurationController0.html
+++ b/docs/apidocs/resource_CloudConfigurationController0.html
--- a/docs/apidocs/resource_CloudCredentialsController.html
+++ b/docs/apidocs/resource_CloudCredentialsController.html
--- a/docs/apidocs/resource_DeployController.html
+++ b/docs/apidocs/resource_DeployController.html
@@ -230,12 +230,12 @@ 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;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -396,12 +396,12 @@ 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;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -590,33 +590,33 @@ Content-Type: application/json
  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;keyPair&quot; : {
    &quot;publicKey&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;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;privateKey&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;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;owner&quot; : &quot;user1&quot;,
-    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-    &quot;timestamp&quot; : 12345
+    &quot;timestamp&quot; : 12345,
+    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
  },
-  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- 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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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_PlannerController0.html
+++ b/docs/apidocs/resource_PlannerController0.html
@@ -125,10 +125,10 @@ Accept: text/xml

                <code class="prettyprint language-xml">
 &lt;plan&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
+  &lt;user&gt;user&lt;/user&gt;
  &lt;file&gt;tosca_definitions_version: tosca_simple_yaml_1_0\n\n\ndescription: example file for infrastructure planner\n\n\nrepositories:\n    MOG_docker_hub: \n      description: MOG project’s code repository in GitHub\n      url: https://github.com/switch-project/mog\n      credential:\n        protocol: xauth\n        token_type: X-Auth-Token\n        # token encoded in Base64\n        token: 604bbe45ac7143a79e14f3158df67091\n\n\nartifact_types:\n  tosca.artifacts.Deployment.Image.Container.Docker:\n    derived_from: tosca.artifacts.Deployment.Image\n\n\ndata_types:\n  Switch.datatypes.QoS.AppComponent:\n    derived_from: tosca.datatypes.Root\n    properties:\n      response_time:\n        type: string\n\n  Switch.datatypes.Application.Connection.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      component_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Application.Connection.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n  Switch.datatypes.Network.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      host_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Network.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n\nnode_types:\n\n  Switch.nodes.Application.Container.Docker:\n    derived_from: tosca.nodes.Container.Application\n    properties:\n      QoS:\n        type: Switch.datatypes.QoS.AppComponent\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n    interfaces:\n      Standard:\n        create:\n          inputs:\n            command:\n              type: string\n            exported_ports:\n              type: list\n              entry_schema:\n                type: string\n            port_bindings:\n              type: list\n              entry_schema:\n                type: string\n\n  Switch.nodes.Application.Container.Docker.MOG.InputDistributor:\n    derived_from: Switch.nodes.Application.Container.Docker\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/InputDistributor:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      inPort: \n        type: integer\n      waitingTime:\n        type: integer\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder:\n    derived_from: Switch.nodes.Application.Container.Docker \n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      multicastAddrIP: \n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Connection:\n    derived_from: tosca.nodes.Root \n    properties:\n      source:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      target:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      bandwidth:\n        type: string\n      latency: \n        type: string\n      jitter:  \n        type: string\n      multicast:\n        type: Switch.datatypes.Application.Connection.Multicast\n\n  Switch.nodes.Compute:\n    derived_from: tosca.nodes.Compute\n    properties:\n      OStype:\n        type: string\n      nodetype:\n        type: string\n      domain:\n        type: string\n      public_address:\n        type: string\n      
        ethernet_port:\n        type: list\n        entry_schema:\n          type: tosca.datatypes.network.NetworkInfo\n      script:\n        type: string\n      installation:\n        type: string\n      ssh_credential:\n        type: tosca.datatypes.Credential\n\n  Switch.nodes.Network:\n    derived_from: tosca.nodes.network.Network\n    properties:\n      bandwidth:\n        type: string\n      latency:\n        type: string\n      jitter:\n        type: string\n      source:\n        type: Switch.datatypes.Network.EndPoint\n      target:\n        type: Switch.datatypes.Network.EndPoint\n      multicast:\n        type: Switch.datatypes.Network.Multicast\n\n\ntopology_template:\n  \n  node_templates:\n    2d13d708e3a9441ab8336ce874e08dd1:\n      type: Switch.nodes.Application.Container.Docker.MOG.InputDistributor\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/InputDistributor:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        inPort: 2000\n        waitingTime: 5\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: InputDistributor\n              exported_ports:\n                - 2000\n              port_bindings:\n                - &quot;2000:2000&quot;\n                - &quot;3000:3000&quot;\n\n    8fcc1788d9ee462c826572c79fdb2a6a:\n      type: Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: ProxyTranscoder\n              exported_ports:\n                - 80\n              port_bindings:\n                - &quot;8080:80&quot;\n\n    5e0add703c8a43938a39301f572e46c0:\n      type: Switch.nodes.Application.Connection\n      properties:\n        source:\n          address: 192.168.21.11\n          component_name: 2d13d708e3a9441ab8336ce874e08dd1\n          netmask: 255.255.255.0\n          port_name: &quot;inputDistributor_out&quot;\n        target:\n          address: 192.168.21.12\n          component_name: 8fcc1788d9ee462c826572c79fdb2a6a\n          netmask: 255.255.255.0\n          port_name: &quot;proxyTranscoder_in&quot;\n        latency: 30ms\n        bandwidth: 130MB/s\n        jitter: 500ms\n        multicast:\n          multicastAddrIP: 255.2.2.0\n          multicastAddrPort: 3000\n&lt;/file&gt;
-  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/plan&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_ProvisionController.html
+++ b/docs/apidocs/resource_ProvisionController.html
@@ -308,16 +308,16 @@ Accept: application/json

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

                <code class="prettyprint language-js">
 {
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -604,26 +604,26 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 {
  &quot;deployParameters&quot; : [ {
+    &quot;role&quot; : &quot;slave&quot;,
    &quot;IP&quot; : &quot;52.73.245.157&quot;,
-    &quot;cloudCertificateName&quot; : &quot;Virginia&quot;,
    &quot;user&quot; : &quot;vm_user&quot;,
-    &quot;role&quot; : &quot;slave&quot;
+    &quot;cloudCertificateName&quot; : &quot;Virginia&quot;
  }, {
+    &quot;role&quot; : &quot;...&quot;,
    &quot;IP&quot; : &quot;...&quot;,
-    &quot;cloudCertificateName&quot; : &quot;...&quot;,
    &quot;user&quot; : &quot;...&quot;,
-    &quot;role&quot; : &quot;...&quot;
+    &quot;cloudCertificateName&quot; : &quot;...&quot;
  } ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- 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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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>
@@ -215,9 +215,9 @@ Accept: application/json

                <code class="prettyprint language-xml">
 &lt;upload&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
-  &lt;pwd&gt;...&lt;/pwd&gt;
  &lt;user&gt;...&lt;/user&gt;
+  &lt;pwd&gt;...&lt;/pwd&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
 &lt;/upload&gt;

                </code>

--- a/docs/apidocs/resource_ScriptController.html
+++ b/docs/apidocs/resource_ScriptController.html
@@ -160,8 +160,8 @@ Accept: application/json
  &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
  &quot;name&quot; : &quot;config.sh&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -396,8 +396,8 @@ Content-Type: application/json
  &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
  &quot;name&quot; : &quot;config.sh&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -682,8 +682,8 @@ Content-Type: application/json
  &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
  &quot;name&quot; : &quot;config.sh&quot;,
  &quot;owner&quot; : &quot;user1&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;timestamp&quot; : 12345,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

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

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

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

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

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

--- a/docs/apidocs/resource_UserController0.html
+++ b/docs/apidocs/resource_UserController0.html
@@ -129,8 +129,8 @@ Accept: application/json

                <code class="prettyprint language-xml">
 &lt;register&gt;
-  &lt;pwd&gt;123abc&lt;/pwd&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123abc&lt;/pwd&gt;
 &lt;/register&gt;

                </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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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
@@ -193,12 +193,12 @@
      <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;vmType&gt;...&lt;/vmType&gt;
  &lt;provisionID&gt;...&lt;/provisionID&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
+  &lt;host&gt;...&lt;/host&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/a-----&gt;
 </pre>


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


--- a/docs/apidocs/xml_ns0_cloudCredentials.html
+++ b/docs/apidocs/xml_ns0_cloudCredentials.html
@@ -118,6 +118,24 @@
 </td>
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
+</td>
+          <td>  <span class="property-description">&nbsp;</span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">keyPairs</span>
+</td>
+          <td>  <span class="datatype-reference"><a href="xml_ns0_keyPair.html">keyPair</a>
+</span>
+</td>
+          <td>  <span class="property-type">element
+</span>
+</td>
+          <td>  <span class="property-namespaceInfo">
+</span>
+</td>
+          <td>  <span class="property-minMaxOccurs">0/unbounded
+</span>
 </td>
          <td>  <span class="property-description">&nbsp;</span>
 </td>
@@ -175,11 +193,27 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;c-----&gt;
-  &lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
-  &lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
+  &lt;keyPairs&gt;
+    &lt;privateKey&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;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+      &lt;name&gt;id_dsa.pub&lt;/name&gt;
+    &lt;/privateKey&gt;
+    &lt;publicKey&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;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+      &lt;name&gt;id_dsa.pub&lt;/name&gt;
+    &lt;/publicKey&gt;
+    &lt;timestamp&gt;...&lt;/timestamp&gt;
+    &lt;owner&gt;user1&lt;/owner&gt;
+  &lt;/keyPairs&gt;
  &lt;cloudProviderName&gt;ec2&lt;/cloudProviderName&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
+  &lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
+  &lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/c-----&gt;
 </pre>


--- 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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
+  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt;
-  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
+  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
+  &lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
-  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
-  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
-  &lt;geniKey&gt;/u3+7QAAAAIAAAABAWuf2AAACvDCCArgwDgYKKwYBBEBAQUABIIC\npKlNUfpKLNCy0h8P4L5XeECwwIN/tezeaOVsjvzLsXeiBsB/luYv9gttoeKFbcJb/IDpZr\nfpL1tjF8Sed6g38kNoWwnVVoNZ1ILpITjESL6FkZW+gGAPS+XHp8l52/2DjeECQlx+38GlFUftWP\nn3QH9bDYD+7sRtm4P0YWnekX67ltQHMV+Cyrg0HAFm+GUzJJoxu64MccURLBMw0If9gCmTOuVoRj\nprPukU+cMY8torQ3+WmzC0S6U10HjQ2AkJ80HwM6CcS82qflHIBfQ/o7ep76rCDN22widcLGOihU\nbJiNQtNdF6KRCJk0emVIvRHDHctsmmt2ao2Qx6ub2mA/eUZtlphHMVN5VQtSxdd87tKrH9FvaOe3\nGX/irmBBopS2mfFee4LPn3FT/F5bl9YunygX3sWLGNsCl8G15hzgSSVn4As37czUulj8hks/Qpvu\nqoVpegs2+m5mXbSMmif+cUPqyJZ8UL5slIGZMKQ7MJG1XVG6vFIHk3cS+L+NpDd2j8DZqBP5FXIO\nCt/IxZxR2ZfPHHmIbOhwdnaznOoyAEGDzFTXnyTClGTDTW/6zxOe/ynNPlnBQaNqVJYqPtFG4AVs\nhrSNuvYjm1xsVDROQI5LYF/nryU4VvqMTo2sjVP2g6Qw7E5ENWiYUAl2W+bk4H6WGDTdQgLm2J65\ngdZpQTQtubzWi8Fxrptqul5eq96l0xH15XQ9lBKV0J8PEMa1jKOW/9s2U++hAtKTixssVntaNyUY\n9dnXNYHnQRKXDrQr/izerNEhvlVcz6foWDurtjAIjxafyEBbXJ5TAyT4rxmkPxDg88LPXKCzpf1x\n3WwD8MBUNBC9nfB37rHxEl7StvnK3IXBHmEksg7X6xhmUsrsQo8mfP05XDmqt+lsiYoAAAACAAVY\nLjUwOQAAAz8wggM7MIICpKADAgECAgJFBDANBgkqhkiG9w0BAQUFADCBiTEUMBIGA1UEChMLY2gu\nZ2VuaS5uZXQxEjAQBgNVBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBm\nMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5z\nQGdlbmkubmV0MB4XDTE3MDEyNTE0NTY0OVoXDTE4MDEyNTE0NTY0OVowUjEtMCsGA1UEAxMkYmY4\nYThhNTQtN2FjOS00NTEzLWIyZTItYjJjN2U2YWUwMDVkMSEwHwYJKoZIhvcNAQkBFhJzLmtvdWxv\ndXppc0B1dmEubmwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANmwnBJETSZSQm67FxQHL0s6\n84SYlYh6ltgi8DfwRu/wMA8sL5PsuupNvgKJCVHHZzPVwIrUy8JxpFrX3BItaDX+VPR+6sBJqUan\nBeb3vojU6CyEZzwCAOhn9OxB8ZFyoMD6SwsykPBOeXhGKpWsOoBwQDx8i6xpto1AP3KY8DpxAgMB\nAAGjgecwgeQwHQYDVR0OBBYEFNTBvaP5OnG0h8exiS8Ob0ZvfF8FMD4GA1UdIwQ3MDWAFHGlguYe\n8bTQK4umhY/oGl1ifTGuoRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIBAzAJBgNVHRMEAjAA\nMHgGA1UdEQRxMG+BEnMua291bG91emlzQHV2YS5ubIYqdXJuOnB1YmxpY2lkOklETitjaC5nZW5p\nLm5ldCt1c2VyK3Nrb3Vsb3V6hi11cm46dXVpZDpiZjhhOGE1NC03YWM5LTQ1MTMtYjJlMi1iMmM3\nZTZhZTAwNWQwDQYJKoZIhvcNAQEFBQADgYEAP/9ihMCaalsPRBMDozgX2Wd6eFCNYuDIMFTeNkKa\nkWJp156oQ4iAmbtP2R9r4W02gjEQRtUxvBhYI2Rp32wl1ZLdpSwnuZAE1H89dIHTct48VkiI1Zp9\n5BtV4olBUAf2K2hd46pH3ObUAYZvWQGoT+oOlfcacAaEUNp01afC8voABVguNTA5AAADUzCCA08w\nggK4oAMCAQICAQMwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLY2guZ2VuaS5uZXQwHhcNMTMw\nNTIwMTMxODI3WhcNMTgwNTE5MTMxODI3WjCBiTEUMBIGA1UEChMLY2guZ2VuaS5uZXQxEjAQBgNV\nBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBmMDlmLTk1ZjctNDUxMC1h\nMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5zQGdlbmkubmV0MIGfMA0G\nCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4LG9Xl2veo5+Zy1fDi47ajinYu+mv8QYDya2Hf8lPolQy\nlnGFFQRMx/JsbG1BBQ86FqSeUWtvANhY1nRlrozutOBeg9EEfhX+JXvVdhEKQ4/ANliC0V1UR3GO\nJHtQaj/6qoG/q01bWP7EJgf+ZPfTdCgCkJ89v8oth1m3UjCxcQIDAQABo4IBNzCCATMwHQYDVR0O\nBBYEFHGlguYe8bTQK4umhY/oGl1ifTGuMEYGA1UdIwQ/MD2AFEU22V1Y/0L1KwlqbnkdPIMEy5hR\noRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIJAJvH3dZoB97bMEcGCCsGAQUFBwEBBDswOTA3\nBhRpg8yTgKiYzKjHvbGngICqrteKG4YfaHR0cHM6Ly9jaC5nZW5pLm5ldC9jYWluZm8uaHRtbDBz\nBgNVHREEbDBqgRJjaC1hZG1pbnNAZ2VuaS5uZXSGKXVybjpwdWJsaWNpZDpJRE4rY2guZ2VuaS5u\nZXQrYXV0aG9yaXR5K21hhil1dWlkOjMxYzBmMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJj\nOTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHgrtROjbfUT6HQCZCl1XuAEZQPse3/x\nT2smC3LzAH4UUj3gEBq27VvxbqzazdBQCSeBEl2RUd+KoDzmhG5vBbAyHt8UE6s3P7Yx\ngoNYTld0JHB5wq3XFRaaGbeVgo2AuK9S/Q3whzMTRW21a58tLP5zwKGzX3oyQQUT5J\ncwv0z5NmJdAfk8Y=&lt;/geniKey&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&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;/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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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
@@ -164,8 +164,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;user&gt;vm_user&lt;/user&gt;
  &lt;cloudCertificateName&gt;Virginia&lt;/cloudCertificateName&gt;
+  &lt;user&gt;vm_user&lt;/user&gt;
  &lt;role&gt;slave&lt;/role&gt;
  &lt;IP&gt;52.73.245.157&lt;/IP&gt;
 &lt;/d-----&gt;

--- a/docs/apidocs/xml_ns0_deployRequest.html
+++ b/docs/apidocs/xml_ns0_deployRequest.html
@@ -177,11 +177,11 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
+  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&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;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/d-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_deployResponse.html
+++ b/docs/apidocs/xml_ns0_deployResponse.html
@@ -181,11 +181,11 @@
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
  &lt;ansibleOutputList&gt;...&lt;/ansibleOutputList&gt;
+  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&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;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/d-----&gt;
 </pre>


--- 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;user&gt;user&lt;/user&gt;
  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&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
@@ -165,8 +165,8 @@
      
      <pre class="prettyprint language-xml example">&lt;k-----&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;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
  &lt;type&gt;PRIVATE&lt;/type&gt;
+  &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
  &lt;name&gt;id_dsa.pub&lt;/name&gt;
 &lt;/k-----&gt;
 </pre>

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


--- a/docs/apidocs/xml_ns0_keyValueHolder.html
+++ b/docs/apidocs/xml_ns0_keyValueHolder.html
@@ -123,8 +123,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;k-----&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/k-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_ownedObject.html
+++ b/docs/apidocs/xml_ns0_ownedObject.html
@@ -130,8 +130,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;o-----&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/o-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_plan.html
+++ b/docs/apidocs/xml_ns0_plan.html
@@ -146,10 +146,10 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;plan&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
+  &lt;user&gt;user&lt;/user&gt;
  &lt;file&gt;tosca_definitions_version: tosca_simple_yaml_1_0\n\n\ndescription: example file for infrastructure planner\n\n\nrepositories:\n    MOG_docker_hub: \n      description: MOG project’s code repository in GitHub\n      url: https://github.com/switch-project/mog\n      credential:\n        protocol: xauth\n        token_type: X-Auth-Token\n        # token encoded in Base64\n        token: 604bbe45ac7143a79e14f3158df67091\n\n\nartifact_types:\n  tosca.artifacts.Deployment.Image.Container.Docker:\n    derived_from: tosca.artifacts.Deployment.Image\n\n\ndata_types:\n  Switch.datatypes.QoS.AppComponent:\n    derived_from: tosca.datatypes.Root\n    properties:\n      response_time:\n        type: string\n\n  Switch.datatypes.Application.Connection.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      component_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Application.Connection.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n  Switch.datatypes.Network.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      host_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Network.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n\nnode_types:\n\n  Switch.nodes.Application.Container.Docker:\n    derived_from: tosca.nodes.Container.Application\n    properties:\n      QoS:\n        type: Switch.datatypes.QoS.AppComponent\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n    interfaces:\n      Standard:\n        create:\n          inputs:\n            command:\n              type: string\n            exported_ports:\n              type: list\n              entry_schema:\n                type: string\n            port_bindings:\n              type: list\n              entry_schema:\n                type: string\n\n  Switch.nodes.Application.Container.Docker.MOG.InputDistributor:\n    derived_from: Switch.nodes.Application.Container.Docker\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/InputDistributor:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      inPort: \n        type: integer\n      waitingTime:\n        type: integer\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder:\n    derived_from: Switch.nodes.Application.Container.Docker \n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      multicastAddrIP: \n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Connection:\n    derived_from: tosca.nodes.Root \n    properties:\n      source:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      target:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      bandwidth:\n        type: string\n      latency: \n        type: string\n      jitter:  \n        type: string\n      multicast:\n        type: Switch.datatypes.Application.Connection.Multicast\n\n  Switch.nodes.Compute:\n    derived_from: tosca.nodes.Compute\n    properties:\n      OStype:\n        type: string\n      nodetype:\n        type: string\n      domain:\n        type: string\n      public_address:\n        type: string\n      
        ethernet_port:\n        type: list\n        entry_schema:\n          type: tosca.datatypes.network.NetworkInfo\n      script:\n        type: string\n      installation:\n        type: string\n      ssh_credential:\n        type: tosca.datatypes.Credential\n\n  Switch.nodes.Network:\n    derived_from: tosca.nodes.network.Network\n    properties:\n      bandwidth:\n        type: string\n      latency:\n        type: string\n      jitter:\n        type: string\n      source:\n        type: Switch.datatypes.Network.EndPoint\n      target:\n        type: Switch.datatypes.Network.EndPoint\n      multicast:\n        type: Switch.datatypes.Network.Multicast\n\n\ntopology_template:\n  \n  node_templates:\n    2d13d708e3a9441ab8336ce874e08dd1:\n      type: Switch.nodes.Application.Container.Docker.MOG.InputDistributor\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/InputDistributor:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        inPort: 2000\n        waitingTime: 5\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: InputDistributor\n              exported_ports:\n                - 2000\n              port_bindings:\n                - &quot;2000:2000&quot;\n                - &quot;3000:3000&quot;\n\n    8fcc1788d9ee462c826572c79fdb2a6a:\n      type: Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: ProxyTranscoder\n              exported_ports:\n                - 80\n              port_bindings:\n                - &quot;8080:80&quot;\n\n    5e0add703c8a43938a39301f572e46c0:\n      type: Switch.nodes.Application.Connection\n      properties:\n        source:\n          address: 192.168.21.11\n          component_name: 2d13d708e3a9441ab8336ce874e08dd1\n          netmask: 255.255.255.0\n          port_name: &quot;inputDistributor_out&quot;\n        target:\n          address: 192.168.21.12\n          component_name: 8fcc1788d9ee462c826572c79fdb2a6a\n          netmask: 255.255.255.0\n          port_name: &quot;proxyTranscoder_in&quot;\n        latency: 30ms\n        bandwidth: 130MB/s\n        jitter: 500ms\n        multicast:\n          multicastAddrIP: 255.2.2.0\n          multicastAddrPort: 3000\n&lt;/file&gt;
-  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/plan&gt;
 </pre>


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


--- a/docs/apidocs/xml_ns0_playbookRepresentation.html
+++ b/docs/apidocs/xml_ns0_playbookRepresentation.html
@@ -121,8 +121,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/p-----&gt;
 </pre>


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


--- a/docs/apidocs/xml_ns0_provisionResponse.html
+++ b/docs/apidocs/xml_ns0_provisionResponse.html
@@ -181,14 +181,14 @@
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
  &lt;deployParameters&gt;
-    &lt;user&gt;vm_user&lt;/user&gt;
    &lt;cloudCertificateName&gt;Virginia&lt;/cloudCertificateName&gt;
+    &lt;user&gt;vm_user&lt;/user&gt;
    &lt;role&gt;slave&lt;/role&gt;
    &lt;IP&gt;52.73.245.157&lt;/IP&gt;
  &lt;/deployParameters&gt;
-  &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
-  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
  &lt;keyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/keyPairIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
+  &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
 &lt;/p-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_register.html
+++ b/docs/apidocs/xml_ns0_register.html
@@ -128,8 +128,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;register&gt;
-  &lt;pwd&gt;123abc&lt;/pwd&gt;
  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123abc&lt;/pwd&gt;
 &lt;/register&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_script.html
+++ b/docs/apidocs/xml_ns0_script.html
@@ -162,8 +162,8 @@ echo &quot;Reading system-wide config....&quot; &amp;gt;&amp;amp;2\n. /etc/cool.
 if [ -r ~/.coolrc ]; then
  echo &quot;Reading user config....&quot; &amp;gt;&amp;amp;2\n  . ~/.coolrc\nfi&lt;/contents&gt;
  &lt;name&gt;config.sh&lt;/name&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/s-----&gt;
 </pre>


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


--- a/docs/apidocs/xml_ns0_toscaRepresentation.html
+++ b/docs/apidocs/xml_ns0_toscaRepresentation.html
@@ -140,8 +140,8 @@
      
      <pre class="prettyprint language-xml example">&lt;t-----&gt;
  &lt;name&gt;input.yml&lt;/name&gt;
-  &lt;owner&gt;user1&lt;/owner&gt;
  &lt;timestamp&gt;...&lt;/timestamp&gt;
+  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/t-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_upload.html
+++ b/docs/apidocs/xml_ns0_upload.html
@@ -146,9 +146,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;upload&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
-  &lt;pwd&gt;...&lt;/pwd&gt;
  &lt;user&gt;...&lt;/user&gt;
+  &lt;pwd&gt;...&lt;/pwd&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
 &lt;/upload&gt;
 </pre>


--- 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;enabled&gt;true&lt;/enabled&gt;
-  &lt;password&gt;...&lt;/password&gt;
  &lt;username&gt;user&lt;/username&gt;
  &lt;roles&gt;[&quot;ADMIN&quot;,&quot;USER&quot;]&lt;/roles&gt;
-  &lt;credentialsNonExpired&gt;true&lt;/credentialsNonExpired&gt;
+  &lt;enabled&gt;true&lt;/enabled&gt;
  &lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt;
-  &lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
  &lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt;
+  &lt;password&gt;...&lt;/password&gt;
+  &lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
+  &lt;credentialsNonExpired&gt;true&lt;/credentialsNonExpired&gt;
 &lt;/u-----&gt;
 </pre>


--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
@@ -180,14 +180,22 @@ public class ProvisionService {
        }
        if (version == 1) {

+            MessageParameter cloudCred = new MessageParameter();
+            cloudCred.setName("cloud_credential");
+
+            cloudCred.setEncoding("UTF-8");
+            List<KeyPair> keyPairs = new ArrayList<>();
+            for (String id : cred.getkeyPairIDs()) {
+                KeyPair pair = keyDao.findOne(id);
+                keyPairs.add(pair);
+            }
+
+            cred.setKeyPairs(keyPairs);
            ObjectMapper mapper = new ObjectMapper();
            mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
            String jsonInString = mapper.writeValueAsString(cred);
-
-            MessageParameter cloudCred = new MessageParameter();
-            cloudCred.setName("cloud_credential");
            cloudCred.setValue("\"" + jsonInString + "\"");
-            cloudCred.setEncoding("UTF-8");
+
            cloudCredentialParams.add(cloudCred);

            return cloudCredentialParams;

--- 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
@@ -15,6 +15,8 @@
 */
 package nl.uva.sne.drip.drip.commons.data.v1.external;

+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.webcohesion.enunciate.metadata.DocumentationExample;
 import java.util.List;
 import org.springframework.data.mongodb.core.mapping.Document;
@@ -26,6 +28,7 @@ import org.springframework.data.mongodb.core.mapping.Document;
 * @author S. Koulouzis
 */
 @Document
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class CloudCredentials extends OwnedObject {

    public static String ACCESS_KEY_NAME = "accessKeyId";
@@ -37,6 +40,8 @@ public class CloudCredentials extends OwnedObject {

    private List<String> keyPairIDs;

+    private List<KeyPair> keyPairs;
+
    private String cloudProviderName;

    /**
@@ -103,4 +108,18 @@ public class CloudCredentials extends OwnedObject {
    public void setKeyIDs(List<String> keyIDs) {
        this.keyPairIDs = keyIDs;
    }
+
+    /**
+     * @return the keyPairs
+     */
+    public List<KeyPair> getKeyPairs() {
+        return keyPairs;
+    }
+
+    /**
+     * @param keyPairs the keyPairs to set
+     */
+    public void setKeyPairs(List<KeyPair> keyPairs) {
+        this.keyPairs = keyPairs;
+    }
 }
--- a/drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/utils/MessageParsing.java
+++ b/drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/utils/MessageParsing.java
@@ -17,6 +17,7 @@ package nl.uva.sne.drip.drip.provisioner.utils;

 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import cz.cesnet.cloud.occi.api.http.auth.X509Authentication;
 import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -27,6 +28,10 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import nl.uva.sne.drip.drip.commons.data.internal.Message;
+import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials;
+import nl.uva.sne.drip.drip.commons.data.v1.external.Key;
+import nl.uva.sne.drip.drip.commons.data.v1.external.KeyPair;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -105,23 +110,47 @@ public class MessageParsing {
        return map;
    }

-    private static Map<String, String> getCloudRawCredentials(JSONArray parameters) throws JSONException, FileNotFoundException {
-        Map<String, String> map = new HashMap<>();
+    public static List<Credential> getCloudCredentials(JSONArray parameters, String tempInputDirPath) throws JSONException, FileNotFoundException, IOException {
+        List<Credential> credentials = new ArrayList<>();
        for (int i = 0; i < parameters.length(); i++) {
            JSONObject param = (JSONObject) parameters.get(i);
            String name = (String) param.get("name");
-            if (name.startsWith("cloud_credential")) {
-                map.put(name, (String) param.get("value"));
+            if (name.equals("cloud_credential")) {
+                Credential credential = null;
+                mapper = new ObjectMapper();
+                mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+                String credentialString = (String) param.get("value");
+                credentialString = credentialString.substring(1, credentialString.length() - 2);
+                CloudCredentials cred = mapper.readValue(credentialString, CloudCredentials.class);
+                if (cred.getCloudProviderName().toLowerCase().equals("ec2")) {
+                    EC2Credential ec2 = new EC2Credential();
+                    ec2.accessKey = cred.getAccessKeyId();
+                    ec2.secretKey = cred.getSecretKey();
+                    credential = ec2;
+                }
+                if (cred.getCloudProviderName().toLowerCase().equals("egi")) {
+                    EGICredential egi = new EGICredential();
+                    egi.proxyFilePath = generateProxy(cred.getAccessKeyId(), cred.getSecretKey());
+                    egi.trustedCertPath = "/etc/grid-security/certificates";
+                    credential = egi;
+                }
+
+                for (KeyPair pair : cred.getKeyPairs()) {
+                    File dir = new File(tempInputDirPath + File.separator + pair.getId());
+                    dir.mkdir();
+                    Key privateKey = pair.getPrivateKey();
+                    writeValueToFile(privateKey.getKey(), new File(dir.getAbsolutePath() + File.separator + privateKey.getName()));
+                    Key publicKey = pair.getPublicKey();
+                    writeValueToFile(publicKey.getKey(), new File(dir.getAbsolutePath() + File.separator + publicKey.getName()));
+                }
+                credentials.add(credential);
            }
        }
-        return map;
-    }

-    public static List<Credential> getCloudCredentials(JSONArray parameters, String tempInputDirPath) throws JSONException, FileNotFoundException {
-
-        mapper = new ObjectMapper();
-        mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+        return credentials;
+    }

-        return null;
+    private static String generateProxy(String accessKeyId, String secretKey) {
+        return "/tmp/x509up_u0";
    }
 }
--- a/drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
+++ b/drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
@@ -25,8 +25,6 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.PrintWriter;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -34,11 +32,8 @@ import java.util.Map;
 import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import nl.uva.sne.drip.drip.provisioner.utils.MessageParsing;
 import org.apache.commons.io.FileUtils;
-import org.apache.commons.io.FilenameUtils;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;