Update docs with changes

diff --git a/docs/commands.rst b/docs/commands.rst
index 1048fdc..f7124fc 100644 (file)
--- a/docs/commands.rst
+++ b/docs/commands.rst
@@ -10,6 +10,9 @@ astakos (Identity Manager)
 .. code-block:: text
 
     authenticate:  Authenticate a user
+    admin userinfo: Get user info, (req. admin privileges)
+    service userinfo: Get user info with service token
+    service list: List cloud services associated with astakos
 
 Showcase: get user information
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -34,6 +37,30 @@ In the following, the token has been set in a previous step (see `setup section
     uniq              :  myaccount@grnet.gr
     username          :  4215th3b357num9323v32
 
+Showcase: get available services
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+In the following, a user needs to know the urls he/she has access to.
+
+.. code-block:: console
+    :emphasize-lines: 1,4
+
+    * Enter appropriate context *
+    [kamaki]:astakos service
+
+    * list services *
+    [astakos service]:list
+    1 grnet cloud
+        icon:  home-icon.png
+        url :  https://okeanos.grnet.gr/
+    2 cyclades
+        icon:  
+        url :  https://cyclades.okeanos.grnet.gr/ui/
+    3 pithos+
+        icon:  
+        url :  https://pithos.okeanos.grnet.gr/ui/
+
+
 flavor (Compute/Cyclades)
 -------------------------
 

diff --git a/docs/man/kamaki.rst b/docs/man/kamaki.rst
index bcf3104..a400348 100644 (file)
--- a/docs/man/kamaki.rst
+++ b/docs/man/kamaki.rst
@@ -36,6 +36,10 @@ history
 
     Access kamaki user history, which is stored in ~/.kamaki.history file.
 
+astakos
+
+    Get information from astakos API
+
 server
 
     Manage compute API virtual machines.
@@ -89,6 +93,15 @@ Command user history, as stored in ~/.kamaki.history
 * clean     clean up history
 
 
+astakos commands
+****************
+
+* admin userinfo    Get user info, provided you have admin privileges
+* authenticate      Authenticate a user, show user information
+* service list      List cloud services associated with astakos
+* service userinfo  Get user info with service token
+
+
 server commands
 ***************
 

diff --git a/docs/usage.rst b/docs/usage.rst
index f178d20..19030a0 100644 (file)
--- a/docs/usage.rst
+++ b/docs/usage.rst
@@ -139,7 +139,7 @@ To see the command groups, users should use -h or --help like in example 1.3.1.
     Example 3.1.2: Cyclades help contains all first-level commands of Cyclades command group
 
 
-    $ kamaki cyclades -h
+    $ kamaki server -h
     usage: kamaki server <...> [-v] [-s] [-V] [-d] [-i] [--config CONFIG]
                                [-o OPTIONS] [-h]
 

diff --git a/kamaki/cli/commands/astakos_cli.py b/kamaki/cli/commands/astakos_cli.py
index a8ea3a6..5af0e5a 100644 (file)
--- a/kamaki/cli/commands/astakos_cli.py
+++ b/kamaki/cli/commands/astakos_cli.py
@@ -109,7 +109,7 @@ class astakos_admin_userinfo(_astakos_init):
 
 @command(astakos_cmds)
 class astakos_service_userinfo(_astakos_init):
-    """Get user by e-mail (with service token)"""
+    """Get user info with service token"""
 
     def __init__(self, arguments={}):
         super(self.__class__, self).__init__(arguments)