summaryrefslogtreecommitdiffstats
path: root/doc/source
diff options
context:
space:
mode:
authorsateesh <sateesh.chodapuneedi@citrix.com>2011-03-16 21:54:02 +0530
committersateesh <sateesh.chodapuneedi@citrix.com>2011-03-16 21:54:02 +0530
commit45ca7b71a8e749cbd9b7729b922190e9aaa53744 (patch)
treee1f8563b6d94289d88ffa504882b2b8856bac9ef /doc/source
parentcd381ae3e1fc4c4e53d3b60272cc8e6ee9fc6352 (diff)
* Updated document vmware_readme.rst to mention VLAN networking
* Corrected docstrings as per pep0257 recommentations. * Stream-lined the comments. * Updated code with locals() where ever applicable. * VIM : It stands for VMware Virtual Infrastructure Methodology. We have used the terminology from VMware. we have added a question in FAQ inside vmware_readme.rst in doc/source * New fake db: vmwareapi fake module uses a different set of fields and hence the structures required are different. Ex: bridge : 'xenbr0' does not hold good for VMware environment and bridge : 'vmnic0' is used instead. Also return values varies, hence went for implementing separate fake db. * Now using eventlet library instead and removed io_utils.py from branch. * Now using glance.client.Client instead of homegrown code to talk to Glance server to handle images. * Corrected all mis-spelled function names and corresponding calls. Yeah, an auto-complete side-effect!
Diffstat (limited to 'doc/source')
-rw-r--r--doc/source/vmwareapi_readme.rst6
1 files changed, 5 insertions, 1 deletions
diff --git a/doc/source/vmwareapi_readme.rst b/doc/source/vmwareapi_readme.rst
index b56cae074..fb0e42b80 100644
--- a/doc/source/vmwareapi_readme.rst
+++ b/doc/source/vmwareapi_readme.rst
@@ -26,7 +26,7 @@ The basic requirement is to support VMware vSphere 4.1 as a compute provider wit
The 'vmwareapi' module is integrated with Glance, so that VM images can be streamed from there for boot on ESXi using Glance server for image storage & retrieval.
-Currently supports Nova's flat networking model (Flat Manager).
+Currently supports Nova's flat networking model (Flat Manager) & VLAN networking model.
.. image:: images/vmwareapi_blockdiagram.jpg
@@ -213,3 +213,7 @@ FAQ
* VMware VMRC based consoles are supported. There are 2 options for credentials one is OTP (Secure but creates multiple session entries in DB for each OpenStack console create request.) & other is host based credentials (It may not be secure as ESX credentials are transmitted as clear text).
+5. What does 'Vim' refer to as far as vmwareapi module is concerned?
+
+* Vim refers to VMware Virtual Infrastructure Methodology. This is not to be confused with "VIM" editor.
+