starlingx
/
test
Code Issues Proposed changes

Adding some changes to get easy to run the test on an env that uses different port numbers 

Signed-off-by: Felipe Desiglo Ferrare <Felipe.DesigloFerrare@windriver.com>
Change-Id: I8b267056b5e0950ddaea6b606d5fcddcfbffad26
This commit is contained in:
Felipe Desiglo Ferrare 2021-10-22 18:00:55 -03:00 committed by Felipe Desiglo Ferrare
parent 1516b57d62
commit 58bbcf1d25
4 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
automated-pytest-suite/consts/auth.py
View File

@ -22,6 +22,7 @@ class Tenant:
'tenant': 'admin',
'domain': 'Default',
'platform': True,
'port': 31000,
}
# Containerized openstack users - admin, and two test users/tenants
@ -29,7 +30,8 @@ class Tenant:
'user': 'admin',
'password': __PASSWORD,
'tenant': 'admin',
'domain': 'Default'
'domain': 'Default',
'port': 8080,
}
__TENANT1 = {
@ -37,7 +39,8 @@ class Tenant:
'password': __PASSWORD,
'tenant': 'tenant1',
'domain': 'Default',
'nova_keypair': 'keypair-tenant1'
'nova_keypair': 'keypair-tenant1',
'port': 8080,
}
__TENANT2 = {
@ -45,7 +48,8 @@ class Tenant:
'password': __PASSWORD,
'tenant': 'tenant2',
'domain': 'Default',
'nova_keypair': 'keypair-tenant2'
'nova_keypair': 'keypair-tenant2',
'port': 8080,
}
__tenants = {

1
automated-pytest-suite/consts/lab.py
View File

@ -17,6 +17,7 @@ class Labs(object):
# 'short_name': 'my_server1',
# 'name': 'my_server1.com',
# 'floating ip': '10.10.10.2',
# 'floating port': '22', # Optional
# 'controller-0 ip': '10.10.10.3',
# 'controller-1 ip': '10.10.10.4',
# }

2
automated-pytest-suite/setups.py
View File

@ -35,7 +35,7 @@ def setup_tis_ssh(lab):
if con_ssh is None:
con_ssh = SSHClient(lab['floating ip'], HostLinuxUser.get_user(),
HostLinuxUser.get_password(),
CONTROLLER_PROMPT)
CONTROLLER_PROMPT, port=lab.get('floating port', None))
con_ssh.connect(retry=True, retry_timeout=30)
ControllerClient.set_active_controller(con_ssh)

9
automated-pytest-suite/testfixtures/horizon.py
View File

@ -32,19 +32,22 @@ def driver(request):
@fixture(scope='function')
def admin_home_pg(driver, request):
return __login_base(request=request, driver=driver,
auth_info=Tenant.get('admin_platform'))
auth_info=Tenant.get('admin_platform'),
port=Tenant.get('admin_platform').get('port', None))
@fixture(scope='function')
def admin_home_pg_container(driver, request):
return __login_base(request=request, driver=driver,
auth_info=Tenant.get('admin'))
auth_info=Tenant.get('admin'),
port=Tenant.get('admin').get('port', None))
@fixture(scope='function')
def tenant_home_pg_container(driver, request):
return __login_base(request=request, driver=driver,
auth_info=Tenant.get_primary())
auth_info=Tenant.get_primary(),
port=Tenant.get_primary().get('port', None))
def __login_base(request, driver, auth_info, port=None):