From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 24 Aug 2017 16:13:23 +0000 (+0000)
Subject: Merge "Obtain pod_name by CONST instead of get function"
X-Git-Tag: opnfv-5.0.RC1~154
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=ad44bfd97555a7372269db539857fd53fffb0460;p=functest.git

Merge "Obtain pod_name by CONST instead of get function"
---

ad44bfd97555a7372269db539857fd53fffb0460
diff --cc functest/energy/energy.py
index c410e84f0,ec03e1801..508f18e74
--- a/functest/energy/energy.py
+++ b/functest/energy/energy.py
@@@ -16,8 -16,8 +16,9 @@@ import urlli
  
  from functools import wraps
  import requests
 +import urllib3
  
+ from functest.utils.constants import CONST
  import functest.utils.functest_utils as ft_utils