Fix some bugs 41/20141/1
authorboucherv <valentin.boucher@orange.com>
Thu, 1 Sep 2016 13:04:42 +0000 (15:04 +0200)
committervalentin boucher <valentin.boucher@orange.com>
Thu, 1 Sep 2016 13:19:03 +0000 (13:19 +0000)
Change-Id: Iaf0859775933ba09cbbe170af3ce4ed1e6d3e9a1
Signed-off-by: boucherv <valentin.boucher@orange.com>
(cherry picked from commit 26f493bf3bb06a0ceb959294397ff653b92da202)

testcases/vnf/vIMS/orchestrator.py
utils/openstack_utils.py

index 3e5117f..61157a4 100644 (file)
@@ -188,7 +188,7 @@ class orchestrator:
         except:
             self.logger.error("Clearwater undeployment failed")
 
-    def _download_blueprints(blueprint_url, branch, dest_path):
+    def _download_blueprints(self, blueprint_url, branch, dest_path):
         if os.path.exists(dest_path):
             shutil.rmtree(dest_path)
         try:
index bc718bb..21e00d9 100755 (executable)
@@ -1077,7 +1077,7 @@ def create_tenant(keystone_client, tenant_name, tenant_description):
                                                 enabled=True)
         return tenant.id
     except Exception, e:
-        logger.error("Error [create_tenant(cinder_client, '%s', '%s')]: %s"
+        logger.error("Error [create_tenant(keystone_client, '%s', '%s')]: %s"
                      % (tenant_name, tenant_description, e))
         return None