implement delete vms

docs/apidocs/downloads.html

@@ -91,7 +91,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-gwt-json-overlay.jar">
       <td><span class="downloadfile-name">drip-api-gwt-json-overlay.jar</span></td>
-      <td><span class="downloadfile-size">15.55K</span></td>
+      <td><span class="downloadfile-size">15.56K</span></td>
       <td><span class="downloadfile-description">The sources for the GWT JSON overlay.</span></td>
     </tr>
     </tbody>
@@ -144,12 +144,12 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-xml-client.jar">
       <td><span class="downloadfile-name">drip-api-xml-client.jar</span></td>
-      <td><span class="downloadfile-size">24.42K</span></td>
+      <td><span class="downloadfile-size">24.39K</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.47K</span></td>
+      <td><span class="downloadfile-size">20.44K</span></td>
       <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
     </tr>
     </tbody>
@@ -184,7 +184,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-js.zip">
       <td><span class="downloadfile-name">drip-api-js.zip</span></td>
-      <td><span class="downloadfile-size">7.05K</span></td>
+      <td><span class="downloadfile-size">7.12K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>
@@ -213,7 +213,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">7.83K</span></td>
+      <td><span class="downloadfile-size">8.05K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>

docs/apidocs/json_AnsibleOutput.html

@@ -130,8 +130,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -142,8 +142,8 @@
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -156,20 +156,20 @@
   &quot;host&quot; : &quot;...&quot;,
   &quot;result&quot; : {
     &quot;msg&quot; : &quot;...&quot;,
+    &quot;start&quot; : &quot;...&quot;,
     &quot;delta&quot; : &quot;...&quot;,
+    &quot;changed&quot; : true,
     &quot;stdout&quot; : &quot;...&quot;,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;,
-    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
     &quot;end&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true
+    &quot;stderr&quot; : &quot;...&quot;,
+    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
   },
   &quot;vmType&quot; : &quot;...&quot;,
   &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
   &quot;provisionID&quot; : &quot;...&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_AnsibleResult.html

@@ -89,7 +89,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">start</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -98,7 +98,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">stdout</span>
+          <td>  <span class="property-name">delta</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -107,16 +107,16 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">stderr</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">start</span>
+          <td>  <span class="property-name">stdout</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -125,16 +125,16 @@
 </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>
 </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>
@@ -143,9 +143,9 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">changed</span>
+          <td>  <span class="property-name">cmd</span>
 </td>
-          <td>  <span class="datatype-reference">boolean
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -158,13 +158,13 @@
       
       <pre class="prettyprint language-js example">{
   &quot;msg&quot; : &quot;...&quot;,
+  &quot;start&quot; : &quot;...&quot;,
   &quot;delta&quot; : &quot;...&quot;,
+  &quot;changed&quot; : true,
   &quot;stdout&quot; : &quot;...&quot;,
-  &quot;stderr&quot; : &quot;...&quot;,
-  &quot;start&quot; : &quot;...&quot;,
-  &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;end&quot; : &quot;...&quot;,
-  &quot;changed&quot; : true
+  &quot;stderr&quot; : &quot;...&quot;,
+  &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_BenchmarkResult.html

@@ -82,7 +82,7 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">delta</span>
+          <td>  <span class="property-name">start</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -91,7 +91,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">vmType</span>
+          <td>  <span class="property-name">cloudDeploymentDomain</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -100,7 +100,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">cloudDeploymentDomain</span>
+          <td>  <span class="property-name">end</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -118,7 +118,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">start</span>
+          <td>  <span class="property-name">delta</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -127,7 +127,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">end</span>
+          <td>  <span class="property-name">vmType</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -141,8 +141,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -153,8 +153,8 @@
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -164,15 +164,15 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;host&quot; : &quot;...&quot;,
   &quot;start&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
   &quot;end&quot; : &quot;...&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;host&quot; : &quot;...&quot;,
+  &quot;delta&quot; : &quot;...&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_DeployParameter.html

@@ -89,7 +89,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">IP</span>
+          <td>  <span class="property-name">user</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -98,7 +98,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">user</span>
+          <td>  <span class="property-name">IP</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -113,8 +113,8 @@
       
       <pre class="prettyprint language-js example">{
   &quot;role&quot; : &quot;slave&quot;,
-  &quot;IP&quot; : &quot;52.73.245.157&quot;,
-  &quot;user&quot; : &quot;vm_user&quot;
+  &quot;user&quot; : &quot;vm_user&quot;,
+  &quot;IP&quot; : &quot;52.73.245.157&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_DeployRequest.html

@@ -114,8 +114,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -126,8 +126,8 @@
           <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>
@@ -140,9 +140,9 @@
   &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_Key.html

@@ -80,16 +80,16 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">attributes</span>
+          <td>  <span class="property-name">name</span>
 </td>
-          <td>  <span class="datatype-reference">map of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">name</span>
+          <td>  <span class="property-name">key</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -107,9 +107,9 @@
 </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;attributes&quot; : {
     &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
     &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-  },
-  &quot;name&quot; : &quot;id_dsa.pub&quot;,
-  &quot;type&quot; : &quot;PRIVATE&quot;,
-  &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
+  }
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_KeyPair.html

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

docs/apidocs/json_KeyValueHolder.html

@@ -96,8 +96,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -108,8 +108,8 @@
           <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>
@@ -123,9 +123,9 @@
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_OwnedObject.html

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

docs/apidocs/json_PlanResponse.html

@@ -80,18 +80,18 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">name</span>
+          <td>  <span class="property-name">level</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">level</span>
+          <td>  <span class="property-name">loweLevelPlanIDs</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <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">name</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -132,8 +132,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -144,8 +144,8 @@
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -155,17 +155,17 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;name&quot; : &quot;planner_output_all.yml&quot;,
   &quot;level&quot; : 0,
-  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
+  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;name&quot; : &quot;planner_output_all.yml&quot;,
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_PlaybookRepresentation.html

@@ -96,8 +96,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -108,8 +108,8 @@
           <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>
@@ -123,9 +123,9 @@
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_ProvisionRequest.html

@@ -91,7 +91,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">cloudCredentialsIDs</span>
+          <td>  <span class="property-name">deployerKeyPairIDs</span>
 </td>
           <td>  <span class="datatype-reference">array of string
 </span>
@@ -100,7 +100,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">userKeyPairIDs</span>
+          <td>  <span class="property-name">cloudCredentialsIDs</span>
 </td>
           <td>  <span class="datatype-reference">array of string
 </span>
@@ -109,7 +109,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">deployerKeyPairIDs</span>
+          <td>  <span class="property-name">userKeyPairIDs</span>
 </td>
           <td>  <span class="datatype-reference">array of string
 </span>
@@ -134,8 +134,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -146,8 +146,8 @@
           <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>
@@ -158,16 +158,16 @@
       
       <pre class="prettyprint language-js example">{
   &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
   &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_ProvisionResponse.html

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

docs/apidocs/json_Script.html

@@ -103,8 +103,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -115,8 +115,8 @@
           <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>
@@ -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;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_SysbenchCPUBenchmark.html

@@ -80,16 +80,16 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">sysbenchVersion</span>
+          <td>  <span class="property-name">approx95Percentile</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">numberOfThreads</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -98,16 +98,16 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">ansibleOutputID</span>
+          <td>  <span class="property-name">avgExecutionTimePerRequest</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">stddevExecTimePerThread</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -116,7 +116,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">approx95Percentile</span>
+          <td>  <span class="property-name">totalNumberOfEvents</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -125,7 +125,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">executionTime</span>
+          <td>  <span class="property-name">avgEventsPerThread</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -134,25 +134,25 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">maxExecutionTimePerRequest</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">minExecutionTimePerRequest</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">avgExecTimePerThread</span>
+          <td>  <span class="property-name">maxExecutionTimePerRequest</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -161,7 +161,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">numberOfThreads</span>
+          <td>  <span class="property-name">executionTime</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -170,7 +170,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">avgEventsPerThread</span>
+          <td>  <span class="property-name">stddevEventsPerThread</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">avgExecTimePerThread</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -188,7 +188,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">totalNumberOfEvents</span>
+          <td>  <span class="property-name">minExecutionTimePerRequest</span>
 </td>
           <td>  <span class="datatype-reference">number
 </span>
@@ -202,19 +202,19 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">delta</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">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">cloudDeploymentDomain</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>
@@ -226,13 +226,13 @@
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">start</span></td>
+          <td><span class="property-name">delta</span></td>
           <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">end</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>
@@ -243,8 +243,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -255,8 +255,8 @@
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -266,28 +266,28 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;sysbenchVersion&quot; : &quot;...&quot;,
-  &quot;avgExecutionTimePerRequest&quot; : 12345.0,
-  &quot;ansibleOutputID&quot; : &quot;...&quot;,
-  &quot;stddevEventsPerThread&quot; : 12345.0,
   &quot;approx95Percentile&quot; : 12345.0,
-  &quot;executionTime&quot; : 12345.0,
-  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
-  &quot;minExecutionTimePerRequest&quot; : 12345.0,
-  &quot;avgExecTimePerThread&quot; : 12345.0,
   &quot;numberOfThreads&quot; : 12345,
-  &quot;avgEventsPerThread&quot; : 12345.0,
+  &quot;avgExecutionTimePerRequest&quot; : 12345.0,
   &quot;stddevExecTimePerThread&quot; : 12345.0,
   &quot;totalNumberOfEvents&quot; : 12345,
-  &quot;delta&quot; : &quot;...&quot;,
-  &quot;vmType&quot; : &quot;...&quot;,
-  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
-  &quot;host&quot; : &quot;...&quot;,
+  &quot;avgEventsPerThread&quot; : 12345.0,
+  &quot;ansibleOutputID&quot; : &quot;...&quot;,
+  &quot;sysbenchVersion&quot; : &quot;...&quot;,
+  &quot;maxExecutionTimePerRequest&quot; : 12345.0,
+  &quot;executionTime&quot; : 12345.0,
+  &quot;stddevEventsPerThread&quot; : 12345.0,
+  &quot;avgExecTimePerThread&quot; : 12345.0,
+  &quot;minExecutionTimePerRequest&quot; : 12345.0,
   &quot;start&quot; : &quot;...&quot;,
+  &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
   &quot;end&quot; : &quot;...&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;host&quot; : &quot;...&quot;,
+  &quot;delta&quot; : &quot;...&quot;,
+  &quot;vmType&quot; : &quot;...&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_ToscaRepresentation.html

@@ -105,8 +105,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -117,8 +117,8 @@
           <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>
@@ -133,9 +133,9 @@
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 
         <footer class="footer">

docs/apidocs/json_User.html

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

docs/apidocs/resource_AnsibleOutputController.html

@@ -161,20 +161,20 @@ Content-Type: application/json
   "host" : "...",
   "result" : {
     "msg" : "...",
+    "start" : "...",
     "delta" : "...",
+    "changed" : true,
     "stdout" : "...",
-    "stderr" : "...",
-    "start" : "...",
-    "cmd" : [ "...", "..." ],
     "end" : "...",
-    "changed" : true
+    "stderr" : "...",
+    "cmd" : [ "...", "..." ]
   },
   "vmType" : "...",
   "cloudDeploymentDomain" : "...",
   "provisionID" : "...",
-  "id" : "58e3946e0fb4f562d84ba1ad",
+  "timestamp" : 12345,
   "owner" : "user1",
-  "timestamp" : 12345
+  "id" : "58e3946e0fb4f562d84ba1ad"
 } ]
                 </code>
               </pre>
@@ -585,20 +585,20 @@ Content-Type: application/json
   &quot;host&quot; : &quot;...&quot;,
   &quot;result&quot; : {
     &quot;msg&quot; : &quot;...&quot;,
+    &quot;start&quot; : &quot;...&quot;,
     &quot;delta&quot; : &quot;...&quot;,
+    &quot;changed&quot; : true,
     &quot;stdout&quot; : &quot;...&quot;,
-    &quot;stderr&quot; : &quot;...&quot;,
-    &quot;start&quot; : &quot;...&quot;,
-    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ],
     &quot;end&quot; : &quot;...&quot;,
-    &quot;changed&quot; : true
+    &quot;stderr&quot; : &quot;...&quot;,
+    &quot;cmd&quot; : [ &quot;...&quot;, &quot;...&quot; ]
   },
   &quot;vmType&quot; : &quot;...&quot;,
   &quot;cloudDeploymentDomain&quot; : &quot;...&quot;,
   &quot;provisionID&quot; : &quot;...&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>

docs/apidocs/resource_BenchmarkController.html

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

docs/apidocs/resource_DeployController.html

@@ -233,9 +233,9 @@ Accept: application/json
   "managerType" : "ansible",
   "provisionID" : "58e3946e0fb4f562d84ba1ad",
   "configurationID" : "58e3946e0fb4f562d84ba1ad",
-  "id" : "58e3946e0fb4f562d84ba1ad",
+  "timestamp" : 12345,
   "owner" : "user1",
-  "timestamp" : 12345
+  "id" : "58e3946e0fb4f562d84ba1ad"
 }
                 </code>
               </pre>
@@ -399,9 +399,9 @@ Content-Type: application/json
   &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>
@@ -587,37 +587,37 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
+  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyPair&quot; : {
-    &quot;privateKey&quot; : {
+    &quot;keyPairId&quot; : &quot;...&quot;,
+    &quot;publicKey&quot; : {
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
+      &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
+      }
     },
+    &quot;privateKey&quot; : {
       &quot;name&quot; : &quot;id_dsa.pub&quot;,
+      &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
       &quot;type&quot; : &quot;PRIVATE&quot;,
-      &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
-    },
-    &quot;publicKey&quot; : {
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
+      }
     },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;,
-      &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
-    },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;,
-    &quot;timestamp&quot; : 12345
+    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
   },
-  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>

docs/apidocs/resource_DeployController0.html

@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
   &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;
 
                 </code>
@@ -226,9 +226,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
   &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;
 
                 </code>

docs/apidocs/resource_PlannerController0.html

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

docs/apidocs/resource_ProvisionController.html

@@ -309,16 +309,16 @@ Accept: application/json
                 <code class="prettyprint language-js">
 {
   &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
   &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>
@@ -406,16 +406,16 @@ Content-Type: application/json
                 <code class="prettyprint language-js">
 {
   &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
   &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>
@@ -605,27 +605,27 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;deployParameters&quot; : [ {
     &quot;role&quot; : &quot;slave&quot;,
-    &quot;IP&quot; : &quot;52.73.245.157&quot;,
-    &quot;user&quot; : &quot;vm_user&quot;
+    &quot;user&quot; : &quot;vm_user&quot;,
+    &quot;IP&quot; : &quot;52.73.245.157&quot;
   }, {
     &quot;role&quot; : &quot;...&quot;,
-    &quot;IP&quot; : &quot;...&quot;,
-    &quot;user&quot; : &quot;...&quot;
+    &quot;user&quot; : &quot;...&quot;,
+    &quot;IP&quot; : &quot;...&quot;
   } ],
+  &quot;cloudKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
   &quot;userKeyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
-  &quot;deployerKeyPairIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>

docs/apidocs/resource_ProvisionController0.html

@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
   &lt;status&gt;Success&lt;/status&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;
 
                 </code>
@@ -215,9 +215,9 @@ Accept: application/json
 
                 <code class="prettyprint language-xml">
 &lt;upload&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
   &lt;user&gt;...&lt;/user&gt;
   &lt;pwd&gt;...&lt;/pwd&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
 &lt;/upload&gt;
 
                 </code>

docs/apidocs/resource_ScriptController.html

@@ -159,9 +159,9 @@ Accept: application/json
 {
   "contents" : "    #!/bin/bash\necho \"Reading system-wide config....\" >&2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \"Reading user config....\" >&2\\n  . ~/.coolrc\\nfi",
   "name" : "config.sh",
-  "id" : "58e3946e0fb4f562d84ba1ad",
+  "timestamp" : 12345,
   "owner" : "user1",
-  "timestamp" : 12345
+  "id" : "58e3946e0fb4f562d84ba1ad"
 }
                 </code>
               </pre>
@@ -395,9 +395,9 @@ Content-Type: application/json
 {
   &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
   &quot;name&quot; : &quot;config.sh&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>
@@ -681,9 +681,9 @@ Content-Type: application/json
 {
   &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
   &quot;name&quot; : &quot;config.sh&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;,
-  &quot;timestamp&quot; : 12345
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
               </pre>

docs/apidocs/resource_UserController.html

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

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>

docs/apidocs/xml_ns0_benchmarkResult.html

@@ -232,11 +232,11 @@
       
       <pre class="prettyprint language-xml example">&lt;b-----&gt;
   &lt;host&gt;...&lt;/host&gt;
-  &lt;start&gt;...&lt;/start&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
+  &lt;delta&gt;...&lt;/delta&gt;
   &lt;end&gt;...&lt;/end&gt;
   &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
-  &lt;delta&gt;...&lt;/delta&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
+  &lt;start&gt;...&lt;/start&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/b-----&gt;

docs/apidocs/xml_ns0_cloudCredentials.html

@@ -194,24 +194,24 @@
       
       <pre class="prettyprint language-xml example">&lt;c-----&gt;
   &lt;accessKeyId&gt;AKIKIQY9K1ZUQ6M7YBSQ&lt;/accessKeyId&gt;
-  &lt;cloudProviderName&gt;ec2&lt;/cloudProviderName&gt;
   &lt;keyPairs&gt;
-    &lt;privateKey&gt;
-      &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
-      &lt;name&gt;id_dsa.pub&lt;/name&gt;
-      &lt;type&gt;PRIVATE&lt;/type&gt;
-      &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
-    &lt;/privateKey&gt;
     &lt;keyPairId&gt;...&lt;/keyPairId&gt;
     &lt;publicKey&gt;
-      &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
       &lt;name&gt;id_dsa.pub&lt;/name&gt;
-      &lt;type&gt;PRIVATE&lt;/type&gt;
       &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
+      &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+      &lt;type&gt;PRIVATE&lt;/type&gt;
     &lt;/publicKey&gt;
+    &lt;privateKey&gt;
+      &lt;name&gt;id_dsa.pub&lt;/name&gt;
+      &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
+      &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+      &lt;type&gt;PRIVATE&lt;/type&gt;
+    &lt;/privateKey&gt;
     &lt;owner&gt;user1&lt;/owner&gt;
     &lt;timestamp&gt;...&lt;/timestamp&gt;
   &lt;/keyPairs&gt;
+  &lt;cloudProviderName&gt;ec2&lt;/cloudProviderName&gt;
   &lt;secretKey&gt;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&lt;/secretKey&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;

docs/apidocs/xml_ns0_configure.html

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

docs/apidocs/xml_ns0_deployParameter.html

@@ -146,9 +146,9 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;user&gt;vm_user&lt;/user&gt;
-  &lt;role&gt;slave&lt;/role&gt;
   &lt;IP&gt;52.73.245.157&lt;/IP&gt;
+  &lt;role&gt;slave&lt;/role&gt;
+  &lt;user&gt;vm_user&lt;/user&gt;
 &lt;/d-----&gt;
 </pre>
 

docs/apidocs/xml_ns0_deployRequest.html

@@ -178,8 +178,8 @@
       
       <pre class="prettyprint language-xml example">&lt;d-----&gt;
   &lt;managerType&gt;ansible&lt;/managerType&gt;
-  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
   &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;
+  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/d-----&gt;

docs/apidocs/xml_ns0_deployResponse.html

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

docs/apidocs/xml_ns0_key.html

@@ -164,10 +164,10 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;k-----&gt;
-  &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
   &lt;name&gt;id_dsa.pub&lt;/name&gt;
-  &lt;type&gt;PRIVATE&lt;/type&gt;
   &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
+  &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+  &lt;type&gt;PRIVATE&lt;/type&gt;
 &lt;/k-----&gt;
 </pre>
 

docs/apidocs/xml_ns0_keyPair.html

@@ -175,19 +175,19 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;k-----&gt;
-  &lt;privateKey&gt;
-    &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
-    &lt;name&gt;id_dsa.pub&lt;/name&gt;
-    &lt;type&gt;PRIVATE&lt;/type&gt;
-    &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
-  &lt;/privateKey&gt;
   &lt;keyPairId&gt;...&lt;/keyPairId&gt;
   &lt;publicKey&gt;
-    &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
     &lt;name&gt;id_dsa.pub&lt;/name&gt;
-    &lt;type&gt;PRIVATE&lt;/type&gt;
     &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
+    &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+    &lt;type&gt;PRIVATE&lt;/type&gt;
   &lt;/publicKey&gt;
+  &lt;privateKey&gt;
+    &lt;name&gt;id_dsa.pub&lt;/name&gt;
+    &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
+    &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
+    &lt;type&gt;PRIVATE&lt;/type&gt;
+  &lt;/privateKey&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/k-----&gt;

docs/apidocs/xml_ns0_plan.html

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

docs/apidocs/xml_ns0_planResponse.html

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

docs/apidocs/xml_ns0_provisionRequest.html

@@ -197,8 +197,8 @@
       <pre class="prettyprint language-xml example">&lt;p-----&gt;
   &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
   &lt;deployerKeyPairIDs&gt;...&lt;/deployerKeyPairIDs&gt;
-  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
   &lt;userKeyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/userKeyPairIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
 &lt;/p-----&gt;

docs/apidocs/xml_ns0_provisionResponse.html

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

docs/apidocs/xml_ns0_register.html

@@ -128,8 +128,8 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;register&gt;
-  &lt;user&gt;user&lt;/user&gt;
   &lt;pwd&gt;123abc&lt;/pwd&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/register&gt;
 </pre>
 

docs/apidocs/xml_ns0_result.html

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

docs/apidocs/xml_ns0_sysbenchCPUBenchmark.html

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

docs/apidocs/xml_ns0_upload.html

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

docs/apidocs/xml_ns0_user.html

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

drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java

@@ -85,9 +85,14 @@ public class ProvisionController {
     @RolesAllowed({UserService.USER, UserService.ADMIN})
     public @ResponseBody
     String delete(@PathVariable("id") String id) {
-        ProvisionRequest provPlan = provisionService.findOne(id);
+        ProvisionResponse provPlan = provisionService.findOne(id);
         if (provPlan != null) {
-            provisionService.delete(id);
+            try {
+                provisionService.deleteProvisionedResources(provPlan);
+            } catch (IOException | TimeoutException | InterruptedException | JSONException ex) {
+                Logger.getLogger(ProvisionController.class.getName()).log(Level.SEVERE, null, ex);
+            }
+            ProvisionResponse provisionInfo = provisionService.delete(id);
             return "Deleted : " + id;
         }
         throw new NotFoundException();

drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/utils/MessageParsing.java

@@ -34,6 +34,7 @@ import java.security.cert.CertificateEncodingException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import nl.uva.sne.drip.drip.commons.data.internal.MessageParameter;
 import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials;
 import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
 import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
@@ -56,6 +57,16 @@ import provisioning.credential.EGICredential;
  */
 public class MessageParsing {
 
+    public static File getClusterKeysPair(JSONArray parameters, String tempInputDirPath) throws JSONException, IOException {
+        ObjectMapper mapper = new ObjectMapper();
+        mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
+        for (int i = 0; i < parameters.length(); i++) {
+            JSONObject param = (JSONObject) parameters.get(i);
+            MessageParameter messageParam = mapper.readValue(param.toString(), MessageParameter.class);
+        }
+        return null;
+    }
+
     enum SOURCE {
         MY_PROXY,
         CERTIFICATE

drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java

@@ -397,11 +397,22 @@ public class Consumer extends DefaultConsumer {
         FileUtils.moveFile(topologyFile, mainTopologyFile);
         String topTopologyLoadingPath = mainTopologyFile.getAbsolutePath();
 
+        List<File> topologyFiles = MessageParsing.getTopologies(parameters, tempInputDirPath, 1);
+        for (File lowLevelTopologyFile : topologyFiles) {
+            File secondaryTopologyFile = new File(tempInputDirPath + File.separator + lowLevelTopologyFile.getName() + ".yml");
+            FileUtils.moveFile(lowLevelTopologyFile, secondaryTopologyFile);
+        }
+        
+          File clusterKeyPair = MessageParsing.getClusterKeysPair(parameters, tempInputDirPath);
+          
+
         tam = new TopologyAnalysisMain(topTopologyLoadingPath);
         if (!tam.fullLoadWholeTopology()) {
             throw new Exception("sth wrong!");
         }
 
+      
+
         tEngine.deleteAll(tam.wholeTopology, userCredential, userDatabase);
         Message response = new Message();
         return response;