From 2236c2a3498e62fad98de0ad533612bf82bab9e3 Mon Sep 17 00:00:00 2001
From: boucherv <valentin.boucher@orange.com>
Date: Thu, 1 Sep 2016 15:04:42 +0200
Subject: Fix some bugs
Change-Id: Iaf0859775933ba09cbbe170af3ce4ed1e6d3e9a1
Signed-off-by: boucherv <valentin.boucher@orange.com>
(cherry picked from commit 26f493bf3bb06a0ceb959294397ff653b92da202)
---
testcases/vnf/vIMS/orchestrator.py | 2 +-
utils/openstack_utils.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/testcases/vnf/vIMS/orchestrator.py b/testcases/vnf/vIMS/orchestrator.py
index 3e5117ffd..61157a4fb 100644
--- a/testcases/vnf/vIMS/orchestrator.py
+++ b/testcases/vnf/vIMS/orchestrator.py
@@ -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:
diff --git a/utils/openstack_utils.py b/utils/openstack_utils.py
index bc718bb2b..21e00d9b9 100755
--- a/utils/openstack_utils.py
+++ b/utils/openstack_utils.py
@@ -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
--
cgit