Merge branch 'master' of https://github.com/skoulouzis/DRIP

cef30a0f · Oceans · 6ce0e1cb · 77adf216 · cef30a0f · cef30a0f
Commit cef30a0f authored May 09, 2017 by Oceans
123 changed files
--- a/docs/apidocs/data.html
+++ b/docs/apidocs/data.html
@@ -158,6 +158,12 @@
      <td>  <span class="datatype-name">OwnedObject</span>
 </td>
      <td>  <span class="datatype-description"></span>
+</td>
+    </tr>
+    <tr class="clickable-row" data-href="json_PlanRequest.html">
+      <td>  <span class="datatype-name">PlanRequest</span>
+</td>
+      <td>  <span class="datatype-description"></span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_PlanResponse.html">
@@ -340,6 +346,12 @@
      <td>  <span class="datatype-name">ownedObject</span>
 </td>
      <td>  <span class="datatype-description"></span>
+</td>
+    </tr>
+    <tr class="clickable-row" data-href="xml_ns0_planRequest.html">
+      <td>  <span class="datatype-name">planRequest</span>
+</td>
+      <td>  <span class="datatype-description"></span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_planResponse.html">

--- a/docs/apidocs/downloads.html
+++ b/docs/apidocs/downloads.html
@@ -72,7 +72,7 @@
  <h1 class="page-header">Files and Libraries</h1>

  <h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p>  <p>
    The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
    can be used to access the Web service API for this application.
@@ -91,13 +91,13 @@
    <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.63K</span></td>
+      <td><span class="downloadfile-size">16.35K</span></td>
      <td><span class="downloadfile-description">The sources for the GWT JSON overlay.</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p><p>
  The Java client-side library is used to provide the set of Java objects that can be serialized
  to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>.  This is useful for accessing the
@@ -116,18 +116,18 @@
    <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.81K</span></td>
+      <td><span class="downloadfile-size">22.81K</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.55K</span></td>
+      <td><span class="downloadfile-size">17.33K</span></td>
      <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p><p>
  The Java client-side library is used to access the Web service API for this application using Java.
 </p>
@@ -144,18 +144,18 @@
    <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.59K</span></td>
+      <td><span class="downloadfile-size">25.48K</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.58K</span></td>
+      <td><span class="downloadfile-size">21.36K</span></td>
      <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_js_client_library">JavaScript Client Library</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p><p>
  The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
  This is useful for accessing the resources that are published by this application, but only
@@ -184,13 +184,13 @@
    <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">7.11K</span></td>
+      <td><span class="downloadfile-size">7.43K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p><p>
  The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
  This is useful for accessing the resources that are published by this application, but only
@@ -213,13 +213,13 @@
    <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.90K</span></td>
+      <td><span class="downloadfile-size">8.36K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p><p>
  The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
  This is useful for accessing the resources that are published by this application, but only
@@ -245,13 +245,13 @@
    <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.96K</span></td>
+      <td><span class="downloadfile-size">9.29K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
-  <p class="lead">Created May 3, 2017</p>
+  <p class="lead">Created May 9, 2017</p>
  <p><p>
  The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
  This is useful for accessing the REST endpoints that are published by this application, but only
@@ -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">114.29K</span></td>
+      <td><span class="downloadfile-size">120.33K</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/index.html
+++ b/docs/apidocs/index.html
@@ -230,6 +230,7 @@ machine the keys correspond to.</span>
 </td>
      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span class="resource-path">/user/v1.0/planner/all</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/planner/ids</span>
+</samp></li><li><samp>  <span class="resource-path">/user/v1.0/planner/plan/</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/planner/{id}</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/planner/plan/{tosca_id}</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/planner/post/{name}</span>
@@ -238,6 +239,7 @@ machine the keys correspond to.</span>
 </samp></li></ul></td>
      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span class="label label-default resource-method">DELETE</span> 
 </samp></li><li><samp>  <span class="label label-default resource-method">GET</span> 
+</samp></li><li><samp>  <span class="label label-default resource-method">POST</span> 
 </samp></li><li><samp>  <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span> 
 </samp></li><li><samp>  <span class="label label-default resource-method">GET</span> 
 </samp></li><li><samp>  <span class="label label-default resource-method">POST</span> 
@@ -479,6 +481,12 @@ used by the provisoner to run on the created VMs.</span>
      <td>  <span class="datatype-name">OwnedObject</span>
 </td>
      <td>  <span class="datatype-description"></span>
+</td>
+    </tr>
+    <tr class="clickable-row" data-href="json_PlanRequest.html">
+      <td>  <span class="datatype-name">PlanRequest</span>
+</td>
+      <td>  <span class="datatype-description"></span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_PlanResponse.html">
@@ -661,6 +669,12 @@ used by the provisoner to run on the created VMs.</span>
      <td>  <span class="datatype-name">ownedObject</span>
 </td>
      <td>  <span class="datatype-description"></span>
+</td>
+    </tr>
+    <tr class="clickable-row" data-href="xml_ns0_planRequest.html">
+      <td>  <span class="datatype-name">planRequest</span>
+</td>
+      <td>  <span class="datatype-description"></span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_planResponse.html">

--- a/docs/apidocs/json_AnsibleOutput.html
+++ b/docs/apidocs/json_AnsibleOutput.html
@@ -139,20 +139,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -164,22 +164,22 @@
      <pre class="prettyprint language-js example">{
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;changed&quot; : true,
    &quot;msg&quot; : &quot;...&quot;,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;stdout&quot; : &quot;...&quot;,
    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+    &quot;end&quot; : &quot;...&quot;,
    &quot;start&quot; : &quot;...&quot;,
+    &quot;stdout&quot; : &quot;...&quot;,
    &quot;delta&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true,
-    &quot;end&quot; : &quot;...&quot;
+    &quot;stderr&quot; : &quot;...&quot;
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_AnsibleResult.html
+++ b/docs/apidocs/json_AnsibleResult.html
@@ -80,16 +80,16 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">msg</span>
+          <td>  <span class="property-name">changed</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">stderr</span>
+          <td>  <span class="property-name">msg</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -98,18 +98,18 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stdout</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">cmd</span>
+          <td>  <span class="property-name">end</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -125,7 +125,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">delta</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">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">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;changed&quot; : true,
  &quot;msg&quot; : &quot;...&quot;,
-  &quot;stderr&quot; : &quot;...&quot;,
-  &quot;stdout&quot; : &quot;...&quot;,
  &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;end&quot; : &quot;...&quot;,
  &quot;start&quot; : &quot;...&quot;,
+  &quot;stdout&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
-  &quot;changed&quot; : true,
-  &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">vmType</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">start</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">host</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">end</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -141,20 +141,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -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;start&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</pre>

        <footer class="footer">

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


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

        <footer class="footer">

--- a/docs/apidocs/json_DeployResponse.html
+++ b/docs/apidocs/json_DeployResponse.html
--- a/docs/apidocs/json_Key.html
+++ b/docs/apidocs/json_Key.html
@@ -80,7 +80,7 @@
        </thead>
        <tbody>
        <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">name</span>
 </td>
-          <td>  <span class="datatype-reference">map of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">key</span>
+          <td>  <span class="property-name">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;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;name&quot; : &quot;id_dsa.pub&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
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">publicKey</span>
+          <td>  <span class="property-name">privateKey</span>
 </td>
          <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
@@ -98,7 +98,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">privateKey</span>
+          <td>  <span class="property-name">publicKey</span>
 </td>
          <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
@@ -112,20 +112,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -136,27 +136,27 @@
      
      <pre class="prettyprint language-js example">{
  &quot;keyPairId&quot; : &quot;...&quot;,
-  &quot;publicKey&quot; : {
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
+  &quot;privateKey&quot; : {
+    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
    &quot;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;name&quot; : &quot;id_dsa.pub&quot;,
+  &quot;publicKey&quot; : {
+    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
    &quot;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;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_KeyValueHolder.html
+++ b/docs/apidocs/json_KeyValueHolder.html
@@ -96,20 +96,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -123,9 +123,9 @@
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</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_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
      </dl>

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

        <footer class="footer">

--- a/docs/apidocs/json_PlanRequest.html
+++ b/docs/apidocs/json_PlanRequest.html
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="utf-8">
+  <meta http-equiv="X-UA-Compatible" content="IE=edge">
+  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+
+  <title>drip-api: PlanRequest</title>
+
+  <!-- Mobile viewport optimized: j.mp/bplateviewport -->
+  <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+  <!-- Bootstrap core CSS -->
+  <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css">
+
+  <!--custom css for these pages-->
+  <link rel="stylesheet" href="css/style.css">
+
+  <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+  <!--[if lt IE 9]>
+  <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
+  <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+  <![endif]-->
+</head>
+
+<body data-spy="scroll" data-target="#apinav">
+
+  <nav class="navbar navbar-inverse navbar-fixed-top">
+    <div class="container-fluid">
+      <div class="navbar-header">
+        <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#navbar">
+          <span class="sr-only">Toggle navigation</span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+          <span class="icon-bar"></span>
+        </button>
+        <a class="navbar-brand" href="index.html">drip-api: PlanRequest</a>
+      </div>
+      <div id="navbar" class="navbar-collapse collapse">
+        <ul class="nav navbar-nav navbar-right">
+          <li><a href="resources.html">Resources</a></li>
+          <li><a href="data.html">Data Types</a></li>
+          <li><a href="downloads.html">Files and Libraries</a></li>
+        </ul>
+      </div>
+    </div>
+  </nav>
+
+  <div class="container-fluid">
+    <div class="row">
+      <div class="col-sm-3 col-md-2 sidebar" id="apinav">
+        <ul class="nav nav-sidebar">
+          <li class="text-right"><a href="#top"><small>Back to Top</small></a></li>
+        </ul>
+      </div>
+
+      <div class="col-sm-9 col-sm-offset-3 col-md-10 col-md-offset-2 main">
+        <ol class="breadcrumb" id="top">
+          <li class="active dropdown"><a href="index.html">Home</a></li>
+          <li class="active dropdown"><a href="syntax_json.html">JSON</a></li>
+          <li class="dropdown"><a href="json_PlanRequest.html">PlanRequest</a></li>
+        </ol>
+
+      <h1 class="page-header">PlanRequest <small>Data Type</small></h1>
+
+      <p></p>
+
+      <dl class="dl-horizontal">
+      </dl>
+
+      <table class="table datatype-properties">
+        <caption>Properties</caption>
+        <thead>
+        <tr>
+          <th>name</th>
+          <th>data type</th>
+          <th>description</th>
+        </tr>
+        </thead>
+        <tbody>
+        <tr>
+          <td>  <span class="property-name">managerType</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">osType</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">domain</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">vmUserName</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">toscaID</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">cloudProvider</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description"></span>
+</td>
+        </tr>
+        </tbody>
+      </table>
+
+      <p class="lead">Example</p>
+      
+      <pre class="prettyprint language-js example">{
+  &quot;managerType&quot; : &quot;...&quot;,
+  &quot;osType&quot; : &quot;...&quot;,
+  &quot;domain&quot; : &quot;...&quot;,
+  &quot;vmUserName&quot; : &quot;...&quot;,
+  &quot;toscaID&quot; : &quot;...&quot;,
+  &quot;cloudProvider&quot; : &quot;...&quot;
+}</pre>
+
+        <footer class="footer">
+          <div class="container">
+            <p class="text-muted">Generated by <a href="http://enunciate.webcohesion.com">Enunciate</a>.</p>
+          </div>
+        </footer>
+
+      </div>
+    </div>
+  </div>
+
+
+  <!-- JavaScript placed at the end of the document so the pages load faster. -->
+  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+
+  <!-- Bootstrap core JavaScript
+  ================================================== -->
+  <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"></script>
+
+  <!-- prettify code blocks. see http://code.google.com/p/google-code-prettify/ -->
+  <script src="https://cdn.rawgit.com/google/code-prettify/master/loader/run_prettify.js" type="text/javascript"></script>
+  <script>
+    $(function() {
+      $(".clickable-row").click(function() {
+        window.document.location = $(this).data("href");
+      });
+
+      $('[data-toggle="tooltip"]').tooltip()
+    });
+  </script>
+
+</body>
+</html>
--- a/docs/apidocs/json_PlanResponse.html
+++ b/docs/apidocs/json_PlanResponse.html
@@ -80,18 +80,18 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">level</span>
+          <td>  <span class="property-name">toscaID</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">toscaID</span>
+          <td>  <span class="property-name">loweLevelPlanIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -107,9 +107,9 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">loweLevelPlanIDs</span>
+          <td>  <span class="property-name">level</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -132,20 +132,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -155,17 +155,17 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;level&quot; : 0,
  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;name&quot; : &quot;planner_output_all.yml&quot;,
  &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
+  &quot;name&quot; : &quot;planner_output_all.yml&quot;,
+  &quot;level&quot; : 0,
  &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;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

--- a/docs/apidocs/json_ProvisionRequest.html
+++ b/docs/apidocs/json_ProvisionRequest.html
@@ -100,18 +100,18 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">deployerKeyPairIDs</span>
+          <td>  <span class="property-name">planID</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">planID</span>
+          <td>  <span class="property-name">deployerKeyPairIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
          <td>  <span class="property-description"></span>
@@ -134,20 +134,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -159,15 +159,15 @@
      <pre class="prettyprint language-js example">{
  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
  &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</pre>

        <footer class="footer">

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

        <footer class="footer">

--- a/docs/apidocs/json_Script.html
+++ b/docs/apidocs/json_Script.html
@@ -103,20 +103,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -128,9 +128,9 @@
      <pre class="prettyprint language-js example">{
  &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
  &quot;name&quot; : &quot;config.sh&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</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">executionTime</span>
+          <td>  <span class="property-name">numberOfThreads</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgEventsPerThread</span>
+          <td>  <span class="property-name">stddevExecTimePerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -98,7 +98,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
+          <td>  <span class="property-name">approx95Percentile</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -107,16 +107,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">totalNumberOfEvents</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">minExecutionTimePerRequest</span>
+          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -125,16 +125,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">ansibleOutputID</span>
+          <td>  <span class="property-name">minExecutionTimePerRequest</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stddevEventsPerThread</span>
+          <td>  <span class="property-name">totalNumberOfEvents</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -143,16 +143,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">avgExecTimePerThread</span>
+          <td>  <span class="property-name">ansibleOutputID</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">approx95Percentile</span>
+          <td>  <span class="property-name">stddevEventsPerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -161,16 +161,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">sysbenchVersion</span>
+          <td>  <span class="property-name">avgExecTimePerThread</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">avgExecutionTimePerRequest</span>
+          <td>  <span class="property-name">avgEventsPerThread</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -179,7 +179,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">stddevExecTimePerThread</span>
+          <td>  <span class="property-name">executionTime</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -188,7 +188,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">numberOfThreads</span>
+          <td>  <span class="property-name">avgExecutionTimePerRequest</span>
 </td>
          <td>  <span class="datatype-reference">number
 </span>
@@ -202,31 +202,31 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">cloudDeploymentDomain</span></td>
+          <td><span class="property-name">vmType</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </tr>
        <tr>
-          <td><span class="property-name">end</span></td>
+          <td><span class="property-name">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">start</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">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">end</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
@@ -243,20 +243,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -266,28 +266,28 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;executionTime&quot; : 12345.0,
-  &quot;avgEventsPerThread&quot; : 12345.0,
+  &quot;numberOfThreads&quot; : 12345,
+  &quot;stddevExecTimePerThread&quot; : 12345.0,
+  &quot;approx95Percentile&quot; : 12345.0,
+  &quot;sysbenchVersion&quot; : &quot;...&quot;,
  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
-  &quot;totalNumberOfEvents&quot; : 12345,
  &quot;minExecutionTimePerRequest&quot; : 12345.0,
+  &quot;totalNumberOfEvents&quot; : 12345,
  &quot;ansibleOutputID&quot; : &quot;...&quot;,
  &quot;stddevEventsPerThread&quot; : 12345.0,
  &quot;avgExecTimePerThread&quot; : 12345.0,
-  &quot;approx95Percentile&quot; : 12345.0,
-  &quot;sysbenchVersion&quot; : &quot;...&quot;,
+  &quot;avgEventsPerThread&quot; : 12345.0,
+  &quot;executionTime&quot; : 12345.0,
  &quot;avgExecutionTimePerRequest&quot; : 12345.0,
-  &quot;stddevExecTimePerThread&quot; : 12345.0,
-  &quot;numberOfThreads&quot; : 12345,
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;end&quot; : &quot;...&quot;,
-  &quot;start&quot; : &quot;...&quot;,
  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;start&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_ToscaRepresentation.html
+++ b/docs/apidocs/json_ToscaRepresentation.html
@@ -105,20 +105,20 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-description"></span></td>
        </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>
        <tr>
-          <td><span class="property-name">owner</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>
@@ -133,9 +133,9 @@
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }</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">username</span>
+          <td>  <span class="property-name">id</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -89,7 +89,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">accountNonLocked</span>
+          <td>  <span class="property-name">enabled</span>
 </td>
          <td>  <span class="datatype-reference">boolean
 </span>
@@ -98,7 +98,7 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">credentialsNonExpired</span>
+          <td>  <span class="property-name">accountNonLocked</span>
 </td>
          <td>  <span class="datatype-reference">boolean
 </span>
@@ -107,25 +107,25 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">accountNonExpired</span>
+          <td>  <span class="property-name">username</span>
 </td>
-          <td>  <span class="datatype-reference">boolean
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">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">enabled</span>
+          <td>  <span class="property-name">credentialsNonExpired</span>
 </td>
          <td>  <span class="datatype-reference">boolean
 </span>
@@ -134,16 +134,16 @@
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">roles</span>
+          <td>  <span class="property-name">accountNonExpired</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">boolean
 </span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">id</span>
+          <td>  <span class="property-name">password</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;username&quot; : &quot;user&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;enabled&quot; : true,
  &quot;accountNonLocked&quot; : true,
+  &quot;username&quot; : &quot;user&quot;,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
  &quot;credentialsNonExpired&quot; : true,
  &quot;accountNonExpired&quot; : true,
-  &quot;password&quot; : &quot;...&quot;,
-  &quot;enabled&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
+  &quot;password&quot; : &quot;...&quot;
 }</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,22 +160,22 @@ Content-Type: application/json
 [ {
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;changed&quot; : true,
    &quot;msg&quot; : &quot;...&quot;,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;stdout&quot; : &quot;...&quot;,
    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+    &quot;end&quot; : &quot;...&quot;,
    &quot;start&quot; : &quot;...&quot;,
+    &quot;stdout&quot; : &quot;...&quot;,
    &quot;delta&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true,
-    &quot;end&quot; : &quot;...&quot;
+    &quot;stderr&quot; : &quot;...&quot;
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 } ]
                </code>
              </pre>
@@ -585,22 +585,22 @@ Content-Type: application/json
 {
  &quot;host&quot; : &quot;...&quot;,
  &quot;result&quot; : {
+    &quot;changed&quot; : true,
    &quot;msg&quot; : &quot;...&quot;,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;stdout&quot; : &quot;...&quot;,
    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+    &quot;end&quot; : &quot;...&quot;,
    &quot;start&quot; : &quot;...&quot;,
+    &quot;stdout&quot; : &quot;...&quot;,
    &quot;delta&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true,
-    &quot;end&quot; : &quot;...&quot;
+    &quot;stderr&quot; : &quot;...&quot;
  },
  &quot;vmType&quot; : &quot;...&quot;,
  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
  &quot;cloudProvider&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }
                </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;start&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 } ]
                </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;start&quot; : &quot;...&quot;,
  &quot;host&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
+  &quot;end&quot; : &quot;...&quot;,
  &quot;delta&quot; : &quot;...&quot;,
+  &quot;owner&quot; : &quot;user1&quot;,
  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;timestamp&quot; : 12345
 }
                </code>
              </pre>

--- a/docs/apidocs/resource_CloudConfigurationController0.html
+++ b/docs/apidocs/resource_CloudConfigurationController0.html
@@ -132,15 +132,15 @@ Accept: application/json
                <code class="prettyprint language-xml">
 &lt;configure&gt;
  &lt;loginKey domain_name=&quot;...&quot;&gt;...&lt;/loginKey&gt;
-  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
-  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
+  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
  &lt;user&gt;user&lt;/user&gt;
  &lt;key&gt;6J7uo99ifrff45126Gsy5vgb3bmrtwY6hBxtYt9y&lt;/key&gt;
  &lt;geniKey&gt;/u3+7QAAAAIAAAABAWuf2AAACvDCCArgwDgYKKwYBBEBAQUABIIC\npKlNUfpKLNCy0h8P4L5XeECwwIN/tezeaOVsjvzLsXeiBsB/luYv9gttoeKFbcJb/IDpZr\nfpL1tjF8Sed6g38kNoWwnVVoNZ1ILpITjESL6FkZW+gGAPS+XHp8l52/2DjeECQlx+38GlFUftWP\nn3QH9bDYD+7sRtm4P0YWnekX67ltQHMV+Cyrg0HAFm+GUzJJoxu64MccURLBMw0If9gCmTOuVoRj\nprPukU+cMY8torQ3+WmzC0S6U10HjQ2AkJ80HwM6CcS82qflHIBfQ/o7ep76rCDN22widcLGOihU\nbJiNQtNdF6KRCJk0emVIvRHDHctsmmt2ao2Qx6ub2mA/eUZtlphHMVN5VQtSxdd87tKrH9FvaOe3\nGX/irmBBopS2mfFee4LPn3FT/F5bl9YunygX3sWLGNsCl8G15hzgSSVn4As37czUulj8hks/Qpvu\nqoVpegs2+m5mXbSMmif+cUPqyJZ8UL5slIGZMKQ7MJG1XVG6vFIHk3cS+L+NpDd2j8DZqBP5FXIO\nCt/IxZxR2ZfPHHmIbOhwdnaznOoyAEGDzFTXnyTClGTDTW/6zxOe/ynNPlnBQaNqVJYqPtFG4AVs\nhrSNuvYjm1xsVDROQI5LYF/nryU4VvqMTo2sjVP2g6Qw7E5ENWiYUAl2W+bk4H6WGDTdQgLm2J65\ngdZpQTQtubzWi8Fxrptqul5eq96l0xH15XQ9lBKV0J8PEMa1jKOW/9s2U++hAtKTixssVntaNyUY\n9dnXNYHnQRKXDrQr/izerNEhvlVcz6foWDurtjAIjxafyEBbXJ5TAyT4rxmkPxDg88LPXKCzpf1x\n3WwD8MBUNBC9nfB37rHxEl7StvnK3IXBHmEksg7X6xhmUsrsQo8mfP05XDmqt+lsiYoAAAACAAVY\nLjUwOQAAAz8wggM7MIICpKADAgECAgJFBDANBgkqhkiG9w0BAQUFADCBiTEUMBIGA1UEChMLY2gu\nZ2VuaS5uZXQxEjAQBgNVBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBm\nMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5z\nQGdlbmkubmV0MB4XDTE3MDEyNTE0NTY0OVoXDTE4MDEyNTE0NTY0OVowUjEtMCsGA1UEAxMkYmY4\nYThhNTQtN2FjOS00NTEzLWIyZTItYjJjN2U2YWUwMDVkMSEwHwYJKoZIhvcNAQkBFhJzLmtvdWxv\ndXppc0B1dmEubmwwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANmwnBJETSZSQm67FxQHL0s6\n84SYlYh6ltgi8DfwRu/wMA8sL5PsuupNvgKJCVHHZzPVwIrUy8JxpFrX3BItaDX+VPR+6sBJqUan\nBeb3vojU6CyEZzwCAOhn9OxB8ZFyoMD6SwsykPBOeXhGKpWsOoBwQDx8i6xpto1AP3KY8DpxAgMB\nAAGjgecwgeQwHQYDVR0OBBYEFNTBvaP5OnG0h8exiS8Ob0ZvfF8FMD4GA1UdIwQ3MDWAFHGlguYe\n8bTQK4umhY/oGl1ifTGuoRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIBAzAJBgNVHRMEAjAA\nMHgGA1UdEQRxMG+BEnMua291bG91emlzQHV2YS5ubIYqdXJuOnB1YmxpY2lkOklETitjaC5nZW5p\nLm5ldCt1c2VyK3Nrb3Vsb3V6hi11cm46dXVpZDpiZjhhOGE1NC03YWM5LTQ1MTMtYjJlMi1iMmM3\nZTZhZTAwNWQwDQYJKoZIhvcNAQEFBQADgYEAP/9ihMCaalsPRBMDozgX2Wd6eFCNYuDIMFTeNkKa\nkWJp156oQ4iAmbtP2R9r4W02gjEQRtUxvBhYI2Rp32wl1ZLdpSwnuZAE1H89dIHTct48VkiI1Zp9\n5BtV4olBUAf2K2hd46pH3ObUAYZvWQGoT+oOlfcacAaEUNp01afC8voABVguNTA5AAADUzCCA08w\nggK4oAMCAQICAQMwDQYJKoZIhvcNAQEFBQAwFjEUMBIGA1UEAxMLY2guZ2VuaS5uZXQwHhcNMTMw\nNTIwMTMxODI3WhcNMTgwNTE5MTMxODI3WjCBiTEUMBIGA1UEChMLY2guZ2VuaS5uZXQxEjAQBgNV\nBAsTCWF1dGhvcml0eTELMAkGA1UECxMCbWExLTArBgNVBAMTJDMxYzBmMDlmLTk1ZjctNDUxMC1h\nMzBiLWQ5M2RmMmJkMDJjOTEhMB8GCSqGSIb3DQEJARYSY2gtYWRtaW5zQGdlbmkubmV0MIGfMA0G\nCSqGSIb3DQEBAQUAA4GNADCBiQKBgQC4LG9Xl2veo5+Zy1fDi47ajinYu+mv8QYDya2Hf8lPolQy\nlnGFFQRMx/JsbG1BBQ86FqSeUWtvANhY1nRlrozutOBeg9EEfhX+JXvVdhEKQ4/ANliC0V1UR3GO\nJHtQaj/6qoG/q01bWP7EJgf+ZPfTdCgCkJ89v8oth1m3UjCxcQIDAQABo4IBNzCCATMwHQYDVR0O\nBBYEFHGlguYe8bTQK4umhY/oGl1ifTGuMEYGA1UdIwQ/MD2AFEU22V1Y/0L1KwlqbnkdPIMEy5hR\noRqkGDAWMRQwEgYDVQQDEwtjaC5nZW5pLm5ldIIJAJvH3dZoB97bMEcGCCsGAQUFBwEBBDswOTA3\nBhRpg8yTgKiYzKjHvbGngICqrteKG4YfaHR0cHM6Ly9jaC5nZW5pLm5ldC9jYWluZm8uaHRtbDBz\nBgNVHREEbDBqgRJjaC1hZG1pbnNAZ2VuaS5uZXSGKXVybjpwdWJsaWNpZDpJRE4rY2guZ2VuaS5u\nZXQrYXV0aG9yaXR5K21hhil1dWlkOjMxYzBmMDlmLTk1ZjctNDUxMC1hMzBiLWQ5M2RmMmJkMDJj\nOTAMBgNVHRMEBTADAQH/MA0GCSqGSIb3DQEBBQUAA4GBAHgrtROjbfUT6HQCZCl1XuAEZQPse3/x\nT2smC3LzAH4UUj3gEBq27VvxbqzazdBQCSeBEl2RUd+KoDzmhG5vBbAyHt8UE6s3P7Yx\ngoNYTld0JHB5wq3XFRaaGbeVgo2AuK9S/Q3whzMTRW21a58tLP5zwKGzX3oyQQUT5J\ncwv0z5NmJdAfk8Y=&lt;/geniKey&gt;
-  &lt;loginPriKey domain_name=&quot;...&quot;&gt;...&lt;/loginPriKey&gt;
-  &lt;pwd&gt;123&lt;/pwd&gt;
-  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
  &lt;loginPubKey domain_name=&quot;...&quot;&gt;...&lt;/loginPubKey&gt;
+  &lt;geniKeyPass&gt;...&lt;/geniKeyPass&gt;
+  &lt;keyid&gt;AKIAITY3K5ZUQ6M7YBSQ&lt;/keyid&gt;
+  &lt;geniKeyAlias&gt;exogeni&lt;/geniKeyAlias&gt;
 &lt;/configure&gt;

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

                </code>

--- a/docs/apidocs/resource_CloudCredentialsController.html
+++ b/docs/apidocs/resource_CloudCredentialsController.html
--- a/docs/apidocs/resource_DeployController.html
+++ b/docs/apidocs/resource_DeployController.html
--- a/docs/apidocs/resource_DeployController0.html
+++ b/docs/apidocs/resource_DeployController0.html
--- a/docs/apidocs/resource_KeyPairController.html
+++ b/docs/apidocs/resource_KeyPairController.html
--- a/docs/apidocs/resource_PlannerController.html
+++ b/docs/apidocs/resource_PlannerController.html
--- a/docs/apidocs/resource_PlannerController0.html
+++ b/docs/apidocs/resource_PlannerController0.html
--- a/docs/apidocs/resource_ProvisionController.html
+++ b/docs/apidocs/resource_ProvisionController.html
--- a/docs/apidocs/resource_ProvisionController0.html
+++ b/docs/apidocs/resource_ProvisionController0.html
--- a/docs/apidocs/resource_ScriptController.html
+++ b/docs/apidocs/resource_ScriptController.html
--- a/docs/apidocs/resource_UserController.html
+++ b/docs/apidocs/resource_UserController.html
--- 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;user&gt;user&lt;/user&gt;
  &lt;pwd&gt;123abc&lt;/pwd&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/register&gt;

                </code>

--- a/docs/apidocs/resource_UserPublicKeysController0.html
+++ b/docs/apidocs/resource_UserPublicKeysController0.html
--- a/docs/apidocs/resource_UserScriptController0.html
+++ b/docs/apidocs/resource_UserScriptController0.html
--- a/docs/apidocs/resources.html
+++ b/docs/apidocs/resources.html
--- a/docs/apidocs/syntax_json.html
+++ b/docs/apidocs/syntax_json.html
--- a/docs/apidocs/syntax_xml.html
+++ b/docs/apidocs/syntax_xml.html
--- a/docs/apidocs/xml_ns0_ansibleOutput.html
+++ b/docs/apidocs/xml_ns0_ansibleOutput.html
--- a/docs/apidocs/xml_ns0_benchmarkResult.html
+++ b/docs/apidocs/xml_ns0_benchmarkResult.html
--- a/docs/apidocs/xml_ns0_cloudCredentials.html
+++ b/docs/apidocs/xml_ns0_cloudCredentials.html
--- a/docs/apidocs/xml_ns0_confScript.html
+++ b/docs/apidocs/xml_ns0_confScript.html
--- a/docs/apidocs/xml_ns0_confUserKey.html
+++ b/docs/apidocs/xml_ns0_confUserKey.html
--- a/docs/apidocs/xml_ns0_configure.html
+++ b/docs/apidocs/xml_ns0_configure.html
--- a/docs/apidocs/xml_ns0_deploy.html
+++ b/docs/apidocs/xml_ns0_deploy.html
--- a/docs/apidocs/xml_ns0_deployParameter.html
+++ b/docs/apidocs/xml_ns0_deployParameter.html
@@ -146,8 +146,8 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;role&gt;slave&lt;/role&gt;
  &lt;IP&gt;52.73.245.157&lt;/IP&gt;
+  &lt;role&gt;slave&lt;/role&gt;
  &lt;user&gt;vm_user&lt;/user&gt;
 &lt;/d-----&gt;
 </pre>

--- a/docs/apidocs/xml_ns0_deployRequest.html
+++ b/docs/apidocs/xml_ns0_deployRequest.html
--- a/docs/apidocs/xml_ns0_deployResponse.html
+++ b/docs/apidocs/xml_ns0_deployResponse.html
--- a/docs/apidocs/xml_ns0_execute.html
+++ b/docs/apidocs/xml_ns0_execute.html
--- a/docs/apidocs/xml_ns0_key.html
+++ b/docs/apidocs/xml_ns0_key.html
--- a/docs/apidocs/xml_ns0_keyPair.html
+++ b/docs/apidocs/xml_ns0_keyPair.html
--- a/docs/apidocs/xml_ns0_keyValueHolder.html
+++ b/docs/apidocs/xml_ns0_keyValueHolder.html
--- a/docs/apidocs/xml_ns0_ownedObject.html
+++ b/docs/apidocs/xml_ns0_ownedObject.html
--- a/docs/apidocs/xml_ns0_plan.html
+++ b/docs/apidocs/xml_ns0_plan.html
--- a/docs/apidocs/xml_ns0_planRequest.html
+++ b/docs/apidocs/xml_ns0_planRequest.html
--- a/docs/apidocs/xml_ns0_planResponse.html
+++ b/docs/apidocs/xml_ns0_planResponse.html
--- a/docs/apidocs/xml_ns0_playbookRepresentation.html
+++ b/docs/apidocs/xml_ns0_playbookRepresentation.html
--- a/docs/apidocs/xml_ns0_provisionRequest.html
+++ b/docs/apidocs/xml_ns0_provisionRequest.html
--- a/docs/apidocs/xml_ns0_provisionResponse.html
+++ b/docs/apidocs/xml_ns0_provisionResponse.html
--- a/docs/apidocs/xml_ns0_register.html
+++ b/docs/apidocs/xml_ns0_register.html
--- a/docs/apidocs/xml_ns0_result.html
+++ b/docs/apidocs/xml_ns0_result.html
--- a/docs/apidocs/xml_ns0_script.html
+++ b/docs/apidocs/xml_ns0_script.html
--- a/docs/apidocs/xml_ns0_sysbenchCPUBenchmark.html
+++ b/docs/apidocs/xml_ns0_sysbenchCPUBenchmark.html
--- a/docs/apidocs/xml_ns0_toscaRepresentation.html
+++ b/docs/apidocs/xml_ns0_toscaRepresentation.html
--- a/docs/apidocs/xml_ns0_upload.html
+++ b/docs/apidocs/xml_ns0_upload.html
--- a/docs/apidocs/xml_ns0_user.html
+++ b/docs/apidocs/xml_ns0_user.html
--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlannerService.java
--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/ToscaService.java
--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/PlannerController0.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/PlannerController0.java
--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/PlannerController.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/PlannerController.java
--- a/drip-commons/nb-configuration.xml
+++ b/drip-commons/nb-configuration.xml
--- a/drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/v1/external/PlanRequest.java
+++ b/drip-commons/src/main/java/nl/uva/sne/drip/drip/commons/data/v1/external/PlanRequest.java
--- a/drip-deployer/ansible_playbook.pyc
+++ b/drip-deployer/ansible_playbook.pyc
--- a/drip-deployer/docker_kubernetes.py
+++ b/drip-deployer/docker_kubernetes.py
--- a/drip-deployer/docker_kubernetes.pyc
+++ b/drip-deployer/docker_kubernetes.pyc
--- a/drip-deployer/playbooks/euroago_cong.yml
+++ b/drip-deployer/playbooks/euroago_cong.yml
--- a/drip-deployer/playbook.yml
+++ b/drip-deployer/playbook.yml
--- a/drip-deployer/playbook1.yml
+++ b/drip-deployer/playbook1.yml
--- a/drip-deployer/playbook2.yml
+++ b/drip-deployer/playbook2.yml
--- a/drip-deployer/playbook3yml
+++ b/drip-deployer/playbook3yml
--- a/drip-planner/ICPCP.pyc
+++ b/drip-planner/ICPCP.pyc
--- a/drip-planner/NewInstance.pyc
+++ b/drip-planner/NewInstance.pyc
--- a/drip-planner2provisioner/pom.xml
+++ b/drip-planner2provisioner/pom.xml
--- a/drip-planner2provisioner/src/main/.DS_Store
+++ b/drip-planner2provisioner/src/main/.DS_Store
--- a/drip-planner2provisioner/src/main/java/.DS_Store
+++ b/drip-planner2provisioner/src/main/java/.DS_Store
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/P2PConverter.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/P2PConverter.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/SimplePlanContainer.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/SimplePlanContainer.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/plannerOut/Parameter.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/plannerOut/Parameter.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/plannerOut/PlannerOutput.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/plannerOut/PlannerOutput.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/planner/out/Component.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/planner/out/Component.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/SubTopologyInfo.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/SubTopologyInfo.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/TopTopology.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/TopTopology.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/VM.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/VM.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/EC2/EC2SubTopology.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/EC2/EC2SubTopology.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/EC2/EC2VM.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/EC2/EC2VM.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/Eth.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/Eth.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/SubConnection.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/SubConnection.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/SubConnectionPoint.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/SubConnectionPoint.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/SubTopology.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/SubTopology.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/SubTopologyInfo.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/SubTopologyInfo.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/Subnet.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisioner/in/Subnet.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/TopConnection.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/TopConnection.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/TopConnectionPoint.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/TopConnectionPoint.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/TopTopology.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/TopTopology.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/VM.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/VM.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/provisionerIn/EGI/EGISubTopology.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/provisionerIn/EGI/EGISubTopology.java
--- a/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/provisionerIn/EGI/EGIVM.java
+++ b/drip-planner2provisioner/src/main/java/nl/uva/sne/drip/drip/converter/provisionerIn/provisionerIn/EGI/EGIVM.java
--- a/drip-planner2provisioner/src/test/java/nl/uva/sne/drip/drip/converter/testConverter.java
+++ b/drip-planner2provisioner/src/test/java/nl/uva/sne/drip/drip/converter/testConverter.java
--- a/drip-planner2provisioner/src/test/java/testConverter.java
+++ b/drip-planner2provisioner/src/test/java/testConverter.java
--- 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