show only non-null values for all data types

docs/apidocs/downloads.html

@@ -116,12 +116,12 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-json-client.jar">
       <td><span class="downloadfile-name">drip-api-json-client.jar</span></td>
-      <td><span class="downloadfile-size">21.81K</span></td>
+      <td><span class="downloadfile-size">21.83K</span></td>
       <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
     </tr>
     <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
       <td><span class="downloadfile-name">drip-api-json-client-json-sources.jar</span></td>
-      <td><span class="downloadfile-size">16.56K</span></td>
+      <td><span class="downloadfile-size">16.55K</span></td>
       <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
     </tr>
     </tbody>
@@ -144,12 +144,12 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-xml-client.jar">
       <td><span class="downloadfile-name">drip-api-xml-client.jar</span></td>
-      <td><span class="downloadfile-size">24.56K</span></td>
+      <td><span class="downloadfile-size">24.55K</span></td>
       <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
     </tr>
     <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
       <td><span class="downloadfile-name">drip-api-xml-client-xml-sources.jar</span></td>
-      <td><span class="downloadfile-size">20.57K</span></td>
+      <td><span class="downloadfile-size">20.58K</span></td>
       <td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
     </tr>
     </tbody>
@@ -213,7 +213,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">7.95K</span></td>
+      <td><span class="downloadfile-size">7.89K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>
@@ -245,7 +245,7 @@
     <tbody data-link="row" class="rowlink">
     <tr class="clickable-row" data-href="drip-api-php.zip">
       <td><span class="downloadfile-name">drip-api-php.zip</span></td>
-      <td><span class="downloadfile-size">8.94K</span></td>
+      <td><span class="downloadfile-size">8.91K</span></td>
       <td><span class="downloadfile-description">&nbsp;</span></td>
     </tr>
     </tbody>

docs/apidocs/drip-api.rb

@@ -344,18 +344,18 @@ module External
   class DeployParameter 
 
     # (no documentation provided)
-    attr_accessor :role
+    attr_accessor :IP
     # (no documentation provided)
     attr_accessor :user
     # (no documentation provided)
-    attr_accessor :IP
+    attr_accessor :role
 
     # the json hash for this DeployParameter
     def to_jaxb_json_hash
       _h = {}
-      _h['role'] = role.to_jaxb_json_hash unless role.nil?
-      _h['user'] = user.to_jaxb_json_hash unless user.nil?
       _h['IP'] = IP.to_jaxb_json_hash unless IP.nil?
+      _h['user'] = user.to_jaxb_json_hash unless user.nil?
+      _h['role'] = role.to_jaxb_json_hash unless role.nil?
       return _h
     end
 
@@ -366,23 +366,23 @@ module External
 
     #initializes this DeployParameter with a json hash
     def init_jaxb_json_hash(_o)
-        if !_o['role'].nil?
-          _oa = _o['role']
+        if !_o['IP'].nil?
+          _oa = _o['IP']
             if(_oa.is_a? Hash)
-              @role = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @role =  String.from_json(_oa) unless _oa['@class']
+              @IP = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @IP =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @role = Array.new
+              @IP = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @role.push String.from_json(_item)
+                   @IP.push String.from_json(_item)
                  else
-                   @role.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @IP.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @role = _oa
+                @IP = _oa
             end
           end
         if !_o['user'].nil?
@@ -404,23 +404,23 @@ module External
                 @user = _oa
             end
           end
-        if !_o['IP'].nil?
-          _oa = _o['IP']
+        if !_o['role'].nil?
+          _oa = _o['role']
             if(_oa.is_a? Hash)
-              @IP = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @IP =  String.from_json(_oa) unless _oa['@class']
+              @role = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @role =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @IP = Array.new
+              @role = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @IP.push String.from_json(_item)
+                   @role.push String.from_json(_item)
                  else
-                   @IP.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @role.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @IP = _oa
+                @role = _oa
             end
           end
     end
@@ -1068,37 +1068,37 @@ module Ansible
   class AnsibleResult 
 
     # (no documentation provided)
-    attr_accessor :delta
+    attr_accessor :end
     # (no documentation provided)
-    attr_accessor :start
+    attr_accessor :cmd
     # (no documentation provided)
     attr_accessor :stderr
     # (no documentation provided)
-    attr_accessor :end
-    # (no documentation provided)
     attr_accessor :changed
     # (no documentation provided)
+    attr_accessor :delta
+    # (no documentation provided)
     attr_accessor :stdout
     # (no documentation provided)
     attr_accessor :msg
     # (no documentation provided)
-    attr_accessor :cmd
+    attr_accessor :start
 
     # the json hash for this AnsibleResult
     def to_jaxb_json_hash
       _h = {}
-      _h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
-      _h['start'] = start.to_jaxb_json_hash unless start.nil?
-      _h['stderr'] = stderr.to_jaxb_json_hash unless stderr.nil?
       _h['end'] = end.to_jaxb_json_hash unless end.nil?
-      _h['changed'] = changed.to_jaxb_json_hash unless changed.nil?
-      _h['stdout'] = stdout.to_jaxb_json_hash unless stdout.nil?
-      _h['msg'] = msg.to_jaxb_json_hash unless msg.nil?
       if !cmd.nil?
         _ha = Array.new
         cmd.each { | _item | _ha.push _item.to_jaxb_json_hash }
         _h['cmd'] = _ha
       end
+      _h['stderr'] = stderr.to_jaxb_json_hash unless stderr.nil?
+      _h['changed'] = changed.to_jaxb_json_hash unless changed.nil?
+      _h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
+      _h['stdout'] = stdout.to_jaxb_json_hash unless stdout.nil?
+      _h['msg'] = msg.to_jaxb_json_hash unless msg.nil?
+      _h['start'] = start.to_jaxb_json_hash unless start.nil?
       return _h
     end
 
@@ -1109,42 +1109,42 @@ module Ansible
 
     #initializes this AnsibleResult with a json hash
     def init_jaxb_json_hash(_o)
-        if !_o['delta'].nil?
-          _oa = _o['delta']
+        if !_o['end'].nil?
+          _oa = _o['end']
             if(_oa.is_a? Hash)
-              @delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @delta =  Time.from_json(_oa) unless _oa['@class']
+              @end = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @end =  Time.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @delta = Array.new
+              @end = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @delta.push Time.from_json(_item)
+                   @end.push Time.from_json(_item)
                  else
-                   @delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @delta = _oa
+                @end = _oa
             end
           end
-        if !_o['start'].nil?
-          _oa = _o['start']
+        if !_o['cmd'].nil?
+          _oa = _o['cmd']
             if(_oa.is_a? Hash)
-              @start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @start =  Time.from_json(_oa) unless _oa['@class']
+              @cmd = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @cmd =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @start = Array.new
+              @cmd = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @start.push Time.from_json(_item)
+                   @cmd.push String.from_json(_item)
                  else
-                   @start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @cmd.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @start = _oa
+                @cmd = _oa
             end
           end
         if !_o['stderr'].nil?
@@ -1166,42 +1166,42 @@ module Ansible
                 @stderr = _oa
             end
           end
-        if !_o['end'].nil?
-          _oa = _o['end']
+        if !_o['changed'].nil?
+          _oa = _o['changed']
             if(_oa.is_a? Hash)
-              @end = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @end =  Time.from_json(_oa) unless _oa['@class']
+              @changed = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @changed =  Boolean.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @end = Array.new
+              @changed = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @end.push Time.from_json(_item)
+                   @changed.push Boolean.from_json(_item)
                  else
-                   @end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @changed.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @end = _oa
+                @changed = _oa
             end
           end
-        if !_o['changed'].nil?
-          _oa = _o['changed']
+        if !_o['delta'].nil?
+          _oa = _o['delta']
             if(_oa.is_a? Hash)
-              @changed = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @changed =  Boolean.from_json(_oa) unless _oa['@class']
+              @delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @delta =  Time.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @changed = Array.new
+              @delta = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @changed.push Boolean.from_json(_item)
+                   @delta.push Time.from_json(_item)
                  else
-                   @changed.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @changed = _oa
+                @delta = _oa
             end
           end
         if !_o['stdout'].nil?
@@ -1242,23 +1242,23 @@ module Ansible
                 @msg = _oa
             end
           end
-        if !_o['cmd'].nil?
-          _oa = _o['cmd']
+        if !_o['start'].nil?
+          _oa = _o['start']
             if(_oa.is_a? Hash)
-              @cmd = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @cmd =  String.from_json(_oa) unless _oa['@class']
+              @start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @start =  Time.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @cmd = Array.new
+              @start = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @cmd.push String.from_json(_item)
+                   @start.push Time.from_json(_item)
                  else
-                   @cmd.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @cmd = _oa
+                @start = _oa
             end
           end
     end
@@ -1319,19 +1319,19 @@ module External
     # (no documentation provided)
     attr_accessor :key
     # (no documentation provided)
-    attr_accessor :attributes
+    attr_accessor :type
     # (no documentation provided)
     attr_accessor :name
     # (no documentation provided)
-    attr_accessor :type
+    attr_accessor :attributes
 
     # the json hash for this Key
     def to_jaxb_json_hash
       _h = {}
       _h['key'] = key.to_jaxb_json_hash unless key.nil?
-      _h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil?
-      _h['name'] = name.to_jaxb_json_hash unless name.nil?
       _h['type'] = type.to_jaxb_json_hash unless type.nil?
+      _h['name'] = name.to_jaxb_json_hash unless name.nil?
+      _h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil?
       return _h
     end
 
@@ -1361,23 +1361,23 @@ module External
                 @key = _oa
             end
           end
-        if !_o['attributes'].nil?
-          _oa = _o['attributes']
+        if !_o['type'].nil?
+          _oa = _o['type']
             if(_oa.is_a? Hash)
-              @attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @attributes =  Hash.from_json(_oa) unless _oa['@class']
+              @type = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @type =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @attributes = Array.new
+              @type = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @attributes.push Hash.from_json(_item)
+                   @type.push String.from_json(_item)
                  else
-                   @attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @type.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @attributes = _oa
+                @type = _oa
             end
           end
         if !_o['name'].nil?
@@ -1399,23 +1399,23 @@ module External
                 @name = _oa
             end
           end
-        if !_o['type'].nil?
-          _oa = _o['type']
+        if !_o['attributes'].nil?
+          _oa = _o['attributes']
             if(_oa.is_a? Hash)
-              @type = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @type =  String.from_json(_oa) unless _oa['@class']
+              @attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @attributes =  Hash.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @type = Array.new
+              @attributes = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @type.push String.from_json(_item)
+                   @attributes.push Hash.from_json(_item)
                  else
-                   @type.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @type = _oa
+                @attributes = _oa
             end
           end
     end
@@ -1471,18 +1471,18 @@ module External
   # (no documentation provided)
   class OwnedObject 
 
-    # (no documentation provided)
-    attr_accessor :timestamp
     # (no documentation provided)
     attr_accessor :id
     # (no documentation provided)
+    attr_accessor :timestamp
+    # (no documentation provided)
     attr_accessor :owner
 
     # the json hash for this OwnedObject
     def to_jaxb_json_hash
       _h = {}
-      _h['timestamp'] = timestamp.to_jaxb_json_hash unless timestamp.nil?
       _h['id'] = id.to_jaxb_json_hash unless id.nil?
+      _h['timestamp'] = timestamp.to_jaxb_json_hash unless timestamp.nil?
       _h['owner'] = owner.to_jaxb_json_hash unless owner.nil?
       return _h
     end
@@ -1494,42 +1494,42 @@ module External
 
     #initializes this OwnedObject with a json hash
     def init_jaxb_json_hash(_o)
-        if !_o['timestamp'].nil?
-          _oa = _o['timestamp']
+        if !_o['id'].nil?
+          _oa = _o['id']
             if(_oa.is_a? Hash)
-              @timestamp = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @timestamp =  Bignum.from_json(_oa) unless _oa['@class']
+              @id = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @id =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @timestamp = Array.new
+              @id = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @timestamp.push Bignum.from_json(_item)
+                   @id.push String.from_json(_item)
                  else
-                   @timestamp.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @id.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @timestamp = _oa
+                @id = _oa
             end
           end
-        if !_o['id'].nil?
-          _oa = _o['id']
+        if !_o['timestamp'].nil?
+          _oa = _o['timestamp']
             if(_oa.is_a? Hash)
-              @id = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @id =  String.from_json(_oa) unless _oa['@class']
+              @timestamp = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @timestamp =  Bignum.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @id = Array.new
+              @timestamp = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @id.push String.from_json(_item)
+                   @timestamp.push Bignum.from_json(_item)
                  else
-                   @id.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @timestamp.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @id = _oa
+                @timestamp = _oa
             end
           end
         if !_o['owner'].nil?
@@ -1744,50 +1744,50 @@ module Ansible
   class BenchmarkResult < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject 
 
     # (no documentation provided)
-    attr_accessor :end
+    attr_accessor :start
     # (no documentation provided)
     attr_accessor :delta
     # (no documentation provided)
-    attr_accessor :host
+    attr_accessor :cloudDeploymentDomain
     # (no documentation provided)
-    attr_accessor :vmType
+    attr_accessor :end
     # (no documentation provided)
-    attr_accessor :start
+    attr_accessor :vmType
     # (no documentation provided)
-    attr_accessor :cloudDeploymentDomain
+    attr_accessor :host
 
     # the json hash for this BenchmarkResult
     def to_jaxb_json_hash
       _h = super
-      _h['end'] = end.to_jaxb_json_hash unless end.nil?
-      _h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
-      _h['host'] = host.to_jaxb_json_hash unless host.nil?
-      _h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
       _h['start'] = start.to_jaxb_json_hash unless start.nil?
+      _h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
       _h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
+      _h['end'] = end.to_jaxb_json_hash unless end.nil?
+      _h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
+      _h['host'] = host.to_jaxb_json_hash unless host.nil?
       return _h
     end
 
     #initializes this BenchmarkResult with a json hash
     def init_jaxb_json_hash(_o)
       super _o
-        if !_o['end'].nil?
-          _oa = _o['end']
+        if !_o['start'].nil?
+          _oa = _o['start']
             if(_oa.is_a? Hash)
-              @end = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @end =  Time.from_json(_oa) unless _oa['@class']
+              @start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @start =  Time.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @end = Array.new
+              @start = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @end.push Time.from_json(_item)
+                   @start.push Time.from_json(_item)
                  else
-                   @end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @end = _oa
+                @start = _oa
             end
           end
         if !_o['delta'].nil?
@@ -1809,80 +1809,80 @@ module Ansible
                 @delta = _oa
             end
           end
-        if !_o['host'].nil?
-          _oa = _o['host']
+        if !_o['cloudDeploymentDomain'].nil?
+          _oa = _o['cloudDeploymentDomain']
             if(_oa.is_a? Hash)
-              @host = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @host =  String.from_json(_oa) unless _oa['@class']
+              @cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @cloudDeploymentDomain =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @host = Array.new
+              @cloudDeploymentDomain = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @host.push String.from_json(_item)
+                   @cloudDeploymentDomain.push String.from_json(_item)
                  else
-                   @host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @host = _oa
+                @cloudDeploymentDomain = _oa
             end
           end
-        if !_o['vmType'].nil?
-          _oa = _o['vmType']
+        if !_o['end'].nil?
+          _oa = _o['end']
             if(_oa.is_a? Hash)
-              @vmType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @vmType =  String.from_json(_oa) unless _oa['@class']
+              @end = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @end =  Time.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @vmType = Array.new
+              @end = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @vmType.push String.from_json(_item)
+                   @end.push Time.from_json(_item)
                  else
-                   @vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @vmType = _oa
+                @end = _oa
             end
           end
-        if !_o['start'].nil?
-          _oa = _o['start']
+        if !_o['vmType'].nil?
+          _oa = _o['vmType']
             if(_oa.is_a? Hash)
-              @start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @start =  Time.from_json(_oa) unless _oa['@class']
+              @vmType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @vmType =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @start = Array.new
+              @vmType = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @start.push Time.from_json(_item)
+                   @vmType.push String.from_json(_item)
                  else
-                   @start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @start = _oa
+                @vmType = _oa
             end
           end
-        if !_o['cloudDeploymentDomain'].nil?
-          _oa = _o['cloudDeploymentDomain']
+        if !_o['host'].nil?
+          _oa = _o['host']
             if(_oa.is_a? Hash)
-              @cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @cloudDeploymentDomain =  String.from_json(_oa) unless _oa['@class']
+              @host = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @host =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @cloudDeploymentDomain = Array.new
+              @host = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @cloudDeploymentDomain.push String.from_json(_item)
+                   @host.push String.from_json(_item)
                  else
-                   @cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @cloudDeploymentDomain = _oa
+                @host = _oa
             end
           end
     end
@@ -1941,115 +1941,115 @@ module External
   class CloudCredentials < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject 
 
     # (no documentation provided)
-    attr_accessor :secretKey
+    attr_accessor :keyPairIDs
     # (no documentation provided)
-    attr_accessor :accessKeyId
+    attr_accessor :attributes
     # (no documentation provided)
-    attr_accessor :keyPairs
+    attr_accessor :accessKeyId
     # (no documentation provided)
-    attr_accessor :keyPairIDs
+    attr_accessor :secretKey
     # (no documentation provided)
     attr_accessor :cloudProviderName
     # (no documentation provided)
-    attr_accessor :attributes
+    attr_accessor :keyPairs
 
     # the json hash for this CloudCredentials
     def to_jaxb_json_hash
       _h = super
-      _h['secretKey'] = secretKey.to_jaxb_json_hash unless secretKey.nil?
-      _h['accessKeyId'] = accessKeyId.to_jaxb_json_hash unless accessKeyId.nil?
-      if !keyPairs.nil?
-        _ha = Array.new
-        keyPairs.each { | _item | _ha.push _item.to_jaxb_json_hash }
-        _h['keyPairs'] = _ha
-      end
       if !keyPairIDs.nil?
         _ha = Array.new
         keyPairIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
         _h['keyPairIDs'] = _ha
       end
-      _h['cloudProviderName'] = cloudProviderName.to_jaxb_json_hash unless cloudProviderName.nil?
       _h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil?
+      _h['accessKeyId'] = accessKeyId.to_jaxb_json_hash unless accessKeyId.nil?
+      _h['secretKey'] = secretKey.to_jaxb_json_hash unless secretKey.nil?
+      _h['cloudProviderName'] = cloudProviderName.to_jaxb_json_hash unless cloudProviderName.nil?
+      if !keyPairs.nil?
+        _ha = Array.new
+        keyPairs.each { | _item | _ha.push _item.to_jaxb_json_hash }
+        _h['keyPairs'] = _ha
+      end
       return _h
     end
 
     #initializes this CloudCredentials with a json hash
     def init_jaxb_json_hash(_o)
       super _o
-        if !_o['secretKey'].nil?
-          _oa = _o['secretKey']
+        if !_o['keyPairIDs'].nil?
+          _oa = _o['keyPairIDs']
             if(_oa.is_a? Hash)
-              @secretKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @secretKey =  String.from_json(_oa) unless _oa['@class']
+              @keyPairIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @keyPairIDs =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @secretKey = Array.new
+              @keyPairIDs = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @secretKey.push String.from_json(_item)
+                   @keyPairIDs.push String.from_json(_item)
                  else
-                   @secretKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @keyPairIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @secretKey = _oa
+                @keyPairIDs = _oa
             end
           end
-        if !_o['accessKeyId'].nil?
-          _oa = _o['accessKeyId']
+        if !_o['attributes'].nil?
+          _oa = _o['attributes']
             if(_oa.is_a? Hash)
-              @accessKeyId = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @accessKeyId =  String.from_json(_oa) unless _oa['@class']
+              @attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @attributes =  Hash.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @accessKeyId = Array.new
+              @attributes = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @accessKeyId.push String.from_json(_item)
+                   @attributes.push Hash.from_json(_item)
                  else
-                   @accessKeyId.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @accessKeyId = _oa
+                @attributes = _oa
             end
           end
-        if !_o['keyPairs'].nil?
-          _oa = _o['keyPairs']
+        if !_o['accessKeyId'].nil?
+          _oa = _o['accessKeyId']
             if(_oa.is_a? Hash)
-              @keyPairs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @keyPairs =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_oa) unless _oa['@class']
+              @accessKeyId = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @accessKeyId =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @keyPairs = Array.new
+              @accessKeyId = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @keyPairs.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_item)
+                   @accessKeyId.push String.from_json(_item)
                  else
-                   @keyPairs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @accessKeyId.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @keyPairs = _oa
+                @accessKeyId = _oa
             end
           end
-        if !_o['keyPairIDs'].nil?
-          _oa = _o['keyPairIDs']
+        if !_o['secretKey'].nil?
+          _oa = _o['secretKey']
             if(_oa.is_a? Hash)
-              @keyPairIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @keyPairIDs =  String.from_json(_oa) unless _oa['@class']
+              @secretKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @secretKey =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @keyPairIDs = Array.new
+              @secretKey = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @keyPairIDs.push String.from_json(_item)
+                   @secretKey.push String.from_json(_item)
                  else
-                   @keyPairIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @secretKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @keyPairIDs = _oa
+                @secretKey = _oa
             end
           end
         if !_o['cloudProviderName'].nil?
@@ -2071,23 +2071,23 @@ module External
                 @cloudProviderName = _oa
             end
           end
-        if !_o['attributes'].nil?
-          _oa = _o['attributes']
+        if !_o['keyPairs'].nil?
+          _oa = _o['keyPairs']
             if(_oa.is_a? Hash)
-              @attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @attributes =  Hash.from_json(_oa) unless _oa['@class']
+              @keyPairs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @keyPairs =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @attributes = Array.new
+              @keyPairs = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @attributes.push Hash.from_json(_item)
+                   @keyPairs.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_item)
                  else
-                   @attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @keyPairs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @attributes = _oa
+                @keyPairs = _oa
             end
           end
     end
@@ -2228,25 +2228,44 @@ module External
   # (no documentation provided)
   class DeployRequest < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject 
 
+    # (no documentation provided)
+    attr_accessor :configurationID
     # (no documentation provided)
     attr_accessor :managerType
     # (no documentation provided)
     attr_accessor :provisionID
-    # (no documentation provided)
-    attr_accessor :configurationID
 
     # the json hash for this DeployRequest
     def to_jaxb_json_hash
       _h = super
+      _h['configurationID'] = configurationID.to_jaxb_json_hash unless configurationID.nil?
       _h['managerType'] = managerType.to_jaxb_json_hash unless managerType.nil?
       _h['provisionID'] = provisionID.to_jaxb_json_hash unless provisionID.nil?
-      _h['configurationID'] = configurationID.to_jaxb_json_hash unless configurationID.nil?
       return _h
     end
 
     #initializes this DeployRequest with a json hash
     def init_jaxb_json_hash(_o)
       super _o
+        if !_o['configurationID'].nil?
+          _oa = _o['configurationID']
+            if(_oa.is_a? Hash)
+              @configurationID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @configurationID =  String.from_json(_oa) unless _oa['@class']
+            elsif (_oa.is_a? Array)
+              #an array(of hashes hopefully) or scalar
+              @configurationID = Array.new
+              _oa.each { | _item | 
+                 if ((_item.nil? || _item['@class'].nil?)rescue true)
+                   @configurationID.push String.from_json(_item)
+                 else
+                   @configurationID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                 end
+               }
+            else
+                @configurationID = _oa
+            end
+          end
         if !_o['managerType'].nil?
           _oa = _o['managerType']
             if(_oa.is_a? Hash)
@@ -2285,25 +2304,6 @@ module External
                 @provisionID = _oa
             end
           end
-        if !_o['configurationID'].nil?
-          _oa = _o['configurationID']
-            if(_oa.is_a? Hash)
-              @configurationID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @configurationID =  String.from_json(_oa) unless _oa['@class']
-            elsif (_oa.is_a? Array)
-              #an array(of hashes hopefully) or scalar
-              @configurationID = Array.new
-              _oa.each { | _item | 
-                 if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @configurationID.push String.from_json(_item)
-                 else
-                   @configurationID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
-                 end
-               }
-            else
-                @configurationID = _oa
-            end
-          end
     end
 
     # constructs a DeployRequest from a (parsed) JSON hash
@@ -2403,58 +2403,58 @@ module External
   # (no documentation provided)
   class Script < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject 
 
-    # (no documentation provided)
-    attr_accessor :name
     # (no documentation provided)
     attr_accessor :contents
+    # (no documentation provided)
+    attr_accessor :name
 
     # the json hash for this Script
     def to_jaxb_json_hash
       _h = super
-      _h['name'] = name.to_jaxb_json_hash unless name.nil?
       _h['contents'] = contents.to_jaxb_json_hash unless contents.nil?
+      _h['name'] = name.to_jaxb_json_hash unless name.nil?
       return _h
     end
 
     #initializes this Script with a json hash
     def init_jaxb_json_hash(_o)
       super _o
-        if !_o['name'].nil?
-          _oa = _o['name']
+        if !_o['contents'].nil?
+          _oa = _o['contents']
             if(_oa.is_a? Hash)
-              @name = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @name =  String.from_json(_oa) unless _oa['@class']
+              @contents = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @contents =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @name = Array.new
+              @contents = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @name.push String.from_json(_item)
+                   @contents.push String.from_json(_item)
                  else
-                   @name.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @contents.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @name = _oa
+                @contents = _oa
             end
           end
-        if !_o['contents'].nil?
-          _oa = _o['contents']
+        if !_o['name'].nil?
+          _oa = _o['name']
             if(_oa.is_a? Hash)
-              @contents = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @contents =  String.from_json(_oa) unless _oa['@class']
+              @name = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @name =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @contents = Array.new
+              @name = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @contents.push String.from_json(_item)
+                   @name.push String.from_json(_item)
                  else
-                   @contents.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @name.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @contents = _oa
+                @name = _oa
             end
           end
     end
@@ -2709,25 +2709,44 @@ module External
   # (no documentation provided)
   class KeyPair < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject 
 
+    # (no documentation provided)
+    attr_accessor :privateKey
     # (no documentation provided)
     attr_accessor :publicKey
     # (no documentation provided)
     attr_accessor :keyPairId
-    # (no documentation provided)
-    attr_accessor :privateKey
 
     # the json hash for this KeyPair
     def to_jaxb_json_hash
       _h = super
+      _h['privateKey'] = privateKey.to_jaxb_json_hash unless privateKey.nil?
       _h['publicKey'] = publicKey.to_jaxb_json_hash unless publicKey.nil?
       _h['keyPairId'] = keyPairId.to_jaxb_json_hash unless keyPairId.nil?
-      _h['privateKey'] = privateKey.to_jaxb_json_hash unless privateKey.nil?
       return _h
     end
 
     #initializes this KeyPair with a json hash
     def init_jaxb_json_hash(_o)
       super _o
+        if !_o['privateKey'].nil?
+          _oa = _o['privateKey']
+            if(_oa.is_a? Hash)
+              @privateKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @privateKey =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::Key.from_json(_oa) unless _oa['@class']
+            elsif (_oa.is_a? Array)
+              #an array(of hashes hopefully) or scalar
+              @privateKey = Array.new
+              _oa.each { | _item | 
+                 if ((_item.nil? || _item['@class'].nil?)rescue true)
+                   @privateKey.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::Key.from_json(_item)
+                 else
+                   @privateKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                 end
+               }
+            else
+                @privateKey = _oa
+            end
+          end
         if !_o['publicKey'].nil?
           _oa = _o['publicKey']
             if(_oa.is_a? Hash)
@@ -2766,25 +2785,6 @@ module External
                 @keyPairId = _oa
             end
           end
-        if !_o['privateKey'].nil?
-          _oa = _o['privateKey']
-            if(_oa.is_a? Hash)
-              @privateKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @privateKey =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::Key.from_json(_oa) unless _oa['@class']
-            elsif (_oa.is_a? Array)
-              #an array(of hashes hopefully) or scalar
-              @privateKey = Array.new
-              _oa.each { | _item | 
-                 if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @privateKey.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::Key.from_json(_item)
-                 else
-                   @privateKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
-                 end
-               }
-            else
-                @privateKey = _oa
-            end
-          end
     end
 
     # constructs a KeyPair from a (parsed) JSON hash
@@ -2841,71 +2841,71 @@ module Ansible
   class SysbenchCPUBenchmark < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::Ansible::BenchmarkResult 
 
     # (no documentation provided)
-    attr_accessor :ansibleOutputID
+    attr_accessor :stddevExecTimePerThread
     # (no documentation provided)
     attr_accessor :executionTime
     # (no documentation provided)
-    attr_accessor :totalNumberOfEvents
+    attr_accessor :approx95Percentile
     # (no documentation provided)
     attr_accessor :sysbenchVersion
     # (no documentation provided)
     attr_accessor :stddevEventsPerThread
     # (no documentation provided)
-    attr_accessor :avgExecutionTimePerRequest
+    attr_accessor :minExecutionTimePerRequest
     # (no documentation provided)
-    attr_accessor :numberOfThreads
+    attr_accessor :ansibleOutputID
     # (no documentation provided)
     attr_accessor :maxExecutionTimePerRequest
     # (no documentation provided)
-    attr_accessor :approx95Percentile
-    # (no documentation provided)
-    attr_accessor :avgExecTimePerThread
+    attr_accessor :avgExecutionTimePerRequest
     # (no documentation provided)
     attr_accessor :avgEventsPerThread
     # (no documentation provided)
-    attr_accessor :stddevExecTimePerThread
+    attr_accessor :totalNumberOfEvents
     # (no documentation provided)
-    attr_accessor :minExecutionTimePerRequest
+    attr_accessor :avgExecTimePerThread
+    # (no documentation provided)
+    attr_accessor :numberOfThreads
 
     # the json hash for this SysbenchCPUBenchmark
     def to_jaxb_json_hash
       _h = super
-      _h['ansibleOutputID'] = ansibleOutputID.to_jaxb_json_hash unless ansibleOutputID.nil?
+      _h['stddevExecTimePerThread'] = stddevExecTimePerThread.to_jaxb_json_hash unless stddevExecTimePerThread.nil?
       _h['executionTime'] = executionTime.to_jaxb_json_hash unless executionTime.nil?
-      _h['totalNumberOfEvents'] = totalNumberOfEvents.to_jaxb_json_hash unless totalNumberOfEvents.nil?
+      _h['approx95Percentile'] = approx95Percentile.to_jaxb_json_hash unless approx95Percentile.nil?
       _h['sysbenchVersion'] = sysbenchVersion.to_jaxb_json_hash unless sysbenchVersion.nil?
       _h['stddevEventsPerThread'] = stddevEventsPerThread.to_jaxb_json_hash unless stddevEventsPerThread.nil?
-      _h['avgExecutionTimePerRequest'] = avgExecutionTimePerRequest.to_jaxb_json_hash unless avgExecutionTimePerRequest.nil?
-      _h['numberOfThreads'] = numberOfThreads.to_jaxb_json_hash unless numberOfThreads.nil?
+      _h['minExecutionTimePerRequest'] = minExecutionTimePerRequest.to_jaxb_json_hash unless minExecutionTimePerRequest.nil?
+      _h['ansibleOutputID'] = ansibleOutputID.to_jaxb_json_hash unless ansibleOutputID.nil?
       _h['maxExecutionTimePerRequest'] = maxExecutionTimePerRequest.to_jaxb_json_hash unless maxExecutionTimePerRequest.nil?
-      _h['approx95Percentile'] = approx95Percentile.to_jaxb_json_hash unless approx95Percentile.nil?
-      _h['avgExecTimePerThread'] = avgExecTimePerThread.to_jaxb_json_hash unless avgExecTimePerThread.nil?
+      _h['avgExecutionTimePerRequest'] = avgExecutionTimePerRequest.to_jaxb_json_hash unless avgExecutionTimePerRequest.nil?
       _h['avgEventsPerThread'] = avgEventsPerThread.to_jaxb_json_hash unless avgEventsPerThread.nil?
-      _h['stddevExecTimePerThread'] = stddevExecTimePerThread.to_jaxb_json_hash unless stddevExecTimePerThread.nil?
-      _h['minExecutionTimePerRequest'] = minExecutionTimePerRequest.to_jaxb_json_hash unless minExecutionTimePerRequest.nil?
+      _h['totalNumberOfEvents'] = totalNumberOfEvents.to_jaxb_json_hash unless totalNumberOfEvents.nil?
+      _h['avgExecTimePerThread'] = avgExecTimePerThread.to_jaxb_json_hash unless avgExecTimePerThread.nil?
+      _h['numberOfThreads'] = numberOfThreads.to_jaxb_json_hash unless numberOfThreads.nil?
       return _h
     end
 
     #initializes this SysbenchCPUBenchmark with a json hash
     def init_jaxb_json_hash(_o)
       super _o
-        if !_o['ansibleOutputID'].nil?
-          _oa = _o['ansibleOutputID']
+        if !_o['stddevExecTimePerThread'].nil?
+          _oa = _o['stddevExecTimePerThread']
             if(_oa.is_a? Hash)
-              @ansibleOutputID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @ansibleOutputID =  String.from_json(_oa) unless _oa['@class']
+              @stddevExecTimePerThread = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @stddevExecTimePerThread =  Float.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @ansibleOutputID = Array.new
+              @stddevExecTimePerThread = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @ansibleOutputID.push String.from_json(_item)
+                   @stddevExecTimePerThread.push Float.from_json(_item)
                  else
-                   @ansibleOutputID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @stddevExecTimePerThread.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @ansibleOutputID = _oa
+                @stddevExecTimePerThread = _oa
             end
           end
         if !_o['executionTime'].nil?
@@ -2927,23 +2927,23 @@ module Ansible
                 @executionTime = _oa
             end
           end
-        if !_o['totalNumberOfEvents'].nil?
-          _oa = _o['totalNumberOfEvents']
+        if !_o['approx95Percentile'].nil?
+          _oa = _o['approx95Percentile']
             if(_oa.is_a? Hash)
-              @totalNumberOfEvents = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @totalNumberOfEvents =  Fixnum.from_json(_oa) unless _oa['@class']
+              @approx95Percentile = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @approx95Percentile =  Float.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @totalNumberOfEvents = Array.new
+              @approx95Percentile = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @totalNumberOfEvents.push Fixnum.from_json(_item)
+                   @approx95Percentile.push Float.from_json(_item)
                  else
-                   @totalNumberOfEvents.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @approx95Percentile.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @totalNumberOfEvents = _oa
+                @approx95Percentile = _oa
             end
           end
         if !_o['sysbenchVersion'].nil?
@@ -2984,42 +2984,42 @@ module Ansible
                 @stddevEventsPerThread = _oa
             end
           end
-        if !_o['avgExecutionTimePerRequest'].nil?
-          _oa = _o['avgExecutionTimePerRequest']
+        if !_o['minExecutionTimePerRequest'].nil?
+          _oa = _o['minExecutionTimePerRequest']
             if(_oa.is_a? Hash)
-              @avgExecutionTimePerRequest = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @avgExecutionTimePerRequest =  Float.from_json(_oa) unless _oa['@class']
+              @minExecutionTimePerRequest = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @minExecutionTimePerRequest =  Float.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @avgExecutionTimePerRequest = Array.new
+              @minExecutionTimePerRequest = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @avgExecutionTimePerRequest.push Float.from_json(_item)
+                   @minExecutionTimePerRequest.push Float.from_json(_item)
                  else
-                   @avgExecutionTimePerRequest.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @minExecutionTimePerRequest.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @avgExecutionTimePerRequest = _oa
+                @minExecutionTimePerRequest = _oa
             end
           end
-        if !_o['numberOfThreads'].nil?
-          _oa = _o['numberOfThreads']
+        if !_o['ansibleOutputID'].nil?
+          _oa = _o['ansibleOutputID']
             if(_oa.is_a? Hash)
-              @numberOfThreads = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @numberOfThreads =  Fixnum.from_json(_oa) unless _oa['@class']
+              @ansibleOutputID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @ansibleOutputID =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @numberOfThreads = Array.new
+              @ansibleOutputID = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @numberOfThreads.push Fixnum.from_json(_item)
+                   @ansibleOutputID.push String.from_json(_item)
                  else
-                   @numberOfThreads.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @ansibleOutputID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @numberOfThreads = _oa
+                @ansibleOutputID = _oa
             end
           end
         if !_o['maxExecutionTimePerRequest'].nil?
@@ -3041,99 +3041,99 @@ module Ansible
                 @maxExecutionTimePerRequest = _oa
             end
           end
-        if !_o['approx95Percentile'].nil?
-          _oa = _o['approx95Percentile']
+        if !_o['avgExecutionTimePerRequest'].nil?
+          _oa = _o['avgExecutionTimePerRequest']
             if(_oa.is_a? Hash)
-              @approx95Percentile = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @approx95Percentile =  Float.from_json(_oa) unless _oa['@class']
+              @avgExecutionTimePerRequest = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @avgExecutionTimePerRequest =  Float.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @approx95Percentile = Array.new
+              @avgExecutionTimePerRequest = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @approx95Percentile.push Float.from_json(_item)
+                   @avgExecutionTimePerRequest.push Float.from_json(_item)
                  else
-                   @approx95Percentile.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @avgExecutionTimePerRequest.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @approx95Percentile = _oa
+                @avgExecutionTimePerRequest = _oa
             end
           end
-        if !_o['avgExecTimePerThread'].nil?
-          _oa = _o['avgExecTimePerThread']
+        if !_o['avgEventsPerThread'].nil?
+          _oa = _o['avgEventsPerThread']
             if(_oa.is_a? Hash)
-              @avgExecTimePerThread = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @avgExecTimePerThread =  Float.from_json(_oa) unless _oa['@class']
+              @avgEventsPerThread = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @avgEventsPerThread =  Float.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @avgExecTimePerThread = Array.new
+              @avgEventsPerThread = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @avgExecTimePerThread.push Float.from_json(_item)
+                   @avgEventsPerThread.push Float.from_json(_item)
                  else
-                   @avgExecTimePerThread.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @avgEventsPerThread.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @avgExecTimePerThread = _oa
+                @avgEventsPerThread = _oa
             end
           end
-        if !_o['avgEventsPerThread'].nil?
-          _oa = _o['avgEventsPerThread']
+        if !_o['totalNumberOfEvents'].nil?
+          _oa = _o['totalNumberOfEvents']
             if(_oa.is_a? Hash)
-              @avgEventsPerThread = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @avgEventsPerThread =  Float.from_json(_oa) unless _oa['@class']
+              @totalNumberOfEvents = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @totalNumberOfEvents =  Fixnum.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @avgEventsPerThread = Array.new
+              @totalNumberOfEvents = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @avgEventsPerThread.push Float.from_json(_item)
+                   @totalNumberOfEvents.push Fixnum.from_json(_item)
                  else
-                   @avgEventsPerThread.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @totalNumberOfEvents.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @avgEventsPerThread = _oa
+                @totalNumberOfEvents = _oa
             end
           end
-        if !_o['stddevExecTimePerThread'].nil?
-          _oa = _o['stddevExecTimePerThread']
+        if !_o['avgExecTimePerThread'].nil?
+          _oa = _o['avgExecTimePerThread']
             if(_oa.is_a? Hash)
-              @stddevExecTimePerThread = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @stddevExecTimePerThread =  Float.from_json(_oa) unless _oa['@class']
+              @avgExecTimePerThread = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @avgExecTimePerThread =  Float.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @stddevExecTimePerThread = Array.new
+              @avgExecTimePerThread = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @stddevExecTimePerThread.push Float.from_json(_item)
+                   @avgExecTimePerThread.push Float.from_json(_item)
                  else
-                   @stddevExecTimePerThread.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @avgExecTimePerThread.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @stddevExecTimePerThread = _oa
+                @avgExecTimePerThread = _oa
             end
           end
-        if !_o['minExecutionTimePerRequest'].nil?
-          _oa = _o['minExecutionTimePerRequest']
+        if !_o['numberOfThreads'].nil?
+          _oa = _o['numberOfThreads']
             if(_oa.is_a? Hash)
-              @minExecutionTimePerRequest = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @minExecutionTimePerRequest =  Float.from_json(_oa) unless _oa['@class']
+              @numberOfThreads = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @numberOfThreads =  Fixnum.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @minExecutionTimePerRequest = Array.new
+              @numberOfThreads = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @minExecutionTimePerRequest.push Float.from_json(_item)
+                   @numberOfThreads.push Fixnum.from_json(_item)
                  else
-                   @minExecutionTimePerRequest.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @numberOfThreads.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @minExecutionTimePerRequest = _oa
+                @numberOfThreads = _oa
             end
           end
     end
@@ -3342,26 +3342,26 @@ module External
     # (no documentation provided)
     attr_accessor :planID
     # (no documentation provided)
-    attr_accessor :cloudCredentialsIDs
-    # (no documentation provided)
     attr_accessor :deployerKeyPairIDs
     # (no documentation provided)
+    attr_accessor :cloudCredentialsIDs
+    # (no documentation provided)
     attr_accessor :userKeyPairIDs
 
     # the json hash for this ProvisionRequest
     def to_jaxb_json_hash
       _h = super
       _h['planID'] = planID.to_jaxb_json_hash unless planID.nil?
-      if !cloudCredentialsIDs.nil?
-        _ha = Array.new
-        cloudCredentialsIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
-        _h['cloudCredentialsIDs'] = _ha
-      end
       if !deployerKeyPairIDs.nil?
         _ha = Array.new
         deployerKeyPairIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
         _h['deployerKeyPairIDs'] = _ha
       end
+      if !cloudCredentialsIDs.nil?
+        _ha = Array.new
+        cloudCredentialsIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
+        _h['cloudCredentialsIDs'] = _ha
+      end
       if !userKeyPairIDs.nil?
         _ha = Array.new
         userKeyPairIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
@@ -3392,42 +3392,42 @@ module External
                 @planID = _oa
             end
           end
-        if !_o['cloudCredentialsIDs'].nil?
-          _oa = _o['cloudCredentialsIDs']
+        if !_o['deployerKeyPairIDs'].nil?
+          _oa = _o['deployerKeyPairIDs']
             if(_oa.is_a? Hash)
-              @cloudCredentialsIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @cloudCredentialsIDs =  String.from_json(_oa) unless _oa['@class']
+              @deployerKeyPairIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @deployerKeyPairIDs =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @cloudCredentialsIDs = Array.new
+              @deployerKeyPairIDs = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @cloudCredentialsIDs.push String.from_json(_item)
+                   @deployerKeyPairIDs.push String.from_json(_item)
                  else
-                   @cloudCredentialsIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @deployerKeyPairIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @cloudCredentialsIDs = _oa
+                @deployerKeyPairIDs = _oa
             end
           end
-        if !_o['deployerKeyPairIDs'].nil?
-          _oa = _o['deployerKeyPairIDs']
+        if !_o['cloudCredentialsIDs'].nil?
+          _oa = _o['cloudCredentialsIDs']
             if(_oa.is_a? Hash)
-              @deployerKeyPairIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @deployerKeyPairIDs =  String.from_json(_oa) unless _oa['@class']
+              @cloudCredentialsIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @cloudCredentialsIDs =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @deployerKeyPairIDs = Array.new
+              @cloudCredentialsIDs = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @deployerKeyPairIDs.push String.from_json(_item)
+                   @cloudCredentialsIDs.push String.from_json(_item)
                  else
-                   @deployerKeyPairIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @cloudCredentialsIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @deployerKeyPairIDs = _oa
+                @cloudCredentialsIDs = _oa
             end
           end
         if !_o['userKeyPairIDs'].nil?
@@ -3505,23 +3505,23 @@ module External
     # (no documentation provided)
     attr_accessor :name
     # (no documentation provided)
+    attr_accessor :toscaID
+    # (no documentation provided)
     attr_accessor :loweLevelPlanIDs
     # (no documentation provided)
     attr_accessor :level
-    # (no documentation provided)
-    attr_accessor :toscaID
 
     # the json hash for this PlanResponse
     def to_jaxb_json_hash
       _h = super
       _h['name'] = name.to_jaxb_json_hash unless name.nil?
+      _h['toscaID'] = toscaID.to_jaxb_json_hash unless toscaID.nil?
       if !loweLevelPlanIDs.nil?
         _ha = Array.new
         loweLevelPlanIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
         _h['loweLevelPlanIDs'] = _ha
       end
       _h['level'] = level.to_jaxb_json_hash unless level.nil?
-      _h['toscaID'] = toscaID.to_jaxb_json_hash unless toscaID.nil?
       return _h
     end
 
@@ -3547,6 +3547,25 @@ module External
                 @name = _oa
             end
           end
+        if !_o['toscaID'].nil?
+          _oa = _o['toscaID']
+            if(_oa.is_a? Hash)
+              @toscaID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @toscaID =  String.from_json(_oa) unless _oa['@class']
+            elsif (_oa.is_a? Array)
+              #an array(of hashes hopefully) or scalar
+              @toscaID = Array.new
+              _oa.each { | _item | 
+                 if ((_item.nil? || _item['@class'].nil?)rescue true)
+                   @toscaID.push String.from_json(_item)
+                 else
+                   @toscaID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                 end
+               }
+            else
+                @toscaID = _oa
+            end
+          end
         if !_o['loweLevelPlanIDs'].nil?
           _oa = _o['loweLevelPlanIDs']
             if(_oa.is_a? Hash)
@@ -3585,25 +3604,6 @@ module External
                 @level = _oa
             end
           end
-        if !_o['toscaID'].nil?
-          _oa = _o['toscaID']
-            if(_oa.is_a? Hash)
-              @toscaID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @toscaID =  String.from_json(_oa) unless _oa['@class']
-            elsif (_oa.is_a? Array)
-              #an array(of hashes hopefully) or scalar
-              @toscaID = Array.new
-              _oa.each { | _item | 
-                 if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @toscaID.push String.from_json(_item)
-                 else
-                   @toscaID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
-                 end
-               }
-            else
-                @toscaID = _oa
-            end
-          end
     end
 
     # constructs a PlanResponse from a (parsed) JSON hash
@@ -3657,62 +3657,62 @@ module External
   # (no documentation provided)
   class DeployResponse < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::DeployRequest 
 
-    # (no documentation provided)
-    attr_accessor :keyPair
     # (no documentation provided)
     attr_accessor :ansibleOutputList
+    # (no documentation provided)
+    attr_accessor :keyPair
 
     # the json hash for this DeployResponse
     def to_jaxb_json_hash
       _h = super
-      _h['keyPair'] = keyPair.to_jaxb_json_hash unless keyPair.nil?
       if !ansibleOutputList.nil?
         _ha = Array.new
         ansibleOutputList.each { | _item | _ha.push _item.to_jaxb_json_hash }
         _h['ansibleOutputList'] = _ha
       end
+      _h['keyPair'] = keyPair.to_jaxb_json_hash unless keyPair.nil?
       return _h
     end
 
     #initializes this DeployResponse with a json hash
     def init_jaxb_json_hash(_o)
       super _o
-        if !_o['keyPair'].nil?
-          _oa = _o['keyPair']
+        if !_o['ansibleOutputList'].nil?
+          _oa = _o['ansibleOutputList']
             if(_oa.is_a? Hash)
-              @keyPair = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @keyPair =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_oa) unless _oa['@class']
+              @ansibleOutputList = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @ansibleOutputList =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @keyPair = Array.new
+              @ansibleOutputList = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @keyPair.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_item)
+                   @ansibleOutputList.push String.from_json(_item)
                  else
-                   @keyPair.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @ansibleOutputList.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @keyPair = _oa
+                @ansibleOutputList = _oa
             end
           end
-        if !_o['ansibleOutputList'].nil?
-          _oa = _o['ansibleOutputList']
+        if !_o['keyPair'].nil?
+          _oa = _o['keyPair']
             if(_oa.is_a? Hash)
-              @ansibleOutputList = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @ansibleOutputList =  String.from_json(_oa) unless _oa['@class']
+              @keyPair = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @keyPair =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @ansibleOutputList = Array.new
+              @keyPair = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @ansibleOutputList.push String.from_json(_item)
+                   @keyPair.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::KeyPair.from_json(_item)
                  else
-                   @ansibleOutputList.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @keyPair.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @ansibleOutputList = _oa
+                @keyPair = _oa
             end
           end
     end
@@ -3768,66 +3768,66 @@ module External
   # (no documentation provided)
   class ProvisionResponse < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::ProvisionRequest 
 
-    # (no documentation provided)
-    attr_accessor :deployParameters
     # (no documentation provided)
     attr_accessor :cloudKeyPairIDs
+    # (no documentation provided)
+    attr_accessor :deployParameters
 
     # the json hash for this ProvisionResponse
     def to_jaxb_json_hash
       _h = super
-      if !deployParameters.nil?
-        _ha = Array.new
-        deployParameters.each { | _item | _ha.push _item.to_jaxb_json_hash }
-        _h['deployParameters'] = _ha
-      end
       if !cloudKeyPairIDs.nil?
         _ha = Array.new
         cloudKeyPairIDs.each { | _item | _ha.push _item.to_jaxb_json_hash }
         _h['cloudKeyPairIDs'] = _ha
       end
+      if !deployParameters.nil?
+        _ha = Array.new
+        deployParameters.each { | _item | _ha.push _item.to_jaxb_json_hash }
+        _h['deployParameters'] = _ha
+      end
       return _h
     end
 
     #initializes this ProvisionResponse with a json hash
     def init_jaxb_json_hash(_o)
       super _o
-        if !_o['deployParameters'].nil?
-          _oa = _o['deployParameters']
+        if !_o['cloudKeyPairIDs'].nil?
+          _oa = _o['cloudKeyPairIDs']
             if(_oa.is_a? Hash)
-              @deployParameters = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @deployParameters =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::DeployParameter.from_json(_oa) unless _oa['@class']
+              @cloudKeyPairIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @cloudKeyPairIDs =  String.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @deployParameters = Array.new
+              @cloudKeyPairIDs = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @deployParameters.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::DeployParameter.from_json(_item)
+                   @cloudKeyPairIDs.push String.from_json(_item)
                  else
-                   @deployParameters.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @cloudKeyPairIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @deployParameters = _oa
+                @cloudKeyPairIDs = _oa
             end
           end
-        if !_o['cloudKeyPairIDs'].nil?
-          _oa = _o['cloudKeyPairIDs']
+        if !_o['deployParameters'].nil?
+          _oa = _o['deployParameters']
             if(_oa.is_a? Hash)
-              @cloudKeyPairIDs = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
-              @cloudKeyPairIDs =  String.from_json(_oa) unless _oa['@class']
+              @deployParameters = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
+              @deployParameters =  Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::DeployParameter.from_json(_oa) unless _oa['@class']
             elsif (_oa.is_a? Array)
               #an array(of hashes hopefully) or scalar
-              @cloudKeyPairIDs = Array.new
+              @deployParameters = Array.new
               _oa.each { | _item | 
                  if ((_item.nil? || _item['@class'].nil?)rescue true)
-                   @cloudKeyPairIDs.push String.from_json(_item)
+                   @deployParameters.push Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::DeployParameter.from_json(_item)
                  else
-                   @cloudKeyPairIDs.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
+                   @deployParameters.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
                  end
                }
             else
-                @cloudKeyPairIDs = _oa
+                @deployParameters = _oa
             end
           end
     end

docs/apidocs/json_AnsibleOutput.html

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

docs/apidocs/json_AnsibleResult.html

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

docs/apidocs/json_BenchmarkResult.html

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

docs/apidocs/json_CloudCredentials.html

@@ -80,36 +80,36 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">secretKey</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>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">accessKeyId</span>
+          <td>  <span class="property-name">attributes</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">map of object
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">keyPairs</span>
+          <td>  <span class="property-name">accessKeyId</span>
 </td>
-          <td>  <span class="datatype-reference">array of <a href="json_KeyPair.html">KeyPair</a>
+          <td>  <span class="datatype-reference">string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">keyPairIDs</span>
+          <td>  <span class="property-name">secretKey</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,9 +125,9 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">attributes</span>
+          <td>  <span class="property-name">keyPairs</span>
 </td>
-          <td>  <span class="datatype-reference">map of object
+          <td>  <span class="datatype-reference">array of <a href="json_KeyPair.html">KeyPair</a>
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -139,14 +139,14 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -162,63 +162,63 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
-  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
+  &quot;attributes&quot; : {
+    &quot;property1&quot; : { },
+    &quot;property2&quot; : { }
+  },
   &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
+  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
   &quot;keyPairs&quot; : [ {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;
   }, {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PUBLIC&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PUBLIC&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;...&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;...&quot;
   } ],
-  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;attributes&quot; : {
-    &quot;property1&quot; : { },
-    &quot;property2&quot; : { }
-  },
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&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">IP</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -98,7 +98,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">IP</span>
+          <td>  <span class="property-name">role</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -112,9 +112,9 @@
       <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;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">managerType</span>
+          <td>  <span class="property-name">configurationID</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -91,7 +91,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">provisionID</span>
+          <td>  <span class="property-name">managerType</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -100,7 +100,7 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">configurationID</span>
+          <td>  <span class="property-name">provisionID</span>
 </td>
           <td>  <span class="datatype-reference">string
 </span>
@@ -114,14 +114,14 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -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;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }</pre>
 

docs/apidocs/json_DeployResponse.html

@@ -80,18 +80,18 @@
         </thead>
         <tbody>
         <tr>
-          <td>  <span class="property-name">keyPair</span>
+          <td>  <span class="property-name">ansibleOutputList</span>
 </td>
-          <td>  <span class="datatype-reference"><a href="json_KeyPair.html">KeyPair</a>
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">ansibleOutputList</span>
+          <td>  <span class="property-name">keyPair</span>
 </td>
-          <td>  <span class="datatype-reference">array of string
+          <td>  <span class="datatype-reference"><a href="json_KeyPair.html">KeyPair</a>
 </span>
 </td>
           <td>  <span class="property-description"></span>
@@ -103,19 +103,19 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">managerType</span></td>
+          <td><span class="property-name">configurationID</span></td>
           <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">provisionID</span></td>
+          <td><span class="property-name">managerType</span></td>
           <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">configurationID</span></td>
+          <td><span class="property-name">provisionID</span></td>
           <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
@@ -126,14 +126,14 @@
         </tr>
         <tbody>
         <tr>
-          <td><span class="property-name">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -149,36 +149,36 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-js example">{
+  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyPair&quot; : {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;
   },
-  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }</pre>
 

docs/apidocs/json_Key.html

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

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

docs/apidocs/json_KeyValueHolder.html

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

docs/apidocs/json_OwnedObject.html

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

docs/apidocs/json_PlanResponse.html

@@ -89,27 +89,27 @@
 </td>
         </tr>
         <tr>
-          <td>  <span class="property-name">loweLevelPlanIDs</span>
+          <td>  <span class="property-name">toscaID</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">level</span>
+          <td>  <span class="property-name">loweLevelPlanIDs</span>
 </td>
-          <td>  <span class="datatype-reference">number
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
           <td>  <span class="property-description"></span>
 </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">timestamp</span></td>
-          <td><span class="datatype-reference">number
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
         <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">timestamp</span></td>
+          <td><span class="datatype-reference">number
 </span></td>
           <td><span class="property-description"></span></td>
         </tr>
@@ -156,15 +156,15 @@
       
       <pre class="prettyprint language-js example">{
   &quot;name&quot; : &quot;planner_output_all.yml&quot;,
+  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
   &quot;level&quot; : 0,
-  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;keyValue&quot; : {
     &quot;property1&quot; : { },
     &quot;property2&quot; : { }
   },
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }</pre>
 

docs/apidocs/json_PlaybookRepresentation.html

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

docs/apidocs/json_ProvisionRequest.html

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

docs/apidocs/json_ProvisionResponse.html

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

docs/apidocs/json_Script.html

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

docs/apidocs/json_SysbenchCPUBenchmark.html

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

docs/apidocs/json_ToscaRepresentation.html

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

docs/apidocs/ns0.xsd

@@ -47,26 +47,26 @@
 
 <xs:complexType name="configure">
        <xs:sequence>
-              <xs:element name="loginKey" type="loginKey0" minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="key" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="pwd" type="xs:string" minOccurs="0">
+              <xs:element name="geniKey" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="keyid" type="xs:string" minOccurs="0">
+              <xs:element name="loginPriKey" type="loginKey0" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
-              <xs:element name="key" type="xs:string" minOccurs="0">
+              <xs:element name="loginKey" type="loginKey0" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
-              <xs:element name="geniKey" type="xs:string" minOccurs="0">
+              <xs:element name="loginPubKey" type="loginKey0" minOccurs="0" maxOccurs="unbounded">
+              </xs:element>
+              <xs:element name="user" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="geniKeyAlias" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="loginPubKey" type="loginKey0" minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="keyid" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="loginPriKey" type="loginKey0" minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="pwd" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="geniKeyPass" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="user" type="xs:string" minOccurs="0">
-              </xs:element>
       </xs:sequence>
 </xs:complexType>
 
@@ -81,10 +81,10 @@
        <xs:sequence>
               <xs:element name="pwd" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="user" type="xs:string" minOccurs="0">
-              </xs:element>
               <xs:element name="action" type="xs:string" minOccurs="0">
               </xs:element>
+              <xs:element name="user" type="xs:string" minOccurs="0">
+              </xs:element>
       </xs:sequence>
 </xs:complexType>
 
@@ -99,12 +99,12 @@
 
 <xs:complexType name="plan">
        <xs:sequence>
+              <xs:element name="file" type="xs:string" minOccurs="0">
+              </xs:element>
               <xs:element name="user" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="pwd" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="file" type="xs:string" minOccurs="0">
-              </xs:element>
       </xs:sequence>
 </xs:complexType>
 
@@ -119,12 +119,12 @@
 
 <xs:complexType name="result">
        <xs:sequence>
+              <xs:element name="status" type="xs:string" minOccurs="0">
+              </xs:element>
               <xs:element name="file" type="attribute" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
               <xs:element name="info" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="status" type="xs:string" minOccurs="0">
-              </xs:element>
       </xs:sequence>
 </xs:complexType>
 
@@ -132,10 +132,10 @@
        <xs:sequence>
               <xs:element name="user" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="file" type="attribute" minOccurs="0" maxOccurs="unbounded">
-              </xs:element>
               <xs:element name="pwd" type="xs:string" minOccurs="0">
               </xs:element>
+              <xs:element name="file" type="attribute" minOccurs="0" maxOccurs="unbounded">
+              </xs:element>
       </xs:sequence>
 </xs:complexType>
 
@@ -147,10 +147,10 @@
               </xs:element>
               <xs:element name="secretKey" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="cloudProviderName" type="xs:string" minOccurs="0">
-              </xs:element>
               <xs:element name="keyPairs" type="keyPair" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
+              <xs:element name="cloudProviderName" type="xs:string" minOccurs="0">
+              </xs:element>
               <xs:element name="attributes" minOccurs="0">
   <xs:complexType>
     <xs:sequence>
@@ -172,10 +172,10 @@
 
 <xs:complexType name="deployParameter">
        <xs:sequence>
-              <xs:element name="user" type="xs:string" minOccurs="0">
-              </xs:element>
               <xs:element name="role" type="xs:string" minOccurs="0">
               </xs:element>
+              <xs:element name="user" type="xs:string" minOccurs="0">
+              </xs:element>
               <xs:element name="IP" type="xs:string" minOccurs="0">
               </xs:element>
       </xs:sequence>
@@ -185,11 +185,11 @@
    <xs:complexContent>
     <xs:extension base="ownedObject">
       <xs:sequence>
-              <xs:element name="configurationID" type="xs:string" minOccurs="0">
+              <xs:element name="managerType" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="provisionID" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="managerType" type="xs:string" minOccurs="0">
+              <xs:element name="configurationID" type="xs:string" minOccurs="0">
               </xs:element>
       </xs:sequence>
     </xs:extension>
@@ -222,11 +222,11 @@
       </xs:element>
     </xs:sequence>
   </xs:complexType>
-              </xs:element>
-              <xs:element name="key" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="type" type="keyType" minOccurs="0">
               </xs:element>
+              <xs:element name="key" type="xs:string" minOccurs="0">
+              </xs:element>
               <xs:element name="name" type="xs:string" minOccurs="0">
               </xs:element>
       </xs:sequence>
@@ -247,10 +247,10 @@
       <xs:sequence>
               <xs:element name="keyPairId" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="privateKey" type="key" minOccurs="0">
-              </xs:element>
               <xs:element name="publicKey" type="key" minOccurs="0">
               </xs:element>
+              <xs:element name="privateKey" type="key" minOccurs="0">
+              </xs:element>
       </xs:sequence>
     </xs:extension>
   </xs:complexContent>
@@ -276,12 +276,12 @@
    <xs:complexContent>
     <xs:extension base="keyValueHolder">
       <xs:sequence>
-              <xs:element name="level" type="xs:int" minOccurs="0">
-              </xs:element>
               <xs:element name="name" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="toscaID" type="xs:string" minOccurs="0">
               </xs:element>
+              <xs:element name="level" type="xs:int" minOccurs="0">
+              </xs:element>
       </xs:sequence>
     </xs:extension>
   </xs:complexContent>
@@ -298,13 +298,13 @@
    <xs:complexContent>
     <xs:extension base="keyValueHolder">
       <xs:sequence>
-              <xs:element name="cloudCredentialsIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="deployerKeyPairIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
               <xs:element name="userKeyPairIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
-              <xs:element name="planID" type="xs:string" minOccurs="0">
+              <xs:element name="cloudCredentialsIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
-              <xs:element name="deployerKeyPairIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+              <xs:element name="planID" type="xs:string" minOccurs="0">
               </xs:element>
       </xs:sequence>
     </xs:extension>
@@ -315,10 +315,10 @@
    <xs:complexContent>
     <xs:extension base="provisionRequest">
       <xs:sequence>
-              <xs:element name="deployParameters" type="deployParameter" minOccurs="0" maxOccurs="unbounded">
-              </xs:element>
               <xs:element name="cloudKeyPairIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
+              <xs:element name="deployParameters" type="deployParameter" minOccurs="0" maxOccurs="unbounded">
+              </xs:element>
       </xs:sequence>
     </xs:extension>
   </xs:complexContent>
@@ -350,22 +350,22 @@
 
 <xs:complexType name="user">
        <xs:sequence>
-              <xs:element name="accountNonLocked" type="xs:boolean" minOccurs="1">
+              <xs:element name="accountNonExpired" type="xs:boolean" minOccurs="1">
               </xs:element>
               <xs:element name="username" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="password" type="xs:string" minOccurs="0">
-              </xs:element>
-              <xs:element name="accountNonExpired" type="xs:boolean" minOccurs="1">
-              </xs:element>
               <xs:element name="roles" type="xs:string" minOccurs="0" maxOccurs="unbounded">
               </xs:element>
               <xs:element name="credentialsNonExpired" type="xs:boolean" minOccurs="1">
               </xs:element>
+              <xs:element name="accountNonLocked" type="xs:boolean" minOccurs="1">
+              </xs:element>
               <xs:element name="enabled" type="xs:boolean" minOccurs="1">
               </xs:element>
               <xs:element name="id" type="xs:string" minOccurs="0">
               </xs:element>
+              <xs:element name="password" type="xs:string" minOccurs="0">
+              </xs:element>
       </xs:sequence>
 </xs:complexType>
 
@@ -373,15 +373,15 @@
    <xs:complexContent>
     <xs:extension base="ownedObject">
       <xs:sequence>
-              <xs:element name="provisionID" type="xs:string" minOccurs="0">
+              <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="vmType" type="xs:string" minOccurs="0">
+              <xs:element name="host" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="cloudProvider" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="host" type="xs:string" minOccurs="0">
+              <xs:element name="provisionID" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
+              <xs:element name="vmType" type="xs:string" minOccurs="0">
               </xs:element>
       </xs:sequence>
     </xs:extension>
@@ -392,18 +392,18 @@
    <xs:complexContent>
     <xs:extension base="ownedObject">
       <xs:sequence>
-              <xs:element name="vmType" type="xs:string" minOccurs="0">
-              </xs:element>
-              <xs:element name="host" type="xs:string" minOccurs="0">
+              <xs:element name="end" type="xs:dateTime" minOccurs="0">
               </xs:element>
               <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="start" type="xs:dateTime" minOccurs="0">
               </xs:element>
-              <xs:element name="end" type="xs:dateTime" minOccurs="0">
+              <xs:element name="vmType" type="xs:string" minOccurs="0">
               </xs:element>
               <xs:element name="delta" type="xs:dateTime" minOccurs="0">
               </xs:element>
+              <xs:element name="host" type="xs:string" minOccurs="0">
+              </xs:element>
       </xs:sequence>
     </xs:extension>
   </xs:complexContent>
@@ -415,29 +415,29 @@
       <xs:sequence>
               <xs:element name="numberOfThreads" type="xs:int" minOccurs="1">
               </xs:element>
-              <xs:element name="ansibleOutputID" type="xs:string" minOccurs="0">
+              <xs:element name="stddevExecTimePerThread" type="xs:double" minOccurs="1">
               </xs:element>
-              <xs:element name="sysbenchVersion" type="xs:string" minOccurs="0">
+              <xs:element name="approx95Percentile" type="xs:double" minOccurs="1">
               </xs:element>
-              <xs:element name="totalNumberOfEvents" type="xs:int" minOccurs="1">
+              <xs:element name="avgExecTimePerThread" type="xs:double" minOccurs="1">
               </xs:element>
-              <xs:element name="executionTime" type="xs:double" minOccurs="1">
+              <xs:element name="sysbenchVersion" type="xs:string" minOccurs="0">
               </xs:element>
-              <xs:element name="approx95Percentile" type="xs:double" minOccurs="1">
+              <xs:element name="avgEventsPerThread" type="xs:double" minOccurs="1">
+              </xs:element>
+              <xs:element name="maxExecutionTimePerRequest" type="xs:double" minOccurs="1">
               </xs:element>
               <xs:element name="avgExecutionTimePerRequest" type="xs:double" minOccurs="1">
               </xs:element>
               <xs:element name="minExecutionTimePerRequest" type="xs:double" minOccurs="1">
               </xs:element>
-              <xs:element name="avgExecTimePerThread" type="xs:double" minOccurs="1">
-              </xs:element>
               <xs:element name="stddevEventsPerThread" type="xs:double" minOccurs="1">
               </xs:element>
-              <xs:element name="avgEventsPerThread" type="xs:double" minOccurs="1">
+              <xs:element name="executionTime" type="xs:double" minOccurs="1">
               </xs:element>
-              <xs:element name="maxExecutionTimePerRequest" type="xs:double" minOccurs="1">
+              <xs:element name="totalNumberOfEvents" type="xs:int" minOccurs="1">
               </xs:element>
-              <xs:element name="stddevExecTimePerThread" type="xs:double" minOccurs="1">
+              <xs:element name="ansibleOutputID" type="xs:string" minOccurs="0">
               </xs:element>
       </xs:sequence>
     </xs:extension>

docs/apidocs/resource_AnsibleOutputController.html

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

docs/apidocs/resource_BenchmarkController.html

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

docs/apidocs/resource_CloudConfigurationController0.html

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

docs/apidocs/resource_CloudCredentialsController.html

@@ -54,7 +54,7 @@
           <li><a href="#resource_CloudCredentialsController_postCredentials_POST"><abbr title="POST /user/v1.0/credentials/cloud">POST /user/v1.0/credentials/cl...</abbr></a></li>
           <li><a href="#resource_CloudCredentialsController_deleteAll_DELETE"><abbr title="DELETE /user/v1.0/credentials/cloud/all">DELETE /user/v1.0/credentials/...</abbr></a></li>
           <li><a href="#resource_CloudCredentialsController_getIds_GET"><abbr title="GET /user/v1.0/credentials/cloud/ids">GET /user/v1.0/credentials/clo...</abbr></a></li>
-          <li><a href="#resource_CloudCredentialsController_geta_GET"><abbr title="GET /user/v1.0/credentials/cloud/sample">GET /user/v1.0/credentials/clo...</abbr></a></li>
+          <li><a href="#resource_CloudCredentialsController_getSample_GET"><abbr title="GET /user/v1.0/credentials/cloud/sample">GET /user/v1.0/credentials/clo...</abbr></a></li>
           <li><a href="#resource_CloudCredentialsController_delete_DELETE"><abbr title="DELETE /user/v1.0/credentials/cloud/{id}">DELETE /user/v1.0/credentials/...</abbr></a></li>
           <li><a href="#resource_CloudCredentialsController_get_GET"><abbr title="GET /user/v1.0/credentials/cloud/{id}">GET /user/v1.0/credentials/clo...</abbr></a></li>
           <li><a href="#resource_CloudCredentialsController_addLogineKey_POST"><abbr title="POST /user/v1.0/credentials/cloud/upload/{id}">POST /user/v1.0/credentials/cl...</abbr></a></li>
@@ -163,63 +163,63 @@ Accept: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
+  &quot;attributes&quot; : {
+    &quot;property1&quot; : { },
+    &quot;property2&quot; : { }
+  },
   &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
+  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
   &quot;keyPairs&quot; : [ {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;
   }, {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PUBLIC&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PUBLIC&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PUBLIC&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;...&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;...&quot;
   } ],
-  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;attributes&quot; : {
-    &quot;property1&quot; : { },
-    &quot;property2&quot; : { }
-  },
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </code>
@@ -390,7 +390,7 @@ Content-Type: application/json
         </div>
       </div>
 
-      <div id="resource_CloudCredentialsController_geta_GET">
+      <div id="resource_CloudCredentialsController_getSample_GET">
         <h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/credentials/cloud/sample <a href="../user/v1.0/credentials/cloud/sample" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
 
         <p></p>
@@ -457,63 +457,63 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
+  &quot;attributes&quot; : {
+    &quot;property1&quot; : { },
+    &quot;property2&quot; : { }
+  },
   &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
+  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
   &quot;keyPairs&quot; : [ {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;
   }, {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PUBLIC&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;...&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;...&quot;
   } ],
-  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;attributes&quot; : {
-    &quot;property1&quot; : { },
-    &quot;property2&quot; : { }
-  },
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </code>
@@ -704,63 +704,63 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
+  &quot;attributes&quot; : {
+    &quot;property1&quot; : { },
+    &quot;property2&quot; : { }
+  },
   &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
+  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
+  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
   &quot;keyPairs&quot; : [ {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;
   }, {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PUBLIC&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;...&quot;,
+      &quot;type&quot; : &quot;PUBLIC&quot;,
+      &quot;name&quot; : &quot;...&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;...&quot;,
         &quot;property2&quot; : &quot;...&quot;
-      },
-      &quot;name&quot; : &quot;...&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;...&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;...&quot;
   } ],
-  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
-  &quot;attributes&quot; : {
-    &quot;property1&quot; : { },
-    &quot;property2&quot; : { }
-  },
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&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;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&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;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </code>
@@ -587,36 +587,36 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
+  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
   &quot;keyPair&quot; : {
-    &quot;publicKey&quot; : {
+    &quot;privateKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;keyPairId&quot; : &quot;...&quot;,
-    &quot;privateKey&quot; : {
+    &quot;publicKey&quot; : {
       &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
       &quot;attributes&quot; : {
         &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
         &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-      },
-      &quot;name&quot; : &quot;id_dsa.pub&quot;,
-      &quot;type&quot; : &quot;PRIVATE&quot;
+      }
     },
-    &quot;timestamp&quot; : 12345,
+    &quot;keyPairId&quot; : &quot;...&quot;,
     &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+    &quot;timestamp&quot; : 12345,
     &quot;owner&quot; : &quot;user1&quot;
   },
-  &quot;ansibleOutputList&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
   &quot;managerType&quot; : &quot;ansible&quot;,
   &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;timestamp&quot; : 12345,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </code>

docs/apidocs/resource_DeployController0.html

@@ -127,8 +127,8 @@ Accept: text/xml
                 <code class="prettyprint language-xml">
 &lt;deploy&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
-  &lt;user&gt;user&lt;/user&gt;
   &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/deploy&gt;
 
                 </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&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;status&gt;Success&lt;/status&gt;
 &lt;/result&gt;
 
                 </code>
@@ -211,8 +211,8 @@ Accept: text/xml
                 <code class="prettyprint language-xml">
 &lt;deploy&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
-  &lt;user&gt;user&lt;/user&gt;
   &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/deploy&gt;
 
                 </code>
@@ -226,9 +226,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&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;status&gt;Success&lt;/status&gt;
 &lt;/result&gt;
 
                 </code>

docs/apidocs/resource_KeyPairController.html

@@ -166,27 +166,27 @@ Accept: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;publicKey&quot; : {
+  &quot;privateKey&quot; : {
     &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
     &quot;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-    },
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;
+    }
   },
-  &quot;keyPairId&quot; : &quot;...&quot;,
-  &quot;privateKey&quot; : {
+  &quot;publicKey&quot; : {
     &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
     &quot;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-    },
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;
+    }
   },
-  &quot;timestamp&quot; : 12345,
+  &quot;keyPairId&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </code>
@@ -424,27 +424,27 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;publicKey&quot; : {
+  &quot;privateKey&quot; : {
     &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
     &quot;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-    },
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;
+    }
   },
-  &quot;keyPairId&quot; : &quot;...&quot;,
-  &quot;privateKey&quot; : {
+  &quot;publicKey&quot; : {
     &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
     &quot;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-    },
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;
+    }
   },
-  &quot;timestamp&quot; : 12345,
+  &quot;keyPairId&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </code>
@@ -635,27 +635,27 @@ Content-Type: application/json
 
                 <code class="prettyprint language-js">
 {
-  &quot;publicKey&quot; : {
+  &quot;privateKey&quot; : {
     &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
     &quot;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-    },
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;
+    }
   },
-  &quot;keyPairId&quot; : &quot;...&quot;,
-  &quot;privateKey&quot; : {
+  &quot;publicKey&quot; : {
     &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;,
+    &quot;type&quot; : &quot;PRIVATE&quot;,
+    &quot;name&quot; : &quot;id_dsa.pub&quot;,
     &quot;attributes&quot; : {
       &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
       &quot;property2&quot; : &quot;domain_name:Virginia&quot;
-    },
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;
+    }
   },
-  &quot;timestamp&quot; : 12345,
+  &quot;keyPairId&quot; : &quot;...&quot;,
   &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;timestamp&quot; : 12345,
   &quot;owner&quot; : &quot;user1&quot;
 }
                 </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;pwd&gt;123&lt;/pwd&gt;
   &lt;file&gt;tosca_definitions_version: tosca_simple_yaml_1_0\n\n\ndescription: example file for infrastructure planner\n\n\nrepositories:\n    MOG_docker_hub: \n      description: MOG project’s code repository in GitHub\n      url: https://github.com/switch-project/mog\n      credential:\n        protocol: xauth\n        token_type: X-Auth-Token\n        # token encoded in Base64\n        token: 604bbe45ac7143a79e14f3158df67091\n\n\nartifact_types:\n  tosca.artifacts.Deployment.Image.Container.Docker:\n    derived_from: tosca.artifacts.Deployment.Image\n\n\ndata_types:\n  Switch.datatypes.QoS.AppComponent:\n    derived_from: tosca.datatypes.Root\n    properties:\n      response_time:\n        type: string\n\n  Switch.datatypes.Application.Connection.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      component_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Application.Connection.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n  Switch.datatypes.Network.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      host_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Network.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n\nnode_types:\n\n  Switch.nodes.Application.Container.Docker:\n    derived_from: tosca.nodes.Container.Application\n    properties:\n      QoS:\n        type: Switch.datatypes.QoS.AppComponent\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n    interfaces:\n      Standard:\n        create:\n          inputs:\n            command:\n              type: string\n            exported_ports:\n              type: list\n              entry_schema:\n                type: string\n            port_bindings:\n              type: list\n              entry_schema:\n                type: string\n\n  Switch.nodes.Application.Container.Docker.MOG.InputDistributor:\n    derived_from: Switch.nodes.Application.Container.Docker\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/InputDistributor:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      inPort: \n        type: integer\n      waitingTime:\n        type: integer\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder:\n    derived_from: Switch.nodes.Application.Container.Docker \n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      multicastAddrIP: \n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Connection:\n    derived_from: tosca.nodes.Root \n    properties:\n      source:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      target:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      bandwidth:\n        type: string\n      latency: \n        type: string\n      jitter:  \n        type: string\n      multicast:\n        type: Switch.datatypes.Application.Connection.Multicast\n\n  Switch.nodes.Compute:\n    derived_from: tosca.nodes.Compute\n    properties:\n      OStype:\n        type: string\n      nodetype:\n        type: string\n      domain:\n        type: string\n      public_address:\n        type: string\n      
         ethernet_port:\n        type: list\n        entry_schema:\n          type: tosca.datatypes.network.NetworkInfo\n      script:\n        type: string\n      installation:\n        type: string\n      ssh_credential:\n        type: tosca.datatypes.Credential\n\n  Switch.nodes.Network:\n    derived_from: tosca.nodes.network.Network\n    properties:\n      bandwidth:\n        type: string\n      latency:\n        type: string\n      jitter:\n        type: string\n      source:\n        type: Switch.datatypes.Network.EndPoint\n      target:\n        type: Switch.datatypes.Network.EndPoint\n      multicast:\n        type: Switch.datatypes.Network.Multicast\n\n\ntopology_template:\n  \n  node_templates:\n    2d13d708e3a9441ab8336ce874e08dd1:\n      type: Switch.nodes.Application.Container.Docker.MOG.InputDistributor\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/InputDistributor:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        inPort: 2000\n        waitingTime: 5\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: InputDistributor\n              exported_ports:\n                - 2000\n              port_bindings:\n                - &quot;2000:2000&quot;\n                - &quot;3000:3000&quot;\n\n    8fcc1788d9ee462c826572c79fdb2a6a:\n      type: Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: ProxyTranscoder\n              exported_ports:\n                - 80\n              port_bindings:\n                - &quot;8080:80&quot;\n\n    5e0add703c8a43938a39301f572e46c0:\n      type: Switch.nodes.Application.Connection\n      properties:\n        source:\n          address: 192.168.21.11\n          component_name: 2d13d708e3a9441ab8336ce874e08dd1\n          netmask: 255.255.255.0\n          port_name: &quot;inputDistributor_out&quot;\n        target:\n          address: 192.168.21.12\n          component_name: 8fcc1788d9ee462c826572c79fdb2a6a\n          netmask: 255.255.255.0\n          port_name: &quot;proxyTranscoder_in&quot;\n        latency: 30ms\n        bandwidth: 130MB/s\n        jitter: 500ms\n        multicast:\n          multicastAddrIP: 255.2.2.0\n          multicastAddrPort: 3000\n&lt;/file&gt;
+  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/plan&gt;
 
                 </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&gt;
+  &lt;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;status&gt;Success&lt;/status&gt;
 &lt;/result&gt;
 
                 </code>

docs/apidocs/resource_ProvisionController.html

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

docs/apidocs/resource_ProvisionController0.html

@@ -127,8 +127,8 @@ Accept: text/xml
                 <code class="prettyprint language-xml">
 &lt;execute&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
-  &lt;user&gt;user&lt;/user&gt;
   &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/execute&gt;
 
                 </code>
@@ -142,9 +142,9 @@ Content-Type: text/xml
 
                 <code class="prettyprint language-xml">
 &lt;result&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;status&gt;Success&lt;/status&gt;
 &lt;/result&gt;
 
                 </code>
@@ -216,8 +216,8 @@ Accept: application/json
                 <code class="prettyprint language-xml">
 &lt;upload&gt;
   &lt;user&gt;...&lt;/user&gt;
-  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
   &lt;pwd&gt;...&lt;/pwd&gt;
+  &lt;file level=&quot;0&quot; name=&quot;planner_output_all&quot;&gt;...&lt;/file&gt;
 &lt;/upload&gt;
 
                 </code>

docs/apidocs/resource_ScriptController.html

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

docs/apidocs/resource_UserPublicKeysController0.html

@@ -133,8 +133,8 @@ Accept: application/json
 <confUserKey>
   <userKey level="0" name="planner_output_all">...</userKey>
   <pwd>123</pwd>
-  <user>user</user>
   <action>58c2c2f3a8d4b56889878d03</action>
+  <user>user</user>
 </confUserKey>
 
                 </code>

docs/apidocs/resource_UserScriptController0.html

@@ -132,8 +132,8 @@ Accept: application/json
 <confScript>
   <script>#!/bin/bash\n\nlogstashScript=/root/runLogstash.sh\nscreen -S logstash -dm /bin/bash "$logstashScript"\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 "File -> $logArchPath"\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="$(( $now - $moddate))"\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 '{print $NF}' | sed 's/://g'`\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</script>
   <pwd>123</pwd>
-  <user>user</user>
   <action>58c2c2f3a8d4b56889878d03</action>
+  <user>user</user>
 </confScript>
 
                 </code>

docs/apidocs/xml_ns0_ansibleOutput.html

@@ -211,11 +211,11 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;a-----&gt;
+  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
+  &lt;host&gt;...&lt;/host&gt;
+  &lt;cloudProvider&gt;...&lt;/cloudProvider&gt;
   &lt;provisionID&gt;...&lt;/provisionID&gt;
   &lt;vmType&gt;...&lt;/vmType&gt;
-  &lt;cloudProvider&gt;...&lt;/cloudProvider&gt;
-  &lt;host&gt;...&lt;/host&gt;
-  &lt;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&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;cloudDeploymentDomain&gt;...&lt;/cloudDeploymentDomain&gt;
   &lt;start&gt;...&lt;/start&gt;
-  &lt;end&gt;...&lt;/end&gt;
+  &lt;vmType&gt;...&lt;/vmType&gt;
   &lt;delta&gt;...&lt;/delta&gt;
+  &lt;host&gt;...&lt;/host&gt;
   &lt;timestamp&gt;...&lt;/timestamp&gt;
   &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/b-----&gt;

docs/apidocs/xml_ns0_cloudCredentials.html

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

docs/apidocs/xml_ns0_confScript.html

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

docs/apidocs/xml_ns0_confUserKey.html

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

docs/apidocs/xml_ns0_deploy.html

@@ -134,8 +134,8 @@
       
       <pre class="prettyprint language-xml example">&lt;deploy&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
-  &lt;user&gt;user&lt;/user&gt;
   &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/deploy&gt;
 </pre>
 

docs/apidocs/xml_ns0_deployParameter.html

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

docs/apidocs/xml_ns0_deployRequest.html

@@ -177,9 +177,9 @@
       <p class="lead">Example</p>
       
       <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;
-  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
   &lt;managerType&gt;ansible&lt;/managerType&gt;
+  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&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

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

@@ -149,8 +149,8 @@
       
       <pre class="prettyprint language-xml example">&lt;execute&gt;
   &lt;pwd&gt;123&lt;/pwd&gt;
-  &lt;user&gt;user&lt;/user&gt;
   &lt;action&gt;58c2c2f3a8d4b56889878d03&lt;/action&gt;
+  &lt;user&gt;user&lt;/user&gt;
 &lt;/execute&gt;
 </pre>
 

docs/apidocs/xml_ns0_key.html

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

docs/apidocs/xml_ns0_keyPair.html

@@ -176,18 +176,18 @@
       
       <pre class="prettyprint language-xml example">&lt;k-----&gt;
   &lt;keyPairId&gt;...&lt;/keyPairId&gt;
-  &lt;privateKey&gt;
+  &lt;publicKey&gt;
     &lt;attributes&gt;domain_name:Virginia&lt;/attributes&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;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
     &lt;name&gt;id_dsa.pub&lt;/name&gt;
-  &lt;/privateKey&gt;
-  &lt;publicKey&gt;
+  &lt;/publicKey&gt;
+  &lt;privateKey&gt;
     &lt;attributes&gt;domain_name:Virginia&lt;/attributes&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;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
     &lt;name&gt;id_dsa.pub&lt;/name&gt;
-  &lt;/publicKey&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;pwd&gt;123&lt;/pwd&gt;
   &lt;file&gt;tosca_definitions_version: tosca_simple_yaml_1_0\n\n\ndescription: example file for infrastructure planner\n\n\nrepositories:\n    MOG_docker_hub: \n      description: MOG project’s code repository in GitHub\n      url: https://github.com/switch-project/mog\n      credential:\n        protocol: xauth\n        token_type: X-Auth-Token\n        # token encoded in Base64\n        token: 604bbe45ac7143a79e14f3158df67091\n\n\nartifact_types:\n  tosca.artifacts.Deployment.Image.Container.Docker:\n    derived_from: tosca.artifacts.Deployment.Image\n\n\ndata_types:\n  Switch.datatypes.QoS.AppComponent:\n    derived_from: tosca.datatypes.Root\n    properties:\n      response_time:\n        type: string\n\n  Switch.datatypes.Application.Connection.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      component_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Application.Connection.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n  Switch.datatypes.Network.EndPoint:\n    derived_from: tosca.datatypes.Root\n    properties:\n      address:\n        type: string\n      host_name:\n        type: string\n      netmask:\n        type: string\n      port_name:\n        type: string\n\n  Switch.datatypes.Network.Multicast:\n    derived_from: tosca.datatypes.Root\n    properties:\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n\n\nnode_types:\n\n  Switch.nodes.Application.Container.Docker:\n    derived_from: tosca.nodes.Container.Application\n    properties:\n      QoS:\n        type: Switch.datatypes.QoS.AppComponent\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n    interfaces:\n      Standard:\n        create:\n          inputs:\n            command:\n              type: string\n            exported_ports:\n              type: list\n              entry_schema:\n                type: string\n            port_bindings:\n              type: list\n              entry_schema:\n                type: string\n\n  Switch.nodes.Application.Container.Docker.MOG.InputDistributor:\n    derived_from: Switch.nodes.Application.Container.Docker\n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/InputDistributor:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      inPort: \n        type: integer\n      waitingTime:\n        type: integer\n      multicastAddrIP:\n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder:\n    derived_from: Switch.nodes.Application.Container.Docker \n    artifacts:\n      docker_image:\n        type: tosca.artifacts.Deployment.Image.Container.Docker\n        file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n        repository: MOG_docker_hub\n    properties:\n      multicastAddrIP: \n        type: string\n      multicastAddrPort:\n        type: integer\n      videoWidth:\n        type: integer\n      videoHeight:\n        type: integer\n\n  Switch.nodes.Application.Connection:\n    derived_from: tosca.nodes.Root \n    properties:\n      source:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      target:\n        type: Switch.datatypes.Application.Connection.EndPoint\n      bandwidth:\n        type: string\n      latency: \n        type: string\n      jitter:  \n        type: string\n      multicast:\n        type: Switch.datatypes.Application.Connection.Multicast\n\n  Switch.nodes.Compute:\n    derived_from: tosca.nodes.Compute\n    properties:\n      OStype:\n        type: string\n      nodetype:\n        type: string\n      domain:\n        type: string\n      public_address:\n        type: string\n      
         ethernet_port:\n        type: list\n        entry_schema:\n          type: tosca.datatypes.network.NetworkInfo\n      script:\n        type: string\n      installation:\n        type: string\n      ssh_credential:\n        type: tosca.datatypes.Credential\n\n  Switch.nodes.Network:\n    derived_from: tosca.nodes.network.Network\n    properties:\n      bandwidth:\n        type: string\n      latency:\n        type: string\n      jitter:\n        type: string\n      source:\n        type: Switch.datatypes.Network.EndPoint\n      target:\n        type: Switch.datatypes.Network.EndPoint\n      multicast:\n        type: Switch.datatypes.Network.Multicast\n\n\ntopology_template:\n  \n  node_templates:\n    2d13d708e3a9441ab8336ce874e08dd1:\n      type: Switch.nodes.Application.Container.Docker.MOG.InputDistributor\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/InputDistributor:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        inPort: 2000\n        waitingTime: 5\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: InputDistributor\n              exported_ports:\n                - 2000\n              port_bindings:\n                - &quot;2000:2000&quot;\n                - &quot;3000:3000&quot;\n\n    8fcc1788d9ee462c826572c79fdb2a6a:\n      type: Switch.nodes.Application.Container.Docker.MOG.ProxyTranscoder\n      artifacts:\n        docker_image:\n          file: &quot;mogswitch/ProxyTranscoder:1.0&quot;\n          type: tosca.artifacts.Deployment.Image.Container.Docker\n          repository: MOG_docker_hub\n      properties:\n        QoS:\n          response_time: 30ms\n        multicastAddrIP: 255.2.2.0\n        multicastAddrPort: 3000\n        videoWidth: 176\n        videoHeight: 100\n      interfaces:\n        Standard:\n          create:\n            implementation: docker_image\n            inputs:\n              command: ProxyTranscoder\n              exported_ports:\n                - 80\n              port_bindings:\n                - &quot;8080:80&quot;\n\n    5e0add703c8a43938a39301f572e46c0:\n      type: Switch.nodes.Application.Connection\n      properties:\n        source:\n          address: 192.168.21.11\n          component_name: 2d13d708e3a9441ab8336ce874e08dd1\n          netmask: 255.255.255.0\n          port_name: &quot;inputDistributor_out&quot;\n        target:\n          address: 192.168.21.12\n          component_name: 8fcc1788d9ee462c826572c79fdb2a6a\n          netmask: 255.255.255.0\n          port_name: &quot;proxyTranscoder_in&quot;\n        latency: 30ms\n        bandwidth: 130MB/s\n        jitter: 500ms\n        multicast:\n          multicastAddrIP: 255.2.2.0\n          multicastAddrPort: 3000\n&lt;/file&gt;
+  &lt;user&gt;user&lt;/user&gt;
+  &lt;pwd&gt;123&lt;/pwd&gt;
 &lt;/plan&gt;
 </pre>
 

docs/apidocs/xml_ns0_planResponse.html

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

docs/apidocs/xml_ns0_provisionRequest.html

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

docs/apidocs/xml_ns0_provisionResponse.html

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

docs/apidocs/xml_ns0_sysbenchCPUBenchmark.html

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

docs/apidocs/xml_ns0_upload.html

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

docs/apidocs/xml_ns0_user.html

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

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

@@ -24,14 +24,12 @@ import nl.uva.sne.drip.api.exception.NotFoundException;
 import nl.uva.sne.drip.api.service.BenchmarkResultService;
 import nl.uva.sne.drip.api.service.UserService;
 import nl.uva.sne.drip.drip.commons.data.v1.external.ansible.BenchmarkResult;
-import nl.uva.sne.drip.drip.commons.data.v1.external.ansible.BenchmarkResult;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 /**

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

@@ -207,17 +207,18 @@ public class CloudCredentialsController {
     @RequestMapping(value = "/sample", method = RequestMethod.GET)
     @RolesAllowed({UserService.USER, UserService.ADMIN})
     public @ResponseBody
-    CloudCredentials geta() {
+    CloudCredentials getSample() {
         CloudCredentials cloudCredentials = new CloudCredentials();
         cloudCredentials.setAccessKeyId("AKIAITWERHZUQ6M7YBSQ");
-        cloudCredentials.setCloudProviderName("ec2");
+        cloudCredentials.setCloudProviderName("egi");
         cloudCredentials.setSecretKey("6J7uo99ifrff45sa6Gsy5vgb3b3ewdsdtwY6hBxtYt9y");
         List<String> keyIDs = new ArrayList<>();
         keyIDs.add("58da4c91f7b43a3282cacdbb");
         keyIDs.add("58da4d2af7b43a3282cacdbd");
         cloudCredentials.setKeyIDs(keyIDs);
         Map<String, Object> attributes = new HashMap<>();
-        attributes.put("myProxyEndpoint", "myproxy1.egee.host.com");
+        attributes.put("myProxyEndpoint", "myproxy.egee.host.com");
+        attributes.put("trustedCertificatesURL", "https://dist.eugridpma.info/distribution/igtf/current/accredited/igtf-preinstalled-bundle-classic.tar.gz");
         cloudCredentials.setAttributes(attributes);
         return cloudCredentials;
     }

drip-deployer/1493819465301/2.txt

+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQDAI5hMEdqCIf12SDh9N9hOTOX+yhTAxvF8YKwz9rD3N3F49e/e
+aG6IzsixYPNrf8Aos0ANFnJDQK3wsC1PrfNLrEMz6/Kalj/D4GotCaVCFZBxvwjn
+OotwYSyJF6bqnv5bun37xY9nrMcr1JmrxRtkhB4QDbW1vu0uzeezkbM1TQIDAQAB
+AoGARlzCqRjgrEdGSsqn5TNOQ15l26ilcPNp++JrLZxpsh7brzBhZ1FXKUKQvGSE
+wBlIhZ8fFavirD5DdKEP9t38+lZ0gE1Ky4Xz77J92RctIgSgReZ8niZGjDTiuS9o
+QBEyfPcJXekVlEGDvyH4BkRocarGnaJfNBqu1+LSL+tDmQECQQDvK4py989ts1nt
+O+fV2XH7sb1MeYVlWw8SgfUaHTQLCONpUSo+PIfdbCwYbxGTObWZmZs1Z/naVNU7
+0FI8mronAkEAzajTx14yvr2tH8A8yTvXwyWXBU56uCAj6n8UI2kfGIoj5/oT5EzC
+NX/bJsG5orS7roZqKvCmy6V2vKaKUdDBawJBAN5gJoeFABmoo9lfVMzSNBfpB/A+
+IRi/VMFJkiJousXzyrZWoCdj0pO/CzTguH+iLcaWOuiqN3aYX/cQWBY/awsCQD8H
+L6hZKSolzUn+y2JM0co/2fHJZHjLeNZkDdLwY5RMucZdcP01vQtSXOKa2n6P7zkE
+fsMcL7IXyrT0QU3jsXMCQA5bQiZ7W4SlE5r1Odz8we+3r/6BbUeAT3WIY/bwAcWn
+yEYfOy9GXmX97kTX92m1RjKylNv1B41RoEGGz3yuUtk=
+-----END RSA PRIVATE KEY-----

drip-deployer/1493822343236/2.txt

+-----BEGIN RSA PRIVATE KEY-----
+MIICXAIBAAKBgQCrID6iv0ObjfT0EKTN/3YgWZUMGNo/IETu2nzRnKLU8W5YKp9N
+9Zwl+rhHjyE+GOadx+brzThcGKawXkgNxu0KO7E+pKpnB3cuFdtfIqW9jFLrNopM
+WuX7tquZPc8l49JPe+2Z5z6WitJ9XJWgpDqdE8Jba9B3o0GuwqYE36I0HwIDAQAB
+AoGAFFE2vpHg0AYxsAyN1JthBgQ8yvvkZZxKMuWj7isfthKYHEWrNlFT4bp7yJs4
+wiuordD/HL331A9lMwlumpwkpmEfpTJcN5ndw5wwt0XReXdp0Icu4/t7FufalcVb
+eGEJQOMAPkfgGU6AciyHMKjzTa5ZWQhU4YpZ2JSlVmZNUUECQQDzHHrP3go77IRq
+gSI8ytCOnm3tBL+Wo5yQfJv2PlQdD/v5TWIZTQoqgBsgpQZ70ylRiF/y9rAqebNx
+8bTQGIf/AkEAtDLGufAPm36ja3LdgFUCvfeb0a8IOwc8ih6eAEuBpYqgwKwV+ota
+WPXP3Cdw/patP2Ev9YwKBa6Vqz/oogVT4QJAU+2UFGkCPXfEqwQTrssRvvrA1l+a
+SMYJCfSK3zLbVQEsqv9lC3kGNm/tbZKrL1pR3FzpSvaREMjdA0w/cMvXPwJBAIez
+CTZy0r4NUvGSkb2XxzXZpmz0e6VAINX+kou0UNCiIcaWkQKZOJNvoXWv+gau346w
+GJa4O7/lpm5M9Vo12uECQDJbvjums0EE0xPRe37uAqmYr9Aborex7RBO+kIs0eNE
+RDbzuUMMs7pJbUeQ5bFaDMZKwoSIEJMWuJMSsZ1Jd1s=
+-----END RSA PRIVATE KEY-----

drip-provisioner/pom.xml

@@ -66,14 +66,21 @@
         <dependency>
             <groupId>org.jglobus</groupId>
             <artifactId>myproxy</artifactId>
-            <version>2.1.0</version>
+            <version>2.0.6</version>
         </dependency>
+            
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-compress</artifactId>
             <version>1.5</version>
             <type>jar</type>
         </dependency>
+        <dependency>
+            <groupId>org.codehaus.plexus</groupId>
+            <artifactId>plexus-archiver</artifactId>
+            <version>2.4.4</version>
+            <type>jar</type>
+        </dependency>
     </dependencies>
     
     

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

@@ -17,14 +17,15 @@ package nl.uva.sne.drip.drip.provisioner.utils;
 
 import com.fasterxml.jackson.core.JsonParser;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import java.io.BufferedInputStream;
-import java.io.BufferedOutputStream;
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
 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.InputStreamReader;
+import java.io.OutputStream;
 import java.io.PrintWriter;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -36,14 +37,7 @@ import java.util.List;
 import java.util.Map;
 import nl.uva.sne.drip.drip.commons.data.internal.MessageParameter;
 import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials;
-import org.apache.commons.compress.archivers.tar.TarArchiveInputStream;
-import org.apache.commons.compress.compressors.gzip.GzipCompressorInputStream;
-import org.apache.commons.io.FilenameUtils;
-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;
@@ -174,11 +168,11 @@ public class MessageParsing {
                     if (att != null && att.containsKey("trustedCertificatesURL")) {
                         trustedCertificatesURL = (String) att.get("trustedCertificatesURL");
                     }
-//                    if (trustedCertificatesURL != null) {
-//                        downloadCACertificates(new URL(trustedCertificatesURL));
-//                    } else {
-//                        downloadCACertificates(PropertyValues.CA_BUNDLE_URL);
-//                    }
+                    if (trustedCertificatesURL != null) {
+                        downloadCACertificates(new URL(trustedCertificatesURL));
+                    } else {
+                        downloadCACertificates(PropertyValues.CA_BUNDLE_URL);
+                    }
                     String myProxyEndpoint = null;
                     if (att != null && att.containsKey("myProxyEndpoint")) {
                         myProxyEndpoint = (String) att.get("myProxyEndpoint");
@@ -187,11 +181,10 @@ public class MessageParsing {
                         myProxyEndpoint = PropertyValues.MY_PROXY_ENDPOINT;
                     }
                     if (myProxyEndpoint != null) {
-                        egi.proxyFilePath = "/tmp/x509up_u0";//generateProxy(cred.getAccessKeyId(), cred.getSecretKey(), SOURCE.MY_PROXY);
+                        egi.proxyFilePath = generateProxy(cred.getAccessKeyId(), cred.getSecretKey(), SOURCE.MY_PROXY);
                     } else {
                         egi.proxyFilePath = generateProxy(cred.getAccessKeyId(), cred.getSecretKey(), SOURCE.CERTIFICATE);
                     }
-
                     egi.trustedCertPath = PropertyValues.TRUSTED_CERTIFICATE_FOLDER;
                     credential = egi;
                 }
@@ -219,20 +212,46 @@ public class MessageParsing {
 
     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);
-            myProxy.writeTrustRoots(PropertyValues.TRUSTED_CERTIFICATE_FOLDER);
-            GSSCredential cert = myProxy.get(accessKeyId, secretKey, 2 * 3600);
-            X509Credential gCred = ((GlobusGSSCredentialImpl) cert).getX509Credential();
-            gCred.save(new FileOutputStream("/tmp/x509up_u0"));
+            //After 10 years of grid comuting and using certificates we still can't get it to work.             
+//            MyProxy myProxy = new MyProxy(PropertyValues.MY_PROXY_ENDPOINT, 7512);
+//            myProxy.writeTrustRoots(PropertyValues.TRUSTED_CERTIFICATE_FOLDER);
+//            
+//            GSSCredential cert = myProxy.get(accessKeyId, secretKey, 2 * 3600);
+//            X509Credential gCred = ((GlobusGSSCredentialImpl) cert).getX509Credential();
+//            gCred.save(new FileOutputStream("/tmp/x509up_u0"));
+            String cmd = "myproxy-logon "
+                    + "--voms fedcloud.egi.eu "
+                    + "-s " + PropertyValues.MY_PROXY_ENDPOINT
+                    + " -l " + accessKeyId
+                    + " --stdin_pass"
+                    + " --out /tmp/x509up_u0";
+//
+            InputStream fileIn = new ByteArrayInputStream(secretKey.getBytes());
+            Process process = Runtime.getRuntime().exec(cmd);
+            OutputStream stdin = process.getOutputStream();
+            InputStream stdout = process.getInputStream();
+            InputStream stderr = process.getErrorStream();
+            pipeStream(fileIn, stdin);
         }
-
         return "/tmp/x509up_u0";
     }
 
-    private static void downloadCACertificates(URL url) throws MalformedURLException, IOException {
+    public static void pipeStream(InputStream input, OutputStream output)
+            throws IOException {
+        byte buffer[] = new byte[1024];
+        int numRead = 0;
+
+        do {
+            numRead = input.read(buffer);
+            output.write(buffer, 0, numRead);
+        } while (input.available() > 0);
+
+        output.flush();
+    }
 
-        String fileName = FilenameUtils.getBaseName(url.getFile());
+    private static void downloadCACertificates(URL url) throws MalformedURLException, IOException {
+        String[] parts = url.getFile().split("/");
+        String fileName = parts[parts.length - 1];
         File bundle = new File(PropertyValues.TRUSTED_CERTIFICATE_FOLDER + File.separator + fileName);
         if (!bundle.getParentFile().exists()) {
             if (!bundle.getParentFile().mkdirs()) {
@@ -240,8 +259,6 @@ public class MessageParsing {
             }
         }
 
-//        Path path = Paths.get(bundle.getAbsolutePath());
-//        BasicFileAttributes attr = Files.readAttributes(path, BasicFileAttributes.class);
         if (!bundle.exists()) {
             URL website = new URL(url.toString());
             ReadableByteChannel rbc = Channels.newChannel(website.openStream());
@@ -253,41 +270,62 @@ public class MessageParsing {
     }
 
     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();
+        Process p = Runtime.getRuntime().exec(" tar -xzvf " + tarFile.getAbsolutePath() + " -C " + dest.getAbsolutePath());
+        BufferedReader stdError = new BufferedReader(new InputStreamReader(p.getErrorStream()));
+        String s = null;
+        StringBuilder error = new StringBuilder();
+        while ((s = stdError.readLine()) != null) {
+            error.append(s);
         }
-        tarIn.close();
-
+        if (s != null) {
+            throw new IOException(error.toString());
+        }
+//        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);
+//                    }
+//                }
+////                Set<PosixFilePermission> perms = new HashSet<>();
+////                perms.add(PosixFilePermission.OWNER_READ);
+////                perms.add(PosixFilePermission.OWNER_WRITE);
+////                perms.add(PosixFilePermission.OWNER_EXECUTE);
+////
+////                perms.add(PosixFilePermission.GROUP_READ);
+////                perms.add(PosixFilePermission.GROUP_WRITE);
+////                perms.add(PosixFilePermission.GROUP_EXECUTE);
+////
+////                perms.add(PosixFilePermission.OTHERS_READ);
+////                perms.add(PosixFilePermission.OTHERS_EXECUTE);
+////                perms.add(PosixFilePermission.OTHERS_EXECUTE);
+////                Files.setPosixFilePermissions(Paths.get(destPath.getAbsolutePath()), perms);
+//            }
+//            tarEntry = tarIn.getNextTarEntry();
+//        }
+//        tarIn.close();
     }
 
 }

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

@@ -42,8 +42,7 @@ public class PropertyValues {
                 "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"));
+                "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");

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

@@ -376,7 +376,7 @@ public class Consumer extends DefaultConsumer {
 
     private Message killTopology(JSONArray parameters, String tempInputDirPath) throws Exception {
         TEngine tEngine = new TEngine();
-        TopologyAnalysisMain tam = null;
+        TopologyAnalysisMain tam;
 
         File topologyFile = MessageParsing.getTopologies(parameters, tempInputDirPath, 0).get(0);
         File mainTopologyFile = new File(tempInputDirPath + "topology_main.yml");