You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by se...@apache.org on 2015/12/21 12:05:38 UTC
[31/53] [partial] cloudstack-www git commit: 4.7.0 api
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/listVpnConnections.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/listVpnConnections.html b/content/api/apidocs-4.7/domain_admin/listVpnConnections.html
new file mode 100644
index 0000000..b5139fe
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/listVpnConnections.html
@@ -0,0 +1,169 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>listVpnConnections</h1>
+<p>Lists site to site vpn connection gateways</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><i>account</i></td><td style="width:500px;"><i>list resources by account. Must be used with the domainId parameter.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domainid</i></td><td style="width:500px;"><i>list only resources belonging to the domain specified</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>fordisplay</i></td><td style="width:500px;"><i>list resources by display flag; only ROOT admin is eligible to pass this parameter</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>id</i></td><td style="width:500px;"><i>id of the vpn connection</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>isrecursive</i></td><td style="width:500px;"><i>defaults to false, but if true, lists all resources from the parent specified by the domainId till leaves.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>keyword</i></td><td style="width:500px;"><i>List by keyword</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>listall</i></td><td style="width:500px;"><i>If set to false, list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>page</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>pagesize</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>projectid</i></td><td style="width:500px;"><i>list objects by project</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>vpcid</i></td><td style="width:500px;"><i>id of vpc</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">the connection ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>cidrlist</strong></td><td style="width:500px;">guest cidr list of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>created</strong></td><td style="width:500px;">the date and time the host was created</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">the domain name of the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the domain id of the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>dpd</strong></td><td style="width:500px;">if DPD is enabled for customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>esplifetime</strong></td><td style="width:500px;">Lifetime of ESP SA of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>esppolicy</strong></td><td style="width:500px;">ESP policy of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>fordisplay</strong></td><td style="width:500px;">is connection for display to the regular user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>gateway</strong></td><td style="width:500px;">public ip address id of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ikelifetime</strong></td><td style="width:500px;">Lifetime of IKE SA of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ikepolicy</strong></td><td style="width:500px;">IKE policy of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ipsecpsk</strong></td><td style="width:500px;">IPsec Preshared-Key of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>passive</strong></td><td style="width:500px;">State of vpn connection</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>project</strong></td><td style="width:500px;">the project name</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectid</strong></td><td style="width:500px;">the project id</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>publicip</strong></td><td style="width:500px;">the public IP address</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>removed</strong></td><td style="width:500px;">the date and time the host was removed</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>s2scustomergatewayid</strong></td><td style="width:500px;">the customer gateway ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>s2svpngatewayid</strong></td><td style="width:500px;">the vpn gateway ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>state</strong></td><td style="width:500px;">State of vpn connection</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/listVpnCustomerGateways.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/listVpnCustomerGateways.html b/content/api/apidocs-4.7/domain_admin/listVpnCustomerGateways.html
new file mode 100644
index 0000000..8dcccbd
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/listVpnCustomerGateways.html
@@ -0,0 +1,148 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>listVpnCustomerGateways</h1>
+<p>Lists site to site vpn customer gateways</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><i>account</i></td><td style="width:500px;"><i>list resources by account. Must be used with the domainId parameter.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domainid</i></td><td style="width:500px;"><i>list only resources belonging to the domain specified</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>id</i></td><td style="width:500px;"><i>id of the customer gateway</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>isrecursive</i></td><td style="width:500px;"><i>defaults to false, but if true, lists all resources from the parent specified by the domainId till leaves.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>keyword</i></td><td style="width:500px;"><i>List by keyword</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>listall</i></td><td style="width:500px;"><i>If set to false, list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>page</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>pagesize</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>projectid</i></td><td style="width:500px;"><i>list objects by project</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">the vpn gateway ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>cidrlist</strong></td><td style="width:500px;">guest cidr list of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">the domain name of the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the domain id of the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>dpd</strong></td><td style="width:500px;">if DPD is enabled for customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>esplifetime</strong></td><td style="width:500px;">Lifetime of ESP SA of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>esppolicy</strong></td><td style="width:500px;">IPsec policy of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>gateway</strong></td><td style="width:500px;">public ip address id of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ikelifetime</strong></td><td style="width:500px;">Lifetime of IKE SA of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ikepolicy</strong></td><td style="width:500px;">IKE policy of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ipaddress</strong></td><td style="width:500px;">guest ip of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ipsecpsk</strong></td><td style="width:500px;">IPsec preshared-key of customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>name</strong></td><td style="width:500px;">name of the customer gateway</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>project</strong></td><td style="width:500px;">the project name</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectid</strong></td><td style="width:500px;">the project id</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>removed</strong></td><td style="width:500px;">the date and time the host was removed</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/listVpnGateways.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/listVpnGateways.html b/content/api/apidocs-4.7/domain_admin/listVpnGateways.html
new file mode 100644
index 0000000..ebfda7a
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/listVpnGateways.html
@@ -0,0 +1,133 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>listVpnGateways</h1>
+<p>Lists site 2 site vpn gateways</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><i>account</i></td><td style="width:500px;"><i>list resources by account. Must be used with the domainId parameter.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domainid</i></td><td style="width:500px;"><i>list only resources belonging to the domain specified</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>fordisplay</i></td><td style="width:500px;"><i>list resources by display flag; only ROOT admin is eligible to pass this parameter</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>id</i></td><td style="width:500px;"><i>id of the vpn gateway</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>isrecursive</i></td><td style="width:500px;"><i>defaults to false, but if true, lists all resources from the parent specified by the domainId till leaves.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>keyword</i></td><td style="width:500px;"><i>List by keyword</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>listall</i></td><td style="width:500px;"><i>If set to false, list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>page</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>pagesize</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>projectid</i></td><td style="width:500px;"><i>list objects by project</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>vpcid</i></td><td style="width:500px;"><i>id of vpc</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">the vpn gateway ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">the domain name of the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the domain id of the owner</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>fordisplay</strong></td><td style="width:500px;">is vpn gateway for display to the regular user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>project</strong></td><td style="width:500px;">the project name</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectid</strong></td><td style="width:500px;">the project id</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>publicip</strong></td><td style="width:500px;">the public IP address</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>removed</strong></td><td style="width:500px;">the date and time the host was removed</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vpcid</strong></td><td style="width:500px;">the vpc id of this gateway</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/listVpnUsers.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/listVpnUsers.html b/content/api/apidocs-4.7/domain_admin/listVpnUsers.html
new file mode 100644
index 0000000..e2ec5a2
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/listVpnUsers.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>listVpnUsers</h1>
+<p>Lists vpn users</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><i>account</i></td><td style="width:500px;"><i>list resources by account. Must be used with the domainId parameter.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domainid</i></td><td style="width:500px;"><i>list only resources belonging to the domain specified</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>id</i></td><td style="width:500px;"><i>The uuid of the Vpn user</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>isrecursive</i></td><td style="width:500px;"><i>defaults to false, but if true, lists all resources from the parent specified by the domainId till leaves.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>keyword</i></td><td style="width:500px;"><i>List by keyword</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>listall</i></td><td style="width:500px;"><i>If set to false, list only resources belonging to the command's caller; if set to true - list resources that the caller is authorized to see. Default value is false</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>page</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>pagesize</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>projectid</i></td><td style="width:500px;"><i>list objects by project</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>username</i></td><td style="width:500px;"><i>the username of the vpn user.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">the vpn userID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the account of the remote access vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">the domain name of the account of the remote access vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the domain id of the account of the remote access vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>project</strong></td><td style="width:500px;">the project name of the vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectid</strong></td><td style="width:500px;">the project id of the vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>state</strong></td><td style="width:500px;">the state of the Vpn User</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>username</strong></td><td style="width:500px;">the username of the vpn user</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/listZones.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/listZones.html b/content/api/apidocs-4.7/domain_admin/listZones.html
new file mode 100644
index 0000000..6993bcf
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/listZones.html
@@ -0,0 +1,229 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>listZones</h1>
+<p>Lists zones</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><i>available</i></td><td style="width:500px;"><i>true if you want to retrieve all available Zones. False if you only want to return the Zones from which you have at least one VM. Default is false.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domainid</i></td><td style="width:500px;"><i>the ID of the domain associated with the zone</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>id</i></td><td style="width:500px;"><i>the ID of the zone</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>keyword</i></td><td style="width:500px;"><i>List by keyword</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>name</i></td><td style="width:500px;"><i>the name of the zone</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>networktype</i></td><td style="width:500px;"><i>the network type of the zone that the virtual machine belongs to</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>page</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>pagesize</i></td><td style="width:500px;"><i></i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>showcapacities</i></td><td style="width:500px;"><i>flag to display the capacity of the zones</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>tags</i></td><td style="width:500px;"><i>List zones by resource tags (key/value pairs)</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">Zone id</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>allocationstate</strong></td><td style="width:500px;">the allocation state of the cluster</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>description</strong></td><td style="width:500px;">Zone description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>dhcpprovider</strong></td><td style="width:500px;">the dhcp Provider for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>displaytext</strong></td><td style="width:500px;">the display text of the zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>dns1</strong></td><td style="width:500px;">the first DNS for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>dns2</strong></td><td style="width:500px;">the second DNS for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">Network domain name for the networks in the zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the UUID of the containing domain, null for public zones</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainname</strong></td><td style="width:500px;">the name of the containing domain, null for public zones</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>guestcidraddress</strong></td><td style="width:500px;">the guest CIDR address for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>internaldns1</strong></td><td style="width:500px;">the first internal DNS for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>internaldns2</strong></td><td style="width:500px;">the second internal DNS for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ip6dns1</strong></td><td style="width:500px;">the first IPv6 DNS for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ip6dns2</strong></td><td style="width:500px;">the second IPv6 DNS for the Zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>localstorageenabled</strong></td><td style="width:500px;">true if local storage offering enabled, false otherwise</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>name</strong></td><td style="width:500px;">Zone name</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>networktype</strong></td><td style="width:500px;">the network type of the zone; can be Basic or Advanced</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>resourcedetails</strong></td><td style="width:500px;">Meta data associated with the zone (key/value pairs)</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>securitygroupsenabled</strong></td><td style="width:500px;">true if security groups support is enabled, false otherwise</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>zonetoken</strong></td><td style="width:500px;">Zone Token</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>capacity(*)</strong></td><td style="width:500px;">the capacity of the Zone</td>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>capacitytotal</strong></td><td style="width:500px;">the total capacity available</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>capacityused</strong></td><td style="width:500px;">the capacity currently in use</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>clusterid</strong></td><td style="width:500px;">the Cluster ID</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>clustername</strong></td><td style="width:500px;">the Cluster name</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>percentused</strong></td><td style="width:500px;">the percentage of capacity currently in use</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>podid</strong></td><td style="width:500px;">the Pod ID</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>podname</strong></td><td style="width:500px;">the Pod name</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>type</strong></td><td style="width:500px;">the capacity type</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>zoneid</strong></td><td style="width:500px;">the Zone ID</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>zonename</strong></td><td style="width:500px;">the Zone name</td>
+</tr>
+</tr>
+<tr>
+<td style="width:200px;"><strong>tags(*)</strong></td><td style="width:500px;">the list of resource tags associated with zone.</td>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>account</strong></td><td style="width:500px;">the account associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>customer</strong></td><td style="width:500px;">customer associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>domain</strong></td><td style="width:500px;">the domain associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>domainid</strong></td><td style="width:500px;">the ID of the domain associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>key</strong></td><td style="width:500px;">tag key name</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>project</strong></td><td style="width:500px;">the project name where tag belongs to</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>projectid</strong></td><td style="width:500px;">the project id the tag belongs to</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>resourceid</strong></td><td style="width:500px;">id of the resource</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>resourcetype</strong></td><td style="width:500px;">resource type</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>value</strong></td><td style="width:500px;">tag value</td>
+</tr>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/lockAccount.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/lockAccount.html b/content/api/apidocs-4.7/domain_admin/lockAccount.html
new file mode 100644
index 0000000..540265e
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/lockAccount.html
@@ -0,0 +1,286 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>lockAccount</h1>
+<p>Locks an account</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;"><strong>Locks the specified account.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;"><strong>Locks the specified account on this domain.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">the id of the account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>accountdetails</strong></td><td style="width:500px;">details for the account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>accounttype</strong></td><td style="width:500px;">account type (admin, domain-admin, user)</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>cpuavailable</strong></td><td style="width:500px;">the total number of cpu cores available to be created for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>cpulimit</strong></td><td style="width:500px;">the total number of cpu cores the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>cputotal</strong></td><td style="width:500px;">the total number of cpu cores owned by account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>defaultzoneid</strong></td><td style="width:500px;">the default zone of the account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">name of the Domain the account belongs too</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">id of the Domain the account belongs too</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>groups</strong></td><td style="width:500px;">the list of acl groups that account belongs to</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>ipavailable</strong></td><td style="width:500px;">the total number of public ip addresses available for this account to acquire</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>iplimit</strong></td><td style="width:500px;">the total number of public ip addresses this account can acquire</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>iptotal</strong></td><td style="width:500px;">the total number of public ip addresses allocated for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>iscleanuprequired</strong></td><td style="width:500px;">true if the account requires cleanup</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>isdefault</strong></td><td style="width:500px;">true if account is default, false otherwise</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>memoryavailable</strong></td><td style="width:500px;">the total memory (in MB) available to be created for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>memorylimit</strong></td><td style="width:500px;">the total memory (in MB) the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>memorytotal</strong></td><td style="width:500px;">the total memory (in MB) owned by account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>name</strong></td><td style="width:500px;">the name of the account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>networkavailable</strong></td><td style="width:500px;">the total number of networks available to be created for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>networkdomain</strong></td><td style="width:500px;">the network domain</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>networklimit</strong></td><td style="width:500px;">the total number of networks the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>networktotal</strong></td><td style="width:500px;">the total number of networks owned by account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>primarystorageavailable</strong></td><td style="width:500px;">the total primary storage space (in GiB) available to be used for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>primarystoragelimit</strong></td><td style="width:500px;">the total primary storage space (in GiB) the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>primarystoragetotal</strong></td><td style="width:500px;">the total primary storage space (in GiB) owned by account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectavailable</strong></td><td style="width:500px;">the total number of projects available for administration by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectlimit</strong></td><td style="width:500px;">the total number of projects the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projecttotal</strong></td><td style="width:500px;">the total number of projects being administrated by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>receivedbytes</strong></td><td style="width:500px;">the total number of network traffic bytes received</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>secondarystorageavailable</strong></td><td style="width:500px;">the total secondary storage space (in GiB) available to be used for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>secondarystoragelimit</strong></td><td style="width:500px;">the total secondary storage space (in GiB) the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>secondarystoragetotal</strong></td><td style="width:500px;">the total secondary storage space (in GiB) owned by account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>sentbytes</strong></td><td style="width:500px;">the total number of network traffic bytes sent</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>snapshotavailable</strong></td><td style="width:500px;">the total number of snapshots available for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>snapshotlimit</strong></td><td style="width:500px;">the total number of snapshots which can be stored by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>snapshottotal</strong></td><td style="width:500px;">the total number of snapshots stored by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>state</strong></td><td style="width:500px;">the state of the account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>templateavailable</strong></td><td style="width:500px;">the total number of templates available to be created by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>templatelimit</strong></td><td style="width:500px;">the total number of templates which can be created by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>templatetotal</strong></td><td style="width:500px;">the total number of templates which have been created by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmavailable</strong></td><td style="width:500px;">the total number of virtual machines available for this account to acquire</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmlimit</strong></td><td style="width:500px;">the total number of virtual machines that can be deployed by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmrunning</strong></td><td style="width:500px;">the total number of virtual machines running for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmstopped</strong></td><td style="width:500px;">the total number of virtual machines stopped for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmtotal</strong></td><td style="width:500px;">the total number of virtual machines deployed by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>volumeavailable</strong></td><td style="width:500px;">the total volume available for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>volumelimit</strong></td><td style="width:500px;">the total volume which can be used by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>volumetotal</strong></td><td style="width:500px;">the total volume being used by this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vpcavailable</strong></td><td style="width:500px;">the total number of vpcs available to be created for this account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vpclimit</strong></td><td style="width:500px;">the total number of vpcs the account can own</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vpctotal</strong></td><td style="width:500px;">the total number of vpcs owned by account</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>user(*)</strong></td><td style="width:500px;">the list of users associated with account</td>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>id</strong></td><td style="width:500px;">the user ID</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>account</strong></td><td style="width:500px;">the account name of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>accountid</strong></td><td style="width:500px;">the account ID of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>accounttype</strong></td><td style="width:500px;">the account type of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>apikey</strong></td><td style="width:500px;">the api key of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>created</strong></td><td style="width:500px;">the date and time the user account was created</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>domain</strong></td><td style="width:500px;">the domain name of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>domainid</strong></td><td style="width:500px;">the domain ID of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>email</strong></td><td style="width:500px;">the user email address</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>firstname</strong></td><td style="width:500px;">the user firstname</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>iscallerchilddomain</strong></td><td style="width:500px;">the boolean value representing if the updating target is in caller's child domain</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>isdefault</strong></td><td style="width:500px;">true if user is default, false otherwise</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>lastname</strong></td><td style="width:500px;">the user lastname</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>secretkey</strong></td><td style="width:500px;">the secret key of the user</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>state</strong></td><td style="width:500px;">the user state</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>timezone</strong></td><td style="width:500px;">the timezone user was created in</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>username</strong></td><td style="width:500px;">the user name</td>
+</tr>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/lockUser.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/lockUser.html b/content/api/apidocs-4.7/domain_admin/lockUser.html
new file mode 100644
index 0000000..de96b0d
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/lockUser.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>lockUser</h1>
+<p>Locks a user account</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;"><strong>Locks user by user ID.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">the user ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the account name of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>accountid</strong></td><td style="width:500px;">the account ID of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>accounttype</strong></td><td style="width:500px;">the account type of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>apikey</strong></td><td style="width:500px;">the api key of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>created</strong></td><td style="width:500px;">the date and time the user account was created</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">the domain name of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the domain ID of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>email</strong></td><td style="width:500px;">the user email address</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>firstname</strong></td><td style="width:500px;">the user firstname</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>iscallerchilddomain</strong></td><td style="width:500px;">the boolean value representing if the updating target is in caller's child domain</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>isdefault</strong></td><td style="width:500px;">true if user is default, false otherwise</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>lastname</strong></td><td style="width:500px;">the user lastname</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>secretkey</strong></td><td style="width:500px;">the secret key of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>state</strong></td><td style="width:500px;">the user state</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>timezone</strong></td><td style="width:500px;">the timezone user was created in</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>username</strong></td><td style="width:500px;">the user name</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/login.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/login.html b/content/api/apidocs-4.7/domain_admin/login.html
new file mode 100644
index 0000000..e40395f
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/login.html
@@ -0,0 +1,115 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>login</h1>
+<p>Logs a user into the CloudStack. A successful login attempt will generate a JSESSIONID cookie value that can be passed in subsequent Query command calls until the "logout" command has been issued or the session has expired.</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>password</strong></td><td style="width:500px;"><strong>Hashed password (Default is MD5). If you wish to use any other hashing algorithm, you would need to write a custom authentication adapter See Docs section.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>username</strong></td><td style="width:500px;"><strong>Username</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domain</i></td><td style="width:500px;"><i>Path of the domain that the user belongs to. Example: domain=/com/cloud/internal. If no domain is passed in, the ROOT (/) domain is assumed.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>domainId</i></td><td style="width:500px;"><i>The id of the domain that the user belongs to. If both domain and domainId are passed in, "domainId" parameter takes precendence</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the account name the user belongs to</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">Domain ID that the user belongs to</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>firstname</strong></td><td style="width:500px;">first name of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>lastname</strong></td><td style="width:500px;">last name of the user</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>registered</strong></td><td style="width:500px;">Is user registered</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>sessionkey</strong></td><td style="width:500px;">Session key that can be passed in subsequent Query command calls</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>timeout</strong></td><td style="width:500px;">the time period before the session has expired</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>timezone</strong></td><td style="width:500px;">user time zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>type</strong></td><td style="width:500px;">the account type (admin, domain-admin, read-only-admin, user)</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>userid</strong></td><td style="width:500px;">User ID</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>username</strong></td><td style="width:500px;">Username</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/logout.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/logout.html b/content/api/apidocs-4.7/domain_admin/logout.html
new file mode 100644
index 0000000..6974286
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/logout.html
@@ -0,0 +1,73 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>logout</h1>
+<p>Logs out the user</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>description</strong></td><td style="width:500px;">Response description</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/migrateVolume.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/migrateVolume.html b/content/api/apidocs-4.7/domain_admin/migrateVolume.html
new file mode 100644
index 0000000..bc7d98e
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/migrateVolume.html
@@ -0,0 +1,268 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>migrateVolume</h1>
+<p>Migrate volume</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>storageid</strong></td><td style="width:500px;"><strong>destination storage pool ID to migrate the volume to</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>volumeid</strong></td><td style="width:500px;"><strong>the ID of the volume</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>livemigrate</i></td><td style="width:500px;"><i>if the volume should be live migrated when it is attached to a running vm</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>id</strong></td><td style="width:500px;">ID of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">the account associated with the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>attached</strong></td><td style="width:500px;">the date the volume was attached to a VM instance</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>chaininfo</strong></td><td style="width:500px;">the chain info of the volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>created</strong></td><td style="width:500px;">the date the disk volume was created</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>destroyed</strong></td><td style="width:500px;">the boolean state of whether the volume is destroyed or not</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>deviceid</strong></td><td style="width:500px;">the ID of the device on user vm the volume is attahed to. This tag is not returned when the volume is detached.</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskBytesReadRate</strong></td><td style="width:500px;">bytes read rate of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskBytesWriteRate</strong></td><td style="width:500px;">bytes write rate of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskIopsReadRate</strong></td><td style="width:500px;">io requests read rate of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskIopsWriteRate</strong></td><td style="width:500px;">io requests write rate of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskofferingdisplaytext</strong></td><td style="width:500px;">the display text of the disk offering</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskofferingid</strong></td><td style="width:500px;">ID of the disk offering</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>diskofferingname</strong></td><td style="width:500px;">name of the disk offering</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>displayvolume</strong></td><td style="width:500px;">an optional field whether to the display the volume to the end user or not.</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">the domain associated with the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;">the ID of the domain associated with the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>hypervisor</strong></td><td style="width:500px;">Hypervisor the volume belongs to</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>isextractable</strong></td><td style="width:500px;">true if the volume is extractable, false otherwise</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>isodisplaytext</strong></td><td style="width:500px;">an alternate display text of the ISO attached to the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>isoid</strong></td><td style="width:500px;">the ID of the ISO attached to the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>isoname</strong></td><td style="width:500px;">the name of the ISO attached to the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>maxiops</strong></td><td style="width:500px;">max iops of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>miniops</strong></td><td style="width:500px;">min iops of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>name</strong></td><td style="width:500px;">name of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>path</strong></td><td style="width:500px;">the path of the volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>project</strong></td><td style="width:500px;">the project name of the vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>projectid</strong></td><td style="width:500px;">the project id of the vpn</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>provisioningtype</strong></td><td style="width:500px;">provisioning type used to create volumes.</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>quiescevm</strong></td><td style="width:500px;">need quiesce vm or not when taking snapshot</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>serviceofferingdisplaytext</strong></td><td style="width:500px;">the display text of the service offering for root disk</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>serviceofferingid</strong></td><td style="width:500px;">ID of the service offering for root disk</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>serviceofferingname</strong></td><td style="width:500px;">name of the service offering for root disk</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>size</strong></td><td style="width:500px;">size of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>snapshotid</strong></td><td style="width:500px;">ID of the snapshot from which this volume was created</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>state</strong></td><td style="width:500px;">the state of the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>status</strong></td><td style="width:500px;">the status of the volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>storage</strong></td><td style="width:500px;">name of the primary storage hosting the disk volume</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>storageid</strong></td><td style="width:500px;">id of the primary storage hosting the disk volume; returned to admin user only</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>storagetype</strong></td><td style="width:500px;">shared or local storage</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>templatedisplaytext</strong></td><td style="width:500px;"> an alternate display text of the template for the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>templateid</strong></td><td style="width:500px;">the ID of the template for the virtual machine. A -1 is returned if the virtual machine was created from an ISO file.</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>templatename</strong></td><td style="width:500px;">the name of the template for the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>type</strong></td><td style="width:500px;">type of the disk volume (ROOT or DATADISK)</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>virtualmachineid</strong></td><td style="width:500px;">id of the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmdisplayname</strong></td><td style="width:500px;">display name of the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmname</strong></td><td style="width:500px;">name of the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>vmstate</strong></td><td style="width:500px;">state of the virtual machine</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>zoneid</strong></td><td style="width:500px;">ID of the availability zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>zonename</strong></td><td style="width:500px;">name of the availability zone</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>tags(*)</strong></td><td style="width:500px;">the list of resource tags associated with volume</td>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>account</strong></td><td style="width:500px;">the account associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>customer</strong></td><td style="width:500px;">customer associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>domain</strong></td><td style="width:500px;">the domain associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>domainid</strong></td><td style="width:500px;">the ID of the domain associated with the tag</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>key</strong></td><td style="width:500px;">tag key name</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>project</strong></td><td style="width:500px;">the project name where tag belongs to</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>projectid</strong></td><td style="width:500px;">the project id the tag belongs to</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>resourceid</strong></td><td style="width:500px;">id of the resource</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>resourcetype</strong></td><td style="width:500px;">resource type</td>
+</tr>
+<tr>
+<td style="width:180px; padding-left:25px;"><strong>value</strong></td><td style="width:500px;">tag value</td>
+</tr>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobid</strong></td><td style="width:500px;">the ID of the latest async job acting on this object</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobstatus</strong></td><td style="width:500px;">the current status of the latest async job acting on this object</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/modifyPool.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/modifyPool.html b/content/api/apidocs-4.7/domain_admin/modifyPool.html
new file mode 100644
index 0000000..6bd606a
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/modifyPool.html
@@ -0,0 +1,76 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>modifyPool</h1>
+<p>Modify pool</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>algorithm</strong></td><td style="width:500px;"><strong>algorithm.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>poolname</strong></td><td style="width:500px;"><strong>pool name.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/queryAsyncJobResult.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/queryAsyncJobResult.html b/content/api/apidocs-4.7/domain_admin/queryAsyncJobResult.html
new file mode 100644
index 0000000..e0067f2
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/queryAsyncJobResult.html
@@ -0,0 +1,109 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>queryAsyncJobResult</h1>
+<p>Retrieves the current status of asynchronous job.</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobid</strong></td><td style="width:500px;"><strong>the ID of the asychronous job</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>accountid</strong></td><td style="width:500px;">the account that executed the async command</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>cmd</strong></td><td style="width:500px;">the async command executed</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>created</strong></td><td style="width:500px;"> the created date of the job</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobinstanceid</strong></td><td style="width:500px;">the unique ID of the instance/entity object related to the job</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobinstancetype</strong></td><td style="width:500px;">the instance/entity object related to the job</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobprocstatus</strong></td><td style="width:500px;">the progress information of the PENDING job</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobresult</strong></td><td style="width:500px;">the result reason</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobresultcode</strong></td><td style="width:500px;">the result code for the job</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobresulttype</strong></td><td style="width:500px;">the result type</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobstatus</strong></td><td style="width:500px;">the current job status-should be 0 for PENDING</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>userid</strong></td><td style="width:500px;">the user that executed the async command</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>jobid</strong></td><td style="width:500px;">the ID of the async job</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>
http://git-wip-us.apache.org/repos/asf/cloudstack-www/blob/3ebf9423/content/api/apidocs-4.7/domain_admin/quotaBalance.html
----------------------------------------------------------------------
diff --git a/content/api/apidocs-4.7/domain_admin/quotaBalance.html b/content/api/apidocs-4.7/domain_admin/quotaBalance.html
new file mode 100644
index 0000000..3b3cfa0
--- /dev/null
+++ b/content/api/apidocs-4.7/domain_admin/quotaBalance.html
@@ -0,0 +1,106 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 1.0 Transitional//EN">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+<META http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<link rel="stylesheet" href="../includes/main.css" type="text/css">
+<link rel="shortcut icon" href="../favicon.ico" type="image/x-icon">
+<title>Apache CloudStack | The Power Behind Your Cloud</title>
+</head>
+<body>
+<div id="insidetopbg">
+<div id="inside_wrapper">
+<div class="uppermenu_panel">
+<div class="uppermenu_box"></div>
+</div>
+<div id="main_master">
+<div id="inside_header">
+<div class="header_top">
+<a class="cloud_logo" href="http://cloudstack.org"></a>
+<div class="mainemenu_panel"></div>
+</div>
+</div>
+<div id="main_content">
+<div class="inside_apileftpanel">
+<div class="inside_contentpanel" style="width:930px;">
+<div class="api_titlebox">
+<div class="api_titlebox_left">
+<span>
+ Apache CloudStack v4.7.0 Domain Admin API Reference
+ </span>
+<p></p>
+<h1>quotaBalance</h1>
+<p>Create a quota balance statement</p>
+</div>
+<div class="api_titlebox_right">
+<a class="api_backbutton" href="../TOC_Domain_Admin.html"></a>
+</div>
+</div>
+<div class="api_tablepanel">
+<h2>Request parameters</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Parameter Name</strong></td><td style="width:500px;">Description</td><td style="width:180px;">Required</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;"><strong>Account Id for which statement needs to be generated</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domainid</strong></td><td style="width:500px;"><strong>If domain Id is given and the caller is domain admin then the statement is generated for domain.</strong></td><td style="width:180px;"><strong>true</strong></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>accountid</i></td><td style="width:500px;"><i>List usage records for the specified account</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>enddate</i></td><td style="width:500px;"><i>End date range for quota query. Use yyyy-MM-dd as the date format, e.g. startDate=2009-06-03.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+<tr>
+<td style="width:200px;"><i>startdate</i></td><td style="width:500px;"><i>Start date range quota query. Use yyyy-MM-dd as the date format, e.g. startDate=2009-06-01.</i></td><td style="width:180px;"><i>false</i></td>
+</tr>
+</table>
+</div>
+<div class="api_tablepanel">
+<h2>Response Tags</h2>
+<table class="apitable">
+<tr class="hed">
+<td style="width:200px;"><strong>Response Name</strong></td><td style="width:500px;">Description</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>account</strong></td><td style="width:500px;">account name</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>accountid</strong></td><td style="width:500px;">account id</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>domain</strong></td><td style="width:500px;">domain id</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>name</strong></td><td style="width:500px;">usage type name</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>quota</strong></td><td style="width:500px;">quota consumed</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>type</strong></td><td style="width:500px;">usage type</td>
+</tr>
+<tr>
+<td style="width:200px;"><strong>unit</strong></td><td style="width:500px;">usage unit</td>
+</tr>
+</table>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div id="footer">
+<div id="footer_mainmaster">
+<p>Copyright © 2015 The Apache Software Foundation, Licensed under the
+ <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache License, Version 2.0.</a>
+<br>
+ Apache, CloudStack, Apache CloudStack, the Apache CloudStack logo, the CloudMonkey logo and the Apache feather logo are trademarks of The Apache Software Foundation.</p>
+</div>
+</div>
+</div>
+</div>
+</body>
+</html>