try to call new provisioner

docs/apidocs/downloads.html

@@ -72,7 +72,7 @@
   <h1 class="page-header">Files and Libraries</h1>
 
   <h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p>  <p>
     The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
     can be used to access the Web service API for this application.
@@ -97,7 +97,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p><p>
   The Java client-side library is used to provide the set of Java objects that can be serialized
   to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>.  This is useful for accessing the
@@ -127,7 +127,7 @@
     </tbody>
   </table>
   <h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p><p>
   The Java client-side library is used to access the Web service API for this application using Java.
 </p>
@@ -155,7 +155,7 @@
     </tbody>
   </table>
   <h3 id="artifact_js_client_library">JavaScript Client Library</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p><p>
   The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -190,7 +190,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p><p>
   The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
   This is useful for accessing the resources that are published by this application, but only
@@ -219,7 +219,7 @@
     </tbody>
   </table>
   <h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p><p>
   The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
   This is useful for accessing the resources that are published by this application, but only
@@ -251,7 +251,7 @@
     </tbody>
   </table>
   <h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
-  <p class="lead">Created April 26, 2017</p>
+  <p class="lead">Created April 27, 2017</p>
   <p><p>
   The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
   This is useful for accessing the REST endpoints that are published by this application, but only

docs/apidocs/json_AnsibleOutput.html

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

docs/apidocs/json_AnsibleResult.html

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

docs/apidocs/json_BenchmarkResult.html

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

docs/apidocs/json_DeployParameter.html

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

docs/apidocs/json_DeployRequest.html

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

docs/apidocs/json_Key.html

@@ -89,18 +89,18 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">key</span>
+          <td>  <span class="property-name">type</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference"><a href="json_KeyType.html">KeyType</a>
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">type</span>
+          <td>  <span class="property-name">key</span>
 </td>
-          <td>  <span class="datatype-reference"><a href="json_KeyType.html">KeyType</a>
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -122,8 +122,8 @@
       
       <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;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;attributes&quot; : {
     &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
     &quot;property2&quot; : &quot;domain_name:Virginia&quot;

docs/apidocs/json_KeyPair.html

@@ -80,7 +80,7 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">publicKey</span>
+          <td>  <span class="property-name">privateKey</span>
 </td>
           <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
@@ -89,7 +89,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">privateKey</span>
+          <td>  <span class="property-name">publicKey</span>
 </td>
           <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
@@ -103,14 +103,14 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">owner</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">owner</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -126,26 +126,26 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;publicKey&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;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
     }
   },
-  &quot;privateKey&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;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;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
     }
   },
-  &quot;owner&quot; : &quot;user1&quot;,
   &quot;timestamp&quot; : 12345,
+  &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 

docs/apidocs/json_KeyValueHolder.html

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

docs/apidocs/json_OwnedObject.html

@@ -68,7 +68,7 @@
 
       <dl class="dl-horizontal">
         <dt>Subtypes</dt>
-        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
+        <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_PlanResponse.html">PlanResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_ToscaRepresentation.html">ToscaRepresentation</a>, <a href="json_SysbenchCPUBenchmark.html">SysbenchCPUBenchmark</a>, <a href="json_PlaybookRepresentation.html">PlaybookRepresentation</a></dd>
       </dl>
 
       <table class="table datatype-properties">
@@ -82,18 +82,18 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">owner</span>
+          <td>  <span class="property-name">timestamp</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">number
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">timestamp</span>
+          <td>  <span class="property-name">owner</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -114,8 +114,8 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;owner&quot; : &quot;user1&quot;,
   &quot;timestamp&quot; : 12345,
+  &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 

docs/apidocs/json_PlanResponse.html

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

docs/apidocs/json_PlaybookRepresentation.html

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

docs/apidocs/json_ProvisionRequest.html

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

docs/apidocs/json_ProvisionResponse.html

@@ -94,8 +94,8 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">planID</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">keyPairIDs</span></td>
+          <td><span class="datatype-reference">array of string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -106,8 +106,8 @@
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">keyPairIDs</span></td>
-          <td><span class="datatype-reference">array of string
+          <td><span class="property-name">planID</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -128,14 +128,14 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">owner</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">owner</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -152,25 +152,25 @@
       
       <pre class="prettyprint language-js example">{
   &quot;deployParameters&quot; : [ {
-    &quot;role&quot; : &quot;slave&quot;,
-    &quot;IP&quot; : &quot;52.73.245.157&quot;,
     &quot;user&quot; : &quot;vm_user&quot;,
-    &quot;cloudCertificateName&quot; : &quot;Virginia&quot;
+    &quot;cloudCertificateName&quot; : &quot;Virginia&quot;,
+    &quot;IP&quot; : &quot;52.73.245.157&quot;,
+    &quot;role&quot; : &quot;slave&quot;
   }, {
-    &quot;role&quot; : &quot;...&quot;,
-    &quot;IP&quot; : &quot;...&quot;,
     &quot;user&quot; : &quot;...&quot;,
-    &quot;cloudCertificateName&quot; : &quot;...&quot;
+    &quot;cloudCertificateName&quot; : &quot;...&quot;,
+    &quot;IP&quot; : &quot;...&quot;,
+    &quot;role&quot; : &quot;...&quot;
   } ],
-  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
-  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
   &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;owner&quot; : &quot;user1&quot;,
   &quot;timestamp&quot; : 12345,
+  &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>
 

docs/apidocs/json_Script.html

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

docs/apidocs/json_SysbenchCPUBenchmark.html

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

docs/apidocs/json_ToscaRepresentation.html

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

docs/apidocs/json_User.html

@@ -89,36 +89,36 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">enabled</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">accountNonExpired</span>
+          <td>  <span class="property-name">roles</span>
 </td>
-          <td>  <span class="datatype-reference">boolean
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">roles</span>
+          <td>  <span class="property-name">id</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">password</span>
+          <td>  <span class="property-name">accountNonExpired</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">boolean
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -134,16 +134,16 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">id</span>
+          <td>  <span class="property-name">credentialsNonExpired</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">credentialsNonExpired</span>
+          <td>  <span class="property-name">enabled</span>
 </td>
           <td>  <span class="datatype-reference">boolean
 </span>
@@ -158,13 +158,13 @@
       
       <pre class="prettyprint language-js example">{
   &quot;username&quot; : &quot;user&quot;,
-  &quot;enabled&quot; : true,
-  &quot;accountNonExpired&quot; : true,
-  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
   &quot;password&quot; : &quot;...&quot;,
-  &quot;accountNonLocked&quot; : true,
+  &quot;roles&quot; : [ &quot;[\&quot;ADMIN\&quot;,\&quot;USER\&quot;]&quot;, &quot;...&quot; ],
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;credentialsNonExpired&quot; : true
+  &quot;accountNonExpired&quot; : true,
+  &quot;accountNonLocked&quot; : true,
+  &quot;credentialsNonExpired&quot; : true,
+  &quot;enabled&quot; : true
 }</pre>
 
         <footer class="footer">

docs/apidocs/resource_AnsibleOutputController.html

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

docs/apidocs/resource_BenchmarkController.html

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

docs/apidocs/resource_DeployController.html

@@ -230,11 +230,11 @@ Accept: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 12345,
+  &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
@@ -396,11 +396,11 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 12345,
+  &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>
@@ -587,35 +587,35 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyPair&quot; : {
-    &quot;publicKey&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;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
       }
     },
-    &quot;privateKey&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;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;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
       }
     },
-    &quot;owner&quot; : &quot;user1&quot;,
     &quot;timestamp&quot; : 12345,
+    &quot;owner&quot; : &quot;user1&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
   },
-  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;managerType&quot; : &quot;ansible&quot;,
+  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;timestamp&quot; : 12345,
+  &quot;owner&quot; : &quot;user1&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                 </code>

docs/apidocs/resource_DeployController0.html

@@ -126,9 +126,9 @@ Accept: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;deploy&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/deploy&gt;
 
                 </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
   &lt;status&gt;Success&lt;/status&gt;
   &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
-  &lt;info&gt;INFO&lt;/info&gt;
 &lt;/result&gt;
 
                 </code>
@@ -210,9 +210,9 @@ Accept: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;deploy&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/deploy&gt;
 
                 </code>
@@ -226,9 +226,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
   &lt;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

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

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

docs/apidocs/resource_ProvisionController0.html

@@ -126,9 +126,9 @@ Accept: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;execute&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/execute&gt;
 
                 </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
+  &lt;info&gt;INFO&lt;/info&gt;
   &lt;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;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;user&gt;...&lt;/user&gt;
 &lt;/upload&gt;
 
                 </code>

docs/apidocs/resource_ScriptController.html

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

docs/apidocs/resource_UserController.html

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

docs/apidocs/resource_UserPublicKeysController0.html

@@ -132,9 +132,9 @@ Accept: application/json
                 <code class="prettyprint language-xml">
 &lt;confUserKey&gt;
   &lt;userKey level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/userKey&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/confUserKey&gt;
 
                 </code>

docs/apidocs/resource_UserScriptController0.html

@@ -131,9 +131,9 @@ Accept: application/json
                 <code class="prettyprint language-xml">
 &lt;confScript&gt;
   &lt;script&gt;#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash &quot;$logstashScript&quot;\n\n\nlogLevelPath=/root/\nlogLevelFile=$logLevelPath/logstash_loglevel.csv\nremotePath=/media/lobcder/skoulouz/\nremoteLogPath=$remotePath/logs\nlocalLogPath=/root/logs\n\nmkdir $localLogPath\n\n\nfor logArchPath in $remoteLogPath/*.gz; do\n  echo &quot;File -&amp;gt; $logArchPath&quot;\n  if [ ! -f $logArchPath.lock ]; then\n    touch $logArchPath.lock\n    cp $logArchPath $localLogPath\n    logArchName=$(basename $logArchPath)\n    tar -xvf $localLogPath/$logArchName -C $localLogPath\n    sleep 120\n    modTime=-100\n    while [ ! -f $logLevelFile ]\n    do\n      sleep 5\n    done\n    while [ $modTime -lt 120 ]\n    do\n      moddate=$(stat -c %Y $logLevelFile)\n      moddate=${moddate%% *}\n      now=$(date +%s)\n      modTime=&quot;$(( $now - $moddate))&quot;\n      echo $modTime\n      sleep 5\n    done\n    rm $localLogPath/*.tar.gz\n    rm $localLogPath/*.log\n    modTime=-100\n  fi\ndone\n    \n\nscreen -X -S logstash quit\nsleep 5\n\nuid=`ifconfig | grep eth0 | awk &#39;{print $NF}&#39; | sed &#39;s/://g&#39;`\n\nfor csvFiles in $logLevelPath/*.csv; do\n  echo $csvFiles $csvFiles$uid.csv\n  mv $csvFiles $csvFiles$uid.csv\n  cp $csvFiles$uid.csv $remotePath\ndone\n\nkillall java \n&lt;/script&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/confScript&gt;
 
                 </code>

docs/apidocs/xml_ns0_ansibleOutput.html

@@ -193,10 +193,10 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;a-----&gt;
+  &lt;host&gt;...&lt;/host&gt;
   &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
   &lt;vmType&gt;...&lt;/vmType&gt;
   &lt;provisionID&gt;...&lt;/provisionID&gt;
-  &lt;host&gt;...&lt;/host&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/a-----&gt;

docs/apidocs/xml_ns0_benchmarkResult.html

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

docs/apidocs/xml_ns0_cloudCredentials.html

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

docs/apidocs/xml_ns0_confScript.html

@@ -152,9 +152,9 @@
       
       <pre class="prettyprint language-xml example">&lt;confScript&gt;
   &lt;script&gt;#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash &quot;$logstashScript&quot;\n\n\nlogLevelPath=/root/\nlogLevelFile=$logLevelPath/logstash_loglevel.csv\nremotePath=/media/lobcder/skoulouz/\nremoteLogPath=$remotePath/logs\nlocalLogPath=/root/logs\n\nmkdir $localLogPath\n\n\nfor logArchPath in $remoteLogPath/*.gz; do\n  echo &quot;File -&amp;gt; $logArchPath&quot;\n  if [ ! -f $logArchPath.lock ]; then\n    touch $logArchPath.lock\n    cp $logArchPath $localLogPath\n    logArchName=$(basename $logArchPath)\n    tar -xvf $localLogPath/$logArchName -C $localLogPath\n    sleep 120\n    modTime=-100\n    while [ ! -f $logLevelFile ]\n    do\n      sleep 5\n    done\n    while [ $modTime -lt 120 ]\n    do\n      moddate=$(stat -c %Y $logLevelFile)\n      moddate=${moddate%% *}\n      now=$(date +%s)\n      modTime=&quot;$(( $now - $moddate))&quot;\n      echo $modTime\n      sleep 5\n    done\n    rm $localLogPath/*.tar.gz\n    rm $localLogPath/*.log\n    modTime=-100\n  fi\ndone\n    \n\nscreen -X -S logstash quit\nsleep 5\n\nuid=`ifconfig | grep eth0 | awk &#39;{print $NF}&#39; | sed &#39;s/://g&#39;`\n\nfor csvFiles in $logLevelPath/*.csv; do\n  echo $csvFiles $csvFiles$uid.csv\n  mv $csvFiles $csvFiles$uid.csv\n  cp $csvFiles$uid.csv $remotePath\ndone\n\nkillall java \n&lt;/script&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/confScript&gt;
 </pre>
 

docs/apidocs/xml_ns0_confUserKey.html

@@ -152,9 +152,9 @@
       
       <pre class="prettyprint language-xml example">&lt;confUserKey&gt;
   &lt;userKey level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/userKey&gt;
+  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
   &lt;user&gt;user&lt;/user&gt;
-  &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
 &lt;/confUserKey&gt;
 </pre>
 

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

docs/apidocs/xml_ns0_deploy.html

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

docs/apidocs/xml_ns0_deployParameter.html

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

docs/apidocs/xml_ns0_deployRequest.html

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

docs/apidocs/xml_ns0_execute.html

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

docs/apidocs/xml_ns0_key.html

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

docs/apidocs/xml_ns0_keyPair.html

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

docs/apidocs/xml_ns0_plan.html

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

docs/apidocs/xml_ns0_planResponse.html

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

docs/apidocs/xml_ns0_provisionRequest.html

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

docs/apidocs/xml_ns0_provisionResponse.html

@@ -181,14 +181,14 @@
       
       <pre class="prettyprint language-xml example">&lt;p-----&gt;
   &lt;deployParameters&gt;
+    &lt;role&gt;slave&lt;/role&gt;
     &lt;cloudCertificateName&gt;Virginia&lt;/cloudCertificateName&gt;
     &lt;user&gt;vm_user&lt;/user&gt;
-    &lt;role&gt;slave&lt;/role&gt;
     &lt;IP&gt;52.73.245.157&lt;/IP&gt;
   &lt;/deployParameters&gt;
-  &lt;keyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/keyPairIDs&gt;
-  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
   &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
+  &lt;keyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/keyPairIDs&gt;
 &lt;/p-----&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;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_script.html

@@ -157,11 +157,11 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;s-----&gt;
+  &lt;name&gt;config.sh&lt;/name&gt;
   &lt;contents&gt;    #!/bin/bash
 echo &quot;Reading system-wide config....&quot; &amp;gt;&amp;amp;2\n. /etc/cool.cfg
 if [ -r ~/.coolrc ]; then
   echo &quot;Reading user config....&quot; &amp;gt;&amp;amp;2\n  . ~/.coolrc\nfi&lt;/contents&gt;
-  &lt;name&gt;config.sh&lt;/name&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/s-----&gt;

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;minExecutionTimePerRequest&gt;...&lt;/minExecutionTimePerRequest&gt;
   &lt;stddevEventsPerThread&gt;...&lt;/stddevEventsPerThread&gt;
-  &lt;ansibleOutputID&gt;...&lt;/ansibleOutputID&gt;
-  &lt;executionTime&gt;...&lt;/executionTime&gt;
+  &lt;maxExecutionTimePerRequest&gt;...&lt;/maxExecutionTimePerRequest&gt;
   &lt;avgExecutionTimePerRequest&gt;...&lt;/avgExecutionTimePerRequest&gt;
-  &lt;sysbenchVersion&gt;...&lt;/sysbenchVersion&gt;
+  &lt;stddevExecTimePerThread&gt;...&lt;/stddevExecTimePerThread&gt;
+  &lt;avgExecTimePerThread&gt;...&lt;/avgExecTimePerThread&gt;
+  &lt;executionTime&gt;...&lt;/executionTime&gt;
   &lt;approx95Percentile&gt;...&lt;/approx95Percentile&gt;
-  &lt;minExecutionTimePerRequest&gt;...&lt;/minExecutionTimePerRequest&gt;
+  &lt;avgEventsPerThread&gt;...&lt;/avgEventsPerThread&gt;
   &lt;numberOfThreads&gt;...&lt;/numberOfThreads&gt;
   &lt;totalNumberOfEvents&gt;...&lt;/totalNumberOfEvents&gt;
-  &lt;maxExecutionTimePerRequest&gt;...&lt;/maxExecutionTimePerRequest&gt;
-  &lt;avgExecTimePerThread&gt;...&lt;/avgExecTimePerThread&gt;
-  &lt;stddevExecTimePerThread&gt;...&lt;/stddevExecTimePerThread&gt;
-  &lt;avgEventsPerThread&gt;...&lt;/avgEventsPerThread&gt;
-  &lt;vmType&gt;...&lt;/vmType&gt;
+  &lt;ansibleOutputID&gt;...&lt;/ansibleOutputID&gt;
+  &lt;sysbenchVersion&gt;...&lt;/sysbenchVersion&gt;
+  &lt;host&gt;...&lt;/host&gt;
   &lt;end&gt;...&lt;/end&gt;
-  &lt;start&gt;...&lt;/start&gt;
   &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
-  &lt;host&gt;...&lt;/host&gt;
   &lt;delta&gt;...&lt;/delta&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
+  &lt;start&gt;...&lt;/start&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
   &lt;owner&gt;user1&lt;/owner&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;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;user&gt;...&lt;/user&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;username&gt;user&lt;/username&gt;
   &lt;roles&gt;[&quot;ADMIN&quot;,&quot;USER&quot;]&lt;/roles&gt;
-  &lt;enabled&gt;true&lt;/enabled&gt;
-  &lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt;
-  &lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt;
-  &lt;password&gt;...&lt;/password&gt;
+  &lt;username&gt;user&lt;/username&gt;
   &lt;id&gt;58e3946e0fb4f562d84ba1ad&lt;/id&gt;
+  &lt;accountNonLocked&gt;true&lt;/accountNonLocked&gt;
   &lt;credentialsNonExpired&gt;true&lt;/credentialsNonExpired&gt;
+  &lt;accountNonExpired&gt;true&lt;/accountNonExpired&gt;
+  &lt;password&gt;...&lt;/password&gt;
+  &lt;enabled&gt;true&lt;/enabled&gt;
 &lt;/u-----&gt;
 </pre>
 

drip-provisioner/pom.xml

@@ -61,6 +61,19 @@
             <version>2.4</version>
             <type>jar</type>
         </dependency>        
+        
+        
+        <dependency>
+            <groupId>org.jglobus</groupId>
+            <artifactId>myproxy</artifactId>
+            <version>2.1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-compress</artifactId>
+            <version>1.5</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     
     

drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/RPCServer.java

@@ -23,11 +23,13 @@ import com.rabbitmq.client.DefaultConsumer;
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.MalformedURLException;
 import java.text.MessageFormat;
 import java.util.Properties;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import nl.uva.sne.drip.drip.provisioner.utils.PropertyValues;
 
 /**
  *
@@ -35,10 +37,7 @@ import java.util.logging.Logger;
  */
 public class RPCServer {
 
-    private static String RPC_QUEUE_NAME = "provisioner_queue_v1";
-    private static String HOST = "127.0.0.1";
-
-    public static void main(String[] argv) {
+    public static void main(String[] argv) throws MalformedURLException {
         Properties prop = new Properties();
         if (argv.length >= 1) {
             try {
@@ -55,33 +54,31 @@ public class RPCServer {
                 Logger.getLogger(RPCServer.class.getName()).log(Level.SEVERE, null, ex);
             }
         }
-        HOST = prop.getProperty("rabbitmq.host", "127.0.0.1");
-        RPC_QUEUE_NAME = prop.getProperty("rpc.queue.name", "provisioner_queue_v1");
-        Logger.getLogger(RPCServer.class.getName()).log(Level.INFO, MessageFormat.format("rabbitmq.host: {0}", HOST));
-        Logger.getLogger(RPCServer.class.getName()).log(Level.INFO, MessageFormat.format("rpc.queue.name: {0}", RPC_QUEUE_NAME));
+        PropertyValues.setPropertyValues(prop);
+
         start();
     }
 
     private static void start() {
         ConnectionFactory factory = new ConnectionFactory();
-        factory.setHost(HOST);
+        factory.setHost(PropertyValues.HOST);
         factory.setPassword("guest");
         factory.setUsername("guest");
         factory.setPort(AMQP.PROTOCOL.PORT);
-        Logger.getLogger(RPCServer.class.getName()).log(Level.INFO, "Connected to: {0}", HOST);
+        Logger.getLogger(RPCServer.class.getName()).log(Level.INFO, "Connected to: {0}", PropertyValues.HOST);
         try (Connection connection = factory.newConnection()) {
             Channel channel = connection.createChannel();
             //We define the queue name 
-            channel.queueDeclare(RPC_QUEUE_NAME, false, false, false, null);
+            channel.queueDeclare(PropertyValues.RPC_QUEUE_NAME, false, false, false, null);
             DefaultConsumer c;
-            if (RPC_QUEUE_NAME.endsWith("v0")) {
+            if (PropertyValues.RPC_QUEUE_NAME.endsWith("v0")) {
                 c = new nl.uva.sne.drip.drip.provisioner.v0.Consumer(channel);
             } else {
                 c = new nl.uva.sne.drip.drip.provisioner.v1.Consumer(channel);
             }
 
             //Start listening for messages 
-            channel.basicConsume(RPC_QUEUE_NAME, false, c);
+            channel.basicConsume(PropertyValues.RPC_QUEUE_NAME, false, c);
 
             //Block so we don't close the channel
             while (true) {

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

@@ -17,21 +17,34 @@ package nl.uva.sne.drip.drip.provisioner.utils;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import cz.cesnet.cloud.occi.api.http.auth.X509Authentication;
+import java.io.BufferedInputStream;
+import java.io.BufferedOutputStream;
 import java.io.File;
+import java.io.FileInputStream;
 import java.io.FileNotFoundException;
+import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.nio.channels.Channels;
+import java.nio.channels.ReadableByteChannel;
+import java.security.cert.CertificateEncodingException;
 import java.util.ArrayList;
-import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Set;
-import nl.uva.sne.drip.drip.commons.data.internal.Message;
+import java.util.zip.GZIPInputStream;
 import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials;
 import nl.uva.sne.drip.drip.commons.data.v1.external.Key;
 import nl.uva.sne.drip.drip.commons.data.v1.external.KeyPair;
+import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
+import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
+import org.globus.gsi.X509Credential;
+import org.globus.gsi.gssapi.GlobusGSSCredentialImpl;
+import org.globus.myproxy.MyProxy;
+import org.globus.myproxy.MyProxyException;
+import org.ietf.jgss.GSSCredential;
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -46,6 +59,11 @@ import provisioning.credential.EGICredential;
  */
 public class MessageParsing {
 
+    enum SOURCE {
+        MY_PROXY,
+        CERTIFICATE
+    }
+
     public static List<File> getTopologies(JSONArray parameters, String tempInputDirPath, int level) throws JSONException, IOException {
         List<File> topologyFiles = new ArrayList<>();
         for (int i = 0; i < parameters.length(); i++) {
@@ -108,7 +126,7 @@ public class MessageParsing {
         return map;
     }
 
-    public static List<Credential> getCloudCredentials(JSONArray parameters, String tempInputDirPath) throws JSONException, FileNotFoundException, IOException {
+    public static List<Credential> getCloudCredentials(JSONArray parameters, String tempInputDirPath) throws JSONException, FileNotFoundException, IOException, MyProxyException, CertificateEncodingException {
         List<Credential> credentials = new ArrayList<>();
         for (int i = 0; i < parameters.length(); i++) {
             JSONObject param = (JSONObject) parameters.get(i);
@@ -118,9 +136,7 @@ public class MessageParsing {
                 ObjectMapper mapper = new ObjectMapper();
                 mapper.configure(JsonParser.Feature.ALLOW_SINGLE_QUOTES, true);
                 String credentialString = (String) param.get("value");
-                System.err.println(credentialString);
                 credentialString = credentialString.substring(1, credentialString.length() - 1);
-                System.err.println(credentialString);
                 CloudCredentials cred = mapper.readValue(credentialString, CloudCredentials.class);
                 if (cred.getCloudProviderName().toLowerCase().equals("ec2")) {
                     EC2Credential ec2 = new EC2Credential();
@@ -130,34 +146,101 @@ public class MessageParsing {
                 }
                 if (cred.getCloudProviderName().toLowerCase().equals("egi")) {
                     EGICredential egi = new EGICredential();
-                    egi.proxyFilePath = generateProxy(cred.getAccessKeyId(), cred.getSecretKey());
-                    egi.trustedCertPath = "/etc/grid-security/certificates";
+                    if (PropertyValues.MY_PROXY_ENDPOINT != null || PropertyValues.MY_PROXY_ENDPOINT.length() > 2) {
+                        egi.proxyFilePath = generateProxy(cred.getAccessKeyId(), cred.getSecretKey(), SOURCE.MY_PROXY);
+                    } else {
+                        egi.proxyFilePath = generateProxy(cred.getAccessKeyId(), cred.getSecretKey(), SOURCE.CERTIFICATE);
+                    }
+//                    else if (){
+//                        
+//                    }
+//                   
+                    downloadCACertificates();
+                    egi.trustedCertPath = PropertyValues.TRUSTED_CERTIFICATE_FOLDER;
                     credential = egi;
                 }
 
-                for (KeyPair pair : cred.getKeyPairs()) {
-                    if (pair != null) {
-                        File dir = new File(tempInputDirPath + File.separator + pair.getId());
-                        dir.mkdir();
-                        Key privateKey = pair.getPrivateKey();
-                        if (privateKey != null) {
-                            writeValueToFile(privateKey.getKey(), new File(dir.getAbsolutePath() + File.separator + privateKey.getName()));
+//                for (KeyPair pair : cred.getKeyPairs()) {
+//                    if (pair != null) {
+//                        File dir = new File(tempInputDirPath + File.separator + pair.getId());
+//                        dir.mkdir();
+//                        Key privateKey = pair.getPrivateKey();
+//                        if (privateKey != null) {
+//                            writeValueToFile(privateKey.getKey(), new File(dir.getAbsolutePath() + File.separator + privateKey.getName()));
+//                        }
+//                        Key publicKey = pair.getPublicKey();
+//                        if (publicKey != null) {
+//                            writeValueToFile(publicKey.getKey(), new File(dir.getAbsolutePath() + File.separator + publicKey.getName()));
+//                        }
+//                    }
+//                }
+                credentials.add(credential);
             }
-                        Key publicKey = pair.getPublicKey();
-                        if (publicKey != null) {
-                            writeValueToFile(publicKey.getKey(), new File(dir.getAbsolutePath() + File.separator + publicKey.getName()));
         }
+
+        return credentials;
     }
 
+    private static String generateProxy(String accessKeyId, String secretKey, SOURCE source) throws MyProxyException, IOException, CertificateEncodingException {
+        if (source.equals(SOURCE.MY_PROXY)) {
+            MyProxy myProxy = new MyProxy(PropertyValues.MY_PROXY_ENDPOINT, 7512);
+            GSSCredential cert = myProxy.get(accessKeyId, secretKey, 2 * 3600);
+            X509Credential gCred = ((GlobusGSSCredentialImpl) cert).getX509Credential();
+            gCred.save(new FileOutputStream("/tmp/x509up_u0"));
         }
-                credentials.add(credential);
+
+        return "/tmp/x509up_u0";
+    }
+
+    private static void downloadCACertificates() throws MalformedURLException, IOException {
+        File bundle = new File(PropertyValues.CA_BUNDLE_URL.getFile());
+//        Path path = Paths.get(bundle.getAbsolutePath());
+//        BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
+        if (!bundle.exists()) {
+            URL website = new URL(PropertyValues.CA_BUNDLE_URL.toString());
+            ReadableByteChannel rbc = Channels.newChannel(website.openStream());
+            FileOutputStream fos = new FileOutputStream(PropertyValues.CA_BUNDLE_URL.getFile());
+            fos.getChannel().transferFrom(rbc, 0, Long.MAX_VALUE);
+            untar(new File(PropertyValues.TRUSTED_CERTIFICATE_FOLDER), bundle);
         }
     }
 
-        return credentials;
+    private static void untar(File dest, File tarFile) throws IOException {
+
+        dest.mkdir();
+        TarArchiveInputStream tarIn;
+
+        tarIn = new TarArchiveInputStream(
+                new GzipCompressorInputStream(
+                        new BufferedInputStream(
+                                new FileInputStream(
+                                        tarFile
+                                )
+                        )
+                )
+        );
+
+        org.apache.commons.compress.archivers.tar.TarArchiveEntry tarEntry = tarIn.getNextTarEntry();
+
+        while (tarEntry != null) {
+            File destPath = new File(dest, tarEntry.getName());
+            if (tarEntry.isDirectory()) {
+                destPath.mkdirs();
+            } else {
+                destPath.createNewFile();
+                byte[] btoRead = new byte[1024];
+                try (BufferedOutputStream bout = new BufferedOutputStream(new FileOutputStream(destPath))) {
+                    int len;
+
+                    while ((len = tarIn.read(btoRead)) != -1) {
+                        bout.write(btoRead, 0, len);
                     }
+                }
+            }
+            tarEntry = tarIn.getNextTarEntry();
+        }
+        tarIn.close();
 
-    private static String generateProxy(String accessKeyId, String secretKey) {
-        return "/tmp/x509up_u0";
     }
+
 }

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

+/*
+ * Copyright 2017 S. Koulouzis, Wang Junchao, Huan Zhou, Yang Hu 
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package nl.uva.sne.drip.drip.provisioner.utils;
+
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.text.MessageFormat;
+import java.util.Properties;
+import java.util.logging.Level;
+import java.util.logging.Logger;
+import nl.uva.sne.drip.drip.provisioner.RPCServer;
+
+/**
+ *
+ * @author S. Koulouzis
+ */
+public class PropertyValues {
+
+    public static String RPC_QUEUE_NAME = "provisioner_queue_v1";
+    public static String HOST = "127.0.0.1";
+    public static String TRUSTED_CERTIFICATE_FOLDER;
+    public static URL CA_BUNDLE_URL;
+    public static String MY_PROXY_ENDPOINT = "myproxy1.egee.cesnet.cz";
+
+    public static void setPropertyValues(Properties prop) throws MalformedURLException {
+        PropertyValues.HOST = prop.getProperty("rabbitmq.host", "127.0.0.1");
+        PropertyValues.RPC_QUEUE_NAME = prop.getProperty("rpc.queue.name",
+                "provisioner_queue_v1");
+        PropertyValues.TRUSTED_CERTIFICATE_FOLDER = prop.getProperty("trusted.certificates.folder", "/etc/grid-security/certificates");
+        CA_BUNDLE_URL = new URL(prop.getProperty("ca.bundle.url",
+                "https://dist.eugridpma.info/distribution/igtf/current/accredited/"
+                + "igtf-preinstalled-bundle-classic.tar.gz"));
+
+        MY_PROXY_ENDPOINT = prop.getProperty("my.proxy.endpoint",
+                "myproxy1.egee.cesnet.cz");;
+        Logger.getLogger(RPCServer.class.getName()).log(Level.INFO,
+                MessageFormat.format("rabbitmq.host: {0}", PropertyValues.HOST));
+        Logger.getLogger(RPCServer.class.getName()).log(Level.INFO,
+                MessageFormat.format("rpc.queue.name: {0}", PropertyValues.RPC_QUEUE_NAME));
+    }
+}

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

@@ -42,6 +42,7 @@ import provisioning.credential.EC2Credential;
 import provisioning.credential.EGICredential;
 import provisioning.credential.SSHKeyPair;
 import provisioning.credential.UserCredential;
+import provisioning.database.EC2.EC2Database;
 import provisioning.database.EGI.EGIDatabase;
 import provisioning.database.UserDatabase;
 import provisioning.engine.TEngine.TEngine;
@@ -172,9 +173,8 @@ public class Consumer extends DefaultConsumer {
 //        EGICredential egiCredential = new EGICredential();
 //        egiCredential.proxyFilePath = "/tmp/x509up_u0";
 //        egiCredential.trustedCertPath = "/etc/grid-security/certificates";
-        System.exit(-1);
-
-        ArrayList<SSHKeyPair> sshKeyPairs = userCredential.loadSSHKeyPairFromFile(currentDir);
+        ArrayList<SSHKeyPair> sshKeyPairs = userCredential.
+                loadSSHKeyPairFromFile(currentDir);
         if (sshKeyPairs == null) {
             throw new NullPointerException("ssh key pairs are null");
         }
@@ -184,13 +184,16 @@ public class Consumer extends DefaultConsumer {
             throw new IOException("ssh key pair initilaziation error");
         }
 
+        System.err.println(currentDir);
+        System.exit(-1);
+
         ///Initial Database
         UserDatabase userDatabase = new UserDatabase();
         EGIDatabase egiDatabase = new EGIDatabase();
         egiDatabase.loadDomainInfoFromFile(currentDir + "EGI_Domain_Info");
-        /*EC2Database ec2Database = new EC2Database();
-		ec2Database.loadDomainFromFile(currentDir+"domains");
-		ec2Database.loadAmiFromFile(currentDir+"OS_Domain_AMI");*/
+        EC2Database ec2Database = new EC2Database();
+        ec2Database.loadDomainFromFile(currentDir + "domains");
+        ec2Database.loadAmiFromFile(currentDir + "OS_Domain_AMI");
         if (userDatabase.databases == null) {
             userDatabase.databases = new HashMap<>();
         }