Skip to content

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

fixed bug with version

parent bdc63864
Hide whitespace changes
Inline Side-by-side
Showing with 982 additions and 973 deletions
docs/apidocs/apidocs/downloads.html
View file @ a6d7851a
......@@ -72,7 +72,7 @@
<h1 class="page-header">Files and Libraries</h1>
<h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p> <p>
The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
can be used to access the Web service API for this application.
......@@ -97,7 +97,7 @@
</tbody>
</table>
<h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The Java client-side library is used to provide the set of Java objects that can be serialized
to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>. This is useful for accessing the
......@@ -127,7 +127,7 @@
</tbody>
</table>
<h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The Java client-side library is used to access the Web service API for this application using Java.
</p>
......@@ -149,13 +149,13 @@
</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">23.28K</span></td>
<td><span class="downloadfile-size">23.27K</span></td>
<td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_js_client_library">JavaScript Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
This is useful for accessing the resources that are published by this application, but only
......@@ -184,13 +184,13 @@
<tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-js.zip">
<td><span class="downloadfile-name">drip-api-js.zip</span></td>
<td><span class="downloadfile-size">5.91K</span></td>
<td><span class="downloadfile-size">6.05K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
This is useful for accessing the resources that are published by this application, but only
......@@ -213,13 +213,13 @@
<tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-php.zip">
<td><span class="downloadfile-name">drip-api-php.zip</span></td>
<td><span class="downloadfile-size">6.78K</span></td>
<td><span class="downloadfile-size">6.75K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
This is useful for accessing the resources that are published by this application, but only
......@@ -245,13 +245,13 @@
<tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-php.zip">
<td><span class="downloadfile-name">drip-api-php.zip</span></td>
<td><span class="downloadfile-size">9.63K</span></td>
<td><span class="downloadfile-size">9.61K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
This is useful for accessing the REST endpoints that are published by this application, but only
......
docs/apidocs/apidocs/drip-api.rb
View file @ a6d7851a
......@@ -93,92 +93,208 @@ module V1
module External
module Ansible
# (no documentation provided)
class DeployParameter
class AnsibleResult
# the IP
attr_accessor :IP
# the user
attr_accessor :user
# the role
attr_accessor :role
# (no documentation provided)
attr_accessor :msg
# (no documentation provided)
attr_accessor :changed
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :stdout
# (no documentation provided)
attr_accessor :cmd
# (no documentation provided)
attr_accessor :start
# (no documentation provided)
attr_accessor :stderr
# (no documentation provided)
attr_accessor :delta
# the json hash for this DeployParameter
# the json hash for this AnsibleResult
def to_jaxb_json_hash
_h = {}
_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?
_h['msg'] = msg.to_jaxb_json_hash unless msg.nil?
_h['changed'] = changed.to_jaxb_json_hash unless changed.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil?
_h['stdout'] = stdout.to_jaxb_json_hash unless stdout.nil?
if !cmd.nil?
_ha = Array.new
cmd.each { | _item | _ha.push _item.to_jaxb_json_hash }
_h['cmd'] = _ha
end
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['stderr'] = stderr.to_jaxb_json_hash unless stderr.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
return _h
end
# the json (string form) for this DeployParameter
# the json (string form) for this AnsibleResult
def to_json
to_jaxb_json_hash.to_json
end
#initializes this DeployParameter with a json hash
#initializes this AnsibleResult with a json hash
def init_jaxb_json_hash(_o)
if !_o['IP'].nil?
_oa = _o['IP']
if !_o['msg'].nil?
_oa = _o['msg']
if(_oa.is_a? Hash)
@IP = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@IP = String.from_json(_oa) unless _oa['@class']
@msg = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@msg = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@IP = Array.new
@msg = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@IP.push String.from_json(_item)
@msg.push String.from_json(_item)
else
@IP.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@msg.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@IP = _oa
@msg = _oa
end
end
if !_o['user'].nil?
_oa = _o['user']
if !_o['changed'].nil?
_oa = _o['changed']
if(_oa.is_a? Hash)
@user = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@user = String.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
@user = Array.new
@changed = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@user.push String.from_json(_item)
@changed.push Boolean.from_json(_item)
else
@user.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@changed.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@user = _oa
@changed = _oa
end
end
if !_o['role'].nil?
_oa = _o['role']
if !_o['end'].nil?
_oa = _o['end']
if(_oa.is_a? Hash)
@role = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@role = 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
@role = Array.new
@end = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@role.push String.from_json(_item)
@end.push Time.from_json(_item)
else
@role.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@role = _oa
@end = _oa
end
end
if !_o['stdout'].nil?
_oa = _o['stdout']
if(_oa.is_a? Hash)
@stdout = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stdout = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stdout = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stdout.push String.from_json(_item)
else
@stdout.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stdout = _oa
end
end
if !_o['cmd'].nil?
_oa = _o['cmd']
if(_oa.is_a? Hash)
@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
@cmd = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@cmd.push String.from_json(_item)
else
@cmd.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@cmd = _oa
end
end
if !_o['start'].nil?
_oa = _o['start']
if(_oa.is_a? Hash)
@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
@start = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@start.push Time.from_json(_item)
else
@start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@start = _oa
end
end
if !_o['stderr'].nil?
_oa = _o['stderr']
if(_oa.is_a? Hash)
@stderr = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stderr = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stderr = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stderr.push String.from_json(_item)
else
@stderr.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stderr = _oa
end
end
if !_o['delta'].nil?
_oa = _o['delta']
if(_oa.is_a? Hash)
@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
@delta = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item)
else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@delta = _oa
end
end
end
# constructs a DeployParameter from a (parsed) JSON hash
# constructs a AnsibleResult from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
......@@ -208,6 +324,8 @@ end
end
end
module Nl
module Uva
......@@ -355,212 +473,96 @@ module Commons
module Data
module V1
module External
module Ansible
# (no documentation provided)
class AnsibleResult
# (no documentation provided)
attr_accessor :msg
# (no documentation provided)
attr_accessor :changed
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :stdout
# (no documentation provided)
attr_accessor :cmd
# (no documentation provided)
attr_accessor :start
# (no documentation provided)
attr_accessor :stderr
# (no documentation provided)
attr_accessor :delta
# the json hash for this AnsibleResult
def to_jaxb_json_hash
_h = {}
_h['msg'] = msg.to_jaxb_json_hash unless msg.nil?
_h['changed'] = changed.to_jaxb_json_hash unless changed.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil?
_h['stdout'] = stdout.to_jaxb_json_hash unless stdout.nil?
if !cmd.nil?
_ha = Array.new
cmd.each { | _item | _ha.push _item.to_jaxb_json_hash }
_h['cmd'] = _ha
end
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['stderr'] = stderr.to_jaxb_json_hash unless stderr.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
return _h
end
# the json (string form) for this AnsibleResult
def to_json
to_jaxb_json_hash.to_json
end
#initializes this AnsibleResult with a json hash
def init_jaxb_json_hash(_o)
if !_o['msg'].nil?
_oa = _o['msg']
if(_oa.is_a? Hash)
@msg = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@msg = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@msg = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@msg.push String.from_json(_item)
else
@msg.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@msg = _oa
end
end
if !_o['changed'].nil?
_oa = _o['changed']
if(_oa.is_a? Hash)
@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
@changed = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@changed.push Boolean.from_json(_item)
else
@changed.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@changed = _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['stdout'].nil?
_oa = _o['stdout']
if(_oa.is_a? Hash)
@stdout = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stdout = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stdout = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stdout.push String.from_json(_item)
else
@stdout.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stdout = _oa
end
end
if !_o['cmd'].nil?
_oa = _o['cmd']
if(_oa.is_a? Hash)
@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
@cmd = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@cmd.push String.from_json(_item)
else
@cmd.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@cmd = _oa
end
end
if !_o['start'].nil?
_oa = _o['start']
module V1
module External
# (no documentation provided)
class DeployParameter
# the IP
attr_accessor :IP
# the user
attr_accessor :user
# the role
attr_accessor :role
# the json hash for this DeployParameter
def to_jaxb_json_hash
_h = {}
_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
# the json (string form) for this DeployParameter
def to_json
to_jaxb_json_hash.to_json
end
#initializes this DeployParameter with a json hash
def init_jaxb_json_hash(_o)
if !_o['IP'].nil?
_oa = _o['IP']
if(_oa.is_a? Hash)
@start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@start = Time.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
@start = Array.new
@IP = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@start.push Time.from_json(_item)
@IP.push String.from_json(_item)
else
@start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@IP.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@start = _oa
@IP = _oa
end
end
if !_o['stderr'].nil?
_oa = _o['stderr']
if !_o['user'].nil?
_oa = _o['user']
if(_oa.is_a? Hash)
@stderr = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stderr = String.from_json(_oa) unless _oa['@class']
@user = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@user = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stderr = Array.new
@user = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stderr.push String.from_json(_item)
@user.push String.from_json(_item)
else
@stderr.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@user.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stderr = _oa
@user = _oa
end
end
if !_o['delta'].nil?
_oa = _o['delta']
if !_o['role'].nil?
_oa = _o['role']
if(_oa.is_a? Hash)
@delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@delta = Time.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
@delta = Array.new
@role = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item)
@role.push String.from_json(_item)
else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@role.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@delta = _oa
@role = _oa
end
end
end
# constructs a AnsibleResult from a (parsed) JSON hash
# constructs a DeployParameter from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
......@@ -590,8 +592,6 @@ end
end
end
module Nl
module Uva
......@@ -1633,187 +1633,12 @@ module External
end
}
else
@contents = _oa
end
end
end
# constructs a Script from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
else
inst = new
inst.init_jaxb_json_hash o
return inst
end
end
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
class KeyType
# For private keys
PRIVATE = "PRIVATE"
# For public keys
PUBLIC = "PUBLIC"
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
class DeployRequest < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# the provisionID
attr_accessor :provisionID
# the managerType
attr_accessor :managerType
# the configurationID
attr_accessor :configurationID
# the json hash for this DeployRequest
def to_jaxb_json_hash
_h = super
_h['provisionID'] = provisionID.to_jaxb_json_hash unless provisionID.nil?
_h['managerType'] = managerType.to_jaxb_json_hash unless managerType.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['provisionID'].nil?
_oa = _o['provisionID']
if(_oa.is_a? Hash)
@provisionID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@provisionID = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@provisionID = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@provisionID.push String.from_json(_item)
else
@provisionID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@provisionID = _oa
end
end
if !_o['managerType'].nil?
_oa = _o['managerType']
if(_oa.is_a? Hash)
@managerType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@managerType = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@managerType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@managerType.push String.from_json(_item)
else
@managerType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@managerType = _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
@contents = _oa
end
end
end
# constructs a DeployRequest from a (parsed) JSON hash
# constructs a Script from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
......@@ -1859,6 +1684,52 @@ module Data
module V1
module External
# (no documentation provided)
class KeyType
# For private keys
PRIVATE = "PRIVATE"
# For public keys
PUBLIC = "PUBLIC"
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
......@@ -2054,6 +1925,135 @@ module Data
module V1
module External
# (no documentation provided)
class DeployRequest < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# the provisionID
attr_accessor :provisionID
# the managerType
attr_accessor :managerType
# the configurationID
attr_accessor :configurationID
# the json hash for this DeployRequest
def to_jaxb_json_hash
_h = super
_h['provisionID'] = provisionID.to_jaxb_json_hash unless provisionID.nil?
_h['managerType'] = managerType.to_jaxb_json_hash unless managerType.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['provisionID'].nil?
_oa = _o['provisionID']
if(_oa.is_a? Hash)
@provisionID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@provisionID = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@provisionID = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@provisionID.push String.from_json(_item)
else
@provisionID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@provisionID = _oa
end
end
if !_o['managerType'].nil?
_oa = _o['managerType']
if(_oa.is_a? Hash)
@managerType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@managerType = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@managerType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@managerType.push String.from_json(_item)
else
@managerType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@managerType = _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
def self.from_json(o)
if o.nil?
return nil
else
inst = new
inst.init_jaxb_json_hash o
return inst
end
end
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
......@@ -2149,25 +2149,25 @@ module Ansible
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :host
attr_accessor :delta
# (no documentation provided)
attr_accessor :cloudDeploymentDomain
attr_accessor :vmType
# (no documentation provided)
attr_accessor :start
# (no documentation provided)
attr_accessor :vmType
attr_accessor :host
# (no documentation provided)
attr_accessor :delta
attr_accessor :cloudDeploymentDomain
# 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['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['host'] = host.to_jaxb_json_hash unless host.nil?
_h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
return _h
end
......@@ -2193,42 +2193,42 @@ module Ansible
@end = _oa
end
end
if !_o['host'].nil?
_oa = _o['host']
if !_o['delta'].nil?
_oa = _o['delta']
if(_oa.is_a? Hash)
@host = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@host = String.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
@host = Array.new
@delta = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@host.push String.from_json(_item)
@delta.push Time.from_json(_item)
else
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@host = _oa
@delta = _oa
end
end
if !_o['cloudDeploymentDomain'].nil?
_oa = _o['cloudDeploymentDomain']
if !_o['vmType'].nil?
_oa = _o['vmType']
if(_oa.is_a? Hash)
@cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@cloudDeploymentDomain = String.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
@cloudDeploymentDomain = Array.new
@vmType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@cloudDeploymentDomain.push String.from_json(_item)
@vmType.push String.from_json(_item)
else
@cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@cloudDeploymentDomain = _oa
@vmType = _oa
end
end
if !_o['start'].nil?
......@@ -2250,42 +2250,42 @@ module Ansible
@start = _oa
end
end
if !_o['vmType'].nil?
_oa = _o['vmType']
if !_o['host'].nil?
_oa = _o['host']
if(_oa.is_a? Hash)
@vmType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@vmType = 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
@vmType = Array.new
@host = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@vmType.push String.from_json(_item)
@host.push String.from_json(_item)
else
@vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@vmType = _oa
@host = _oa
end
end
if !_o['delta'].nil?
_oa = _o['delta']
if !_o['cloudDeploymentDomain'].nil?
_oa = _o['cloudDeploymentDomain']
if(_oa.is_a? Hash)
@delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@delta = Time.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
@delta = Array.new
@cloudDeploymentDomain = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item)
@cloudDeploymentDomain.push String.from_json(_item)
else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@delta = _oa
@cloudDeploymentDomain = _oa
end
end
end
......
docs/apidocs/apidocs/index.html
View file @ a6d7851a
......@@ -170,8 +170,8 @@ provisoner to request for resources (VMs)</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span>
</samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for storing PlayBook descriptions that can be
used by the planner.</span>
<td> <span class="resource-description">This controller is responsible for managing deployment configurations used
by the deployer. Currently docker-compose.yml and ansible playbooks are supported.</span>
</td>
</tr>
<tr class="clickable-row" data-href="resource_DeployController.html">
......
docs/apidocs/apidocs/json_BenchmarkResult.html
View file @ a6d7851a
......@@ -81,16 +81,16 @@ class</p>
</thead>
<tbody>
<tr>
<td> <span class="property-name">start</span>
<td> <span class="property-name">host</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">end</span>
<td> <span class="property-name">delta</span>
</td>
<td> <span class="datatype-reference">number
</span>
......@@ -99,7 +99,7 @@ class</p>
</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>
......@@ -108,27 +108,27 @@ class</p>
</td>
</tr>
<tr>
<td> <span class="property-name">cloudDeploymentDomain</span>
<td> <span class="property-name">start</span>
</td>
<td> <span class="datatype-reference">string
<td> <span class="datatype-reference">number
</span>
</td>
<td> <span class="property-description"></span>
</td>
</tr>
<tr>
<td> <span class="property-name">delta</span>
<td> <span class="property-name">vmType</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">vmType</span>
<td> <span class="property-name">end</span>
</td>
<td> <span class="datatype-reference">string
<td> <span class="datatype-reference">number
</span>
</td>
<td> <span class="property-description"></span>
......@@ -167,12 +167,12 @@ No need to set during a POST</span></td>
<p class="lead">Example</p>
<pre class="prettyprint language-js example">{
&quot;start&quot; : 12345,
&quot;end&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;delta&quot; : 12345,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;end&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011
......
docs/apidocs/apidocs/json_OwnedObject.html
View file @ a6d7851a
......@@ -69,7 +69,7 @@ class</p>
<dl class="dl-horizontal">
<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_DRIPLogRecord.html">DRIPLogRecord</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_MonitorringMessage.html">MonitorringMessage</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_DRIPLogRecord.html">DRIPLogRecord</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_MonitorringMessage.html">MonitorringMessage</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
</dl>
<table class="table datatype-properties">
......
docs/apidocs/apidocs/ns0.xsd
View file @ a6d7851a
......@@ -821,16 +821,16 @@ class]]>
<xs:complexContent>
<xs:extension base="ownedObject">
<xs:sequence>
<xs:element name="end" type="xs:dateTime" minOccurs="0">
</xs:element>
<xs:element name="start" type="xs:dateTime" minOccurs="0">
</xs:element>
<xs:element name="vmType" type="xs:string" minOccurs="0">
</xs:element>
<xs:element name="host" type="xs:string" minOccurs="0">
</xs:element>
<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="host" type="xs:string" minOccurs="0">
</xs:element>
<xs:element name="delta" type="xs:dateTime" minOccurs="0">
</xs:element>
</xs:sequence>
......
docs/apidocs/apidocs/resource_BenchmarkController.html
View file @ a6d7851a
......@@ -76,7 +76,7 @@ sysbench</p>
<div id="resource_BenchmarkController_getBySysbench_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/benchmark/ <a href="../user/v1.0/benchmark/" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Returns sysbench results only. Not Not supported yet</p>
<p>Returns sysbench results only. Not supported yet</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -144,12 +144,12 @@ Content-Type: application/json
<code class="prettyprint language-js">
[ {
&quot;start&quot; : 12345,
&quot;end&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;delta&quot; : 12345,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;end&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011
......@@ -514,12 +514,12 @@ Content-Type: application/json
<code class="prettyprint language-js">
{
&quot;start&quot; : 12345,
&quot;end&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;delta&quot; : 12345,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;end&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011
......
docs/apidocs/apidocs/resource_ConfigurationController.html
View file @ a6d7851a
......@@ -54,7 +54,7 @@
<li><a href="#resource_ConfigurationController_deleteAll_DELETE"><abbr title="DELETE /user/v1.0/deployer/configuration/all">DELETE /user/v1.0/deployer/con...</abbr></a></li>
<li><a href="#resource_ConfigurationController_getIds_GET"><abbr title="GET /user/v1.0/deployer/configuration/ids">GET /user/v1.0/deployer/config...</abbr></a></li>
<li><a href="#resource_ConfigurationController_post_POST"><abbr title="POST /user/v1.0/deployer/configuration/post">POST /user/v1.0/deployer/confi...</abbr></a></li>
<li><a href="#resource_ConfigurationController_toscaUpload_POST"><abbr title="POST /user/v1.0/deployer/configuration/upload">POST /user/v1.0/deployer/confi...</abbr></a></li>
<li><a href="#resource_ConfigurationController_configurationUpload_POST"><abbr title="POST /user/v1.0/deployer/configuration/upload">POST /user/v1.0/deployer/confi...</abbr></a></li>
<li><a href="#resource_ConfigurationController_delete_DELETE"><abbr title="DELETE /user/v1.0/deployer/configuration/{id}">DELETE /user/v1.0/deployer/con...</abbr></a></li>
<li><a href="#resource_ConfigurationController_get_GET"><abbr title="GET /user/v1.0/deployer/configuration/{id}">GET /user/v1.0/deployer/config...</abbr></a></li>
<li class="divider"></li>
......@@ -71,8 +71,8 @@
<h1 class="page-header">ConfigurationController <small>Resource</small></h1>
<p>This controller is responsible for storing PlayBook descriptions that can be
used by the planner.</p>
<p>This controller is responsible for managing deployment configurations used
by the deployer. Currently docker-compose.yml and ansible playbooks are supported.</p>
<div id="resource_ConfigurationController_deleteAll_DELETE">
<h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/deployer/configuration/all <a href="../user/v1.0/deployer/configuration/all" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
......@@ -155,7 +155,7 @@ Content-Type: application/json
<div id="resource_ConfigurationController_getIds_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/deployer/configuration/ids <a href="../user/v1.0/deployer/configuration/ids" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Gets the IDs of all the stored PlayBook descriptions.</p>
<p>Gets the IDs of all the stored configuration</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -340,10 +340,10 @@ Content-Type: application/json
</div>
</div>
<div id="resource_ConfigurationController_toscaUpload_POST">
<div id="resource_ConfigurationController_configurationUpload_POST">
<h3><span class="label label-default resource-method">POST</span> <span class="resource-path">/user/v1.0/deployer/configuration/upload <a href="../user/v1.0/deployer/configuration/upload" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Uploads and stores a PlayBook description file</p>
<p>Uploads and stores a configuration file</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -408,7 +408,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the ID of the PlayBook description</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the ID of the configuration description</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......@@ -447,7 +447,7 @@ Content-Type: application/json
<div id="resource_ConfigurationController_delete_DELETE">
<h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/deployer/configuration/{id} <a href="../user/v1.0/deployer/configuration/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Deletes the PlayBook description.</p>
<p>Deletes the configuration</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -512,7 +512,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">The ID of the deleted PlayBook description.</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">The ID of the deleted configuration</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......@@ -551,7 +551,7 @@ Content-Type: application/json
<div id="resource_ConfigurationController_get_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/deployer/configuration/{id} <a href="../user/v1.0/deployer/configuration/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Gets the PlayBook description.</p>
<p>Gets the configuration contents.</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -572,7 +572,7 @@ Content-Type: application/json
<tr>
<td><span class="parameter-name">id</span></td>
<td>path</td>
<td><span class="parameter-description">the ID PlayBook description.</span></td>
<td><span class="parameter-description">the ID configuration contents.</span></td>
<td><span class="parameter-constraints">required</span></td>
</tr>
<tr>
......@@ -626,7 +626,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the PlayBook description.</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the configuration contents.</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......
docs/apidocs/apidocs/resource_DeployController.html
View file @ a6d7851a
......@@ -442,7 +442,7 @@ Content-Type: application/json
<div id="resource_DeployController_scaleDeployment_POST">
<h3><span class="label label-default resource-method">POST</span> <span class="resource-path">/user/v1.0/deployer/scale <a href="../user/v1.0/deployer/scale" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p></p>
<p>Scales deployment</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......
docs/apidocs/apidocs/resource_ToscaController.html
View file @ a6d7851a
......@@ -687,7 +687,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the docker-compose.</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the docker-compose ID.</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......
docs/apidocs/apidocs/resources.html
View file @ a6d7851a
......@@ -162,8 +162,8 @@ provisoner to request for resources (VMs)</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span>
</samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for storing PlayBook descriptions that can be
used by the planner.</span>
<td> <span class="resource-description">This controller is responsible for managing deployment configurations used
by the deployer. Currently docker-compose.yml and ansible playbooks are supported.</span>
</td>
</tr>
<tr class="clickable-row" data-href="resource_DeployController.html">
......
docs/apidocs/apidocs/xml_ns0_benchmarkResult.html
View file @ a6d7851a
......@@ -220,11 +220,11 @@ It is created automatically. No need to set during a POST</span></td>
<p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;b-----&gt;
&lt;end&gt;...&lt;/end&gt;
&lt;start&gt;...&lt;/start&gt;
&lt;vmType&gt;...&lt;/vmType&gt;
&lt;host&gt;147.228.242.58&lt;/host&gt;
&lt;end&gt;...&lt;/end&gt;
&lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
&lt;host&gt;147.228.242.58&lt;/host&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;owner&gt;user1&lt;/owner&gt;
&lt;/b-----&gt;
......
docs/apidocs/downloads.html
View file @ a6d7851a
......@@ -72,7 +72,7 @@
<h1 class="page-header">Files and Libraries</h1>
<h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p> <p>
The <a href="http://code.google.com/webtoolkit/">Google Web Toolkit</a> JSON Overlay library provides the JSON Overlays that
can be used to access the Web service API for this application.
......@@ -97,7 +97,7 @@
</tbody>
</table>
<h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The Java client-side library is used to provide the set of Java objects that can be serialized
to/from JSON using <a href="http://jackson.codehaus.org/">Jackson</a>. This is useful for accessing the
......@@ -127,7 +127,7 @@
</tbody>
</table>
<h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The Java client-side library is used to access the Web service API for this application using Java.
</p>
......@@ -149,13 +149,13 @@
</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">23.28K</span></td>
<td><span class="downloadfile-size">23.27K</span></td>
<td><span class="downloadfile-description">The sources for the Java XML client library.</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_js_client_library">JavaScript Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The JavaScript client-side library defines classes that can be (de)serialized to/from JSON.
This is useful for accessing the resources that are published by this application, but only
......@@ -184,13 +184,13 @@
<tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-js.zip">
<td><span class="downloadfile-name">drip-api-js.zip</span></td>
<td><span class="downloadfile-size">5.91K</span></td>
<td><span class="downloadfile-size">6.05K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_php_json_client_library">PHP JSON Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The PHP JSON client-side library defines the PHP classes that can be (de)serialized to/from JSON.
This is useful for accessing the resources that are published by this application, but only
......@@ -213,13 +213,13 @@
<tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-php.zip">
<td><span class="downloadfile-name">drip-api-php.zip</span></td>
<td><span class="downloadfile-size">6.78K</span></td>
<td><span class="downloadfile-size">6.75K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_php_xml_client_library">PHP XML Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The PHP client-side library defines the PHP classes that can be (de)serialized to/from XML.
This is useful for accessing the resources that are published by this application, but only
......@@ -245,13 +245,13 @@
<tbody data-link="row" class="rowlink">
<tr class="clickable-row" data-href="drip-api-php.zip">
<td><span class="downloadfile-name">drip-api-php.zip</span></td>
<td><span class="downloadfile-size">9.63K</span></td>
<td><span class="downloadfile-size">9.61K</span></td>
<td><span class="downloadfile-description">&nbsp;</span></td>
</tr>
</tbody>
</table>
<h3 id="artifact_ruby_json_client_library">Ruby JSON Client Library</h3>
<p class="lead">Created December 7, 2017</p>
<p class="lead">Created December 9, 2017</p>
<p><p>
The Ruby JSON client-side library defines the Ruby classes that can be (de)serialized to/from JSON.
This is useful for accessing the REST endpoints that are published by this application, but only
......
docs/apidocs/drip-api.rb
View file @ a6d7851a
......@@ -93,92 +93,208 @@ module V1
module External
module Ansible
# (no documentation provided)
class DeployParameter
class AnsibleResult
# the IP
attr_accessor :IP
# the user
attr_accessor :user
# the role
attr_accessor :role
# (no documentation provided)
attr_accessor :msg
# (no documentation provided)
attr_accessor :changed
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :stdout
# (no documentation provided)
attr_accessor :cmd
# (no documentation provided)
attr_accessor :start
# (no documentation provided)
attr_accessor :stderr
# (no documentation provided)
attr_accessor :delta
# the json hash for this DeployParameter
# the json hash for this AnsibleResult
def to_jaxb_json_hash
_h = {}
_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?
_h['msg'] = msg.to_jaxb_json_hash unless msg.nil?
_h['changed'] = changed.to_jaxb_json_hash unless changed.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil?
_h['stdout'] = stdout.to_jaxb_json_hash unless stdout.nil?
if !cmd.nil?
_ha = Array.new
cmd.each { | _item | _ha.push _item.to_jaxb_json_hash }
_h['cmd'] = _ha
end
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['stderr'] = stderr.to_jaxb_json_hash unless stderr.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
return _h
end
# the json (string form) for this DeployParameter
# the json (string form) for this AnsibleResult
def to_json
to_jaxb_json_hash.to_json
end
#initializes this DeployParameter with a json hash
#initializes this AnsibleResult with a json hash
def init_jaxb_json_hash(_o)
if !_o['IP'].nil?
_oa = _o['IP']
if !_o['msg'].nil?
_oa = _o['msg']
if(_oa.is_a? Hash)
@IP = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@IP = String.from_json(_oa) unless _oa['@class']
@msg = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@msg = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@IP = Array.new
@msg = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@IP.push String.from_json(_item)
@msg.push String.from_json(_item)
else
@IP.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@msg.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@IP = _oa
@msg = _oa
end
end
if !_o['user'].nil?
_oa = _o['user']
if !_o['changed'].nil?
_oa = _o['changed']
if(_oa.is_a? Hash)
@user = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@user = String.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
@user = Array.new
@changed = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@user.push String.from_json(_item)
@changed.push Boolean.from_json(_item)
else
@user.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@changed.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@user = _oa
@changed = _oa
end
end
if !_o['role'].nil?
_oa = _o['role']
if !_o['end'].nil?
_oa = _o['end']
if(_oa.is_a? Hash)
@role = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@role = 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
@role = Array.new
@end = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@role.push String.from_json(_item)
@end.push Time.from_json(_item)
else
@role.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@end.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@role = _oa
@end = _oa
end
end
if !_o['stdout'].nil?
_oa = _o['stdout']
if(_oa.is_a? Hash)
@stdout = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stdout = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stdout = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stdout.push String.from_json(_item)
else
@stdout.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stdout = _oa
end
end
if !_o['cmd'].nil?
_oa = _o['cmd']
if(_oa.is_a? Hash)
@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
@cmd = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@cmd.push String.from_json(_item)
else
@cmd.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@cmd = _oa
end
end
if !_o['start'].nil?
_oa = _o['start']
if(_oa.is_a? Hash)
@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
@start = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@start.push Time.from_json(_item)
else
@start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@start = _oa
end
end
if !_o['stderr'].nil?
_oa = _o['stderr']
if(_oa.is_a? Hash)
@stderr = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stderr = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stderr = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stderr.push String.from_json(_item)
else
@stderr.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stderr = _oa
end
end
if !_o['delta'].nil?
_oa = _o['delta']
if(_oa.is_a? Hash)
@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
@delta = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item)
else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@delta = _oa
end
end
end
# constructs a DeployParameter from a (parsed) JSON hash
# constructs a AnsibleResult from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
......@@ -208,6 +324,8 @@ end
end
end
module Nl
module Uva
......@@ -355,212 +473,96 @@ module Commons
module Data
module V1
module External
module Ansible
# (no documentation provided)
class AnsibleResult
# (no documentation provided)
attr_accessor :msg
# (no documentation provided)
attr_accessor :changed
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :stdout
# (no documentation provided)
attr_accessor :cmd
# (no documentation provided)
attr_accessor :start
# (no documentation provided)
attr_accessor :stderr
# (no documentation provided)
attr_accessor :delta
# the json hash for this AnsibleResult
def to_jaxb_json_hash
_h = {}
_h['msg'] = msg.to_jaxb_json_hash unless msg.nil?
_h['changed'] = changed.to_jaxb_json_hash unless changed.nil?
_h['end'] = end.to_jaxb_json_hash unless end.nil?
_h['stdout'] = stdout.to_jaxb_json_hash unless stdout.nil?
if !cmd.nil?
_ha = Array.new
cmd.each { | _item | _ha.push _item.to_jaxb_json_hash }
_h['cmd'] = _ha
end
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['stderr'] = stderr.to_jaxb_json_hash unless stderr.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
return _h
end
# the json (string form) for this AnsibleResult
def to_json
to_jaxb_json_hash.to_json
end
#initializes this AnsibleResult with a json hash
def init_jaxb_json_hash(_o)
if !_o['msg'].nil?
_oa = _o['msg']
if(_oa.is_a? Hash)
@msg = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@msg = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@msg = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@msg.push String.from_json(_item)
else
@msg.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@msg = _oa
end
end
if !_o['changed'].nil?
_oa = _o['changed']
if(_oa.is_a? Hash)
@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
@changed = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@changed.push Boolean.from_json(_item)
else
@changed.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@changed = _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['stdout'].nil?
_oa = _o['stdout']
if(_oa.is_a? Hash)
@stdout = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stdout = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stdout = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stdout.push String.from_json(_item)
else
@stdout.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stdout = _oa
end
end
if !_o['cmd'].nil?
_oa = _o['cmd']
if(_oa.is_a? Hash)
@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
@cmd = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@cmd.push String.from_json(_item)
else
@cmd.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@cmd = _oa
end
end
if !_o['start'].nil?
_oa = _o['start']
module V1
module External
# (no documentation provided)
class DeployParameter
# the IP
attr_accessor :IP
# the user
attr_accessor :user
# the role
attr_accessor :role
# the json hash for this DeployParameter
def to_jaxb_json_hash
_h = {}
_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
# the json (string form) for this DeployParameter
def to_json
to_jaxb_json_hash.to_json
end
#initializes this DeployParameter with a json hash
def init_jaxb_json_hash(_o)
if !_o['IP'].nil?
_oa = _o['IP']
if(_oa.is_a? Hash)
@start = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@start = Time.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
@start = Array.new
@IP = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@start.push Time.from_json(_item)
@IP.push String.from_json(_item)
else
@start.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@IP.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@start = _oa
@IP = _oa
end
end
if !_o['stderr'].nil?
_oa = _o['stderr']
if !_o['user'].nil?
_oa = _o['user']
if(_oa.is_a? Hash)
@stderr = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@stderr = String.from_json(_oa) unless _oa['@class']
@user = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@user = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@stderr = Array.new
@user = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@stderr.push String.from_json(_item)
@user.push String.from_json(_item)
else
@stderr.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@user.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@stderr = _oa
@user = _oa
end
end
if !_o['delta'].nil?
_oa = _o['delta']
if !_o['role'].nil?
_oa = _o['role']
if(_oa.is_a? Hash)
@delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@delta = Time.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
@delta = Array.new
@role = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item)
@role.push String.from_json(_item)
else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@role.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@delta = _oa
@role = _oa
end
end
end
# constructs a AnsibleResult from a (parsed) JSON hash
# constructs a DeployParameter from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
......@@ -590,8 +592,6 @@ end
end
end
module Nl
module Uva
......@@ -1633,187 +1633,12 @@ module External
end
}
else
@contents = _oa
end
end
end
# constructs a Script from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
else
inst = new
inst.init_jaxb_json_hash o
return inst
end
end
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
class KeyType
# For private keys
PRIVATE = "PRIVATE"
# For public keys
PUBLIC = "PUBLIC"
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
class DeployRequest < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# the provisionID
attr_accessor :provisionID
# the managerType
attr_accessor :managerType
# the configurationID
attr_accessor :configurationID
# the json hash for this DeployRequest
def to_jaxb_json_hash
_h = super
_h['provisionID'] = provisionID.to_jaxb_json_hash unless provisionID.nil?
_h['managerType'] = managerType.to_jaxb_json_hash unless managerType.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['provisionID'].nil?
_oa = _o['provisionID']
if(_oa.is_a? Hash)
@provisionID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@provisionID = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@provisionID = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@provisionID.push String.from_json(_item)
else
@provisionID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@provisionID = _oa
end
end
if !_o['managerType'].nil?
_oa = _o['managerType']
if(_oa.is_a? Hash)
@managerType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@managerType = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@managerType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@managerType.push String.from_json(_item)
else
@managerType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@managerType = _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
@contents = _oa
end
end
end
# constructs a DeployRequest from a (parsed) JSON hash
# constructs a Script from a (parsed) JSON hash
def self.from_json(o)
if o.nil?
return nil
......@@ -1859,6 +1684,52 @@ module Data
module V1
module External
# (no documentation provided)
class KeyType
# For private keys
PRIVATE = "PRIVATE"
# For public keys
PUBLIC = "PUBLIC"
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
......@@ -2054,6 +1925,135 @@ module Data
module V1
module External
# (no documentation provided)
class DeployRequest < Nl::Uva::Sne::Drip::Drip::Commons::Data::V1::External::OwnedObject
# the provisionID
attr_accessor :provisionID
# the managerType
attr_accessor :managerType
# the configurationID
attr_accessor :configurationID
# the json hash for this DeployRequest
def to_jaxb_json_hash
_h = super
_h['provisionID'] = provisionID.to_jaxb_json_hash unless provisionID.nil?
_h['managerType'] = managerType.to_jaxb_json_hash unless managerType.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['provisionID'].nil?
_oa = _o['provisionID']
if(_oa.is_a? Hash)
@provisionID = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@provisionID = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@provisionID = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@provisionID.push String.from_json(_item)
else
@provisionID.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@provisionID = _oa
end
end
if !_o['managerType'].nil?
_oa = _o['managerType']
if(_oa.is_a? Hash)
@managerType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@managerType = String.from_json(_oa) unless _oa['@class']
elsif (_oa.is_a? Array)
#an array(of hashes hopefully) or scalar
@managerType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@managerType.push String.from_json(_item)
else
@managerType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@managerType = _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
def self.from_json(o)
if o.nil?
return nil
else
inst = new
inst.init_jaxb_json_hash o
return inst
end
end
end
end
end
end
end
end
end
end
end
end
module Nl
module Uva
module Sne
module Drip
module Drip
module Commons
module Data
module V1
module External
# (no documentation provided)
......@@ -2149,25 +2149,25 @@ module Ansible
# (no documentation provided)
attr_accessor :end
# (no documentation provided)
attr_accessor :host
attr_accessor :delta
# (no documentation provided)
attr_accessor :cloudDeploymentDomain
attr_accessor :vmType
# (no documentation provided)
attr_accessor :start
# (no documentation provided)
attr_accessor :vmType
attr_accessor :host
# (no documentation provided)
attr_accessor :delta
attr_accessor :cloudDeploymentDomain
# 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['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['host'] = host.to_jaxb_json_hash unless host.nil?
_h['cloudDeploymentDomain'] = cloudDeploymentDomain.to_jaxb_json_hash unless cloudDeploymentDomain.nil?
_h['start'] = start.to_jaxb_json_hash unless start.nil?
_h['vmType'] = vmType.to_jaxb_json_hash unless vmType.nil?
_h['delta'] = delta.to_jaxb_json_hash unless delta.nil?
return _h
end
......@@ -2193,42 +2193,42 @@ module Ansible
@end = _oa
end
end
if !_o['host'].nil?
_oa = _o['host']
if !_o['delta'].nil?
_oa = _o['delta']
if(_oa.is_a? Hash)
@host = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@host = String.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
@host = Array.new
@delta = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@host.push String.from_json(_item)
@delta.push Time.from_json(_item)
else
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@host = _oa
@delta = _oa
end
end
if !_o['cloudDeploymentDomain'].nil?
_oa = _o['cloudDeploymentDomain']
if !_o['vmType'].nil?
_oa = _o['vmType']
if(_oa.is_a? Hash)
@cloudDeploymentDomain = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@cloudDeploymentDomain = String.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
@cloudDeploymentDomain = Array.new
@vmType = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@cloudDeploymentDomain.push String.from_json(_item)
@vmType.push String.from_json(_item)
else
@cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@cloudDeploymentDomain = _oa
@vmType = _oa
end
end
if !_o['start'].nil?
......@@ -2250,42 +2250,42 @@ module Ansible
@start = _oa
end
end
if !_o['vmType'].nil?
_oa = _o['vmType']
if !_o['host'].nil?
_oa = _o['host']
if(_oa.is_a? Hash)
@vmType = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@vmType = 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
@vmType = Array.new
@host = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@vmType.push String.from_json(_item)
@host.push String.from_json(_item)
else
@vmType.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@host.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@vmType = _oa
@host = _oa
end
end
if !_o['delta'].nil?
_oa = _o['delta']
if !_o['cloudDeploymentDomain'].nil?
_oa = _o['cloudDeploymentDomain']
if(_oa.is_a? Hash)
@delta = EnunciateHelpers::LAMB_CLASS_AWARE.call(_oa) if _oa['@class']
@delta = Time.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
@delta = Array.new
@cloudDeploymentDomain = Array.new
_oa.each { | _item |
if ((_item.nil? || _item['@class'].nil?)rescue true)
@delta.push Time.from_json(_item)
@cloudDeploymentDomain.push String.from_json(_item)
else
@delta.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
@cloudDeploymentDomain.push EnunciateHelpers::LAMB_CLASS_AWARE.call(_item)
end
}
else
@delta = _oa
@cloudDeploymentDomain = _oa
end
end
end
......
docs/apidocs/index.html
View file @ a6d7851a
......@@ -170,8 +170,8 @@ provisoner to request for resources (VMs)</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span>
</samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for storing PlayBook descriptions that can be
used by the planner.</span>
<td> <span class="resource-description">This controller is responsible for managing deployment configurations used
by the deployer. Currently docker-compose.yml and ansible playbooks are supported.</span>
</td>
</tr>
<tr class="clickable-row" data-href="resource_DeployController.html">
......
docs/apidocs/json_BenchmarkResult.html
View file @ a6d7851a
......@@ -90,16 +90,16 @@ class</p>
</td>
</tr>
<tr>
<td> <span class="property-name">host</span>
<td> <span class="property-name">delta</span>
</td>
<td> <span class="datatype-reference">string
<td> <span class="datatype-reference">number
</span>
</td>
<td> <span class="property-description"></span>
</td>
</tr>
<tr>
<td> <span class="property-name">cloudDeploymentDomain</span>
<td> <span class="property-name">vmType</span>
</td>
<td> <span class="datatype-reference">string
</span>
......@@ -117,7 +117,7 @@ class</p>
</td>
</tr>
<tr>
<td> <span class="property-name">vmType</span>
<td> <span class="property-name">host</span>
</td>
<td> <span class="datatype-reference">string
</span>
......@@ -126,9 +126,9 @@ class</p>
</td>
</tr>
<tr>
<td> <span class="property-name">delta</span>
<td> <span class="property-name">cloudDeploymentDomain</span>
</td>
<td> <span class="datatype-reference">number
<td> <span class="datatype-reference">string
</span>
</td>
<td> <span class="property-description"></span>
......@@ -168,11 +168,11 @@ No need to set during a POST</span></td>
<pre class="prettyprint language-js example">{
&quot;end&quot; : 12345,
&quot;delta&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;start&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011
......
docs/apidocs/json_OwnedObject.html
View file @ a6d7851a
......@@ -69,7 +69,7 @@ class</p>
<dl class="dl-horizontal">
<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_DRIPLogRecord.html">DRIPLogRecord</a>, <a href="json_ProvisionRequest.html">ProvisionRequest</a>, <a href="json_Script.html">Script</a>, <a href="json_KeyValueHolder.html">KeyValueHolder</a>, <a href="json_DeployRequest.html">DeployRequest</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a>, <a href="json_MonitorringMessage.html">MonitorringMessage</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_DRIPLogRecord.html">DRIPLogRecord</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_MonitorringMessage.html">MonitorringMessage</a>, <a href="json_ProvisionResponse.html">ProvisionResponse</a></dd>
</dl>
<table class="table datatype-properties">
......
docs/apidocs/ns0.xsd
View file @ a6d7851a
......@@ -821,18 +821,18 @@ class]]>
<xs:complexContent>
<xs:extension base="ownedObject">
<xs:sequence>
<xs:element name="end" type="xs:dateTime" minOccurs="0">
<xs:element name="vmType" type="xs:string" minOccurs="0">
</xs:element>
<xs:element name="start" type="xs:dateTime" minOccurs="0">
</xs:element>
<xs:element name="host" type="xs:string" 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 name="end" type="xs:dateTime" minOccurs="0">
</xs:element>
<xs:element name="delta" type="xs:dateTime" minOccurs="0">
</xs:element>
<xs:element name="vmType" type="xs:string" minOccurs="0">
</xs:element>
</xs:sequence>
</xs:extension>
</xs:complexContent>
......
docs/apidocs/resource_BenchmarkController.html
View file @ a6d7851a
......@@ -76,7 +76,7 @@ sysbench</p>
<div id="resource_BenchmarkController_getBySysbench_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/benchmark/ <a href="./user/v1.0/benchmark/" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Returns sysbench results only. Not Not supported yet</p>
<p>Returns sysbench results only. Not supported yet</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -145,11 +145,11 @@ Content-Type: application/json
<code class="prettyprint language-js">
[ {
&quot;end&quot; : 12345,
&quot;delta&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;start&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011
......@@ -515,11 +515,11 @@ Content-Type: application/json
<code class="prettyprint language-js">
{
&quot;end&quot; : 12345,
&quot;delta&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;start&quot; : 12345,
&quot;host&quot; : &quot;147.228.242.58&quot;,
&quot;cloudDeploymentDomain&quot; : &quot;us-east-1&quot;,
&quot;start&quot; : 12345,
&quot;vmType&quot; : &quot;...&quot;,
&quot;delta&quot; : 12345,
&quot;owner&quot; : &quot;user1&quot;,
&quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
&quot;timestamp&quot; : 1499793079011
......
docs/apidocs/resource_ConfigurationController.html
View file @ a6d7851a
......@@ -54,7 +54,7 @@
<li><a href="#resource_ConfigurationController_deleteAll_DELETE"><abbr title="DELETE /user/v1.0/deployer/configuration/all">DELETE /user/v1.0/deployer/con...</abbr></a></li>
<li><a href="#resource_ConfigurationController_getIds_GET"><abbr title="GET /user/v1.0/deployer/configuration/ids">GET /user/v1.0/deployer/config...</abbr></a></li>
<li><a href="#resource_ConfigurationController_post_POST"><abbr title="POST /user/v1.0/deployer/configuration/post">POST /user/v1.0/deployer/confi...</abbr></a></li>
<li><a href="#resource_ConfigurationController_toscaUpload_POST"><abbr title="POST /user/v1.0/deployer/configuration/upload">POST /user/v1.0/deployer/confi...</abbr></a></li>
<li><a href="#resource_ConfigurationController_configurationUpload_POST"><abbr title="POST /user/v1.0/deployer/configuration/upload">POST /user/v1.0/deployer/confi...</abbr></a></li>
<li><a href="#resource_ConfigurationController_delete_DELETE"><abbr title="DELETE /user/v1.0/deployer/configuration/{id}">DELETE /user/v1.0/deployer/con...</abbr></a></li>
<li><a href="#resource_ConfigurationController_get_GET"><abbr title="GET /user/v1.0/deployer/configuration/{id}">GET /user/v1.0/deployer/config...</abbr></a></li>
<li class="divider"></li>
......@@ -71,8 +71,8 @@
<h1 class="page-header">ConfigurationController <small>Resource</small></h1>
<p>This controller is responsible for storing PlayBook descriptions that can be
used by the planner.</p>
<p>This controller is responsible for managing deployment configurations used
by the deployer. Currently docker-compose.yml and ansible playbooks are supported.</p>
<div id="resource_ConfigurationController_deleteAll_DELETE">
<h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/deployer/configuration/all <a href="./user/v1.0/deployer/configuration/all" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
......@@ -155,7 +155,7 @@ Content-Type: application/json
<div id="resource_ConfigurationController_getIds_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/deployer/configuration/ids <a href="./user/v1.0/deployer/configuration/ids" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Gets the IDs of all the stored PlayBook descriptions.</p>
<p>Gets the IDs of all the stored configuration</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -340,10 +340,10 @@ Content-Type: application/json
</div>
</div>
<div id="resource_ConfigurationController_toscaUpload_POST">
<div id="resource_ConfigurationController_configurationUpload_POST">
<h3><span class="label label-default resource-method">POST</span> <span class="resource-path">/user/v1.0/deployer/configuration/upload <a href="./user/v1.0/deployer/configuration/upload" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Uploads and stores a PlayBook description file</p>
<p>Uploads and stores a configuration file</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -408,7 +408,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the ID of the PlayBook description</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the ID of the configuration description</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......@@ -447,7 +447,7 @@ Content-Type: application/json
<div id="resource_ConfigurationController_delete_DELETE">
<h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/deployer/configuration/{id} <a href="./user/v1.0/deployer/configuration/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Deletes the PlayBook description.</p>
<p>Deletes the configuration</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -512,7 +512,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">The ID of the deleted PlayBook description.</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">The ID of the deleted configuration</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......@@ -551,7 +551,7 @@ Content-Type: application/json
<div id="resource_ConfigurationController_get_GET">
<h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/deployer/configuration/{id} <a href="./user/v1.0/deployer/configuration/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p>Gets the PlayBook description.</p>
<p>Gets the configuration contents.</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......@@ -572,7 +572,7 @@ Content-Type: application/json
<tr>
<td><span class="parameter-name">id</span></td>
<td>path</td>
<td><span class="parameter-description">the ID PlayBook description.</span></td>
<td><span class="parameter-description">the ID configuration contents.</span></td>
<td><span class="parameter-constraints">required</span></td>
</tr>
<tr>
......@@ -626,7 +626,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the PlayBook description.</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the configuration contents.</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......
docs/apidocs/resource_DeployController.html
View file @ a6d7851a
......@@ -442,7 +442,7 @@ Content-Type: application/json
<div id="resource_DeployController_scaleDeployment_POST">
<h3><span class="label label-default resource-method">POST</span> <span class="resource-path">/user/v1.0/deployer/scale <a href="./user/v1.0/deployer/scale" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
<p></p>
<p>Scales deployment</p>
<dl class="dl-horizontal">
<dt>Security Roles Allowed</dt>
......
docs/apidocs/resource_ToscaController.html
View file @ a6d7851a
......@@ -687,7 +687,7 @@ Content-Type: application/json
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/json&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/json</span></abbr></td>
<td><span class="datatype-reference">string
(JSON)</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the docker-compose.</span></td>
<td rowspan="2" class="multi-row-description"><span class="response-description">the docker-compose ID.</span></td>
</tr>
<tr>
<td><abbr data-toggle="tooltip" data-placement="top" title="Use the &quot;Accept: application/xml&quot; HTTP header to request that this media type be provided by the server."><span class="response-type">application/xml</span></abbr></td>
......
docs/apidocs/resources.html
View file @ a6d7851a
......@@ -162,8 +162,8 @@ provisoner to request for resources (VMs)</span>
</samp></li><li><samp> <span class="label label-default resource-method">POST</span>
</samp></li><li><samp> <span class="label label-default resource-method">DELETE</span> <span class="label label-default resource-method">GET</span>
</samp></li></ul></td>
<td> <span class="resource-description">This controller is responsible for storing PlayBook descriptions that can be
used by the planner.</span>
<td> <span class="resource-description">This controller is responsible for managing deployment configurations used
by the deployer. Currently docker-compose.yml and ansible playbooks are supported.</span>
</td>
</tr>
<tr class="clickable-row" data-href="resource_DeployController.html">
......
docs/apidocs/xml_ns0_benchmarkResult.html
View file @ a6d7851a
......@@ -220,12 +220,12 @@ It is created automatically. No need to set during a POST</span></td>
<p class="lead">Example</p>
<pre class="prettyprint language-xml example">&lt;b-----&gt;
&lt;end&gt;...&lt;/end&gt;
&lt;vmType&gt;...&lt;/vmType&gt;
&lt;start&gt;...&lt;/start&gt;
&lt;host&gt;147.228.242.58&lt;/host&gt;
&lt;cloudDeploymentDomain&gt;us-east-1&lt;/cloudDeploymentDomain&gt;
&lt;start&gt;...&lt;/start&gt;
&lt;end&gt;...&lt;/end&gt;
&lt;delta&gt;...&lt;/delta&gt;
&lt;vmType&gt;...&lt;/vmType&gt;
&lt;owner&gt;user1&lt;/owner&gt;
&lt;/b-----&gt;
</pre>
......
drip-api/src/main/java/nl/uva/sne/drip/api/service/ConfigurationService.java
View file @ a6d7851a
......@@ -62,10 +62,10 @@ public class ConfigurationService {
}
if (fromat != null && fromat.toLowerCase().equals("json")) {
String jsonStr = Converter.map2JsonString(map);
jsonStr = jsonStr.replaceAll("\\uff0E", ".");
return jsonStr;
}
String ymlStr = Converter.map2YmlString(map);
ymlStr = ymlStr.replaceAll("\\uff0E", ".");
ymlStr = cleanup(ymlStr);
return ymlStr;
}
......@@ -130,9 +130,19 @@ public class ConfigurationService {
private String cleanup(String ymlStr) {
ymlStr = ymlStr.replaceAll("\\uff0E", ".");
ymlStr = ymlStr.replaceAll("\'---':", "---");
Pattern p = Pattern.compile("cpus:.*,");
Pattern p = Pattern.compile("version:.*");
Matcher match = p.matcher(ymlStr);
while (match.find()) {
String line = match.group();
if (!line.contains("\"") || line.contains("'")) {
String number = line.split(": ")[1];
ymlStr = ymlStr.replaceAll(number, "\'" + number + "\'");
}
}
p = Pattern.compile("cpus:.*,");
match = p.matcher(ymlStr);
while (match.find()) {
String line = match.group();
if (!line.contains("\"") || line.contains("'")) {
......
drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ConfigurationController.java
View file @ a6d7851a
......@@ -80,8 +80,8 @@ public class ConfigurationController {
/**
* Uploads and stores a configuration file
*
* @param file. The PlayBook description file
* @return the ID of the PlayBook description
* @param file. The configuration description file
* @return the ID of the configuration description
*/
@RequestMapping(value = "/upload", method = RequestMethod.POST)
@RolesAllowed({UserService.USER, UserService.ADMIN})
......@@ -91,7 +91,7 @@ public class ConfigurationController {
+ "contents are not valid (e.g. not a yaml format)")
})
public @ResponseBody
String toscaUpload(@RequestParam("file") MultipartFile file) {
String configurationUpload(@RequestParam("file") MultipartFile file) {
if (file.isEmpty()) {
throw new BadRequestException("Must uplaod a file");
}
......@@ -106,7 +106,7 @@ public class ConfigurationController {
* Gets the configuration contents.
*
* @param id the ID configuration contents.
* @param format. the format to display the PlayBook description.
* @param format. the format to display the configuration description.
* @return the configuration contents.
*/
@RequestMapping(value = "/{id}", method = RequestMethod.GET, params = {"format"})
......
drip-commons/src/main/java/nl/uva/sne/drip/commons/utils/Converter.java
View file @ a6d7851a
......@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Map;
import java.util.Properties;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
import nl.uva.sne.drip.drip.commons.data.v1.external.CloudCredentials;
import org.apache.commons.io.FilenameUtils;
import org.json.JSONArray;
......@@ -37,7 +38,6 @@ import nl.uva.sne.drip.drip.commons.data.internal.Message;
import nl.uva.sne.drip.drip.commons.data.internal.MessageParameter;
import nl.uva.sne.drip.drip.commons.data.v0.external.Attribute;
import nl.uva.sne.drip.drip.commons.data.v1.external.PlanResponse;
import org.yaml.snakeyaml.DumperOptions;
/**
*
......@@ -258,10 +258,9 @@ public class Converter {
int hex = Constants.BAD_CHARS[i];
ymlContents = ymlContents.replaceAll(String.valueOf((char) hex), "");
}
ymlContents = ymlContents.replaceAll("\\.", "\uff0E");
Map<String, Object> map = null;
map = Converter.ymlString2Map(ymlContents);
map = ymlString2Map(ymlContents);
return map;
}
......
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