Skip to content

C
CONF
Commit 2ee716a9 authored by Spiros Koulouzis's avatar Spiros Koulouzis
Browse files
Options

scale down works

parent c156913c
Hide whitespace changes
Inline Side-by-side
Showing with 348 additions and 347 deletions
docs/apidocs/apidocs/downloads.html
View file @ 2ee716a9
...@@ -116,12 +116,12 @@ ...@@ -116,12 +116,12 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-json-client.jar"> <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-name">drip-api-json-client.jar</span></td>
<td><span class="downloadfile-size">16.80K</span></td> <td><span class="downloadfile-size">16.81K</span></td>
<td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td> <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
</tr> </tr>
<tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar"> <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-name">drip-api-json-client-json-sources.jar</span></td>
<td><span class="downloadfile-size">13.97K</span></td> <td><span class="downloadfile-size">13.96K</span></td>
<td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td> <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-xml-client.jar"> <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-name">drip-api-xml-client.jar</span></td>
<td><span class="downloadfile-size">24.60K</span></td> <td><span class="downloadfile-size">24.59K</span></td>
<td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td> <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
</tr> </tr>
<tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar"> <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-js.zip"> <tr class="clickable-row" data-href="drip-api-js.zip">
<td><span class="downloadfile-name">drip-api-js.zip</span></td> <td><span class="downloadfile-name">drip-api-js.zip</span></td>
<td><span class="downloadfile-size">5.26K</span></td> <td><span class="downloadfile-size">5.27K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td> <td><span class="downloadfile-description">&nbsp;</span></td>
</tr> </tr>
</tbody> </tbody>
......
docs/apidocs/apidocs/drip-api.rb
View file @ 2ee716a9
...@@ -1410,156 +1410,110 @@ module V1 ...@@ -1410,156 +1410,110 @@ module V1
module External module External
module Ansible
# (no documentation provided) # (no documentation provided)
class BenchmarkResult < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject class CloudCredentials < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# (no documentation provided) # the secret key
attr_accessor :vmType attr_accessor :secretKey
# (no documentation provided) # the cloudProviderName
attr_accessor :end attr_accessor :cloudProviderName
# (no documentation provided) # the accessKeyId
attr_accessor :start attr_accessor :accessKeyId
# (no documentation provided) # the attributes
attr_accessor :host attr_accessor :attributes
# (no documentation provided)
attr_accessor :delta
# (no documentation provided)
attr_accessor :cloudDeploymentDomain
# the json hash for this BenchmarkResult # the json hash for this CloudCredentials
def to_jaxb_json_hash def to_jaxb_json_hash
_h = super _h = super
_h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil? _h['secretKey'] = secretKey.to_jaxb_json_hash unless secretKey.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil? _h['cloudProviderName'] = cloudProviderName.to_jaxb_json_hash unless cloudProviderName.nil?
_h['start'] = start.to_jaxb_json_hash unless start.nil? _h['accessKeyId'] = accessKeyId.to_jaxb_json_hash unless accessKeyId.nil?
_h['host'] = host.to_jaxb_json_hash unless host.nil? _h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
_h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
return _h return _h
end end
#initializes this BenchmarkResult with a json hash #initializes this CloudCredentials with a json hash
def init_jaxb_json_hash(_o) def init_jaxb_json_hash(_o)
super _o super _o
if !_o['vmType'].nil? if !_o['secretKey'].nil?
_oa = _o['vmType'] _oa = _o['secretKey']
if(_oa.is_a? Hash)
@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
@vmType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@vmType.push String.from_json(_item)
else
@vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@vmType = _oa
end
end
if !_o['end'].nil?
_oa = _o['end']
if(_oa.is_a? Hash)
@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
@end = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@end.push Time.from_json(_item)
else
@end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@end = _oa
end
end
if !_o['start'].nil?
_oa = _o['start']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @secretKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@start = Time.from_json(_oa) unless _oa['@class'] @secretKey = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@start = Array.new @secretKey = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@start.push Time.from_json(_item) @secretKey.push String.from_json(_item)
else else
@start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @secretKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@start = _oa @secretKey = _oa
end end
end end
if !_o['host'].nil? if !_o['cloudProviderName'].nil?
_oa = _o['host'] _oa = _o['cloudProviderName']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@host = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @cloudProviderName = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@host = String.from_json(_oa) unless _oa['@class'] @cloudProviderName = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@host = Array.new @cloudProviderName = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@host.push String.from_json(_item) @cloudProviderName.push String.from_json(_item)
else else
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @cloudProviderName.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@host = _oa @cloudProviderName = _oa
end end
end end
if !_o['delta'].nil? if !_o['accessKeyId'].nil?
_oa = _o['delta'] _oa = _o['accessKeyId']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @accessKeyId = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@delta = Time.from_json(_oa) unless _oa['@class'] @accessKeyId = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@delta = Array.new @accessKeyId = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item) @accessKeyId.push String.from_json(_item)
else else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @accessKeyId.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@delta = _oa @accessKeyId = _oa
end end
end end
if !_o['cloudDeploymentDomain'].nil? if !_o['attributes'].nil?
_oa = _o['cloudDeploymentDomain'] _oa = _o['attributes']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@cloudDeploymentDomain = String.from_json(_oa) unless _oa['@class'] @attributes = Hash.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@cloudDeploymentDomain = Array.new @attributes = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@cloudDeploymentDomain.push String.from_json(_item) @attributes.push Hash.from_json(_item)
else else
@cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@cloudDeploymentDomain = _oa @attributes = _oa
end end
end end
end end
# constructs a BenchmarkResult from a (parsed) JSON hash # constructs a CloudCredentials from a (parsed) JSON hash
def self.from_json(o) def self.from_json(o)
if o.nil? if o.nil?
return nil return nil
...@@ -1589,8 +1543,6 @@ end ...@@ -1589,8 +1543,6 @@ end
end end
end
module Nl module Nl
module Uva module Uva
...@@ -1609,110 +1561,156 @@ module V1 ...@@ -1609,110 +1561,156 @@ module V1
module External module External
module Ansible
# (no documentation provided) # (no documentation provided)
class CloudCredentials < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject class BenchmarkResult < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# the secret key # (no documentation provided)
attr_accessor :secretKey attr_accessor :start
# the cloudProviderName # (no documentation provided)
attr_accessor :cloudProviderName attr_accessor :delta
# the accessKeyId # (no documentation provided)
attr_accessor :accessKeyId attr_accessor :cloudDeploymentDomain
# the attributes # (no documentation provided)
attr_accessor :attributes attr_accessor :vmType
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :host
# the json hash for this CloudCredentials # the json hash for this BenchmarkResult
def to_jaxb_json_hash def to_jaxb_json_hash
_h = super _h = super
_h['secretKey'] = secretKey.to_jaxb_json_hash unless secretKey.nil? _h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['cloudProviderName'] = cloudProviderName.to_jaxb_json_hash unless cloudProviderName.nil? _h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
_h['accessKeyId'] = accessKeyId.to_jaxb_json_hash unless accessKeyId.nil? _h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
_h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil? _h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil?
_h['host'] = host.to_jaxb_json_hash unless host.nil?
return _h return _h
end end
#initializes this CloudCredentials with a json hash #initializes this BenchmarkResult with a json hash
def init_jaxb_json_hash(_o) def init_jaxb_json_hash(_o)
super _o super _o
if !_o['secretKey'].nil? if !_o['start'].nil?
_oa = _o['secretKey'] _oa = _o['start']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@secretKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@secretKey = String.from_json(_oa) unless _oa['@class'] @start = Time.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@secretKey = Array.new @start = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@secretKey.push String.from_json(_item) @start.push Time.from_json(_item)
else else
@secretKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@secretKey = _oa @start = _oa
end end
end end
if !_o['cloudProviderName'].nil? if !_o['delta'].nil?
_oa = _o['cloudProviderName'] _oa = _o['delta']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@cloudProviderName = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@cloudProviderName = String.from_json(_oa) unless _oa['@class'] @delta = Time.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@cloudProviderName = Array.new @delta = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@cloudProviderName.push String.from_json(_item) @delta.push Time.from_json(_item)
else else
@cloudProviderName.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@cloudProviderName = _oa @delta = _oa
end end
end end
if !_o['accessKeyId'].nil? if !_o['cloudDeploymentDomain'].nil?
_oa = _o['accessKeyId'] _oa = _o['cloudDeploymentDomain']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@accessKeyId = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@accessKeyId = String.from_json(_oa) unless _oa['@class'] @cloudDeploymentDomain = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@accessKeyId = Array.new @cloudDeploymentDomain = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@accessKeyId.push String.from_json(_item) @cloudDeploymentDomain.push String.from_json(_item)
else else
@accessKeyId.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@accessKeyId = _oa @cloudDeploymentDomain = _oa
end end
end end
if !_o['attributes'].nil? if !_o['vmType'].nil?
_oa = _o['attributes'] _oa = _o['vmType']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @vmType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@attributes = Hash.from_json(_oa) unless _oa['@class'] @vmType = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@attributes = Array.new @vmType = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@attributes.push Hash.from_json(_item) @vmType.push String.from_json(_item)
else else
@attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@attributes = _oa @vmType = _oa
end
end
if !_o['end'].nil?
_oa = _o['end']
if(_oa.is_a? Hash)
@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
@end = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@end.push Time.from_json(_item)
else
@end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@end = _oa
end
end
if !_o['host'].nil?
_oa = _o['host']
if(_oa.is_a? Hash)
@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
@host = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@host.push String.from_json(_item)
else
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@host = _oa
end end
end end
end end
# constructs a CloudCredentials from a (parsed) JSON hash # constructs a BenchmarkResult from a (parsed) JSON hash
def self.from_json(o) def self.from_json(o)
if o.nil? if o.nil?
return nil return nil
...@@ -1742,6 +1740,8 @@ end ...@@ -1742,6 +1740,8 @@ end
end end
end
module Nl module Nl
module Uva module Uva
......
docs/apidocs/apidocs/json_BenchmarkResult.html
View file @ 2ee716a9
...@@ -81,34 +81,34 @@ class</p> ...@@ -81,34 +81,34 @@ class</p>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">cloudDeploymentDomain</span> <td> <span class="property-name">start</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">number
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">end</span> <td> <span class="property-name">host</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">delta</span> <td> <span class="property-name">vmType</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">host</span> <td> <span class="property-name">cloudDeploymentDomain</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -117,16 +117,16 @@ class</p> ...@@ -117,16 +117,16 @@ class</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">vmType</span> <td> <span class="property-name">delta</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">number
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">start</span> <td> <span class="property-name">end</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">number
</span> </span>
...@@ -165,12 +165,12 @@ object is saved.</span></td> ...@@ -165,12 +165,12 @@ object is saved.</span></td>
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;, &quot;start&quot; : 12345,
&quot;end&quot; : 12345,
&quot;delta&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;, &quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;vmType&quot; : &quot;...&quot;, &quot;vmType&quot; : &quot;...&quot;,
&quot;start&quot; : 12345, &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;delta&quot; : 12345,
&quot;end&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;, &quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011 &quot;timestamp&quot; : 1499793079011
......
docs/apidocs/apidocs/json_OwnedObject.html
View file @ 2ee716a9
...@@ -69,7 +69,7 @@ class</p> ...@@ -69,7 +69,7 @@ class</p>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Subtypes</dt> <dt>Subtypes</dt>
<dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd> <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
</dl> </dl>
<table class="table datatype-properties"> <table class="table datatype-properties">
......
docs/apidocs/apidocs/ns0.xsd
View file @ 2ee716a9
...@@ -804,16 +804,16 @@ class]]> ...@@ -804,16 +804,16 @@ class]]>
<xs:complexContent> <xs:complexContent>
<xs:extension base="ownedObject"> <xs:extension base="ownedObject">
<xs:sequence> <xs:sequence>
<xs:element name="start" type="xs:dateTime" minOccurs="0"> <xs:element name="delta" type="xs:dateTime" minOccurs="0">
</xs:element> </xs:element>
<xs:element name="end" type="xs:dateTime" minOccurs="0"> <xs:element name="end" type="xs:dateTime" minOccurs="0">
</xs:element> </xs:element>
<xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0"> <xs:element name="start" type="xs:dateTime" minOccurs="0">
</xs:element>
<xs:element name="delta" type="xs:dateTime" minOccurs="0">
</xs:element> </xs:element>
<xs:element name="host" type="xs:string" minOccurs="0"> <xs:element name="host" type="xs:string" minOccurs="0">
</xs:element> </xs:element>
<xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
</xs:element>
<xs:element name="vmType" type="xs:string" minOccurs="0"> <xs:element name="vmType" type="xs:string" minOccurs="0">
</xs:element> </xs:element>
</xs:sequence> </xs:sequence>
......
docs/apidocs/apidocs/resource_BenchmarkController.html
View file @ 2ee716a9
...@@ -144,12 +144,12 @@ Content-Type: application/json ...@@ -144,12 +144,12 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
[ { [ {
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;, &quot;start&quot; : 12345,
&quot;end&quot; : 12345,
&quot;delta&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;, &quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;vmType&quot; : &quot;...&quot;, &quot;vmType&quot; : &quot;...&quot;,
&quot;start&quot; : 12345, &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;delta&quot; : 12345,
&quot;end&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;, &quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011 &quot;timestamp&quot; : 1499793079011
...@@ -514,12 +514,12 @@ Content-Type: application/json ...@@ -514,12 +514,12 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;, &quot;start&quot; : 12345,
&quot;end&quot; : 12345,
&quot;delta&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;, &quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;vmType&quot; : &quot;...&quot;, &quot;vmType&quot; : &quot;...&quot;,
&quot;start&quot; : 12345, &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;delta&quot; : 12345,
&quot;end&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;, &quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011 &quot;timestamp&quot; : 1499793079011
......
docs/apidocs/apidocs/xml_ns0_benchmarkResult.html
View file @ 2ee716a9
...@@ -231,11 +231,11 @@ the DAO saves the object based on the principal how made the call</span></td> ...@@ -231,11 +231,11 @@ the DAO saves the object based on the principal how made the call</span></td>
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;b-----&gt; <pre class="prettyprint language-xml example">&lt;b-----&gt;
&lt;start&gt;...&lt;/start&gt;
&lt;end&gt;...&lt;/end&gt;
&lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
&lt;delta&gt;...&lt;/delta&gt; &lt;delta&gt;...&lt;/delta&gt;
&lt;end&gt;...&lt;/end&gt;
&lt;start&gt;...&lt;/start&gt;
&lt;host&gt;147.228.242.58&lt;/host&gt; &lt;host&gt;147.228.242.58&lt;/host&gt;
&lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
&lt;vmType&gt;...&lt;/vmType&gt; &lt;vmType&gt;...&lt;/vmType&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;1499793079011&lt;/timestamp&gt; &lt;timestamp&gt;1499793079011&lt;/timestamp&gt;
......
docs/apidocs/downloads.html
View file @ 2ee716a9
...@@ -116,12 +116,12 @@ ...@@ -116,12 +116,12 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-json-client.jar"> <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-name">drip-api-json-client.jar</span></td>
<td><span class="downloadfile-size">16.80K</span></td> <td><span class="downloadfile-size">16.81K</span></td>
<td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td> <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
</tr> </tr>
<tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar"> <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-name">drip-api-json-client-json-sources.jar</span></td>
<td><span class="downloadfile-size">13.97K</span></td> <td><span class="downloadfile-size">13.96K</span></td>
<td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td> <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
</tr> </tr>
</tbody> </tbody>
...@@ -144,7 +144,7 @@ ...@@ -144,7 +144,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-xml-client.jar"> <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-name">drip-api-xml-client.jar</span></td>
<td><span class="downloadfile-size">24.60K</span></td> <td><span class="downloadfile-size">24.59K</span></td>
<td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td> <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
</tr> </tr>
<tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar"> <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
...@@ -184,7 +184,7 @@ ...@@ -184,7 +184,7 @@
<tbody data-link="row" class="rowlink"> <tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-js.zip"> <tr class="clickable-row" data-href="drip-api-js.zip">
<td><span class="downloadfile-name">drip-api-js.zip</span></td> <td><span class="downloadfile-name">drip-api-js.zip</span></td>
<td><span class="downloadfile-size">5.26K</span></td> <td><span class="downloadfile-size">5.27K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td> <td><span class="downloadfile-description">&nbsp;</span></td>
</tr> </tr>
</tbody> </tbody>
......
docs/apidocs/drip-api.rb
View file @ 2ee716a9
...@@ -1410,156 +1410,110 @@ module V1 ...@@ -1410,156 +1410,110 @@ module V1
module External module External
module Ansible
# (no documentation provided) # (no documentation provided)
class BenchmarkResult < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject class CloudCredentials < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# (no documentation provided) # the secret key
attr_accessor :vmType attr_accessor :secretKey
# (no documentation provided) # the cloudProviderName
attr_accessor :end attr_accessor :cloudProviderName
# (no documentation provided) # the accessKeyId
attr_accessor :start attr_accessor :accessKeyId
# (no documentation provided) # the attributes
attr_accessor :host attr_accessor :attributes
# (no documentation provided)
attr_accessor :delta
# (no documentation provided)
attr_accessor :cloudDeploymentDomain
# the json hash for this BenchmarkResult # the json hash for this CloudCredentials
def to_jaxb_json_hash def to_jaxb_json_hash
_h = super _h = super
_h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil? _h['secretKey'] = secretKey.to_jaxb_json_hash unless secretKey.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil? _h['cloudProviderName'] = cloudProviderName.to_jaxb_json_hash unless cloudProviderName.nil?
_h['start'] = start.to_jaxb_json_hash unless start.nil? _h['accessKeyId'] = accessKeyId.to_jaxb_json_hash unless accessKeyId.nil?
_h['host'] = host.to_jaxb_json_hash unless host.nil? _h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
_h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
return _h return _h
end end
#initializes this BenchmarkResult with a json hash #initializes this CloudCredentials with a json hash
def init_jaxb_json_hash(_o) def init_jaxb_json_hash(_o)
super _o super _o
if !_o['vmType'].nil? if !_o['secretKey'].nil?
_oa = _o['vmType'] _oa = _o['secretKey']
if(_oa.is_a? Hash)
@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
@vmType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@vmType.push String.from_json(_item)
else
@vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@vmType = _oa
end
end
if !_o['end'].nil?
_oa = _o['end']
if(_oa.is_a? Hash)
@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
@end = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@end.push Time.from_json(_item)
else
@end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@end = _oa
end
end
if !_o['start'].nil?
_oa = _o['start']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @secretKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@start = Time.from_json(_oa) unless _oa['@class'] @secretKey = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@start = Array.new @secretKey = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@start.push Time.from_json(_item) @secretKey.push String.from_json(_item)
else else
@start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @secretKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@start = _oa @secretKey = _oa
end end
end end
if !_o['host'].nil? if !_o['cloudProviderName'].nil?
_oa = _o['host'] _oa = _o['cloudProviderName']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@host = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @cloudProviderName = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@host = String.from_json(_oa) unless _oa['@class'] @cloudProviderName = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@host = Array.new @cloudProviderName = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@host.push String.from_json(_item) @cloudProviderName.push String.from_json(_item)
else else
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @cloudProviderName.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@host = _oa @cloudProviderName = _oa
end end
end end
if !_o['delta'].nil? if !_o['accessKeyId'].nil?
_oa = _o['delta'] _oa = _o['accessKeyId']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @accessKeyId = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@delta = Time.from_json(_oa) unless _oa['@class'] @accessKeyId = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@delta = Array.new @accessKeyId = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item) @accessKeyId.push String.from_json(_item)
else else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @accessKeyId.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@delta = _oa @accessKeyId = _oa
end end
end end
if !_o['cloudDeploymentDomain'].nil? if !_o['attributes'].nil?
_oa = _o['cloudDeploymentDomain'] _oa = _o['attributes']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@cloudDeploymentDomain = String.from_json(_oa) unless _oa['@class'] @attributes = Hash.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@cloudDeploymentDomain = Array.new @attributes = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@cloudDeploymentDomain.push String.from_json(_item) @attributes.push Hash.from_json(_item)
else else
@cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@cloudDeploymentDomain = _oa @attributes = _oa
end end
end end
end end
# constructs a BenchmarkResult from a (parsed) JSON hash # constructs a CloudCredentials from a (parsed) JSON hash
def self.from_json(o) def self.from_json(o)
if o.nil? if o.nil?
return nil return nil
...@@ -1589,8 +1543,6 @@ end ...@@ -1589,8 +1543,6 @@ end
end end
end
module Nl module Nl
module Uva module Uva
...@@ -1609,110 +1561,156 @@ module V1 ...@@ -1609,110 +1561,156 @@ module V1
module External module External
module Ansible
# (no documentation provided) # (no documentation provided)
class CloudCredentials < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject class BenchmarkResult < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# the secret key # (no documentation provided)
attr_accessor :secretKey attr_accessor :start
# the cloudProviderName # (no documentation provided)
attr_accessor :cloudProviderName attr_accessor :delta
# the accessKeyId # (no documentation provided)
attr_accessor :accessKeyId attr_accessor :cloudDeploymentDomain
# the attributes # (no documentation provided)
attr_accessor :attributes attr_accessor :vmType
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :host
# the json hash for this CloudCredentials # the json hash for this BenchmarkResult
def to_jaxb_json_hash def to_jaxb_json_hash
_h = super _h = super
_h['secretKey'] = secretKey.to_jaxb_json_hash unless secretKey.nil? _h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['cloudProviderName'] = cloudProviderName.to_jaxb_json_hash unless cloudProviderName.nil? _h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
_h['accessKeyId'] = accessKeyId.to_jaxb_json_hash unless accessKeyId.nil? _h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
_h['attributes'] = attributes.to_jaxb_json_hash unless attributes.nil? _h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil?
_h['host'] = host.to_jaxb_json_hash unless host.nil?
return _h return _h
end end
#initializes this CloudCredentials with a json hash #initializes this BenchmarkResult with a json hash
def init_jaxb_json_hash(_o) def init_jaxb_json_hash(_o)
super _o super _o
if !_o['secretKey'].nil? if !_o['start'].nil?
_oa = _o['secretKey'] _oa = _o['start']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@secretKey = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@secretKey = String.from_json(_oa) unless _oa['@class'] @start = Time.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@secretKey = Array.new @start = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@secretKey.push String.from_json(_item) @start.push Time.from_json(_item)
else else
@secretKey.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@secretKey = _oa @start = _oa
end end
end end
if !_o['cloudProviderName'].nil? if !_o['delta'].nil?
_oa = _o['cloudProviderName'] _oa = _o['delta']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@cloudProviderName = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@cloudProviderName = String.from_json(_oa) unless _oa['@class'] @delta = Time.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@cloudProviderName = Array.new @delta = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@cloudProviderName.push String.from_json(_item) @delta.push Time.from_json(_item)
else else
@cloudProviderName.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@cloudProviderName = _oa @delta = _oa
end end
end end
if !_o['accessKeyId'].nil? if !_o['cloudDeploymentDomain'].nil?
_oa = _o['accessKeyId'] _oa = _o['cloudDeploymentDomain']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@accessKeyId = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@accessKeyId = String.from_json(_oa) unless _oa['@class'] @cloudDeploymentDomain = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@accessKeyId = Array.new @cloudDeploymentDomain = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@accessKeyId.push String.from_json(_item) @cloudDeploymentDomain.push String.from_json(_item)
else else
@accessKeyId.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@accessKeyId = _oa @cloudDeploymentDomain = _oa
end end
end end
if !_o['attributes'].nil? if !_o['vmType'].nil?
_oa = _o['attributes'] _oa = _o['vmType']
if(_oa.is_a? Hash) if(_oa.is_a? Hash)
@attributes = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class'] @vmType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@attributes = Hash.from_json(_oa) unless _oa['@class'] @vmType = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array) elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar #an array(of hashes hopefully) or scalar
@attributes = Array.new @vmType = Array.new
_oa.each { | _item | _oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true) if ((_item.nil? || _item['@class'].nil?)rescue true)
@attributes.push Hash.from_json(_item) @vmType.push String.from_json(_item)
else else
@attributes.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item) @vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end end
} }
else else
@attributes = _oa @vmType = _oa
end
end
if !_o['end'].nil?
_oa = _o['end']
if(_oa.is_a? Hash)
@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
@end = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@end.push Time.from_json(_item)
else
@end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@end = _oa
end
end
if !_o['host'].nil?
_oa = _o['host']
if(_oa.is_a? Hash)
@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
@host = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@host.push String.from_json(_item)
else
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@host = _oa
end end
end end
end end
# constructs a CloudCredentials from a (parsed) JSON hash # constructs a BenchmarkResult from a (parsed) JSON hash
def self.from_json(o) def self.from_json(o)
if o.nil? if o.nil?
return nil return nil
...@@ -1742,6 +1740,8 @@ end ...@@ -1742,6 +1740,8 @@ end
end end
end
module Nl module Nl
module Uva module Uva
......
docs/apidocs/json_BenchmarkResult.html
View file @ 2ee716a9
...@@ -81,7 +81,7 @@ class</p> ...@@ -81,7 +81,7 @@ class</p>
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<td> <span class="property-name">vmType</span> <td> <span class="property-name">cloudDeploymentDomain</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">string
</span> </span>
...@@ -117,18 +117,18 @@ class</p> ...@@ -117,18 +117,18 @@ class</p>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">cloudDeploymentDomain</span> <td> <span class="property-name">start</span>
</td> </td>
<td> <span class="datatype-reference">string <td> <span class="datatype-reference">number
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
</td> </td>
</tr> </tr>
<tr> <tr>
<td> <span class="property-name">start</span> <td> <span class="property-name">vmType</span>
</td> </td>
<td> <span class="datatype-reference">number <td> <span class="datatype-reference">string
</span> </span>
</td> </td>
<td> <span class="property-description"></span> <td> <span class="property-description"></span>
...@@ -165,12 +165,12 @@ object is saved.</span></td> ...@@ -165,12 +165,12 @@ object is saved.</span></td>
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-js example">{ <pre class="prettyprint language-js example">{
&quot;vmType&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;host&quot; : &quot;147.228.242.58&quot;, &quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;end&quot; : 12345, &quot;end&quot; : 12345,
&quot;delta&quot; : 12345, &quot;delta&quot; : 12345,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345, &quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011 &quot;timestamp&quot; : 1499793079011
......
docs/apidocs/json_OwnedObject.html
View file @ 2ee716a9
...@@ -69,7 +69,7 @@ class</p> ...@@ -69,7 +69,7 @@ class</p>
<dl class="dl-horizontal"> <dl class="dl-horizontal">
<dt>Subtypes</dt> <dt>Subtypes</dt>
<dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd> <dd><a href="json_KeyPair.html">KeyPair</a>, <a href="json_ScaleRequest.html">ScaleRequest</a>, <a href="json_AnsibleOutput.html">AnsibleOutput</a>, <a href="json_CloudCredentials.html">CloudCredentials</a>, <a href="json_BenchmarkResult.html">BenchmarkResult</a>, <a href="json_DeployResponse.html">DeployResponse</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
</dl> </dl>
<table class="table datatype-properties"> <table class="table datatype-properties">
......
docs/apidocs/ns0.xsd
View file @ 2ee716a9
...@@ -804,10 +804,6 @@ class]]> ...@@ -804,10 +804,6 @@ class]]>
<xs:complexContent> <xs:complexContent>
<xs:extension base="ownedObject"> <xs:extension base="ownedObject">
<xs:sequence> <xs:sequence>
<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="cloudDeploymentDomain" type="xs:string" minOccurs="0"> <xs:element name="cloudDeploymentDomain" type="xs:string" minOccurs="0">
</xs:element> </xs:element>
<xs:element name="start" type="xs:dateTime" minOccurs="0"> <xs:element name="start" type="xs:dateTime" minOccurs="0">
...@@ -816,6 +812,10 @@ class]]> ...@@ -816,6 +812,10 @@ class]]>
</xs:element> </xs:element>
<xs:element name="end" type="xs:dateTime" minOccurs="0"> <xs:element name="end" type="xs:dateTime" minOccurs="0">
</xs:element> </xs:element>
<xs:element name="vmType" type="xs:string" minOccurs="0">
</xs:element>
<xs:element name="delta" type="xs:dateTime" minOccurs="0">
</xs:element>
</xs:sequence> </xs:sequence>
</xs:extension> </xs:extension>
</xs:complexContent> </xs:complexContent>
......
docs/apidocs/resource_BenchmarkController.html
View file @ 2ee716a9
...@@ -144,12 +144,12 @@ Content-Type: application/json ...@@ -144,12 +144,12 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
[ { [ {
&quot;vmType&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;host&quot; : &quot;147.228.242.58&quot;, &quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;end&quot; : 12345, &quot;end&quot; : 12345,
&quot;delta&quot; : 12345, &quot;delta&quot; : 12345,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345, &quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011 &quot;timestamp&quot; : 1499793079011
...@@ -514,12 +514,12 @@ Content-Type: application/json ...@@ -514,12 +514,12 @@ Content-Type: application/json
<code class="prettyprint language-js"> <code class="prettyprint language-js">
{ {
&quot;vmType&quot; : &quot;...&quot;, &quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;host&quot; : &quot;147.228.242.58&quot;, &quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;end&quot; : 12345, &quot;end&quot; : 12345,
&quot;delta&quot; : 12345, &quot;delta&quot; : 12345,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345, &quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;owner&quot; : &quot;user1&quot;, &quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011 &quot;timestamp&quot; : 1499793079011
......
docs/apidocs/xml_ns0_benchmarkResult.html
View file @ 2ee716a9
...@@ -231,12 +231,12 @@ the DAO saves the object based on the principal how made the call</span></td> ...@@ -231,12 +231,12 @@ the DAO saves the object based on the principal how made the call</span></td>
<p class="lead">Example</p> <p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;b-----&gt; <pre class="prettyprint language-xml example">&lt;b-----&gt;
&lt;vmType&gt;...&lt;/vmType&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt; &lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
&lt;start&gt;...&lt;/start&gt; &lt;start&gt;...&lt;/start&gt;
&lt;host&gt;147.228.242.58&lt;/host&gt; &lt;host&gt;147.228.242.58&lt;/host&gt;
&lt;end&gt;...&lt;/end&gt; &lt;end&gt;...&lt;/end&gt;
&lt;vmType&gt;...&lt;/vmType&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;owner&gt;user1&lt;/owner&gt; &lt;owner&gt;user1&lt;/owner&gt;
&lt;timestamp&gt;1499793079011&lt;/timestamp&gt; &lt;timestamp&gt;1499793079011&lt;/timestamp&gt;
&lt;/b-----&gt; &lt;/b-----&gt;
......
drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
View file @ 2ee716a9
...@@ -482,13 +482,14 @@ public class ProvisionService { ...@@ -482,13 +482,14 @@ public class ProvisionService {
Map<String, Object> subMap = (Map<String, Object>) plan.get(key); Map<String, Object> subMap = (Map<String, Object>) plan.get(key);
if (subMap.containsKey("topologies")) { if (subMap.containsKey("topologies")) {
List< Map<String, Object>> topologies = (List< Map<String, Object>>) subMap.get("topologies"); List< Map<String, Object>> topologies = (List< Map<String, Object>>) subMap.get("topologies");
for (Map<String, Object> topology : topologies) { for (Map<String, Object> topology : topologies) {
if (topology.get("tag").equals("scaling") && topology.get("topology").equals(scaleName) && !scaleNameExists) { if (topology.get("tag").equals("scaling") && topology.get("topology").equals(scaleName) && !scaleNameExists) {
cloudProvider = (String) topology.get("cloudProvider"); cloudProvider = (String) topology.get("cloudProvider");
domain = (String) topology.get("domain"); domain = (String) topology.get("domain");
scaleNameExists = true; scaleNameExists = true;
} else if (topology.get("tag").equals("scaled") && topology.get("copyOf").equals(scaleName)) { } else if (topology.get("tag").equals("scaled")
&& topology.get("status").equals("running")
&& topology.get("copyOf").equals(scaleName)) {
currentNumOfInstances++; currentNumOfInstances++;
} }
} }
......
drip-provisioner/src/main/java/nl/uva/sne/drip/drip/provisioner/v1/Consumer.java
View file @ 2ee716a9
...@@ -611,7 +611,7 @@ public class Consumer extends DefaultConsumer { ...@@ -611,7 +611,7 @@ public class Consumer extends DefaultConsumer {
for (SubTopologyInfo sub : tam.wholeTopology.topologies) { for (SubTopologyInfo sub : tam.wholeTopology.topologies) {
ArrayList<VM> vms = sub.subTopology.getVMsinSubClass(); ArrayList<VM> vms = sub.subTopology.getVMsinSubClass();
for (VM vm : vms) { for (VM vm : vms) {
if (vm != null) { if (vm != null && sub.status.equals("running")) {
paramValue += vm.publicAddress + " "; paramValue += vm.publicAddress + " ";
paramValue += sub.userName + " "; paramValue += sub.userName + " ";
// paramValue += tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa"; // paramValue += tempInputDirPath + File.separator + sub.subTopology.accessKeyPair.SSHKeyPairId + File.separator + "id_rsa";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment