Merge "More support of snaps for VNF"

diff --cc functest/opnfv_tests/vnf/ims/cloudify_ims.py
Simple merge

diff --cc functest/opnfv_tests/vnf/ims/cloudify_ims.yaml
Simple merge

diff --cc functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
Simple merge

diff --cc functest/opnfv_tests/vnf/ims/orchestra_openims.py
index 6c9628f,d9d4d8a..aae3514
--- 1/functest/opnfv_tests/vnf/ims/orchestra_openims.py
--- 2/functest/opnfv_tests/vnf/ims/orchestra_openims.py
+++ b/functest/opnfv_tests/vnf/ims/orchestra_openims.py
@@@ -195,10 -194,10 +194,9 @@@ class OpenImsVnf(vnf.VnfOnBoarding)
          if not os.path.exists(self.data_dir):
              os.makedirs(self.data_dir)
  
 -        self.images = get_config("tenant_images.%s" %
 -                                 self.case_name, config_file)
 +        self.images = get_config("tenant_images.orchestrator", config_file)
          self.images.update(get_config("tenant_images.%s" %
                                        self.case_name, config_file))
-         self.snaps_creds = None
  
      def prepare(self):
          """Prepare testscase (Additional pre-configuration steps)."""