Fix some issues with tempest test when not running with devstack
Change-Id: I51cc7867a60357d8e1c809d1ea985b0624546ebb
This commit is contained in:
parent
6772bdbd3b
commit
3e72f7d1aa
|
@ -20,11 +20,14 @@ import time
|
||||||
|
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
import requests
|
import requests
|
||||||
|
from requests.packages.urllib3.exceptions import InsecureRequestWarning
|
||||||
|
|
||||||
from freezer.storage import physical
|
from freezer.storage import physical
|
||||||
|
|
||||||
LOG = log.getLogger(__name__)
|
LOG = log.getLogger(__name__)
|
||||||
|
|
||||||
|
requests.packages.urllib3.disable_warnings(InsecureRequestWarning)
|
||||||
|
|
||||||
|
|
||||||
class SwiftStorage(physical.PhysicalStorage):
|
class SwiftStorage(physical.PhysicalStorage):
|
||||||
"""
|
"""
|
||||||
|
|
|
@ -138,7 +138,7 @@ class BaseFreezerTest(test.BaseTestCase):
|
||||||
@classmethod
|
@classmethod
|
||||||
def get_auth_url(cls):
|
def get_auth_url(cls):
|
||||||
return cls.os_primary.auth_provider.auth_client.auth_url[:-len(
|
return cls.os_primary.auth_provider.auth_client.auth_url[:-len(
|
||||||
'/tokens')]
|
'/auth/tokens')]
|
||||||
|
|
||||||
@classmethod
|
@classmethod
|
||||||
def setup_clients(cls):
|
def setup_clients(cls):
|
||||||
|
@ -151,6 +151,10 @@ class BaseFreezerTest(test.BaseTestCase):
|
||||||
os.environ['OS_USERNAME'] = cls.os_primary.credentials.username
|
os.environ['OS_USERNAME'] = cls.os_primary.credentials.username
|
||||||
os.environ['OS_PROJECT_NAME'] = cls.os_primary.credentials.tenant_name
|
os.environ['OS_PROJECT_NAME'] = cls.os_primary.credentials.tenant_name
|
||||||
os.environ['OS_TENANT_NAME'] = cls.os_primary.credentials.tenant_name
|
os.environ['OS_TENANT_NAME'] = cls.os_primary.credentials.tenant_name
|
||||||
|
os.environ['OS_PROJECT_DOMAIN_NAME'] = \
|
||||||
|
cls.os_primary.credentials.project_domain_name
|
||||||
|
os.environ['OS_USER_DOMAIN_NAME'] = \
|
||||||
|
cls.os_primary.credentials.user_domain_name
|
||||||
|
|
||||||
# Allow developers to set OS_AUTH_URL when developing so that
|
# Allow developers to set OS_AUTH_URL when developing so that
|
||||||
# Keystone may be on a host other than localhost.
|
# Keystone may be on a host other than localhost.
|
||||||
|
|
|
@ -57,8 +57,8 @@ class BaseFreezerCliTest(base.BaseFreezerTest):
|
||||||
|
|
||||||
output = self.cli.freezer_client(
|
output = self.cli.freezer_client(
|
||||||
action='job-create',
|
action='job-create',
|
||||||
params='--file {}'.format(job_file.name)
|
params='--file {} --client {}'.format(job_file.name,
|
||||||
)
|
job_json['client_id']))
|
||||||
job_id = output.split()[1]
|
job_id = output.split()[1]
|
||||||
expected = 'Job {} created'.format(job_id)
|
expected = 'Job {} created'.format(job_id)
|
||||||
self.assertEqual(expected, output.strip())
|
self.assertEqual(expected, output.strip())
|
||||||
|
@ -116,12 +116,19 @@ class CLIClientWithFreezer(cli_base.CLIClient):
|
||||||
"""
|
"""
|
||||||
|
|
||||||
flags += ' --os-endpoint-type %s' % endpoint_type
|
flags += ' --os-endpoint-type %s' % endpoint_type
|
||||||
|
flags += ' --os-cacert /etc/ssl/certs/ca-certificates.crt'
|
||||||
|
flags += ' --os-project-domain-name Default'
|
||||||
|
flags += ' --os-user-domain-name Default'
|
||||||
|
|
||||||
return self.cmd_with_auth(
|
return self.cmd_with_auth(
|
||||||
'freezer-scheduler', action, flags, params, fail_ok, merge_stderr)
|
'freezer-scheduler', action, flags, params, fail_ok, merge_stderr)
|
||||||
|
|
||||||
def freezer_client(self, action, flags='', params='', fail_ok=False,
|
def freezer_client(self, action, flags='', params='', fail_ok=False,
|
||||||
endpoint_type='publicURL', merge_stderr=True):
|
endpoint_type='publicURL', merge_stderr=True):
|
||||||
flags += ' --os-endpoint-type %s' % endpoint_type
|
flags += ' --os-endpoint-type %s' % endpoint_type
|
||||||
|
flags += ' --os-cacert /etc/ssl/certs/ca-certificates.crt'
|
||||||
|
flags += ' --os-project-domain-name Default'
|
||||||
|
flags += ' --os-user-domain-name Default'
|
||||||
return self.cmd_with_auth(
|
return self.cmd_with_auth(
|
||||||
'freezer', action, flags, params, fail_ok, merge_stderr)
|
'freezer', action, flags, params, fail_ok, merge_stderr)
|
||||||
|
|
||||||
|
@ -234,14 +241,18 @@ class TestFreezerScenario(BaseFreezerCliTest):
|
||||||
self.source_tree.add_random_data()
|
self.source_tree.add_random_data()
|
||||||
self.dest_tree = Temp_Tree()
|
self.dest_tree = Temp_Tree()
|
||||||
|
|
||||||
self.cli.freezer_scheduler(action='start', flags='-c test_node')
|
self.cli.freezer_scheduler(action='start',
|
||||||
|
flags='-c test_node '
|
||||||
|
'-f /tmp/freezer_tempest_job_dir/')
|
||||||
|
|
||||||
def tearDown(self):
|
def tearDown(self):
|
||||||
super(TestFreezerScenario, self).tearDown()
|
super(TestFreezerScenario, self).tearDown()
|
||||||
self.source_tree.cleanup()
|
self.source_tree.cleanup()
|
||||||
self.dest_tree.cleanup()
|
self.dest_tree.cleanup()
|
||||||
|
|
||||||
self.cli.freezer_scheduler(action='stop', flags='-c test_node')
|
self.cli.freezer_scheduler(action='stop',
|
||||||
|
flags='-c test_node '
|
||||||
|
'-f /tmp/freezer_tempest_job_dir/')
|
||||||
|
|
||||||
def test_simple_backup(self):
|
def test_simple_backup(self):
|
||||||
backup_job = {
|
backup_job = {
|
||||||
|
|
Loading…
Reference in New Issue