arif/zaza-openstack-tests
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

test block function instead of ls

Browse Source
This commit is contained in:
camille.rodriguez
2020-08-20 13:47:12 -05:00
parent 320dbb4214
commit cece0d3096
1 changed files with 21 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
zaza/openstack/charm_tests/gnocchi/tests.py
+21 -15
View File
@@ -76,7 +76,7 @@ class GnocchiS3Test(test_utils.OpenStackBaseTest):
session = openstack_utils.get_overcloud_keystone_session()
ks_client = openstack_utils.get_keystone_session_client(session)
# Get token data so we can glean our user_id and project_id
# Get token data so we can clean our user_id and project_id
token_data = ks_client.tokens.get_token_data(session.get_token())
project_id = token_data['token']['project']['id']
user_id = token_data['token']['user']['id']
@@ -133,18 +133,24 @@ class GnocchiExternalCATest(test_utils.OpenStackBaseTest):
)
model.block_until_all_units_idle()
cert_location = '/usr/local/share/ca-certificates'
cert_name = 'gnocchi-external.crt'
cmd = 'ls ' + cert_location + '/' + cert_name
logging.info("Validating that the file {} is created in \
{}".format(cert_name, cert_location))
result = model.run_on_unit('gnocchi/0', cmd)
self.assertEqual(result['Code'], '0')
# cert_location = '/usr/local/share/ca-certificates'
# cert_name = 'gnocchi-external.crt'
# cmd = 'ls ' + cert_location + '/' + cert_name
# logging.info("Validating that the file {} is created in \
# {}".format(cert_name, cert_location))
# result = model.run_on_unit('gnocchi/0', cmd)
remote_file = '/usr/local/share/ca-certificates/gnocchi-external.crt'
logging.info("Validating that {} is created.".format(remote_file))
result = model.block_until_file_ready('gnocchi', remote_file, b64_cert)
self.assertTrue(result)
linked_cert_location = '/etc/ssl/certs'
linked_cert_name = 'gnocchi-external.pem'
cmd = 'ls ' + linked_cert_location + '/' + linked_cert_name
logging.info("Validating that the link {} is created in \
{}".format(linked_cert_name, linked_cert_location))
result = model.run_on_unit('gnocchi/0', cmd)
self.assertEqual(result['Code'], '0')
# linked_cert_location = '/etc/ssl/certs'
# linked_cert_name = 'gnocchi-external.pem'
# cmd = 'ls ' + linked_cert_location + '/' + linked_cert_name
# logging.info("Validating that the link {} is created in \
# {}".format(linked_cert_name, linked_cert_location))
# result = model.run_on_unit('gnocchi/0', cmd)
remote_linked_file = '/etc/ssl/certs/gnocchi-external.pem'
result = model.block_until_file_ready('gnocchi', remote_linked_file, b64_cert)
# self.assertEqual(result['Code'], '0')
self.assertTrue(result)