Make session.this_host and session.this_user ROrun -- they are implicitly set

by a call to session.login_with_password, and cannot be created through a
constructor.

Signed-off-by: Ewan Mellor <ewan@xensource.com>

diff --git a/docs/xen-api/xenapi-datamodel.tex b/docs/xen-api/xenapi-datamodel.tex
index 644489850c3ef5db17978ae4c4067102e5e8b44e..511ef10d6da7b380f5ac78121432bd03dbb0ca9c 100644 (file)
--- a/docs/xen-api/xenapi-datamodel.tex
+++ b/docs/xen-api/xenapi-datamodel.tex
@@ -284,8 +284,8 @@ The following enumeration types are used:
 Quals & Field & Type & Description \\
 \hline
 $\mathit{RO}_\mathit{run}$ &  {\tt uuid} & string & unique identifier/object reference \\
-$\mathit{RO}_\mathit{ins}$ &  {\tt this\_host} & host ref & Currently connected host \\
-$\mathit{RO}_\mathit{ins}$ &  {\tt this\_user} & user ref & Currently connected user \\
+$\mathit{RO}_\mathit{run}$ &  {\tt this\_host} & host ref & Currently connected host \\
+$\mathit{RO}_\mathit{run}$ &  {\tt this\_user} & user ref & Currently connected user \\
 $\mathit{RO}_\mathit{run}$ &  {\tt last\_active} & int & Timestamp for last time session was active \\
 \hline
 \end{longtable}

diff --git a/tools/python/xen/xend/XendAPI.py b/tools/python/xen/xend/XendAPI.py
index 26702819436428edec0c47bb0e7c6033488f2b73..52e7ba3c4d12da669d9b7b9e3c056de265347582 100644 (file)
--- a/tools/python/xen/xend/XendAPI.py
+++ b/tools/python/xen/xend/XendAPI.py
@@ -451,7 +451,6 @@ class XendAPI(object):
 
     session_attr_ro = ['this_host', 'this_user']
     session_methods = [('logout', None)]
-    # session_funcs = ['login_with_password']    
 
     def session_login_with_password(self, *args):
         if len(args) != 2:
@@ -473,8 +472,6 @@ class XendAPI(object):
     def session_logout(self, session):
         auth_manager().logout(session)
         return xen_api_success_void()
-    def session_destroy(self, session):
-        return xen_api_error(XEND_ERROR_UNSUPPORTED)
     def session_get_record(self, session):
         record = {'this_host': XendNode.instance().uuid,
                   'this_user': auth_manager().get_user(session)}