Modified tripleo tests to use data from nova metadata instead

This commit is contained in:
Ade Lee 2017-08-09 14:13:21 -04:00
parent a1eee05af4
commit f2ef37da33
2 changed files with 58 additions and 0 deletions

View File

@ -66,6 +66,10 @@ class NovajoinScenarioTest(manager.ScenarioTest):
result = self.ipa_client.find_service(service_principal)
self.assertTrue(result['count'] > 0)
def verify_service_managed_by_host(self, service, host, realm):
# TODO(alee) Implement this using service-show
pass
def verify_service_deleted(self, service, host, realm):
service_principal = '{servicename}/{hostname}@{realm}'.format(
servicename=service, hostname=host, realm=realm

View File

@ -53,6 +53,23 @@ CONTROLLER_CERT_TAGS = [
'haproxy-storage_mgmt-cert'
]
CONTROLLERS = ['overcloud-controller-0']
COMPACT_SERVICES = {
"HTTP": ["ctlplane", "internalapi", "storagemgmt", "storage"],
"rabbitmq": ["internalapi"],
"mysql": ["internalapi"]
}
MANAGED_SERVICES = [
'haproxy/overcloud.ctlplane.tripleodomain.example.com',
'haproxy/overcloud.tripleodomain.example.com',
'haproxy/overcloud.internalapi.tripleodomain.example.com',
'haproxy/overcloud.storage.tripleodomain.example.com',
'haproxy/overcloud.storagemgmt.tripleodomain.example.com',
'mysql/overcloud.internalapi.tripleodomain.example.com'
]
class TripleOTest(novajoin_manager.NovajoinScenarioTest):
@ -105,6 +122,17 @@ class TripleOTest(novajoin_manager.NovajoinScenarioTest):
else:
self.assertTrue(serial is not None)
def test_verify_compact_services_created(self):
# TODO(alee) Get the compact services from the host metadata
for host in CONTROLLERS:
self.verify_controller_compact_services(host, COMPACT_SERVICES)
def test_verify_controller_managed_services(self):
# TODO(alee) Get the managed services from the host metadata
for host in CONTROLLERS:
print(host)
self.verify_controller_managed_services(MANAGED_SERVICES)
def test_verify_service_certs_are_tracked(self):
# TODO(alee) get correct overcloud_ip
overcloud_ip = '192.168.24.17'
@ -122,3 +150,29 @@ class TripleOTest(novajoin_manager.NovajoinScenarioTest):
overcloud_ip,
'heat-admin'
)
def verify_controller_compact_services(self, host, compact_services):
for (service, networks) in compact_services.items():
for network in networks:
subhost = '{host}.{network}.{domain}'.format(
host=host, network=network, domain=DOMAIN
)
self.verify_service(service, subhost, REALM)
def verify_service(self, service, host, realm):
self.verify_host_registered_with_ipa(host)
self.verify_service_created(service, host, realm)
serial = self.get_service_cert(service, host, realm)
if service == 'mysql' and host == 'overcloud-controller-0.internalapi':
pass
else:
self.assertTrue(serial is not None)
self.verify_service_managed_by_host(service, host, realm)
def verify_controller_managed_services(self, managed_services):
for principal in managed_services:
service = principal.split('/', 1)[0]
host = principal.split('/', 1)[1]
self.verify_service(service, host, REALM)