License for PCAP files

[yardstick.git] / yardstick / vTC / apexlake / experimental_framework / heat_manager.py

diff --git a/yardstick/vTC/apexlake/experimental_framework/heat_manager.py b/yardstick/vTC/apexlake/experimental_framework/heat_manager.py
index 41fc585..28c069f 100644 (file)
--- a/yardstick/vTC/apexlake/experimental_framework/heat_manager.py
+++ b/yardstick/vTC/apexlake/experimental_framework/heat_manager.py
@@ -12,14 +12,13 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-__author__ = 'vmriccox'
-
-
 from keystoneclient.v2_0 import client as keystoneClient
 from heatclient import client as heatClient
 from heatclient.common import template_utils
 
-from experimental_framework import common
+import experimental_framework.common as common
+
+__author__ = 'vmriccox'
 
 
 class HeatManager:
@@ -33,15 +32,14 @@ class HeatManager:
         self.project_id = credentials['project']
         self.heat = None
 
-        # TODO: verify that init_heat is useless in the constructor
-        # self.init_heat()
-
     def init_heat(self):
         keystone = keystoneClient.Client(username=self.user,
                                          password=self.password,
                                          tenant_name=self.project_id,
                                          auth_url=self.auth_uri)
         auth_token = keystone.auth_token
+        self.heat_url = keystone.service_catalog.url_for(
+            service_type='orchestration')
         self.heat = heatClient.Client('1', endpoint=self.heat_url,
                                       token=auth_token)