Merge pull request #64 from grycap/devel

Prepare release version 1.5.8

Author: micafer

README.md

@@ -311,7 +311,14 @@ im_client.py [-u|--xmlrpc-url <url>] [-r|--restapi-url <url>] [-v|--verify-ssl]
 
    ``sshvm <infId> <vmId> [show_only]``
       Connect with SSH with the specified virtual machine ``vmId`` associated to the infrastructure with ID
-      infrastructure with ID ``infId``. 
+      infrastructure with ID ``infId``. In case that the specified VM does not have public IP the client
+      will try to connect using the virtual machine with ID ``0`` as SSH proxy.
+      The ``show_only`` parameter is optional
+      and is a flag to specify if ssh command will only be shown in stdout instead of executed.
+
+   ``ssh <infId> [show_only]``
+      Connect with SSH with the virtual machine with ID ``0`` associated to the infrastructure with ID
+      infrastructure with ID ``infId``.
       The ``show_only`` parameter is optional
       and is a flag to specify if ssh command will only be shown in stdout instead of executed.
 

changelog

@@ -97,3 +97,7 @@ IM-client 1.5.7
     * Add support for ProxyCommand ssh.
     * Add force option to delete operation.
 
+IM-client 1.5.8
+    * Fix error where context flag ignored in add and remove resource in case of REST APA.
+    * Add Bearer token command.
+    * Add support for ProxyCommand ssh to internal VMs using master VM as proxy.

im_client.py

@@ -1139,6 +1139,7 @@ def get_parser():
     parser.add_operation_help('stopvm', '<inf_id> <vm_id>')
     parser.add_operation_help('rebootvm', '<inf_id> <vm_id>')
     parser.add_operation_help('sshvm', '<inf_id> <vm_id> [show_only]')
+    parser.add_operation_help('ssh', '<inf_id> [show_only]')
     parser.add_operation_help('export', '<inf_id> [delete]')
     parser.add_operation_help('import', '<json_file>')
     parser.add_operation_help('getoutputs', '<inf_id>')

setup.py

@@ -18,7 +18,7 @@
 
 from setuptools import setup
 
-version = "1.5.7"
+version = "1.5.8"
 
 setup(name="IM-client", version=version,
       author='GRyCAP - Universitat Politecnica de Valencia',