Merge branch 'master' into Azure

Change-Id: Ia9726dfe53813157c1e3002a44f041861722d424
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>

diff --cc test/test_RO.py
index be711c8,932853c..014030b
--- 1/test/test_RO.py
--- 2/test/test_RO.py
+++ b/test/test_RO.py
@@@ -20,15 -20,6 +20,15 @@@
  #
  ##
  
- import os
- if os.getenv('OSMRO_PDB_DEBUG'):
 +# DEBUG WITH PDB
++from os import getenv
++if getenv('OSMRO_PDB_DEBUG'):
 +    import sys
 +    print(sys.path)
 +    import pdb
 +    pdb.set_trace()
 +
 +
  """
  Module for testing openmano functionality. It uses openmanoclient.py for invoking openmano
  """
@@@ -961,11 -931,7 +947,11 @@@ class test_vimconn_get_image_list(test_
                                                              self.__class__.test_index,
                                                  inspect.currentframe().f_code.co_name)
          self.__class__.test_index += 1
-         if test_config['image_name']:
-             image_list = test_config['vim_conn'].get_image_list({'name': test_config['image_name']})
-         else:
-             image_list = test_config["vim_conn"].get_image_list()
 +
++        # if test_config['image_name']:
++        #     image_list = test_config['vim_conn'].get_image_list({'name': test_config['image_name']})
++        # else:
+         image_list = test_config["vim_conn"].get_image_list()
  
          for item in image_list:
              if 'name' in item: