Author: buildbot
Date: Fri Jun 26 16:27:14 2015
New Revision: 956080
Log:
Staging update by buildbot for vcl
Modified:
websites/staging/vcl/trunk/content/ (props changed)
websites/staging/vcl/trunk/content/dev/database-schema.html
Propchange: websites/staging/vcl/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Fri Jun 26 16:27:14 2015
@@ -1 +1 @@
-1675835
+1687808
Modified: websites/staging/vcl/trunk/content/dev/database-schema.html
==============================================================================
--- websites/staging/vcl/trunk/content/dev/database-schema.html (original)
+++ websites/staging/vcl/trunk/content/dev/database-schema.html Fri Jun 26
16:27:14 2015
@@ -86,19 +86,29 @@
<li><a href="#computerloadflow-table">computerloadflow table</a></li>
<li><a href="#computerloadlog-table">computerloadlog table</a></li>
<li><a href="#computerloadstate-table">computerloadstate table</a></li>
+<li><a href="#connectlog-table">connectlog table</a></li>
<li><a href="#connectmethod-table">connectmethod table</a></li>
<li><a href="#connectmethodmap-table">connectmethodmap table</a></li>
+<li><a href="#connectmethodport">connectmethodport</a></li>
<li><a href="#continuations-table">continuations table</a></li>
<li><a href="#documentation-table">documentation table</a></li>
<li><a href="#image-table">image table</a></li>
<li><a href="#imagemeta-table">imagemeta table</a></li>
<li><a href="#imagerevision-table">imagerevision table</a></li>
+<li><a href="#imagerevisioninfo">imagerevisioninfo</a></li>
+<li><a href="#imagetype">imagetype</a></li>
<li><a href="#imtype-table">IMtype table</a></li>
<li><a href="#localauth-table">localauth table</a></li>
<li><a href="#log-table">log table</a></li>
<li><a href="#loginlog-table">loginlog table</a></li>
<li><a href="#managementnode-table">managementnode table</a></li>
<li><a href="#module-table">module table</a></li>
+<li><a href="#nathost">nathost</a></li>
+<li><a href="#nathostcomputermap">nathostcomputermap</a></li>
+<li><a href="#natlog">natlog</a></li>
+<li><a href="#natport">natport</a></li>
+<li><a href="#openstackcomputermap">openstackcomputermap</a></li>
+<li><a href="#openstackimagerevision">openstackimagerevision</a></li>
<li><a href="#os-table">OS table</a></li>
<li><a href="#osinstalltype-table">OSinstalltype table</a></li>
<li><a href="#ostype-table">OStype table</a></li>
@@ -118,6 +128,7 @@
<li><a href="#resourcetype-table">resourcetype table</a></li>
<li><a href="#schedule-table">schedule table</a></li>
<li><a href="#scheduletimes-table">scheduletimes table</a></li>
+<li><a href="#semaphone-table">semaphone table</a></li>
<li><a href="#serverprofile-table">serverprofile table</a></li>
<li><a href="#serverrequest-table">serverrequest table</a></li>
<li><a href="#shibauth-table">shibauth table</a></li>
@@ -152,6 +163,7 @@
<li><strong>sitewwwaddress</strong> - URL for login page for this affiliation;
typically it is just the URL encoded parameters to index.php to have the
authentication method already selected (i.e. <a
href="https://vcl.example.org/vcl/index.php?mode=selectauth&authtype=EXAMPLE%20LDAP";
class="external-link"
rel="nofollow">https://vcl.example.org/vcl/index.php?mode=selectauth&authtype=EXAMPLE%20LDAP</a>)</li>
<li><strong>helpaddress</strong> - support email address for this
affiliation</li>
<li><strong>shibonly</strong> - 1 if this affiliation can only be
authenticated via shibboleth, 0 if LDAP is also set up</li>
+<li><strong>theme</strong> - theme to be used for the web UI for users with
this affiliation; must match something under the themes directory of the web
code</li>
</ul>
<h3 id="blockcomputers-table">blockComputers table</h3>
<p>This table tracks which computers have been allocated to individual block
allocation time slots.</p>
@@ -214,12 +226,15 @@
<ul>
<li><strong>id</strong> - id of entry</li>
<li><strong>logid</strong> - reference to log.id</li>
+<li><strong>userid</strong> - user.id for the user that made the change (in
case of server reservations, may not match owner of reservation)</li>
+<li><strong>reservationid</strong> - reservation.id of the reservation
affected by the change</li>
<li><strong>start</strong> - change to start time of reservation</li>
<li><strong>end</strong> - change to end time of reservation</li>
<li><strong>computerid</strong> - reference to computer.id - change to
computer assigned to reservation</li>
<li><strong>remoteIP</strong> - change to remote IP of reservation user</li>
<li><strong>wasavailable</strong> - mostly deprecated - if submitted change to
start/end time of reservation was available for use or not</li>
<li><strong>timestamp</strong> - datetime entry was added</li>
+<li><strong>other</strong> - for recording events users cause to happen to
reservations such as reinstalling, rebooting, or changing admin/login user
groups (recorded by calling addChangeLogEntryOther in the web code)</li>
</ul>
<h3 id="clickthroughs-table">clickThroughs table</h3>
<p>This table logs click through agreements users must agree to when they
create images.</p>
@@ -238,6 +253,7 @@
<li><strong>ownerid</strong> - reference to owner.id - owner of computer</li>
<li><strong>platformid</strong> - reference to platform.id - platform of
computer</li>
<li><strong>scheduleid</strong> - reference to schedule.id - schedule of
computer</li>
+<li><strong>vmhostid</strong> - reference to vmhost.id - only used for virtual
machines, this is the host computer of the VM</li>
<li><strong>currentimageid</strong> - reference to image.id - image currently
loaded on computer</li>
<li><strong>nextimageid</strong> - reference to image.id - image to be loaded
next on computer, only used under certain circumstances</li>
<li><strong>imagerevisionid</strong> - reference to imagerevision.id - image
revision currently loaded on computer (somewhat redundant with
currentimageid)</li>
@@ -247,13 +263,14 @@
<li><strong>network</strong> - speed of (public?) NIC(s) in Mbps</li>
<li><strong>hostname</strong> - private hostname of computer</li>
<li><strong>IPaddress</strong> - public IP address</li>
-<li><strong>privateIPaddress</strong> - private IP address
-eth0macaddress - MAC address of private NIC
-eth1macaddress - MAC address of public NIC</li>
+<li><strong>privateIPaddress</strong> - private IP address</li>
+<li><strong>eth0macaddress</strong> - MAC address of private NIC</li>
+<li><strong>eth1macaddress</strong> - MAC address of public NIC</li>
<li><strong>type</strong> - blade, lab, or virtualmachine - type of the
computer</li>
<li><strong>provisioningid</strong> - reference to provisioning.id -
provisioning module/method to be used for computer</li>
<li><strong>drivetype</strong> - hda or sda - type of drive in the computer
(is this still used?)</li>
<li><strong>deleted</strong> - flag to show if computer has been deleted - 1
if deleted, 0 if not</li>
+<li><strong>datedeleted</strong> - datetime field for when computer was
flagged as deleted</li>
<li><strong>notes</strong> - any notes entered when computer placed into
maintenance state</li>
<li><strong>lastcheck</strong> - date stamp of last time the computer was
checked through healthcheck.pl</li>
<li><strong>location</strong> - physical location of node (Data Center 1, rack
1, etc)</li>
@@ -263,8 +280,8 @@ eth1macaddress - MAC address of public N
<li><strong>rsapub</strong> - Not being used. Was planned for storing host
keys for ssh </li>
<li><strong>host</strong> - Not being used. Was planned for storing host keys
for ssh</li>
<li><strong>hostpub</strong> - Not being used. Was planned for storing host
keys for ssh</li>
-<li><strong>vmhostid</strong> - reference to vmhost.id - only used for virtual
machines, this is the host computer of the VM</li>
<li><strong>vmtypeid</strong> - reference to vmtype.id - only used for virtual
machines, this is the type of the VM (vmware, xen, kvm, etc)</li>
+<li><strong>predictivemoduleid</strong> - module.id for the perl module that
handles what to do with the node after a reservation</li>
</ul>
<h3 id="computerloadflow-table">computerloadflow table</h3>
<p>This table contains entries that establish a flow of states that are
followed when a reservation is being deployed so that users can have feedback
on the current reservations page about their reservations.</p>
@@ -291,14 +308,23 @@ eth1macaddress - MAC address of public N
<li><strong>prettyname</strong> - more descriptive name of state</li>
<li><strong>est</strong> - estimated time for state in minutes</li>
</ul>
+<h3 id="connectlog-table">connectlog table</h3>
+<p>This table contains information about users connecting to reservations.</p>
+<ul>
+<li><strong>id</strong> - id of entry</li>
+<li><strong>logid</strong> - log.id for reservation</li>
+<li><strong>reservationid</strong> - reservation.id for reservation</li>
+<li><strong>userid</strong> - user.id for user connecting to reservation</li>
+<li><strong>remoteIP</strong> - remote IP of user</li>
+<li><strong>varified</strong> - </li>
+<li><strong>timestamp</strong> - time stamp when event occurred</li>
+</ul>
<h3 id="connectmethod-table">connectmethod table</h3>
<p>This table contains all of the connect methods available to be assigned to
an image. Connect methods are things like RDP, ssh, VNC, etc.</p>
<ul>
<li><strong>id</strong> - id of entry</li>
<li><strong>name</strong> - name of entry</li>
<li><strong>description</strong> - description of connect method</li>
-<li><strong>protocol</strong> - TCP or UDP</li>
-<li><strong>port</strong> - tcp or udp port number</li>
<li><strong>connecttext</strong> - this text will be displayed on the Connect
page, there are a few variable substitutions available to be used: #userid#,
#password#, #connectIP#, and #connectport#</li>
<li><strong>servicename</strong> - name of service to be started to enable
connect method on provisioned node</li>
<li><strong>startupscript</strong> - name of script to be run to enable
connect method on provisioned node</li>
@@ -313,6 +339,14 @@ eth1macaddress - MAC address of public N
<li><strong>disabled</strong> - flag telling if method is enabled/disabled for
combination of OStypeid, OSid, and imagerevisionid</li>
<li><strong>autoprovisioned</strong> - NULL, 0, or 1 - flag to tell if this
connect method can be autoprovisioned by vcld or if the image owner must
install the software to enable it</li>
</ul>
+<h3 id="connectmethodport">connectmethodport</h3>
+<p>This table contains the ports associated with a connectmethod. The ports
were initially part of the connectmethod table, but separating them out allowed
for multiple ports per connect method.</p>
+<ul>
+<li><strong>id</strong> - id of entry</li>
+<li><strong>connectmethodid</strong> - connectmethod.id of which these ports
are part</li>
+<li><strong>protocol</strong> - TCP or UDP</li>
+<li><strong>port</strong> - tcp or udp port number</li>
+</ul>
<h3 id="continuations-table">continuations table</h3>
<p>This table contains "continuations" which are basically saved states that
can then be submitted by the frontend to perform an action.</p>
<ul>
@@ -340,6 +374,7 @@ eth1macaddress - MAC address of public N
<li><strong>name</strong> - system name of image</li>
<li><strong>prettyname</strong> - name of image that is displayed to users</li>
<li><strong>ownerid</strong> - reference to user.id - owner of image</li>
+<li><strong>imagetypeid</strong> - reference to imagetype.id - type of the
image</li>
<li><strong>platformid</strong> - reference to platform.id - platform of
image</li>
<li><strong>OSid</strong> - reference to OS.id - OS of image</li>
<li><strong>imagemetaid</strong> - reference to imagemeta.id - NULL or id from
imagemeta table where additional image information is stored</li>
@@ -367,11 +402,11 @@ eth1macaddress - MAC address of public N
<li><strong>id</strong> - id of entry</li>
<li><strong>checkuser</strong> - flag to tell if reservations for image should
be timed out if user is disconnect for > 15 minutes - 0 not to do timeout, 1
to do timeout</li>
<li><strong>subimages</strong> - flag to tell if subimages are associated with
image</li>
-<li><strong>usergroupid</strong> - reference to usergroup.id - user group
allowed to log in to reservations for image (deprecated?)</li>
<li><strong>sysprep</strong> - flat to tell if sysprep should be used on this
image (bare metal images only, sysprep is always disabled for VMs)</li>
<li><strong>postoption</strong> - ??</li>
<li><strong>architecture</strong> - ??</li>
<li><strong>rootaccess</strong> - flag to tell if users should have root
access on reservations for image - 1 to have it, 0 not to</li>
+<li><strong>sethostname</strong> - flag to determine if vcld should set the
hostname of the computer after an image is deployed to the computer.hostname
entry for the computer; default value is NULL; default behaviour for windows is
not to set it; default behaviour for linux is to set it</li>
</ul>
<h3 id="imagerevision-table">imagerevision table</h3>
<p>This table contains an entry for every revision (including the initial one)
of each image.</p>
@@ -388,6 +423,19 @@ eth1macaddress - MAC address of public N
<li><strong>imagename</strong> - system name of revision</li>
<li><strong>autocaptured</strong> - flag to tell if this was an auto-captured
revision - 1 if it was, 0 otherwise</li>
</ul>
+<h3 id="imagerevisioninfo">imagerevisioninfo</h3>
+<ul>
+<li><strong>imagerevisionid</strong> - reference to imagerevision.id</li>
+<li><strong>usernames</strong> - </li>
+<li><strong>firewallenabled</strong> - </li>
+<li><strong>timestamp</strong> - </li>
+</ul>
+<h3 id="imagetype">imagetype</h3>
+<p>This table is a list of all of the types of images VCL can handle. As of
2.4.2, these values are kickstart, lab, none, partimage, partimage-ng, qcow2,
vdi, and vmdk.</p>
+<ul>
+<li><strong>id</strong> - id of entry</li>
+<li><strong>name</strong> - name of entry</li>
+</ul>
<h3 id="imtype-table">IMtype table</h3>
<p>This table never really got used. The idea was the people could be
notified via IM in addition to or instead of via email.</p>
<ul>
@@ -430,6 +478,7 @@ eth1macaddress - MAC address of public N
<li><strong>timestamp</strong> - date/time authentication attempt occurred</li>
<li><strong>passfail</strong> - 0 for fail, 1 for pass</li>
<li><strong>remoteIP</strong> - IP address of user's machine</li>
+<li><strong>code</strong> - either "none" or "invalid credentials" - used for
recording when an LDAP server responds with "invalid credentials" when
attempting to validate a username/password combination</li>
</ul>
<h3 id="managementnode-table">managementnode table</h3>
<p>This table contains information about each management node.</p>
@@ -447,7 +496,6 @@ eth1macaddress - MAC address of public N
<li><strong>imagelibuser</strong> - user to use when fetching images from
other management nodes</li>
<li><strong>imagelibkey</strong> - ssh identity key to use when fetching
images from other management nodes</li>
<li><strong>keys</strong> - comman delimited list of ssh identity keys to use
when sshing to compute nodes</li>
-<li><strong>predictivemoduleid</strong> - id of module for predicting which
image to load when a reservation completes</li>
<li><strong>sshport</strong> - ssh port to listen on</li>
<li><strong>publicIPconfiguration</strong> - how compute nodes managed by this
node obtain their public IP</li>
<li><strong>publicSubnetMask</strong> - if publicIPconfiguration is 'static',
enter the subnet mask to be used when configuring the compute nodes
addresses</li>
@@ -455,7 +503,8 @@ eth1macaddress - MAC address of public N
<li><strong>publicDNSserver</strong> - if publicIPconfiguration is 'static',
enter the DNS server to be used when configuring the compute nodes
addresses</li>
<li><strong>sysadminEmailAddress</strong> - email address to use when sending
problem reports</li>
<li><strong>sharedMailBox</strong> - email address to use for sending shadow
emails of user emails
-NOT_STANDALONE - ??</li>
+NOT_STANDALONE - list of affiliations for which federated authentication is
used for Linux images, meaning vcld does not need to set a password for users
when creating their reservations because the image will handle it via federated
authentication</li>
+<li><strong>availablenetworks</strong> - list of networks for which the
management node is capable of configuring fixed (static) addresses for server
reservations</li>
</ul>
<h3 id="module-table">module table</h3>
<p>This table contains information about the various perl modules that are
part of vcld.</p>
@@ -466,6 +515,51 @@ NOT_STANDALONE - ??</li>
<li><strong>description</strong> - description of module</li>
<li><strong>perlpackage</strong> - string to use when including this module in
perl scripts</li>
</ul>
+<h3 id="nathost">nathost</h3>
+<p>This table tracks which nodes are configured to be used as NAT hosts.</p>
+<ul>
+<li><strong>id</strong> - id of entry</li>
+<li><strong>resourceid</strong> - reference to resource.id - which resource is
being used as a NAT host (can be either a computer or management node)</li>
+<li><strong>publicIPaddress</strong> - IP address on node that faces the
public Internet</li>
+<li><strong>internalIPaddress</strong> - IP address on node that faces the
internal network</li>
+</ul>
+<h3 id="nathostcomputermap">nathostcomputermap</h3>
+<p>This table maps compute nodes to nodes being used as a NAT host for
them.</p>
+<ul>
+<li><strong>nathostid</strong> - reference to nathost.id</li>
+<li><strong>computerid</strong> - reference to computer.id</li>
+</ul>
+<h3 id="natlog">natlog</h3>
+<p>This table records relevant information about how NAT was configured for a
reservation.</p>
+<ul>
+<li><strong>sublogid</strong> - reference to sublog.id - sublog entry for
reservation</li>
+<li><strong>nathostresourceid</strong> - reference to resource.id - resource
id of host doing NAT at time of reservation</li>
+<li><strong>publicIPaddress</strong> - public facing IP address on NAT host at
time of reservation</li>
+<li><strong>publicport</strong> - public port forwarded to internal node on
NAT host at time of reservation</li>
+<li><strong>internalIPaddress</strong> - internal facing IP address on NAT
host at time of reservation</li>
+<li><strong>internalport</strong> - internal port on reserved node to which
forwarding was done on NAT host at time of reservation</li>
+<li><strong>protocol</strong> - protocol (TCP or UDP) of port that was
forwarded at time of reservation</li>
+<li><strong>timestamp</strong> - timestamp at which the port forward was set
up</li>
+</ul>
+<h3 id="natport">natport</h3>
+<p>This table tracks which ports are actively being forwarded on NAT hosts for
which reservations.</p>
+<ul>
+<li><strong>reservationid</strong> - reference to reservation.id - reservation
for which port is forwarded</li>
+<li><strong>nathostid</strong> - reference to nathost.id - node on which port
is forwarded</li>
+<li><strong>publicport</strong> - public port being forwarded on NAT host</li>
+<li><strong>connectmethodportid</strong> - reference to
connectmethodport.id</li>
+</ul>
+<h3 id="openstackcomputermap">openstackcomputermap</h3>
+<ul>
+<li><strong>instanceid</strong> - </li>
+<li><strong>computerid</strong> - </li>
+</ul>
+<h3 id="openstackimagerevision">openstackimagerevision</h3>
+<ul>
+<li><strong>imagerevisionid</strong> - </li>
+<li><strong>imagedetails</strong> - </li>
+<li><strong>flavordetails</strong> - </li>
+</ul>
<h3 id="os-table">OS table</h3>
<p>This table contains information about OSes VCL knows about.</p>
<ul>
@@ -474,6 +568,7 @@ NOT_STANDALONE - ??</li>
<li><strong>prettyname</strong> - more descriptive name of OS</li>
<li><strong>type</strong> - reference to OStype.name - windows, linux, unix,
etc</li>
<li><strong>installtype</strong> - reference to OSinstalltype.name - none,
partimage, kickstart, etc</li>
+<li><strong>minram</strong> - minimum RAM required by this OS</li>
<li><strong>sourcepath</strong> - ??</li>
<li><strong>moduleid</strong> - reference to module.id - module that handles
this OS</li>
</ul>
@@ -618,6 +713,16 @@ resourcetypeid2 - reference to resourcet
<li><strong>start</strong> - start of time slot in minutes since midnight
Sunday morning</li>
<li><strong>end</strong> - end of time slot in minutes since midnight Sunday
morning</li>
</ul>
+<h3 id="semaphone-table">semaphone table</h3>
+<p>This table is used by the frontend to manage semaphores for computers being
considered for reservations. During normal network and CPU loads, entries in
this table should only exist for fractions of a second.</p>
+<ul>
+<li><strong>computerid</strong> - reference to computer.id - computer being
locked</li>
+<li><strong>imageid</strong> - reference to image.id - image to be deployed on
computer</li>
+<li><strong>imagerevisionid</strong> - reference to imagerevision.id -
revision of image to be deployed on computer</li>
+<li><strong>managementnodeid</strong> - reference to managementnode.id -
management node to handle reservation</li>
+<li><strong>expires</strong> - timestamp after which the semaphore is
considered to be expired; can be configured by setting SEMTIMEOUT in conf.php,
defaults to 45 seconds after insertion</li>
+<li><strong>procid</strong> - unique id for process that obtained the lock
(combination of hostname and process id)</li>
+</ul>
<h3 id="serverprofile-table">serverprofile table</h3>
<p>This table contains all of the server profiles.</p>
<ul>
@@ -631,19 +736,20 @@ resourcetypeid2 - reference to resourcet
<li><strong>fixedMAC</strong> - MAC address reservations for this profile will
typically use</li>
<li><strong>admingroupid</strong> - reference to usergroup.id</li>
<li><strong>logingroupid</strong> - reference to usergroup.id</li>
-<li><strong>monitored</strong> - </li>
+<li><strong>monitored</strong> - (unused)</li>
</ul>
<h3 id="serverrequest-table">serverrequest table</h3>
<p>This table contains an entry for each server reservation.</p>
<ul>
<li><strong>id</strong> - id of entry</li>
+<li><strong>name</strong> - name of server reservation</li>
<li><strong>serverprofileid</strong> - reference to serverprofile.id - 0 if no
profile used or too many items changed from profile</li>
<li><strong>requestid</strong> - reference to request.id - main request entry
associated with this server reservation</li>
<li><strong>fixedIP</strong> - IP address to use on deployed machine</li>
<li><strong>fixedMAC</strong> - MAC address to use on deployed machine</li>
<li><strong>admingroupid</strong> - reference to usergroup.id - user group
containing users that should be able to control this reservation and have admin
access to the machine</li>
<li><strong>logingroupid</strong> - reference to usergroup.id - user group
containing users that should be only be able to log in to this machine (will
see reservation, but only the Connect button)</li>
-<li><strong>monitored</strong> - 1 to have this reservation monitored, 0
otherwise</li>
+<li><strong>monitored</strong> - 1 to have this reservation monitored, 0
otherwise (unused)</li>
</ul>
<h3 id="shibauth-table">shibauth table</h3>
<p>This table contains authentication information related to shibboleth
logins.</p>
@@ -678,8 +784,9 @@ resourcetypeid2 - reference to resourcet
<ul>
<li><strong>graphtype</strong> - totalres, concurres, concurblade, or concurvm
- type of graph for this entry</li>
<li><strong>statdate</strong> - date for this entry</li>
-<li><strong>affiliationid</strong> - affiliation for this entry</li>
+<li><strong>affiliationid</strong> - reference to affiliation.id; affiliation
for this entry or NULL</li>
<li><strong>value</strong> - data point value for this entry</li>
+<li><strong>provisioningid</strong> - reference to provisioning.id;
provisioning id for this entry or NULL</li>
</ul>
<h3 id="subimages-table">subimages table</h3>
<p>This table contains a list of sub images associated with any clusters.</p>
@@ -690,6 +797,7 @@ resourcetypeid2 - reference to resourcet
<h3 id="sublog-table">sublog table</h3>
<p>This table contains an entry for each computer that was part of a log table
entry. For normal reservations, this is a single entry; for cluster
reservations, it is one entry for each subimage.</p>
<ul>
+<li><strong>id</strong> - id of entry</li>
<li><strong>logid</strong> - reference to log.id - corresponding entry in log
table</li>
<li><strong>imageid</strong> - reference to image.id - image deployed for this
reservation</li>
<li><strong>imagerevisionid</strong> - reference to imagerevision.id - image
revision deployed for this reservation</li>
@@ -698,6 +806,9 @@ resourcetypeid2 - reference to resourcet
<li><strong>managementnodeid</strong> - reference to managementnode.id -
management node that handled this deploy</li>
<li><strong>predictivemoduleid</strong> - reference to module.id - prediction
module used to load image when this reservation finished ??</li>
<li><strong>hostcomputerid</strong> - reference to computer.id - for VMs, this
was the host the VM was deployed to</li>
+<li><strong>blockRequestid</strong> - reference to blockRequest.id (if
reservation was part of a block allocation)</li>
+<li><strong>blockStart</strong> - start time of blockTime (if reservation was
part of a block allocation)</li>
+<li><strong>blockEnd</strong> - end time of blockTime (if reservation was part
of a block allocation)</li>
</ul>
<h3 id="user-table">user table</h3>
<p>This table contains an entry for every user that has every logged in to
VCL.</p>
@@ -723,6 +834,9 @@ resourcetypeid2 - reference to resourcet
<li><strong>mapserial</strong> - serial mapping status for RDP files</li>
<li><strong>showallgroups</strong> - 1 to show user groups from all
affiliations where user groups can be selected, 0 to only show user groups
matching user's affiliation</li>
<li><strong>lastupdated</strong> - date/time user's info was last updated</li>
+<li><strong>validated</strong> - 0 or 1; if shibboleth authentication is
configured and ALLOWADDSHIBUSERS is set to 1 in conf.php, users can be added to
the site (i.e. adding to a user group) without validating that the entered user
name is valid, in which case this would be set to 0 until the user actually
logs in, at which point it is updated to 1; always 1 for other types of
authentication</li>
+<li><strong>usepublickeys</strong> - 0 or 1; whether or not user wants to use
public key authentication for linux reservations</li>
+<li><strong>sshpublickeys</strong> - data to be put in ~/.ssh/authorized_keys
within linux reservations if usepublickeys is set to 1</li>
</ul>
<h3 id="usergroup-table">usergroup table</h3>
<p>This table contains all of the user groups.</p>
@@ -790,23 +904,32 @@ resourcetypeid2 - reference to resourcet
<li><strong>computerid</strong> - reference to computer.id - physical machine
entry refers to</li>
<li><strong>vmlimit</strong> - max number of VMs that can be on this host</li>
<li><strong>vmprofileid</strong> - reference to vmprofile.id - profile being
used on this host</li>
-<li><strong>vmkernalnic</strong> - ??</li>
-<li><strong>vmwaredisk</strong> - localdisk or networkdisk - ??</li>
</ul>
<h3 id="vmprofile-table">vmprofile table</h3>
<p>This table contains an entry for each virtual host profile.</p>
<ul>
<li><strong>id</strong> - id of entry</li>
<li><strong>profilename</strong> - name of the profile</li>
-<li><strong>vmtypeid</strong> - reference to vmtype.id - hypervisor type of
this profile</li>
<li><strong>imageid</strong> - reference to image.id - image deployed on
host</li>
-<li><strong>repositorypath</strong> - ??</li>
-<li><strong>datastorepath</strong> - ??</li>
-<li><strong>virtualdiskpath</strong> - ??</li>
-<li><strong>vmpath</strong> - ??
-virtualswitch0 - name of virtual switch0
-virtualswitch1 - name of virtual switch1
-virtualswitch2 - name of virtual switch2</li>
+<li><strong>resourcepath</strong> - only used with vCenter, location where VMs
will be created in the vCenter inventory tree</li>
+<li><strong>folderpath</strong> - only used with vCenter, location where VMs
will reside according to the vSphere Client's 'VMs and Templates' inventory
view</li>
+<li><strong>repositorypath</strong> - path where master copies of images are
stored which are used to transfer images to VM host datastores or to other
repositories</li>
+<li><strong>repositoryimagetypeid</strong> - virtual disk type of the images
stored in the repository</li>
+<li><strong>datastorepath</strong> - location where master copies of images
are stored which are used by running VMs</li>
+<li><strong>datastoreimagetypeid</strong> - virtual disk type of the images
stored in the datastore</li>
+<li><strong>vmpath</strong> - path on VM host where VM working directories
will reside</li>
+<li><strong>virtualswitch0</strong> - name of virtual switch0</li>
+<li><strong>virtualswitch1</strong> - name of virtual switch1</li>
+<li><strong>virtualswitch2</strong> - name of virtual switch2</li>
+<li><strong>virtualswitch3</strong> - name of virtual switch3</li>
+<li><strong>vmdisk</strong> - whether the Virtual Disk Path storage is
dedicated to a single host or shared among multiple hosts</li>
+<li><strong>username</strong> - name of the administrative or root user
residing on the VM host</li>
+<li><strong>password</strong> - password of the administrative or root user
residing on the VM host</li>
+<li><strong>eth0generated</strong> - 0 or 1, whether the mac address for eth0
should be generated by the hypervisor or not</li>
+<li><strong>eth1generated</strong> - 0 or 1, whether the mac address for eth1
should be generated by the hypervisor or not</li>
+<li><strong>rsapub</strong> - public key used to encrypt password for VM host
and store it in encryptedpasswd</li>
+<li><strong>rsakey</strong> - path to private key on management nodes that is
used to decrypt password for VM host</li>
+<li><strong>encryptedpasswd</strong> - encrypted password of the
administrative or root user residing on the VM host, if encrypted, the
"password" field will be NULL</li>
</ul>
<h3 id="vmtype-table">vmtype table</h3>
<p>This table contains all of the virtual machine types.</p>
