Fixed bug 902058 (review comments fixed)
Change-Id: If3f0a38dd704dfb3bacb4f29ddc9782c6897b1e9
diff --git a/tempest/config.py b/tempest/config.py
index 3511d5c..8fa3ee5 100644
--- a/tempest/config.py
+++ b/tempest/config.py
@@ -1,6 +1,7 @@
import ConfigParser
import logging
import os
+from tempest.common.utils import data_utils
LOG = logging.getLogger(__name__)
@@ -38,6 +39,15 @@
"""Path of API request"""
return self.get("path", "/")
+ @property
+ def auth_url(self):
+ """The Auth URL (derived)"""
+ auth_url = data_utils.build_url(self.host,
+ self.port,
+ self.apiVer,
+ self.path)
+ return auth_url
+
def params(self):
"""Parameters to be passed with the API request"""
return self.get("params", "")
@@ -111,7 +121,7 @@
@property
def create_image_enabled(self):
- """ Does the test environment support resizing """
+ """ Does the test environment support snapshots """
return self.get("create_image_enabled", 'false') != 'false'
@property
diff --git a/tempest/openstack.py b/tempest/openstack.py
index dcabd8d..b1e22ad 100644
--- a/tempest/openstack.py
+++ b/tempest/openstack.py
@@ -28,31 +28,27 @@
config_file = os.environ.get('TEMPEST_CONFIG',
self.DEFAULT_CONFIG_FILE)
self.config = tempest.config.TempestConfig(config_dir, config_file)
- self.auth_url = data_utils.build_url(self.config.nova.host,
- self.config.nova.port,
- self.config.nova.apiVer,
- self.config.nova.path)
if self.config.env.authentication == 'keystone_v2':
self.servers_client = ServersClient(self.config,
self.config.nova.username,
self.config.nova.api_key,
- self.auth_url,
+ self.config.nova.auth_url,
self.config.nova.tenant_name)
self.flavors_client = FlavorsClient(self.config,
self.config.nova.username,
self.config.nova.api_key,
- self.auth_url,
+ self.config.nova.auth_url,
self.config.nova.tenant_name)
self.images_client = ImagesClient(self.config,
self.config.nova.username,
self.config.nova.api_key,
- self.auth_url,
+ self.config.nova.auth_url,
self.config.nova.tenant_name)
self.limits_client = LimitsClient(self.config,
self.config.nova.username,
self.config.nova.api_key,
- self.auth_url,
+ self.config.nova.auth_url,
self.config.nova.tenant_name)
else:
@@ -60,18 +56,16 @@
self.servers_client = ServersClient(self.config,
self.config.nova.username,
self.config.nova.api_key,
- self.auth_url)
+ self.config.nova.auth_url)
self.flavors_client = FlavorsClient(self.config,
self.config.nova.username,
self.config.nova.api_key,
- self.auth_url)
+ self.config.nova.auth_url)
self.images_client = ImagesClient(self.config,
self.config.nova.username,
- self.config.nova.auth_url,
self.config.nova.api_key,
- self.auth_url)
+ self.config.nova.auth_url)
self.limits_client = LimitsClient(self.config,
self.config.nova.username,
- self.config.nova.auth_url,
self.config.nova.api_key,
- self.auth_url)
+ self.config.nova.auth_url)