Update documentation

a9fd7df7 · Spiros Koulouzis · f02552da · a9fd7df7 · a9fd7df7 · a9fd7df7
Commit a9fd7df7 authored Apr 08, 2017 by Spiros Koulouzis
68 changed files
--- a/Dockerfiles/deployer/Dockerfile
+++ b/Dockerfiles/deployer/Dockerfile
+# Pull base image  
+FROM ubuntu:latest
+
+##install java
+ENV DEBIAN_FRONTEND=noninteractive 
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y wget software-properties-common build-essential libssl-dev libffi-dev python-dev graphviz graphviz-dev python-dev python-pip
+
+RUN pip install --upgrade pip
+RUN pip install pydot
+RUN pip install numpy
+RUN pip install networkx==1.10
+RUN pip install flask
+RUN pip install tosca-parser
+RUN pip install pika
+RUN export LC_ALL="en_US.UTF-8"
+RUN pip install paramiko
+
+
+
+
+WORKDIR /root/
+RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-deployer.tar.gz
+RUN tar -xzvf drip-deployer.tar.gz
+
+WORKDIR drip-deployer
+ENTRYPOINT python rpc_server.py 172.17.0.2
+
+# docker build -t drip-deployer .
+# docker run --name drip-deployer-inst -d drip-deployer
--- a/Dockerfiles/manager/Dockerfile
+++ b/Dockerfiles/manager/Dockerfile
+FROM ubuntu:latest
+
+MAINTAINER S. Koulouzis "S.Koulouzis@uva.nl"
+
+##install java
+ENV DEBIAN_FRONTEND=noninteractive 
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends openjdk-8-jdk
+RUN apt-get upgrade -y
+RUN apt-get install -y wget git
+
+
+##install drip-manager
+WORKDIR /root
+RUN wget http://www-eu.apache.org/dist/tomcat/tomcat-7/v7.0.75/bin/apache-tomcat-7.0.75.tar.gz
+RUN tar -xzf apache-tomcat-7.0.75.tar.gz
+WORKDIR apache-tomcat-7.0.75
+RUN echo
+RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-api-1.0-SNAPSHOT.tar.gz 
+RUN tar -xzvf drip-api-1.0-SNAPSHOT.tar.gz
+
+ARG RABBITMQ_HOST=172.17.0.2
+ARG MONOG_HOST=172.17.0.3
+RUN sed -ie "s/^message.broker.host=.*/message.broker.host=$RABBITMQ_HOST/" drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties
+RUN sed -ie "s/^db.host=.*/db.host=$MONOG_HOST/" drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties
+RUN cat drip-api-1.0-SNAPSHOT/WEB-INF/classes/drip.properties
+RUN mv drip-api-1.0-SNAPSHOT webapps/drip-api
+
+WORKDIR /root
+RUN echo "./apache-tomcat-7.0.75/bin/startup.sh" >> startAll.sh
+RUN echo "tail -f ./apache-tomcat-7.0.75/logs/catalina.out" >> startAll.sh
+RUN echo "while true" >> startAll.sh
+RUN echo "do" >> startAll.sh
+RUN echo "sleep 10s" >> startAll.sh
+RUN echo "done" >> startAll.sh
+
+
+EXPOSE 8080
+RUN chmod +x startAll.sh
+ENTRYPOINT ./startAll.sh
+
+# To build: docker build -t drip-manager .
+# To run: docker run --name drip-manager-inst -p 127.0.0.1:8080:8080 -d drip-manager
+
--- a/Dockerfiles/planner/Dockerfile
+++ b/Dockerfiles/planner/Dockerfile
+# Pull base image  
+FROM ubuntu:latest
+
+MAINTAINER S. Koulouzis "S.Koulouzis@uva.nl"
+
+
+##install java
+ENV DEBIAN_FRONTEND=noninteractive 
+RUN apt-get update
+RUN apt-get upgrade -y
+RUN apt-get install -y wget software-properties-common build-essential libssl-dev libffi-dev python-dev graphviz graphviz-dev python-dev python-pip
+
+RUN pip install --upgrade pip
+RUN pip install pydot
+RUN pip install numpy
+RUN pip install networkx==1.10
+RUN pip install flask
+RUN pip install tosca-parser
+RUN pip install pika
+RUN export LC_ALL="en_US.UTF-8"
+RUN pip install paramiko
+
+
+
+
+WORKDIR /root/
+COPY ../../drip-planner .
+RUN ls 
+# RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-planner.tar.gz
+# RUN tar -xzvf drip-planner.tar.gz
+
+# WORKDIR drip-planner
+# ARG RABBITMQ_HOST=172.17.0.2
+# RUN echo $RABBITMQ_HOST > hostFile
+# ENTRYPOINT python rpc_server.py 172.17.0.2
+
+# docker build -t drip-planner .
+# docker run --name drip-planner-inst -d drip-planner
--- a/Dockerfiles/provisioner/Dockerfile
+++ b/Dockerfiles/provisioner/Dockerfile
+# Pull base image  
+FROM ubuntu:latest
+
+MAINTAINER Huan "h.zhou@uva.nl"
+
+ARG release_version=0.0.3
+
+WORKDIR /root/
+
+#install openssh and wget
+RUN apt-get update && apt-get upgrade -y
+
+RUN apt-get install openssh-server wget software-properties-common inetutils-ping -y
+
+##install jdk 1.8
+ENV DEBIAN_FRONTEND=noninteractive
+RUN echo debconf shared/accepted-oracle-license-v1-1 select true | debconf-set-selections
+RUN echo debconf shared/accepted-oracle-license-v1-1 seen true | debconf-set-selections
+RUN add-apt-repository -y ppa:webupd8team/java
+RUN apt-get update
+RUN apt-get install -y oracle-java8-set-default
+
+RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar
+
+ARG RABBITMQ_HOST=172.17.0.1
+WORKDIR /root
+RUN echo rabbitmq.host=$RABBITMQ_HOST > provisioner.properties
+RUN cat provisioner.properties
+RUN wget https://github.com/QCAPI-DRIP/DRIP-integradation/releases/download/beta/database.tar.gz
+RUN tar -xzvf database.tar.gz
+
+ENTRYPOINT java -jar drip-provisioner-1.0-SNAPSHOT-jar-with-dependencies.jar /root/provisioner.properties
+
+#Build: docker build -t drip-pro .
+# Run: docker run --name drip-pro-inst -d drip-pro
--- a/docs/apidocs/data.html
+++ b/docs/apidocs/data.html
@@ -101,7 +101,9 @@ software</span>
    <tr class="clickable-row" data-href="json_DeployResponse.html">
      <td>  <span class="datatype-name">DeployResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_Key.html">
@@ -122,7 +124,8 @@ logging in VMs.</span>
    <tr class="clickable-row" data-href="json_KeyValueHolder.html">
      <td>  <span class="datatype-name">KeyValueHolder</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_OwnedObject.html">
@@ -141,13 +144,14 @@ class</span>
    <tr class="clickable-row" data-href="json_PlaybookRepresentation.html">
      <td>  <span class="datatype-name">PlaybookRepresentation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents a playbook used by ansible manager to deploy software.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_ProvisionRequest.html">
      <td>  <span class="datatype-name">ProvisionRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_ProvisionResponse.html">
@@ -285,7 +289,9 @@ software</span>
    <tr class="clickable-row" data-href="xml_ns0_deployResponse.html">
      <td>  <span class="datatype-name">deployResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_key.html">
@@ -312,7 +318,8 @@ logging in VMs.</span>
    <tr class="clickable-row" data-href="xml_ns0_keyValueHolder.html">
      <td>  <span class="datatype-name">keyValueHolder</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_ownedObject.html">
@@ -331,13 +338,14 @@ class</span>
    <tr class="clickable-row" data-href="xml_ns0_playbookRepresentation.html">
      <td>  <span class="datatype-name">playbookRepresentation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents a playbook used by ansible manager to deploy software.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_provisionRequest.html">
      <td>  <span class="datatype-name">provisionRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_provisionResponse.html">

--- a/docs/apidocs/downloads.html
+++ b/docs/apidocs/downloads.html
@@ -72,7 +72,7 @@
  <h1 class="page-header">Files and Libraries</h1>

  <h3 id="artifact_gwt_json_overlay">GWT JSON Overlay</h3>
-  <p class="lead">Created April 7, 2017</p>
+  <p class="lead">Created April 8, 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.
@@ -91,13 +91,13 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-gwt-json-overlay.jar">
      <td><span class="downloadfile-name">drip-api-gwt-json-overlay.jar</span></td>
-      <td><span class="downloadfile-size">10.34K</span></td>
+      <td><span class="downloadfile-size">10.43K</span></td>
      <td><span class="downloadfile-description">The sources for the GWT JSON overlay.</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_java_json_client_library">Java JSON Client Library</h3>
-  <p class="lead">Created April 7, 2017</p>
+  <p class="lead">Created April 8, 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
@@ -116,18 +116,18 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-json-client.jar">
      <td><span class="downloadfile-name">drip-api-json-client.jar</span></td>
-      <td><span class="downloadfile-size">13.28K</span></td>
+      <td><span class="downloadfile-size">12.94K</span></td>
      <td><span class="downloadfile-description">The binaries for the Java JSON client library.</span></td>
    </tr>
    <tr class="clickable-row" data-href="drip-api-json-client-json-sources.jar">
      <td><span class="downloadfile-name">drip-api-json-client-json-sources.jar</span></td>
-      <td><span class="downloadfile-size">10.72K</span></td>
+      <td><span class="downloadfile-size">10.70K</span></td>
      <td><span class="downloadfile-description">The sources for the Java JSON client library.</span></td>
    </tr>
    </tbody>
  </table>
  <h3 id="artifact_java_xml_client_library">Java XML Client Library</h3>
-  <p class="lead">Created April 7, 2017</p>
+  <p class="lead">Created April 8, 2017</p>
  <p><p>
  The Java client-side library is used to access the Web service API for this application using Java.
 </p>
@@ -144,18 +144,18 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api-xml-client.jar">
      <td><span class="downloadfile-name">drip-api-xml-client.jar</span></td>
-      <td><span class="downloadfile-size">21.38K</span></td>
+      <td><span class="downloadfile-size">21.31K</span></td>
      <td><span class="downloadfile-description">The binaries for the Java XML client library.</span></td>
    </tr>
    <tr class="clickable-row" data-href="drip-api-xml-client-xml-sources.jar">
      <td><span class="downloadfile-name">drip-api-xml-client-xml-sources.jar</span></td>
-      <td><span class="downloadfile-size">19.56K</span></td>
+      <td><span class="downloadfile-size">19.78K</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 April 7, 2017</p>
+  <p class="lead">Created April 8, 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">3.75K</span></td>
+      <td><span class="downloadfile-size">3.69K</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 April 7, 2017</p>
+  <p class="lead">Created April 8, 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">3.99K</span></td>
+      <td><span class="downloadfile-size">3.92K</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 April 7, 2017</p>
+  <p class="lead">Created April 8, 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">7.72K</span></td>
+      <td><span class="downloadfile-size">7.62K</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 April 7, 2017</p>
+  <p class="lead">Created April 8, 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
@@ -276,7 +276,7 @@
    <tbody data-link="row" class="rowlink">
    <tr class="clickable-row" data-href="drip-api.rb">
      <td><span class="downloadfile-name">drip-api.rb</span></td>
-      <td><span class="downloadfile-size">51.14K</span></td>
+      <td><span class="downloadfile-size">47.40K</span></td>
      <td><span class="downloadfile-description">&nbsp;</span></td>
    </tr>
    </tbody>

--- a/docs/apidocs/drip-api-gwt-json-overlay.jar
+++ b/docs/apidocs/drip-api-gwt-json-overlay.jar
--- a/docs/apidocs/drip-api-js.zip
+++ b/docs/apidocs/drip-api-js.zip
--- a/docs/apidocs/drip-api-json-client-json-sources.jar
+++ b/docs/apidocs/drip-api-json-client-json-sources.jar
--- a/docs/apidocs/drip-api-json-client.jar
+++ b/docs/apidocs/drip-api-json-client.jar
--- a/docs/apidocs/drip-api-php.zip
+++ b/docs/apidocs/drip-api-php.zip
--- a/docs/apidocs/drip-api-xml-client-xml-sources.jar
+++ b/docs/apidocs/drip-api-xml-client-xml-sources.jar
--- a/docs/apidocs/drip-api-xml-client.jar
+++ b/docs/apidocs/drip-api-xml-client.jar
--- a/docs/apidocs/drip-api.rb
+++ b/docs/apidocs/drip-api.rb
--- a/docs/apidocs/index.html
+++ b/docs/apidocs/index.html
@@ -227,13 +227,11 @@ provisopned based on a TOSCA description.</span>
      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span class="resource-path">/user/v1.0/provisioner/all</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/ids</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/provision</span>
-</samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/sample</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/{id}</span>
 </samp></li></ul></td>
      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span class="label label-default resource-method">DELETE</span> 
 </samp></li><li><samp>  <span class="label label-default resource-method">GET</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">GET</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 obtaining resources from cloud providers
@@ -384,7 +382,9 @@ software</span>
    <tr class="clickable-row" data-href="json_DeployResponse.html">
      <td>  <span class="datatype-name">DeployResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_Key.html">
@@ -405,7 +405,8 @@ logging in VMs.</span>
    <tr class="clickable-row" data-href="json_KeyValueHolder.html">
      <td>  <span class="datatype-name">KeyValueHolder</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_OwnedObject.html">
@@ -424,13 +425,14 @@ class</span>
    <tr class="clickable-row" data-href="json_PlaybookRepresentation.html">
      <td>  <span class="datatype-name">PlaybookRepresentation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents a playbook used by ansible manager to deploy software.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_ProvisionRequest.html">
      <td>  <span class="datatype-name">ProvisionRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_ProvisionResponse.html">
@@ -568,7 +570,9 @@ software</span>
    <tr class="clickable-row" data-href="xml_ns0_deployResponse.html">
      <td>  <span class="datatype-name">deployResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_key.html">
@@ -595,7 +599,8 @@ logging in VMs.</span>
    <tr class="clickable-row" data-href="xml_ns0_keyValueHolder.html">
      <td>  <span class="datatype-name">keyValueHolder</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_ownedObject.html">
@@ -614,13 +619,14 @@ class</span>
    <tr class="clickable-row" data-href="xml_ns0_playbookRepresentation.html">
      <td>  <span class="datatype-name">playbookRepresentation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents a playbook used by ansible manager to deploy software.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_provisionRequest.html">
      <td>  <span class="datatype-name">provisionRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_provisionResponse.html">

--- a/docs/apidocs/json_CloudCredentials.html
+++ b/docs/apidocs/json_CloudCredentials.html
@@ -87,15 +87,6 @@ to request for resources.</p>
 </span>
 </td>
          <td>  <span class="property-description">It is the secret key / password for accessing a cloud provider.</span>
-</td>
-        </tr>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-description">The UID of this object.</span>
 </td>
        </tr>
        <tr>
@@ -135,7 +126,15 @@ field</span>
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -144,11 +143,11 @@ field</span>
      
      <pre class="prettyprint language-js example">{
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_DeployRequest.html
+++ b/docs/apidocs/json_DeployRequest.html
@@ -88,7 +88,7 @@ software</p>
          <td>  <span class="datatype-reference">string
 </span>
 </td>
-          <td>  <span class="property-description">The ID of the provision resources description <code>nl.uva.sne.drip.data.v1.external.ProvisionResponse</code></span>
+          <td>  <span class="property-description">The ID of the provision resources description <code>ProvisionResponse</code></span>
 </td>
        </tr>
        <tr>
@@ -108,7 +108,7 @@ software</p>
 </td>
          <td>  <span class="property-description">The ID of the configuration POJO that contains information used the
 chosen deployment manager (for now only ansible)
-<code>nl.uva.sne.drip.data.v1.external.PlaybookRepresentation</code></span>
+<code>PlaybookRepresentation</code></span>
 </td>
        </tr>
        </tbody>
@@ -120,7 +120,15 @@ chosen deployment manager (for now only ansible)
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -131,7 +139,8 @@ chosen deployment manager (for now only ansible)
  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_DeployResponse.html
+++ b/docs/apidocs/json_DeployResponse.html
@@ -64,7 +64,9 @@

      <h1 class="page-header">DeployResponse <small>Data Type</small></h1>

-      <p></p>
+      <p>This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</p>

      <dl class="dl-horizontal">
      </dl>
@@ -80,21 +82,12 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">key</span>
+          <td>  <span class="property-name">keyPair</span>
 </td>
-          <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
+          <td>  <span class="datatype-reference"><a href="json_KeyPair.html">KeyPair</a>
 </span>
 </td>
-          <td>  <span class="property-description"></span>
-</td>
-        </tr>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The key pair to log in and manage a docker cluster</span>
 </td>
        </tr>
        </tbody>
@@ -106,7 +99,7 @@
          <td><span class="property-name">provisionID</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The ID of the provision resources description <code>nl.uva.sne.drip.data.v1.external.ProvisionResponse</code></span></td>
+          <td><span class="property-description">The ID of the provision resources description <code>ProvisionResponse</code></span></td>
        </tr>
        <tr>
          <td><span class="property-name">managerType</span></td>
@@ -120,7 +113,7 @@
 </span></td>
          <td><span class="property-description">The ID of the configuration POJO that contains information used the
 chosen deployment manager (for now only ansible)
-<code>nl.uva.sne.drip.data.v1.external.PlaybookRepresentation</code></span></td>
+<code>PlaybookRepresentation</code></span></td>
        </tr>
        </tbody>
        <tr>
@@ -131,7 +124,15 @@ chosen deployment manager (for now only ansible)
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -139,20 +140,33 @@ chosen deployment manager (for now only ansible)
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;key&quot; : {
-    &quot;name&quot; : &quot;id_dsa.pub&quot;,
-    &quot;type&quot; : &quot;PRIVATE&quot;,
-    &quot;attributes&quot; : {
-      &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
-      &quot;property2&quot; : &quot;domain_name:Virginia&quot;
+  &quot;keyPair&quot; : {
+    &quot;privateKey&quot; : {
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;attributes&quot; : {
+        &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
+        &quot;property2&quot; : &quot;domain_name:Virginia&quot;
+      },
+      &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
+    },
+    &quot;publicKey&quot; : {
+      &quot;name&quot; : &quot;id_dsa.pub&quot;,
+      &quot;type&quot; : &quot;PRIVATE&quot;,
+      &quot;attributes&quot; : {
+        &quot;property1&quot; : &quot;domain_name:Virginia&quot;,
+        &quot;property2&quot; : &quot;domain_name:Virginia&quot;
+      },
+      &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
    },
-    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
+    &quot;owner&quot; : &quot;user1&quot;,
+    &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
  },
-  &quot;id&quot; : &quot;...&quot;,
  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_KeyPair.html
+++ b/docs/apidocs/json_KeyPair.html
@@ -94,15 +94,6 @@ logging in VMs.</p>
 </td>
          <td>  <span class="datatype-reference"><a href="json_Key.html">Key</a>
 </span>
-</td>
-          <td>  <span class="property-description"></span>
-</td>
-        </tr>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
 </td>
          <td>  <span class="property-description"></span>
 </td>
@@ -116,7 +107,15 @@ logging in VMs.</p>
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -142,8 +141,8 @@ logging in VMs.</p>
    },
    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_KeyValueHolder.html
+++ b/docs/apidocs/json_KeyValueHolder.html
@@ -64,7 +64,8 @@

      <h1 class="page-header">KeyValueHolder <small>Data Type</small></h1>

-      <p></p>
+      <p>This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</p>

      <dl class="dl-horizontal">
        <dt>Subtypes</dt>
@@ -87,16 +88,7 @@
          <td>  <span class="datatype-reference">map of object
 </span>
 </td>
-          <td>  <span class="property-description"></span>
-</td>
-        </tr>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The key-value map</span>
 </td>
        </tr>
        </tbody>
@@ -108,7 +100,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -120,8 +120,8 @@
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_OwnedObject.html
+++ b/docs/apidocs/json_OwnedObject.html
@@ -88,7 +88,18 @@ class</p>
          <td>  <span class="datatype-reference">string
 </span>
 </td>
-          <td>  <span class="property-description">The owner (username) for the particular object.</span>
+          <td>  <span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span>
+</td>
+        </tr>
+        <tr>
+          <td>  <span class="property-name">id</span>
+</td>
+          <td>  <span class="datatype-reference">string
+</span>
+</td>
+          <td>  <span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span>
 </td>
        </tr>
        </tbody>
@@ -97,7 +108,8 @@ class</p>
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_PlanResponse.html
+++ b/docs/apidocs/json_PlanResponse.html
@@ -85,7 +85,7 @@
          <td>  <span class="datatype-reference">string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The name of the generated plan</span>
 </td>
        </tr>
        <tr>
@@ -94,7 +94,8 @@
          <td>  <span class="datatype-reference">string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The id of the TOSCA <code>PlaybookRepresentation</code> description from
+which this plan was generated</span>
 </td>
        </tr>
        <tr>
@@ -103,7 +104,8 @@
          <td>  <span class="datatype-reference">number
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The level of the plan. Some provisioners use levels to represent a plan.
+In these cases there are two levels of TOSCA descriptions.</span>
 </td>
        </tr>
        <tr>
@@ -112,7 +114,9 @@
          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The list of the lower level plans attached to this plan. Some
+provisioners use levels to represent a plan. In these cases there are two
+levels of TOSCA descriptions.</span>
 </td>
        </tr>
        </tbody>
@@ -124,13 +128,7 @@
          <td><span class="property-name">keyValue</span></td>
          <td><span class="datatype-reference">map of object
 </span></td>
-          <td><span class="property-description"></span></td>
-        </tr>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The key-value map</span></td>
        </tr>
        </tbody>
        <tr>
@@ -141,7 +139,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -149,16 +155,16 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;name&quot; : &quot;...&quot;,
-  &quot;toscaID&quot; : &quot;...&quot;,
-  &quot;level&quot; : 12345,
-  &quot;loweLevelPlanIDs&quot; : [ &quot;...&quot;, &quot;...&quot; ],
+  &quot;name&quot; : &quot;planner_output_all.yml&quot;,
+  &quot;toscaID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
+  &quot;level&quot; : 0,
+  &quot;loweLevelPlanIDs&quot; : [ &quot;ew44Ae3946e0sdds4f562d84baA&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_PlaybookRepresentation.html
+++ b/docs/apidocs/json_PlaybookRepresentation.html
@@ -64,7 +64,7 @@

      <h1 class="page-header">PlaybookRepresentation <small>Data Type</small></h1>

-      <p></p>
+      <p>This class represents a playbook used by ansible manager to deploy software.</p>

      <dl class="dl-horizontal">
      </dl>
@@ -79,15 +79,6 @@
        </tr>
        </thead>
        <tbody>
-        <tr>
-          <td>  <span class="property-name">name</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-description"></span>
-</td>
-        </tr>
        </tbody>
        <tr>
          <td colspan="3"><h5 class="text-muted">Properties inherited from <a href="json_KeyValueHolder.html">KeyValueHolder</a></h5></td>
@@ -97,13 +88,7 @@
          <td><span class="property-name">keyValue</span></td>
          <td><span class="datatype-reference">map of object
 </span></td>
-          <td><span class="property-description"></span></td>
-        </tr>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The key-value map</span></td>
        </tr>
        </tbody>
        <tr>
@@ -114,7 +99,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -122,13 +115,12 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;name&quot; : &quot;...&quot;,
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_ProvisionRequest.html
+++ b/docs/apidocs/json_ProvisionRequest.html
@@ -64,7 +64,8 @@

      <h1 class="page-header">ProvisionRequest <small>Data Type</small></h1>

-      <p></p>
+      <p>This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</p>

      <dl class="dl-horizontal">
        <dt>Subtypes</dt>
@@ -82,12 +83,12 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">cloudCredentialsID</span>
+          <td>  <span class="property-name">cloudCredentialsIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The cloud credentials ids required to provision the cloud resources.</span>
 </td>
        </tr>
        <tr>
@@ -96,16 +97,16 @@
          <td>  <span class="datatype-reference">string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The ID of the plan <code>PlanResponse</code> to provision for.</span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">publicKeyID</span>
+          <td>  <span class="property-name">keyPairIDs</span>
 </td>
-          <td>  <span class="datatype-reference">string
+          <td>  <span class="datatype-reference">array of string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The key pair id for the keys to use to log in the provisioned VMs.</span>
 </td>
        </tr>
        </tbody>
@@ -117,13 +118,7 @@
          <td><span class="property-name">keyValue</span></td>
          <td><span class="datatype-reference">map of object
 </span></td>
-          <td><span class="property-description"></span></td>
-        </tr>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The key-value map</span></td>
        </tr>
        </tbody>
        <tr>
@@ -134,7 +129,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -142,15 +145,15 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;cloudCredentialsID&quot; : &quot;...&quot;,
-  &quot;planID&quot; : &quot;...&quot;,
-  &quot;publicKeyID&quot; : &quot;...&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_ProvisionResponse.html
+++ b/docs/apidocs/json_ProvisionResponse.html
@@ -94,22 +94,22 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">cloudCredentialsID</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">cloudCredentialsIDs</span></td>
+          <td><span class="datatype-reference">array of string
 </span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The cloud credentials ids required to provision the cloud resources.</span></td>
        </tr>
        <tr>
          <td><span class="property-name">planID</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The ID of the plan <code>PlanResponse</code> to provision for.</span></td>
        </tr>
        <tr>
-          <td><span class="property-name">publicKeyID</span></td>
-          <td><span class="datatype-reference">string
+          <td><span class="property-name">keyPairIDs</span></td>
+          <td><span class="datatype-reference">array of string
 </span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The key pair id for the keys to use to log in the provisioned VMs.</span></td>
        </tr>
        </tbody>
        <tr>
@@ -120,13 +120,7 @@
          <td><span class="property-name">keyValue</span></td>
          <td><span class="datatype-reference">map of object
 </span></td>
-          <td><span class="property-description"></span></td>
-        </tr>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The key-value map</span></td>
        </tr>
        </tbody>
        <tr>
@@ -137,7 +131,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -156,15 +158,15 @@
    &quot;user&quot; : &quot;...&quot;,
    &quot;role&quot; : &quot;...&quot;
  } ],
-  &quot;cloudCredentialsID&quot; : &quot;...&quot;,
-  &quot;planID&quot; : &quot;...&quot;,
-  &quot;publicKeyID&quot; : &quot;...&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_Script.html
+++ b/docs/apidocs/json_Script.html
@@ -79,15 +79,6 @@
        </tr>
        </thead>
        <tbody>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-description"></span>
-</td>
-        </tr>
        <tr>
          <td>  <span class="property-name">name</span>
 </td>
@@ -115,7 +106,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -123,10 +122,10 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;id&quot; : &quot;...&quot;,
  &quot;name&quot; : &quot;config.sh&quot;,
  &quot;contents&quot; : &quot;    #!/bin/bash\necho \&quot;Reading system-wide config....\&quot; &gt;&amp;2\\n. /etc/cool.cfg\nif [ -r ~/.coolrc ]; then\n  echo \&quot;Reading user config....\&quot; &gt;&amp;2\\n  . ~/.coolrc\\nfi&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/json_ToscaRepresentation.html
+++ b/docs/apidocs/json_ToscaRepresentation.html
@@ -85,7 +85,7 @@
          <td>  <span class="datatype-reference">string
 </span>
 </td>
-          <td>  <span class="property-description"></span>
+          <td>  <span class="property-description">The name of the TOSCA description</span>
 </td>
        </tr>
        </tbody>
@@ -97,13 +97,7 @@
          <td><span class="property-name">keyValue</span></td>
          <td><span class="datatype-reference">map of object
 </span></td>
-          <td><span class="property-description"></span></td>
-        </tr>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-description"></span></td>
+          <td><span class="property-description">The key-value map</span></td>
        </tr>
        </tbody>
        <tr>
@@ -114,7 +108,15 @@
          <td><span class="property-name">owner</span></td>
          <td><span class="datatype-reference">string
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
+        </tr>
+        <tr>
+          <td><span class="property-name">id</span></td>
+          <td><span class="datatype-reference">string
+</span></td>
+          <td><span class="property-description">The UID of this object. This value is auto generated by the DAO when the
+object is saved.</span></td>
        </tr>
        </tbody>
      </table>
@@ -122,13 +124,13 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-js example">{
-  &quot;name&quot; : &quot;...&quot;,
+  &quot;name&quot; : &quot;input.yml&quot;,
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }</pre>

        <footer class="footer">

--- a/docs/apidocs/ns0.xsd
+++ b/docs/apidocs/ns0.xsd
@@ -336,7 +336,7 @@ software]]>
              <xs:element name="provisionID" type="xs:string" minOccurs="0">
              <xs:annotation>
                <xs:documentation>
-                  <![CDATA[The ID of the provision resources description <code>nl.uva.sne.drip.data.v1.external.ProvisionResponse</code>]]>
+                  <![CDATA[The ID of the provision resources description <code>ProvisionResponse</code>]]>
                </xs:documentation>
              </xs:annotation>
              </xs:element>
@@ -352,7 +352,7 @@ software]]>
                <xs:documentation>
                  <![CDATA[The ID of the configuration POJO that contains information used the
 chosen deployment manager (for now only ansible)
-<code>nl.uva.sne.drip.data.v1.external.PlaybookRepresentation</code>]]>
+<code>PlaybookRepresentation</code>]]>
                </xs:documentation>
              </xs:annotation>
              </xs:element>
@@ -362,14 +362,15 @@ chosen deployment manager (for now only ansible)
 </xs:complexType>

 <xs:complexType name="deployResponse">
+  <xs:annotation>
+    <xs:documentation>
+      <![CDATA[This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes]]>
+    </xs:documentation>
+  </xs:annotation>
   <xs:complexContent>
    <xs:extension base="deployRequest">
-      <xs:sequence>
-              <xs:element name="key" type="key" minOccurs="0">
-              </xs:element>
-              <xs:element name="id" type="xs:string" minOccurs="0">
-              </xs:element>
-      </xs:sequence>
    </xs:extension>
  </xs:complexContent>
 </xs:complexType>
@@ -456,12 +457,14 @@ logging in VMs.]]>
 </xs:complexType>

 <xs:complexType name="keyValueHolder">
+  <xs:annotation>
+    <xs:documentation>
+      <![CDATA[This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.]]>
+    </xs:documentation>
+  </xs:annotation>
   <xs:complexContent>
    <xs:extension base="ownedObject">
-      <xs:sequence>
-              <xs:element name="id" type="xs:string" minOccurs="0">
-              </xs:element>
-      </xs:sequence>
    </xs:extension>
  </xs:complexContent>
 </xs:complexType>
@@ -477,7 +480,8 @@ class]]>
              <xs:element name="owner" type="xs:string" minOccurs="0">
              <xs:annotation>
                <xs:documentation>
-                  <![CDATA[The owner (username) for the particular object.]]>
+                  <![CDATA[The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call]]>
                </xs:documentation>
              </xs:annotation>
              </xs:element>
@@ -494,10 +498,27 @@ class]]>
    <xs:extension base="keyValueHolder">
      <xs:sequence>
              <xs:element name="name" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The name of the generated plan]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
              <xs:element name="toscaID" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The id of the TOSCA <code>PlaybookRepresentation</code> description from
+which this plan was generated]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
              <xs:element name="level" type="xs:int" minOccurs="0">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The level of the plan. Some provisioners use levels to represent a plan.
+In these cases there are two levels of TOSCA descriptions.]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
      </xs:sequence>
    </xs:extension>
@@ -505,25 +526,47 @@ class]]>
 </xs:complexType>

 <xs:complexType name="playbookRepresentation">
+  <xs:annotation>
+    <xs:documentation>
+      <![CDATA[This class represents a playbook used by ansible manager to deploy software.]]>
+    </xs:documentation>
+  </xs:annotation>
   <xs:complexContent>
    <xs:extension base="keyValueHolder">
-      <xs:sequence>
-              <xs:element name="name" type="xs:string" minOccurs="0">
-              </xs:element>
-      </xs:sequence>
    </xs:extension>
  </xs:complexContent>
 </xs:complexType>

 <xs:complexType name="provisionRequest">
+  <xs:annotation>
+    <xs:documentation>
+      <![CDATA[This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.]]>
+    </xs:documentation>
+  </xs:annotation>
   <xs:complexContent>
    <xs:extension base="keyValueHolder">
      <xs:sequence>
-              <xs:element name="cloudCredentialsID" type="xs:string" minOccurs="0">
+              <xs:element name="cloudCredentialsIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The cloud credentials ids required to provision the cloud resources.]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
              <xs:element name="planID" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The ID of the plan <code>PlanResponse</code> to provision for.]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
-              <xs:element name="publicKeyID" type="xs:string" minOccurs="0">
+              <xs:element name="keyPairIDs" type="xs:string" minOccurs="0" maxOccurs="unbounded">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The key pair id for the keys to use to log in the provisioned VMs.]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
      </xs:sequence>
    </xs:extension>
@@ -560,8 +603,6 @@ class]]>
   <xs:complexContent>
    <xs:extension base="ownedObject">
      <xs:sequence>
-              <xs:element name="id" type="xs:string" minOccurs="0">
-              </xs:element>
              <xs:element name="name" type="xs:string" minOccurs="0">
              <xs:annotation>
                <xs:documentation>
@@ -586,6 +627,11 @@ class]]>
    <xs:extension base="keyValueHolder">
      <xs:sequence>
              <xs:element name="name" type="xs:string" minOccurs="0">
+              <xs:annotation>
+                <xs:documentation>
+                  <![CDATA[The name of the TOSCA description]]>
+                </xs:documentation>
+              </xs:annotation>
              </xs:element>
      </xs:sequence>
    </xs:extension>

--- a/docs/apidocs/resource_CloudCredentialsController.html
+++ b/docs/apidocs/resource_CloudCredentialsController.html
@@ -161,11 +161,11 @@ Accept: application/json
                <code class="prettyprint language-js">
 {
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -355,11 +355,11 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 {
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -518,11 +518,11 @@ Content-Type: application/json
                <code class="prettyprint language-js">
 {
  &quot;secretKey&quot; : &quot;7A7vo19ffdfa4SAsA6gsF5Fgbfb5rtwY6hBxtYt12&quot;,
-  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;cloudProviderName&quot; : &quot;ec2&quot;,
  &quot;accessKeyId&quot; : &quot;AKIKIQY9K1ZUQ6M7YBSQ&quot;,
  &quot;keyPairIDs&quot; : [ &quot;AKIKIQY9K1ZUQ6M7YBSQ, LKJ2KIQY9K1F236M7YASD&quot;, &quot;...&quot; ],
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- a/docs/apidocs/resource_DeployController.html
+++ b/docs/apidocs/resource_DeployController.html
@@ -201,7 +201,8 @@ Accept: application/json
  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -333,7 +334,8 @@ Content-Type: application/json
  &quot;provisionID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
  &quot;managerType&quot; : &quot;ansible&quot;,
  &quot;configurationID&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -487,20 +489,33 @@ Content-Type: application/json

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

--- a/docs/apidocs/resource_KeyPairController.html
+++ b/docs/apidocs/resource_KeyPairController.html
@@ -179,8 +179,8 @@ Accept: application/json
    },
    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -387,8 +387,8 @@ Content-Type: application/json
    },
    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -564,8 +564,8 @@ Content-Type: application/json
    },
    &quot;key&quot; : &quot;-----BEGIN RSA PRIVATE KEY-----\\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\\n-----END RSA PRIVATE KEY-----\\n&quot;
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- a/docs/apidocs/resource_ProvisionController.html
+++ b/docs/apidocs/resource_ProvisionController.html
@@ -54,7 +54,6 @@
          <li><a href="#resource_ProvisionController_deleteAll_DELETE"><abbr title="DELETE /user/v1.0/provisioner/all">DELETE /user/v1.0/provisioner/...</abbr></a></li>
          <li><a href="#resource_ProvisionController_getIds_GET">GET /user/v1.0/provisioner/ids</a></li>
          <li><a href="#resource_ProvisionController_provision_POST"><abbr title="POST /user/v1.0/provisioner/provision">POST /user/v1.0/provisioner/pr...</abbr></a></li>
-          <li><a href="#resource_ProvisionController_provision_GET"><abbr title="GET /user/v1.0/provisioner/sample">GET /user/v1.0/provisioner/sam...</abbr></a></li>
          <li><a href="#resource_ProvisionController_delete_DELETE"><abbr title="DELETE /user/v1.0/provisioner/{id}">DELETE /user/v1.0/provisioner/...</abbr></a></li>
          <li><a href="#resource_ProvisionController_get_GET"><abbr title="GET /user/v1.0/provisioner/{id}">GET /user/v1.0/provisioner/{id...</abbr></a></li>
          <li class="divider"></li>
@@ -260,15 +259,15 @@ Accept: application/json

                <code class="prettyprint language-js">
 {
-  &quot;cloudCredentialsID&quot; : &quot;...&quot;,
-  &quot;planID&quot; : &quot;...&quot;,
-  &quot;publicKeyID&quot; : &quot;...&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>
@@ -288,74 +287,6 @@ Content-Type: application/json
        </div>
      </div>

-      <div id="resource_ProvisionController_provision_GET">
-        <h3><span class="label label-default resource-method">GET</span> <span class="resource-path">/user/v1.0/provisioner/sample <a href="../user/v1.0/provisioner/sample" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>
-
-        <p></p>
-
-        <dl class="dl-horizontal">
-          <dt>Security Roles Allowed</dt>
-          <dd>ADMIN, USER</dd>
-        </dl>
-
-        <table class="table resource-response-body">
-          <caption>Response Body</caption>
-          <thead>
-          <tr>
-            <th>media type</th>
-            <th>data type</th>
-          </tr>
-          </thead>
-          <tbody>
-          <tr>
-            <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"><a href="json_ProvisionRequest.html">ProvisionRequest</a>
- (JSON)</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>
-            <td><span class="datatype-reference"><a href="xml_ns0_provisionRequest.html">provisionRequest</a>
- (XML)</span></td>
-          </tr>
-          </tbody>
-        </table>
-        <h4>Example</h4>
-
-        <div class="container-fluid example panel">
-          <div class="row panel-body">
-            <div class="col-md-6">
-              <h5>Request</h5>
-              <pre>
-GET /user/v1.0/provisioner/sample
-Accept: application/json
-
-              </pre>
-            </div>
-            <div class="col-md-6">
-              <h5>Response</h5>
-              <pre>
-HTTP/1.1 200 Looks Good
-Content-Type: application/json
-
-                <code class="prettyprint language-js">
-{
-  &quot;cloudCredentialsID&quot; : &quot;...&quot;,
-  &quot;planID&quot; : &quot;...&quot;,
-  &quot;publicKeyID&quot; : &quot;...&quot;,
-  &quot;keyValue&quot; : {
-    &quot;property1&quot; : { },
-    &quot;property2&quot; : { }
-  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
-}
-                </code>
-              </pre>
-            </div>
-          </div>
-        </div>
-      </div>
-
      <div id="resource_ProvisionController_delete_DELETE">
        <h3><span class="label label-default resource-method">DELETE</span> <span class="resource-path">/user/v1.0/provisioner/{id} <a href="../user/v1.0/provisioner/{id}" class="glyphicon glyphicon-new-window" target="_blank"></a></span></h3>

@@ -516,15 +447,15 @@ Content-Type: application/json
    &quot;user&quot; : &quot;...&quot;,
    &quot;role&quot; : &quot;...&quot;
  } ],
-  &quot;cloudCredentialsID&quot; : &quot;...&quot;,
-  &quot;planID&quot; : &quot;...&quot;,
-  &quot;publicKeyID&quot; : &quot;...&quot;,
+  &quot;cloudCredentialsIDs&quot; : [ &quot;58e3946e0fb4f562d84ba1ad&quot;, &quot;...&quot; ],
+  &quot;planID&quot; : &quot;ASedsfd46b4fDFd83ba1q&quot;,
+  &quot;keyPairIDs&quot; : [ &quot;ASedsfd46b4fFd344a1A&quot;, &quot;...&quot; ],
  &quot;keyValue&quot; : {
    &quot;property1&quot; : { },
    &quot;property2&quot; : { }
  },
-  &quot;id&quot; : &quot;...&quot;,
-  &quot;owner&quot; : &quot;user1&quot;
+  &quot;owner&quot; : &quot;user1&quot;,
+  &quot;id&quot; : &quot;58e3946e0fb4f562d84ba1ad&quot;
 }
                </code>
              </pre>

--- a/docs/apidocs/resource_ScriptController.html
+++ b/docs/apidocs/resource_ScriptController.html
@@ -141,10 +141,10 @@ Accept: application/json

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

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

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

--- a/docs/apidocs/resources.html
+++ b/docs/apidocs/resources.html
@@ -219,13 +219,11 @@ provisopned based on a TOSCA description.</span>
      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span class="resource-path">/user/v1.0/provisioner/all</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/ids</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/provision</span>
-</samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/sample</span>
 </samp></li><li><samp>  <span class="resource-path">/user/v1.0/provisioner/{id}</span>
 </samp></li></ul></td>
      <td class="text-nowrap"><ul class="list-unstyled"><li><samp>  <span class="label label-default resource-method">DELETE</span> 
 </samp></li><li><samp>  <span class="label label-default resource-method">GET</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">GET</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 obtaining resources from cloud providers

--- a/docs/apidocs/syntax_json.html
+++ b/docs/apidocs/syntax_json.html
@@ -96,7 +96,9 @@ software</span>
    <tr class="clickable-row" data-href="json_DeployResponse.html">
      <td>  <span class="datatype-name">DeployResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_Key.html">
@@ -117,7 +119,8 @@ logging in VMs.</span>
    <tr class="clickable-row" data-href="json_KeyValueHolder.html">
      <td>  <span class="datatype-name">KeyValueHolder</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_OwnedObject.html">
@@ -136,13 +139,14 @@ class</span>
    <tr class="clickable-row" data-href="json_PlaybookRepresentation.html">
      <td>  <span class="datatype-name">PlaybookRepresentation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents a playbook used by ansible manager to deploy software.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_ProvisionRequest.html">
      <td>  <span class="datatype-name">ProvisionRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="json_ProvisionResponse.html">

--- a/docs/apidocs/syntax_xml.html
+++ b/docs/apidocs/syntax_xml.html
@@ -163,7 +163,9 @@ software</span>
    <tr class="clickable-row" data-href="xml_ns0_deployResponse.html">
      <td>  <span class="datatype-name">deployResponse</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_key.html">
@@ -190,7 +192,8 @@ logging in VMs.</span>
    <tr class="clickable-row" data-href="xml_ns0_keyValueHolder.html">
      <td>  <span class="datatype-name">keyValueHolder</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_ownedObject.html">
@@ -209,13 +212,14 @@ class</span>
    <tr class="clickable-row" data-href="xml_ns0_playbookRepresentation.html">
      <td>  <span class="datatype-name">playbookRepresentation</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class represents a playbook used by ansible manager to deploy software.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_provisionRequest.html">
      <td>  <span class="datatype-name">provisionRequest</span>
 </td>
-      <td>  <span class="datatype-description"></span>
+      <td>  <span class="datatype-description">This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</span>
 </td>
    </tr>
    <tr class="clickable-row" data-href="xml_ns0_provisionResponse.html">

--- a/docs/apidocs/xml_ns0_cloudCredentials.html
+++ b/docs/apidocs/xml_ns0_cloudCredentials.html
@@ -157,7 +157,8 @@ field</span>
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>

--- a/docs/apidocs/xml_ns0_deployRequest.html
+++ b/docs/apidocs/xml_ns0_deployRequest.html
@@ -106,7 +106,7 @@ software</p>
 </td>
          <td>  <span class="property-description">The ID of the configuration POJO that contains information used the
 chosen deployment manager (for now only ansible)
-<code>nl.uva.sne.drip.data.v1.external.PlaybookRepresentation</code></span>
+<code>PlaybookRepresentation</code></span>
 </td>
        </tr>
        <tr>
@@ -142,7 +142,7 @@ chosen deployment manager (for now only ansible)
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">The ID of the provision resources description <code>nl.uva.sne.drip.data.v1.external.ProvisionResponse</code></span>
+          <td>  <span class="property-description">The ID of the provision resources description <code>ProvisionResponse</code></span>
 </td>
        </tr>
        </tbody>
@@ -160,7 +160,8 @@ chosen deployment manager (for now only ansible)
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>

--- a/docs/apidocs/xml_ns0_deployResponse.html
+++ b/docs/apidocs/xml_ns0_deployResponse.html
@@ -64,7 +64,9 @@

      <h1 class="page-header">deployResponse <small>Data Type</small></h1>

-      <p></p>
+      <p>This class represents the response of a deploy request. It may hold a key
+pair used for logging in and managing a docker cluster. Currently they key
+pair is only used by kubernetes</p>

      <dl class="dl-horizontal">
        <dt>Namespace</dt>
@@ -86,42 +88,6 @@
        </tr>
        </thead>
        <tbody>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-type">element
-</span>
-</td>
-          <td>  <span class="property-namespaceInfo">
-</span>
-</td>
-          <td>  <span class="property-minMaxOccurs">0/1
-</span>
-</td>
-          <td>  <span class="property-description">the id</span>
-</td>
-        </tr>
-        <tr>
-          <td>  <span class="property-name">key</span>
-</td>
-          <td>  <span class="datatype-reference"><a href="xml_ns0_key.html">key</a>
-</span>
-</td>
-          <td>  <span class="property-type">element
-</span>
-</td>
-          <td>  <span class="property-namespaceInfo">
-</span>
-</td>
-          <td>  <span class="property-minMaxOccurs">0/1
-</span>
-</td>
-          <td>  <span class="property-description">&nbsp;</span>
-</td>
-        </tr>
        </tbody>
        <tr>
          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_deployRequest.html">deployRequest</a></h5></td>
@@ -139,7 +105,7 @@
 </span></td>
          <td><span class="property-description">The ID of the configuration POJO that contains information used the
 chosen deployment manager (for now only ansible)
-<code>nl.uva.sne.drip.data.v1.external.PlaybookRepresentation</code></span></td>
+<code>PlaybookRepresentation</code></span></td>
        </tr>
        <tr>
          <td><span class="property-name">managerType</span></td>
@@ -163,7 +129,7 @@ chosen deployment manager (for now only ansible)
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The ID of the provision resources description <code>nl.uva.sne.drip.data.v1.external.ProvisionResponse</code></span></td>
+          <td><span class="property-description">The ID of the provision resources description <code>ProvisionResponse</code></span></td>
        </tr>
        </tbody>
        <tr>
@@ -180,7 +146,8 @@ chosen deployment manager (for now only ansible)
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -188,13 +155,6 @@ chosen deployment manager (for now only ansible)
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;d-----&gt;
-  &lt;key&gt;
-    &lt;name&gt;id_dsa.pub&lt;/name&gt;
-    &lt;type&gt;PRIVATE&lt;/type&gt;
-    &lt;attributes&gt;domain_name:Virginia&lt;/attributes&gt;
-    &lt;key&gt;-----BEGIN RSA PRIVATE KEY-----\nMIIEogIBAAKCAQEAm6AALYxkJFNzD3bfVJ4+hMY5j0/kqM9CURLKXMlYuAysnvoG8wZKx9Bedefm\neNSse4zTg798ZA2kDMZFIrwp1AseTwtj8DDu5fhG5DjyI3g6iJltS5zFQdMXneDlHXBX8cncSzNY\nRx0NdjEMAe7YttvI8FNlxL0VnMFli/HB/ftzYMe5+AmkSROncVGHiwoiUpj+vtobCFOYtXsCf6ri\nd4lgWA5wv6DZT/JKCYymiBqgSXu3ueFcEzw5SAukARWVjn1xccjZkokFfBbO/FpYY00TrUTBw9S6\nD3iM+gj8RT6EKILOmhrt71D21S95WAWIT7h2YBsy1KAvMixhNf9VaQIDAQABAoIBAHhVYK3Xl3tr\nN1Xm0ctJTQg3ijxhR2qsUBgGUokqezpdOoD2zbbOz7XvTYsX1GLr967U9pwxzUpELexexwiTvDgk\nnLv8D7ui6qbRsmc4DSsWBRSophVIVFKQmftO8Xow6x+fuYJAYmsicM1KIYHBILtL+PSzV8anenWq\nKQ3r0tfCiQhEzKEk4b1uT3SJWQyHE++JAhVkO7lIeb6S9Dg1jAaAeMnJ/NiMxTarpPRnxe6hsTsH\ngG1iKWo+Skcl4SknOc+CMEfyDjG4FL7MGhKduahsO8vMUrgGsDD7EH3NiX/FweB8La6qpDYAwFpC\nycrooyhiyzw8Wb5gGaYnmvr9l70CgYEAx74O8JleXaHpxEAmh4h7VbLmJ3mOylfBmOdzcHeedJQw\nack2SAv65WBI9S9MEQ7J/vFuyw5HNk3C/mcWgzDQXSNIhHLvl/Z9sux/Qpm3SQWLzBxKV3dJ4r\nwcAxzVA93+/L1Nee+VOKnlyRumvVa6+XLsLagpap2AVcTqlerMcCgYEAx3T2pXtqkCE9eU/ov22r\npdaKjgHoGOUg1CMEfWi/Ch6sYIIRyrHz6dhy+yR1pXNgPbLWdrn8l88F3+IsmbaMupMgRmqwEC3G\n9Y2FglGIVvRdZaagvRxLzRCcvcN4v6OYs9ST4o1xlv7Qxphld+0XDKv7VSCv/rASuK8BqlFL3E8C\ngYArMXJRnRjG7qh6g9TRIjZphdI3XxX9s5Rt2D8iZvuhAhqmBZjzY4PR7kxYmO2+EpCjzNnEl0XW\n/GHaWbiIjhnAykx4N9KP7gGom3O5lzwHUme1XnFKcO2wDjQwJbufRmba8iQF1srN577mF+Z7ha4V\nJ1duCTzvWF1KFX6sk/uhKQKBgAcDFai7rgNjJ8YcCRKxyFcMM9LKPl6hr4XFtWKzTAQPEABUkkuN\n9gVClsg9f+VRKRECOIf0Ae1UWeCFEwxUXp4wjfHrzkTDVztKvmbWdvSXorDwKrZ7SC7tZpVFSfly\nxuuLjadpUZT9YFmbAfY1X5oSccOMYqORjRbxEB3svb4BAoGAGTgFuq9Zojh/KIqY8b4HpEfmh6CQ\nhLVfD98Nqd6GDbxgvIM0v4mFXE92x2jn35Ia0JdFyh3B8Vkl7sqQZfxDFXI9O9pte2mxY9ICaY\n55+X/SN1pd53BH+gaPZJy/R+Vpvs5MN48hoUKy5UKpoFeUWrS5QArjtvNCm4SGlXw=\n-----END RSA PRIVATE KEY-----\n&lt;/key&gt;
-  &lt;/key&gt;
-  &lt;id&gt;...&lt;/id&gt;
  &lt;provisionID&gt;58e3946e0fb4f562d84ba1ad&lt;/provisionID&gt;
  &lt;managerType&gt;ansible&lt;/managerType&gt;
  &lt;configurationID&gt;58e3946e0fb4f562d84ba1ad&lt;/configurationID&gt;

--- a/docs/apidocs/xml_ns0_keyPair.html
+++ b/docs/apidocs/xml_ns0_keyPair.html
@@ -138,7 +138,8 @@ logging in VMs.</p>
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>

--- a/docs/apidocs/xml_ns0_keyValueHolder.html
+++ b/docs/apidocs/xml_ns0_keyValueHolder.html
@@ -64,7 +64,8 @@

      <h1 class="page-header">keyValueHolder <small>Data Type</small></h1>

-      <p></p>
+      <p>This is a generic class that hold key-value pairs. It's main usage is to hold
+abstract types such as TOSCA.</p>

      <dl class="dl-horizontal">
        <dt>Namespace</dt>
@@ -88,24 +89,6 @@
        </tr>
        </thead>
        <tbody>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-type">element
-</span>
-</td>
-          <td>  <span class="property-namespaceInfo">
-</span>
-</td>
-          <td>  <span class="property-minMaxOccurs">0/1
-</span>
-</td>
-          <td>  <span class="property-description">the id</span>
-</td>
-        </tr>
        </tbody>
        <tr>
          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_ownedObject.html">ownedObject</a></h5></td>
@@ -121,7 +104,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -129,7 +113,6 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;k-----&gt;
-  &lt;id&gt;...&lt;/id&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/k-----&gt;
 </pre>

--- a/docs/apidocs/xml_ns0_ownedObject.html
+++ b/docs/apidocs/xml_ns0_ownedObject.html
@@ -104,7 +104,8 @@ class</p>
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">The owner (username) for the particular object.</span>
+          <td>  <span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span>
 </td>
        </tr>
        </tbody>

--- a/docs/apidocs/xml_ns0_planResponse.html
+++ b/docs/apidocs/xml_ns0_planResponse.html
@@ -101,7 +101,8 @@
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">the level</span>
+          <td>  <span class="property-description">The level of the plan. Some provisioners use levels to represent a plan.
+In these cases there are two levels of TOSCA descriptions.</span>
 </td>
        </tr>
        <tr>
@@ -119,7 +120,7 @@
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">the name</span>
+          <td>  <span class="property-description">The name of the generated plan</span>
 </td>
        </tr>
        <tr>
@@ -137,27 +138,11 @@
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">the toscaID</span>
+          <td>  <span class="property-description">The id of the TOSCA <code>PlaybookRepresentation</code> description from
+which this plan was generated</span>
 </td>
        </tr>
        </tbody>
-        <tr>
-          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_keyValueHolder.html">keyValueHolder</a></h5></td>
-        </tr>
-        <tbody>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-type">element
-</span></td>
-          <td><span class="property-namespaceInfo">
-</span></td>
-          <td><span class="property-minMaxOccurs">0/1
-</span></td>
-          <td><span class="property-description">the id</span></td>
-        </tr>
-        </tbody>
        <tr>
          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_ownedObject.html">ownedObject</a></h5></td>
        </tr>
@@ -172,7 +157,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -180,10 +166,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
-  &lt;name&gt;...&lt;/name&gt;
-  &lt;toscaID&gt;...&lt;/toscaID&gt;
-  &lt;level&gt;...&lt;/level&gt;
-  &lt;id&gt;...&lt;/id&gt;
+  &lt;name&gt;planner_output_all.yml&lt;/name&gt;
+  &lt;toscaID&gt;58e3946e0fb4f562d84ba1ad&lt;/toscaID&gt;
+  &lt;level&gt;0&lt;/level&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/p-----&gt;
 </pre>

--- a/docs/apidocs/xml_ns0_playbookRepresentation.html
+++ b/docs/apidocs/xml_ns0_playbookRepresentation.html
@@ -64,7 +64,7 @@

      <h1 class="page-header">playbookRepresentation <small>Data Type</small></h1>

-      <p></p>
+      <p>This class represents a playbook used by ansible manager to deploy software.</p>

      <dl class="dl-horizontal">
        <dt>Namespace</dt>
@@ -86,41 +86,6 @@
        </tr>
        </thead>
        <tbody>
-        <tr>
-          <td>  <span class="property-name">name</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-type">element
-</span>
-</td>
-          <td>  <span class="property-namespaceInfo">
-</span>
-</td>
-          <td>  <span class="property-minMaxOccurs">0/1
-</span>
-</td>
-          <td>  <span class="property-description">the name</span>
-</td>
-        </tr>
-        </tbody>
-        <tr>
-          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_keyValueHolder.html">keyValueHolder</a></h5></td>
-        </tr>
-        <tbody>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-type">element
-</span></td>
-          <td><span class="property-namespaceInfo">
-</span></td>
-          <td><span class="property-minMaxOccurs">0/1
-</span></td>
-          <td><span class="property-description">the id</span></td>
-        </tr>
        </tbody>
        <tr>
          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_ownedObject.html">ownedObject</a></h5></td>
@@ -136,7 +101,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -144,8 +110,6 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
-  &lt;name&gt;...&lt;/name&gt;
-  &lt;id&gt;...&lt;/id&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/p-----&gt;
 </pre>

--- a/docs/apidocs/xml_ns0_provisionRequest.html
+++ b/docs/apidocs/xml_ns0_provisionRequest.html
@@ -64,7 +64,8 @@

      <h1 class="page-header">provisionRequest <small>Data Type</small></h1>

-      <p></p>
+      <p>This class is a holder for the the object IDs that are required by the
+provisioner to request for cloud resources.</p>

      <dl class="dl-horizontal">
        <dt>Namespace</dt>
@@ -89,7 +90,7 @@
        </thead>
        <tbody>
        <tr>
-          <td>  <span class="property-name">cloudCredentialsID</span>
+          <td>  <span class="property-name">cloudCredentialsIDs</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -100,14 +101,14 @@
          <td>  <span class="property-namespaceInfo">
 </span>
 </td>
-          <td>  <span class="property-minMaxOccurs">0/1
+          <td>  <span class="property-minMaxOccurs">0/unbounded
 </span>
 </td>
-          <td>  <span class="property-description">the cloudCredentialsID</span>
+          <td>  <span class="property-description">The cloud credentials ids required to provision the cloud resources.</span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">planID</span>
+          <td>  <span class="property-name">keyPairIDs</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -118,14 +119,14 @@
          <td>  <span class="property-namespaceInfo">
 </span>
 </td>
-          <td>  <span class="property-minMaxOccurs">0/1
+          <td>  <span class="property-minMaxOccurs">0/unbounded
 </span>
 </td>
-          <td>  <span class="property-description">the planID</span>
+          <td>  <span class="property-description">The key pair id for the keys to use to log in the provisioned VMs.</span>
 </td>
        </tr>
        <tr>
-          <td>  <span class="property-name">publicKeyID</span>
+          <td>  <span class="property-name">planID</span>
 </td>
          <td>  <span class="datatype-reference">string
 </span>
@@ -139,27 +140,10 @@
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">the publicKeyID</span>
+          <td>  <span class="property-description">The ID of the plan <code>PlanResponse</code> to provision for.</span>
 </td>
        </tr>
        </tbody>
-        <tr>
-          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_keyValueHolder.html">keyValueHolder</a></h5></td>
-        </tr>
-        <tbody>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-type">element
-</span></td>
-          <td><span class="property-namespaceInfo">
-</span></td>
-          <td><span class="property-minMaxOccurs">0/1
-</span></td>
-          <td><span class="property-description">the id</span></td>
-        </tr>
-        </tbody>
        <tr>
          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_ownedObject.html">ownedObject</a></h5></td>
        </tr>
@@ -174,7 +158,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -182,10 +167,9 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;p-----&gt;
-  &lt;cloudCredentialsID&gt;...&lt;/cloudCredentialsID&gt;
-  &lt;planID&gt;...&lt;/planID&gt;
-  &lt;publicKeyID&gt;...&lt;/publicKeyID&gt;
-  &lt;id&gt;...&lt;/id&gt;
+  &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
+  &lt;keyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/keyPairIDs&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/p-----&gt;
 </pre>

--- a/docs/apidocs/xml_ns0_provisionResponse.html
+++ b/docs/apidocs/xml_ns0_provisionResponse.html
@@ -110,48 +110,31 @@
        </tr>
        <tbody>
        <tr>
-          <td><span class="property-name">cloudCredentialsID</span></td>
+          <td><span class="property-name">cloudCredentialsIDs</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-type">element
 </span></td>
          <td><span class="property-namespaceInfo">
 </span></td>
-          <td><span class="property-minMaxOccurs">0/1
-</span></td>
-          <td><span class="property-description">the cloudCredentialsID</span></td>
-        </tr>
-        <tr>
-          <td><span class="property-name">planID</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-type">element
-</span></td>
-          <td><span class="property-namespaceInfo">
-</span></td>
-          <td><span class="property-minMaxOccurs">0/1
+          <td><span class="property-minMaxOccurs">0/unbounded
 </span></td>
-          <td><span class="property-description">the planID</span></td>
+          <td><span class="property-description">The cloud credentials ids required to provision the cloud resources.</span></td>
        </tr>
        <tr>
-          <td><span class="property-name">publicKeyID</span></td>
+          <td><span class="property-name">keyPairIDs</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-type">element
 </span></td>
          <td><span class="property-namespaceInfo">
 </span></td>
-          <td><span class="property-minMaxOccurs">0/1
+          <td><span class="property-minMaxOccurs">0/unbounded
 </span></td>
-          <td><span class="property-description">the publicKeyID</span></td>
+          <td><span class="property-description">The key pair id for the keys to use to log in the provisioned VMs.</span></td>
        </tr>
-        </tbody>
        <tr>
-          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_keyValueHolder.html">keyValueHolder</a></h5></td>
-        </tr>
-        <tbody>
-        <tr>
-          <td><span class="property-name">id</span></td>
+          <td><span class="property-name">planID</span></td>
          <td><span class="datatype-reference">string
 </span></td>
          <td><span class="property-type">element
@@ -160,7 +143,7 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">the id</span></td>
+          <td><span class="property-description">The ID of the plan <code>PlanResponse</code> to provision for.</span></td>
        </tr>
        </tbody>
        <tr>
@@ -177,7 +160,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -191,10 +175,9 @@
    &lt;user&gt;vm_user&lt;/user&gt;
    &lt;role&gt;slave&lt;/role&gt;
  &lt;/deployParameters&gt;
-  &lt;cloudCredentialsID&gt;...&lt;/cloudCredentialsID&gt;
-  &lt;planID&gt;...&lt;/planID&gt;
-  &lt;publicKeyID&gt;...&lt;/publicKeyID&gt;
-  &lt;id&gt;...&lt;/id&gt;
+  &lt;cloudCredentialsIDs&gt;58e3946e0fb4f562d84ba1ad&lt;/cloudCredentialsIDs&gt;
+  &lt;planID&gt;ASedsfd46b4fDFd83ba1q&lt;/planID&gt;
+  &lt;keyPairIDs&gt;ASedsfd46b4fFd344a1A&lt;/keyPairIDs&gt;
 &lt;/p-----&gt;
 </pre>


--- a/docs/apidocs/xml_ns0_script.html
+++ b/docs/apidocs/xml_ns0_script.html
@@ -102,24 +102,6 @@
 </span>
 </td>
          <td>  <span class="property-description">The contents of the script</span>
-</td>
-        </tr>
-        <tr>
-          <td>  <span class="property-name">id</span>
-</td>
-          <td>  <span class="datatype-reference">string
-</span>
-</td>
-          <td>  <span class="property-type">element
-</span>
-</td>
-          <td>  <span class="property-namespaceInfo">
-</span>
-</td>
-          <td>  <span class="property-minMaxOccurs">0/1
-</span>
-</td>
-          <td>  <span class="property-description">the id</span>
 </td>
        </tr>
        <tr>
@@ -155,7 +137,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -163,7 +146,6 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;s-----&gt;
-  &lt;id&gt;...&lt;/id&gt;
  &lt;name&gt;config.sh&lt;/name&gt;
  &lt;contents&gt;    #!/bin/bash
 echo &quot;Reading system-wide config....&quot; &amp;gt;&amp;amp;2\n. /etc/cool.cfg

--- a/docs/apidocs/xml_ns0_toscaRepresentation.html
+++ b/docs/apidocs/xml_ns0_toscaRepresentation.html
@@ -101,27 +101,10 @@
          <td>  <span class="property-minMaxOccurs">0/1
 </span>
 </td>
-          <td>  <span class="property-description">the name</span>
+          <td>  <span class="property-description">The name of the TOSCA description</span>
 </td>
        </tr>
        </tbody>
-        <tr>
-          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_keyValueHolder.html">keyValueHolder</a></h5></td>
-        </tr>
-        <tbody>
-        <tr>
-          <td><span class="property-name">id</span></td>
-          <td><span class="datatype-reference">string
-</span></td>
-          <td><span class="property-type">element
-</span></td>
-          <td><span class="property-namespaceInfo">
-</span></td>
-          <td><span class="property-minMaxOccurs">0/1
-</span></td>
-          <td><span class="property-description">the id</span></td>
-        </tr>
-        </tbody>
        <tr>
          <td colspan="6"><h5 class="text-muted">Properties inherited from <a href="xml_ns0_ownedObject.html">ownedObject</a></h5></td>
        </tr>
@@ -136,7 +119,8 @@
 </span></td>
          <td><span class="property-minMaxOccurs">0/1
 </span></td>
-          <td><span class="property-description">The owner (username) for the particular object.</span></td>
+          <td><span class="property-description">The owner (username) for the particular object. This value is set when
+the DAO saves the object based on the principal how made the call</span></td>
        </tr>
        </tbody>
      </table>
@@ -144,8 +128,7 @@
      <p class="lead">Example</p>
      
      <pre class="prettyprint language-xml example">&lt;t-----&gt;
-  &lt;name&gt;...&lt;/name&gt;
-  &lt;id&gt;...&lt;/id&gt;
+  &lt;name&gt;input.yml&lt;/name&gt;
  &lt;owner&gt;user1&lt;/owner&gt;
 &lt;/t-----&gt;
 </pre>

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/DeployService.java
@@ -46,6 +46,7 @@ import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 import nl.uva.sne.drip.api.dao.DeployDao;
 import nl.uva.sne.drip.api.dao.KeyPairDao;
+import nl.uva.sne.drip.api.exception.KeyException;
 import nl.uva.sne.drip.data.v1.external.KeyPair;

 /**
@@ -126,7 +127,9 @@ public class DeployService {
                    String value = p.getValue();
                    Key k = new Key();
                    k.setKey(value);
-                    deployResponse.setKey(k);
+                    KeyPair pair = new KeyPair();
+                    pair.setPrivateKey(k);
+                    deployResponse.setKey(pair);
                    save(deployResponse);
                    return deployResponse;
                }
@@ -134,6 +137,8 @@ public class DeployService {

        } catch (IOException | TimeoutException | JSONException | InterruptedException ex) {
            Logger.getLogger(DeployController.class.getName()).log(Level.SEVERE, null, ex);
+        } catch (KeyException ex) {
+            Logger.getLogger(DeployService.class.getName()).log(Level.SEVERE, null, ex);
        }
        return null;
    }
@@ -143,8 +148,8 @@ public class DeployService {
        if (pro == null) {
            throw new NotFoundException();
        }
-        String cloudConfID = pro.getCloudCredentialsID();
-        CloudCredentials cCred = cloudCredentialsService.findOne(cloudConfID);
+        List<String> cloudConfIDs = pro.getCloudCredentialsIDs();
+        CloudCredentials cCred = cloudCredentialsService.findOne(cloudConfIDs.get(0));
        List<String> loginKeysIDs = cCred.getkeyPairIDs();
        List<KeyPair> loginKeys = new ArrayList<>();
        for (String keyID : loginKeysIDs) {

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlaybookService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/PlaybookService.java
@@ -72,20 +72,15 @@ public class PlaybookService {

    public String saveFile(MultipartFile file) throws IOException {
        String originalFileName = file.getOriginalFilename();
-        String name = System.currentTimeMillis() + "_" + originalFileName;
        byte[] bytes = file.getBytes();
        String str = new String(bytes, "UTF-8");
-        return saveStringContents(str, name);
+        return saveStringContents(str);
    }

    public String saveYamlString(String yamlString, String name) throws IOException {
-        if (name == null) {
-            name = System.currentTimeMillis() + "_" + "playbook.yaml";
-        }
        yamlString = yamlString.replaceAll("\\.", "\uff0E");
        Map<String, Object> map = Converter.ymlString2Map(yamlString);
        PlaybookRepresentation t = new PlaybookRepresentation();
-        t.setName(name);
        t.setKvMap(map);
        save(t);
        return t.getId();
@@ -120,7 +115,7 @@ public class PlaybookService {
        dao.deleteAll();
    }

-    public String saveStringContents(String playbookContents, String name) throws IOException {
+    public String saveStringContents(String playbookContents) throws IOException {

        //Remove '\' and 'n' if they are together and replace them with '\n'
        char[] array = playbookContents.toCharArray();
@@ -147,7 +142,6 @@ public class PlaybookService {
        playbookContents = playbookContents.replaceAll("\\.", "\uff0E");
        Map<String, Object> map = Converter.ymlString2Map(playbookContents);
        PlaybookRepresentation t = new PlaybookRepresentation();
-        t.setName(name);
        t.setKvMap(map);
        save(t);
        return t.getId();

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/service/ProvisionService.java
@@ -165,8 +165,8 @@ public class ProvisionService {
                    provisionResponse.setDeployParameters(deployParameters);
                }
            }
-            provisionResponse.setCloudCredentialsID(provisionRequest.getCloudCredentialsID());
-            provisionResponse.setPublicKeyID(provisionRequest.getPublicKeyID());
+            provisionResponse.setCloudCredentialsIDs(provisionRequest.getCloudCredentialsIDs());
+            provisionResponse.setKeyPairIDs(provisionRequest.getKeyPairIDs());

            provisionResponse = save(provisionResponse);
            return provisionResponse;
@@ -176,7 +176,7 @@ public class ProvisionService {
    private Message buildProvisionerMessage(ProvisionRequest pReq) throws JSONException, IOException {
        Message invokationMessage = new Message();
        List<MessageParameter> parameters = new ArrayList();
-        CloudCredentials cred = cloudCredentialsService.findOne(pReq.getCloudCredentialsID());
+        CloudCredentials cred = cloudCredentialsService.findOne(pReq.getCloudCredentialsIDs().get(0));
        if (cred == null) {
            throw new CloudCredentialsNotFoundException();
        }
@@ -189,9 +189,9 @@ public class ProvisionService {
        List<MessageParameter> topologies = buildTopologyParams(pReq.getPlanID());
        parameters.addAll(topologies);

-        String userKeyID = pReq.getPublicKeyID();
-        if (userKeyID != null) {
-            List<MessageParameter> userKeys = buildKeysParams(userKeyID);
+        List<String> userKeyIDs = pReq.getKeyPairIDs();
+        if (userKeyIDs != null) {
+            List<MessageParameter> userKeys = buildKeysParams(userKeyIDs.get(0));
            parameters.addAll(userKeys);
        }


--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/DeployController0.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/DeployController0.java
@@ -79,9 +79,9 @@ public class DeployController0 {
        res.info = "INFO";
        res.status = "Success";
        List<Attribute> files = new ArrayList<>();
-        Attribute e = new Attribute();
-        e.content = key.getKey().getKey();
-        files.add(e);
+        Attribute attribute = new Attribute();
+        attribute.content = key.getKeyPair().getPrivateKey().getKey();
+        files.add(attribute);
        res.file = files;
        return res;
    }

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/ProvisionController0.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/ProvisionController0.java
@@ -86,7 +86,9 @@ public class ProvisionController0 {
        ProvisionResponse resp = new ProvisionResponse();
        CloudCredentials cloudCred = cloudCredentialsService.findAll().get(0);
        String cloudCredID = cloudCred.getId();
-        resp.setCloudCredentialsID(cloudCredID);
+        List<String> idList = new ArrayList<>();
+        idList.add(cloudCredID);
+        resp.setCloudCredentialsIDs(idList);
        List<nl.uva.sne.drip.data.v0.external.Attribute> plans = upload.file;
        nl.uva.sne.drip.data.v1.external.PlanResponse topLevelPlan = null;
        Set<String> loweLevelPlansIDs = new HashSet<>();
@@ -105,9 +107,13 @@ public class ProvisionController0 {
        String planID = topLevelPlan.getId();
        resp.setPlanID(planID);
        List<KeyPair> allKeys = userKeysService.findAll();
+        List<String> keyPairIDs = new ArrayList<>();
        if (allKeys != null && !allKeys.isEmpty()) {
-            String userKeyID = allKeys.get(0).getId();
-            resp.setPublicKeyID(userKeyID);
+            for (KeyPair keyPair : allKeys) {
+                String userKeyID = keyPair.getId();
+                keyPairIDs.add(userKeyID);
+            }
+            resp.setKeyPairIDs(keyPairIDs);
        }
        resp = provisionService.save(resp);
        return "Success: Infrastructure files are uploaded! Action number: "

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/UserPublicKeysController0.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v0/rest/UserPublicKeysController0.java
@@ -15,6 +15,8 @@
 */
 package nl.uva.sne.drip.api.v0.rest;

+import java.util.ArrayList;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import javax.annotation.security.RolesAllowed;
@@ -68,7 +70,9 @@ public class UserPublicKeysController0 {
            pair = service.save(pair);

            ProvisionResponse provPlan = provisionService.findOne(confUserKey.action);
-            provPlan.setPublicKeyID(pair.getId());
+            List<String> keyPairIDs = new ArrayList<>();
+            keyPairIDs.add(pair.getId());
+            provPlan.setKeyPairIDs(keyPairIDs);
            provisionService.save(provPlan);

            return "Success: " + pair.getId();

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ConfigurationController.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ConfigurationController.java
@@ -57,7 +57,7 @@ public class ConfigurationController {
    String post(@RequestBody String toscaContents) {
        try {

-            return playbookService.saveStringContents(toscaContents, String.valueOf(System.currentTimeMillis()));
+            return playbookService.saveStringContents(toscaContents);
        } catch (IOException ex) {
            Logger.getLogger(ConfigurationController.class.getName()).log(Level.SEVERE, null, ex);
        }

--- a/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/api/v1/rest/ProvisionController.java
@@ -125,7 +125,7 @@ public class ProvisionController {
    @RolesAllowed({UserService.USER, UserService.ADMIN})
    public @ResponseBody
    String provision(@RequestBody ProvisionRequest req) {
-        if (req.getCloudCredentialsID() == null) {
+        if (req.getCloudCredentialsIDs() == null) {
            throw new BadRequestException();
        }
        if (req.getPlanID() == null) {
@@ -142,16 +142,4 @@ public class ProvisionController {
        return null;
    }

-    @RequestMapping(value = "/sample", method = RequestMethod.GET)
-    @RolesAllowed({UserService.USER, UserService.ADMIN})
-    public @ResponseBody
-    ProvisionRequest provision() {
-        ProvisionRequest r = new ProvisionRequest();
-
-        r.setCloudCredentialsID("Cloud_Credentials_ID");
-        r.setPlanID("Plan_ID");
-        r.setPublicKeyID("Public_Key_ID");
-        return r;
-    }
-
 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/CloudCredentials.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/CloudCredentials.java
@@ -32,9 +32,6 @@ public class CloudCredentials extends OwnedObject {
    public static String ACCESS_KEY_NAME = "accessKeyId";
    public static String SECRET_KEY_NAME = "secretKey";

-    @Id
-    private String id;
-
    private String secretKey;

    private String accessKeyId;
@@ -57,15 +54,6 @@ public class CloudCredentials extends OwnedObject {
        this.secretKey = secretKey;
    }

-    /**
-     * The UID of this object. 
-     * @return 
-     */
-    @DocumentationExample("58e3946e0fb4f562d84ba1ad")
-    public final String getId() {
-        return id;
-    }
-
    /**
     * The name of the cloud provider
     *

--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/DeployRequest.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/DeployRequest.java
@@ -30,7 +30,7 @@ public class DeployRequest extends OwnedObject {
    private String configurationID;

    /**
-     * The ID of the provision resources description <code>nl.uva.sne.drip.data.v1.external.ProvisionResponse</code>
+     * The ID of the provision resources description <code>ProvisionResponse</code>
     * @return the provisionID
     */
    @DocumentationExample("58e3946e0fb4f562d84ba1ad")
@@ -64,7 +64,7 @@ public class DeployRequest extends OwnedObject {
    /**
     * The ID of the configuration POJO that contains information used the 
     * chosen deployment manager (for now only ansible) 
-     * <code>nl.uva.sne.drip.data.v1.external.PlaybookRepresentation</code>
+     * <code>PlaybookRepresentation</code>
     * @return the configurationID
     */
    @DocumentationExample("58e3946e0fb4f562d84ba1ad")

--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/DeployResponse.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/DeployResponse.java
@@ -19,37 +19,28 @@ import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

 /**
- *
+ * This class represents the response of a deploy request. It may hold a key 
+ * pair used for logging in and managing a docker cluster. Currently they key 
+ * pair is only used by kubernetes
+ * 
 * @author S. Koulouzis
 */
 @Document
 public class DeployResponse extends DeployRequest {

-    @Id
-    private String id;
-
-    private Key key;
+    private KeyPair key;

-    public void setKey(Key key) {
+    public void setKey(KeyPair key) {
        this.key = key;
    }

-    public Key getKey() {
-        return key;
-    }
-
    /**
-     * @return the id
+     * The key pair to log in and manage a docker cluster
+     * @return 
     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
+    
+    public KeyPair getKeyPair() {
+        return key;
    }

 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/KeyPair.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/KeyPair.java
@@ -28,9 +28,6 @@ import org.springframework.data.mongodb.core.mapping.Document;
 @Document
 public class KeyPair extends OwnedObject {

-    @Id
-    private String id;
-
    private Key privateKey;
    private Key publicKey;

@@ -70,11 +67,4 @@ public class KeyPair extends OwnedObject {
        this.publicKey = publicKey;
    }

-    /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
-
 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/KeyValueHolder.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/KeyValueHolder.java
@@ -15,25 +15,28 @@
 */
 package nl.uva.sne.drip.data.v1.external;

+import com.webcohesion.enunciate.metadata.DocumentationExample;
 import java.util.Map;
 import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

 /**
- *
+ * This is a generic class that hold key-value pairs. It's main usage is to hold 
+ * abstract types such as TOSCA.
+ * 
 * @author S. Koulouzis
 */
 @Document
 public class KeyValueHolder extends OwnedObject{

-    @Id
-    private String id;
-
    private Map<String, Object> keyValue;

    /**
+     *  The key-value map 
     * @return the keyValue
     */
+    @DocumentationExample("\"artifact_types\":{\"tosca.artifacts.Deployment.Image.Container.Docker\":"
+            + "{\"derived_from\": \"tosca.artifacts.Deployment.Image\"}}")
    public Map<String, Object> getKeyValue() {
        return keyValue;
    }
@@ -45,18 +48,4 @@ public class KeyValueHolder extends OwnedObject{
        this.keyValue = keyValue;
    }

-    /**
-     * @return the id
-     */
-    public String getId() {
-        return id;
-    }
-
-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/OwnedObject.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/OwnedObject.java
@@ -17,21 +17,28 @@ package nl.uva.sne.drip.data.v1.external;

 import com.webcohesion.enunciate.metadata.DocumentationExample;
 import javax.validation.constraints.NotNull;
+import org.springframework.data.annotation.Id;
 import org.springframework.data.mongodb.core.mapping.Document;

 /**
- * This is the base class for users to own resources. Many classes extend this 
+ * This is the base class for users to own resources. Many classes extend this
 * class
+ *
 * @author S. Koulouzis
 */
 @Document
 public class OwnedObject {

+    @Id
+    private String id;
+
    @NotNull
    private String owner;

    /**
-     * The owner (username) for the particular object.
+     * The owner (username) for the particular object. This value is set when 
+     * the DAO saves the object based on the principal how made the call
+     *
     * @return the owner
     */
    @DocumentationExample("user1")
@@ -46,4 +53,15 @@ public class OwnedObject {
        this.owner = owner;
    }

+    /**
+     * The UID of this object. This value is auto generated by the DAO when the 
+     * object is saved.
+     *
+     * @return the id
+     */
+    @DocumentationExample("58e3946e0fb4f562d84ba1ad")
+    public String getId() {
+        return id;
+    }
+
 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/PlanResponse.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/PlanResponse.java
@@ -15,6 +15,7 @@
 */
 package nl.uva.sne.drip.data.v1.external;

+import com.webcohesion.enunciate.metadata.DocumentationExample;
 import java.util.Set;
 import org.springframework.data.mongodb.core.mapping.Document;

@@ -36,8 +37,11 @@ public class PlanResponse extends KeyValueHolder {
    private Set<String> loweLevelPlansIDs;

    /**
+     * The name of the generated plan
+     *
     * @return the name
     */
+    @DocumentationExample("planner_output_all.yml")
    public String getName() {
        return name;
    }
@@ -50,8 +54,12 @@ public class PlanResponse extends KeyValueHolder {
    }

    /**
+     * The id of the TOSCA <code>PlaybookRepresentation</code> description from
+     * which this plan was generated
+     *
     * @return the toscaID
     */
+    @DocumentationExample("58e3946e0fb4f562d84ba1ad")
    public String getToscaID() {
        return toscaID;
    }
@@ -64,8 +72,12 @@ public class PlanResponse extends KeyValueHolder {
    }

    /**
+     * The level of the plan. Some provisioners use levels to represent a plan.
+     * In these cases there are two levels of TOSCA descriptions.
+     *
     * @return the level
     */
+    @DocumentationExample("0")
    public Integer getLevel() {
        return level;
    }
@@ -78,8 +90,14 @@ public class PlanResponse extends KeyValueHolder {
    }

    /**
+     * The list of the lower level plans attached to this plan. Some 
+     * provisioners use levels to represent a plan. In these cases there are two 
+     * levels of TOSCA descriptions.
+     *
+     *
     * @return the loweLevelPlansIDs
     */
+    @DocumentationExample("ew44Ae3946e0sdds4f562d84baA")
    public Set<String> getLoweLevelPlanIDs() {
        return loweLevelPlansIDs;
    }

--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/PlaybookRepresentation.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/PlaybookRepresentation.java
@@ -18,25 +18,9 @@ package nl.uva.sne.drip.data.v1.external;
 import org.springframework.data.mongodb.core.mapping.Document;

 /**
- *
+ * This class represents a playbook used by ansible manager to deploy software.
 * @author S. Koulouzis
 */
 @Document
 public class PlaybookRepresentation extends KeyValueHolder {
-
-    private String name;
-
-    /**
-     * @return the name
-     */
-    public String getName() {
-        return name;
-    }
-
-    /**
-     * @param name the name to set
-     */
-    public void setName(String name) {
-        this.name = name;
-    }
 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/ProvisionRequest.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/ProvisionRequest.java
@@ -15,38 +15,48 @@
 */
 package nl.uva.sne.drip.data.v1.external;

+import com.webcohesion.enunciate.metadata.DocumentationExample;
+import java.util.List;
 import org.springframework.data.mongodb.core.mapping.Document;

 /**
+ * This class is a holder for the the object IDs that are required by the
+ * provisioner to request for cloud resources.
 *
 * @author S. Koulouzis
 */
 @Document
 public class ProvisionRequest extends KeyValueHolder {

-    private String cloudCredentialsID;
+    private List<String> cloudCredentialsIDs;

    private String planID;

-    private String publicKeyID;
+    private List<String> keyPairIDs;

    /**
-     * @return the cloudCredentialsID
+     * The cloud credentials ids required to provision the cloud resources.
+     *
+     * @return the cloudCredentialsIDs
     */
-    public String getCloudCredentialsID() {
-        return cloudCredentialsID;
+    @DocumentationExample("58e3946e0fb4f562d84ba1ad")
+    public List<String> getCloudCredentialsIDs() {
+        return cloudCredentialsIDs;
    }

    /**
-     * @param cloudCredentialsID the cloudCredentialsID to set
+     * @param cloudCredentialsIDs the cloudCredentialsIDs to set
     */
-    public void setCloudCredentialsID(String cloudCredentialsID) {
-        this.cloudCredentialsID = cloudCredentialsID;
+    public void setCloudCredentialsIDs(List<String> cloudCredentialsIDs) {
+        this.cloudCredentialsIDs = cloudCredentialsIDs;
    }

    /**
+     * The ID of the plan <code>PlanResponse</code> to provision for.
+     *
     * @return the planID
     */
+    @DocumentationExample("ASedsfd46b4fDFd83ba1q")
    public String getPlanID() {
        return planID;
    }
@@ -59,16 +69,18 @@ public class ProvisionRequest extends KeyValueHolder {
    }

    /**
-     * @return the publicKeyID
+     * The key pair id for the keys to use to log in the provisioned VMs.
+     * @return the keyPairIDs
     */
-    public String getPublicKeyID() {
-        return publicKeyID;
+     @DocumentationExample("ASedsfd46b4fFd344a1A")
+    public List<String> getKeyPairIDs() {
+        return keyPairIDs;
    }

    /**
-     * @param userKeyID the publicKeyID to set
+     * @param userKeyID the keyPairIDs to set
     */
-    public void setPublicKeyID(String userKeyID) {
-        this.publicKeyID = userKeyID;
+    public void setKeyPairIDs(List<String> userKeyID) {
+        this.keyPairIDs = userKeyID;
    }
 }
--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/ToscaRepresentation.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/ToscaRepresentation.java
@@ -15,6 +15,7 @@
 */
 package nl.uva.sne.drip.data.v1.external;

+import com.webcohesion.enunciate.metadata.DocumentationExample;
 import org.springframework.data.mongodb.core.mapping.Document;

 /**
@@ -27,8 +28,11 @@ public class ToscaRepresentation extends KeyValueHolder {
    private String name;

    /**
+     * The name of the TOSCA description
+     *
     * @return the name
     */
+    @DocumentationExample("input.yml")
    public String getName() {
        return name;
    }

--- a/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/User.java
+++ b/drip-api/src/main/java/nl/uva/sne/drip/data/v1/external/User.java
@@ -51,19 +51,16 @@ public class User implements UserDetails {
    private boolean enabled;

    /**
+     * The unique id of this object. This value is auto-generated when the DAO
+     * saves this object
+     *
     * @return the id
     */
+    @DocumentationExample("58e3946e0fb4f562d84ba1ad")
    public String getId() {
        return id;
    }

-    /**
-     * @param id the id to set
-     */
-    public void setId(String id) {
-        this.id = id;
-    }
-
    @Override
    @JsonIgnore
    public Collection<? extends GrantedAuthority> getAuthorities() {

--- a/drip-deployer/playbook2.yml
+++ b/drip-deployer/playbook2.yml
@@ -5,6 +5,7 @@
    apt: name="{{ item }}" update_cache=yes state=latest
    with_items: [phoronix-test-suite, sysbench, expect, git, python-pexpect, php-zip]
    become: true
+    
  - {name: Phoronix-test-suite accept User Agreement, command: 'expect -c "spawn phoronix-test-suite;
      expect \"Do you agree to these terms and wish to proceed \(Y/n\):\"; send \"Y
      \"; expect \"Enable anonymous usage / statistics reporting \(Y/n\):\"; send