openstack
/
murano-dashboard
Code Issues Proposed changes

Create glare client in dashboard tests 

Create glare client in selenium tests to allow murano dashboard tests
work with enabled GLARE.

Marks categories tests to be skipped, since they use package count and
package count is not available with GLARE backend. Adds zip packages
test for GLARE backend.
Marks test_upload_package skipped due to a bug in glare backend.
Removes checks for "Deploying" status, since the test can be too fast
for "Deploying" message to appear.

Related-Bug: #1618222
Related-Bug: #1618228
Related-Bug: #1618266
Related-Bug: #1618271

Co-Authored-By: Kirill Zaitsev <k.zaitsev@me.com>
Targets bp: murano-glare-devstack-testing
Depends-On: I6581d9bbdf72424e2520ba1a7ecc25d5861885d9
Change-Id: I4b4793436c84410349939655bf60e5591cfcacb1
This commit is contained in:
Nikolay Starodubtsev 2016-08-29 11:59:51 +03:00 committed by Kirill Zaitsev
parent 8b86508090
commit bb347d8173
4 changed files with 90 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
muranodashboard/tests/functional/base.py
View File

@ -23,6 +23,7 @@ from glanceclient import client as gclient
from keystoneauth1.identity import v3
from keystoneauth1 import session as ks_session
from keystoneclient.v3 import client as ks_client
from muranoclient.glance import client as glare_client
import muranoclient.v1.client as mclient
from oslo_log import handlers
from oslo_log import log
@ -63,12 +64,21 @@ class UITestCase(BaseDeps):
project_name=cfg.common.tenant,
auth_url=cfg.common.keystone_url)
session = ks_session.Session(auth=auth)
cls.murano_client = mclient.Client(
endpoint_override=cfg.common.murano_url,
session=session)
cls.keystone_client = ks_client.Client(session=session)
cls.auth_ref = auth.get_auth_ref(session)
cls.service_catalog = cls.auth_ref.service_catalog
if utils.glare_enabled():
glare_endpoint = "http://127.0.0.1:9494"
artifacts_client = glare_client.Client(
endpoint=glare_endpoint, token=cls.auth_ref.auth_token,
insecure=False, key_file=None, ca_file=None, cert_file=None,
type_name="murano", type_version=1)
else:
artifacts_client = None
cls.murano_client = mclient.Client(
artifacts_client=artifacts_client,
endpoint_override=cfg.common.murano_url,
session=session)
cls.url_prefix = urlparse.urlparse(cfg.common.horizon_url).path or ''
if cls.url_prefix.endswith('/'):

3
muranodashboard/tests/functional/config/config.py
View File

@ -37,6 +37,9 @@ MuranoGroup = [
cfg.IntOpt('items_per_page',
default=20,
help='items per page displayed'),
cfg.StrOpt('packages_service',
default='murano',
help='murano packages service, either "murano" or "glare"'),
]

75
muranodashboard/tests/functional/sanity_check.py
View File

@ -724,9 +724,6 @@ class TestSuiteApplications(base.ApplicationTestCase):
self.check_element_on_page(by.By.XPATH, c.CellStatus.format('up'))
self.driver.find_element_by_id('services__action_deploy_env').click()
self.check_element_on_page(by.By.XPATH,
c.Status.format('Deploying'))
self.check_element_on_page(by.By.XPATH, c.CellStatus.format('unknown'))
self.check_element_on_page(by.By.XPATH,
c.Status.format('Ready'),
sec=90)
@ -1269,6 +1266,9 @@ class TestSuitePackages(base.PackageTestCase):
self.driver.find_element_by_xpath(
c.MockAppDescr).text)
@unittest.skipIf(utils.glare_enabled(),
"GLARE backend doesn't honor public flag. "
"Bug #1618222")
def test_upload_package(self):
"""Test package uploading via Packages view.
@ -1378,12 +1378,19 @@ class TestSuitePackages(base.PackageTestCase):
self.wait_for_alert_message()
# TODO(kzaitsev): We need to wait while the spinner is gone
# instead will add a 5 sec sleep, should fix as part of 1618271
time.sleep(5)
pkg_name = self.archive_name
self.driver.find_element_by_xpath(
"//a[contains(text(), '{0}')]".format(pkg_name)).click()
self.assertIn(pkg_name,
self.driver.find_element(by.By.XPATH, c.AppDetail).text)
@unittest.skipIf(utils.glare_enabled(),
"GLARE backend doesn't expose category count"
"Bug #1618228")
def test_add_pkg_to_category_non_admin(self):
"""Test package addition to category as non admin user
@ -1459,6 +1466,9 @@ class TestSuitePackages(base.PackageTestCase):
self.wait_for_alert_message()
self.check_element_not_on_page(by.By.XPATH, delete_new_category_btn)
@unittest.skipIf(utils.glare_enabled(),
"This test fails with GLARE, shoud be fixed as part of "
"bug #1618266")
def test_sharing_app_without_permission(self):
"""Tests sharing Murano App without permission
@ -1875,7 +1885,9 @@ class TestSuiteRepository(base.PackageTestCase):
self.check_element_not_on_page(
by.By.XPATH, c.AppPackages.format(pkg_name))
def test_import_big_zip_file(self):
@unittest.skipIf(utils.glare_enabled(),
'GLARE allows importing big files')
def test_import_big_zip_file_negative(self):
"""Import very big zip archive.
Scenario:
@ -1913,6 +1925,47 @@ class TestSuiteRepository(base.PackageTestCase):
self.check_element_not_on_page(
by.By.XPATH, c.AppPackages.format(pkg_name))
@unittest.skipUnless(utils.glare_enabled(),
'Without GLARE backend murano restricts file size')
def test_import_big_zip_file(self):
"""Import very big zip archive.
Scenario:
1. Log in Horizon with admin credentials
2. Navigate to 'Packages' page
3. Click 'Import Package' and select 'File' as a package source
4. Choose very big zip file
5. Click on 'Next' button
6. Check that error message that user can't upload file more than
5 MB is displayed
"""
pkg_name = self.gen_random_resource_name('pkg')
self._make_big_zip_pkg(name=pkg_name,
size=10 * 1024 * 1024)
# import package and choose big zip file for it
self.navigate_to('Manage')
self.go_to_submenu('Packages')
self.driver.find_element_by_id(c.UploadPackage).click()
sel = self.driver.find_element_by_css_selector(
"select[name='upload-import_type']")
sel = ui.Select(sel)
sel.select_by_value("by_name")
el = self.driver.find_element_by_css_selector(
"input[name='upload-repo_name']")
el.send_keys("{0}".format(pkg_name))
self.driver.find_element_by_xpath(c.InputSubmit).click()
# no additional input needed
self.driver.find_element_by_xpath(c.InputSubmit).click()
self.driver.find_element_by_xpath(c.InputSubmit).click()
self.wait_for_alert_message()
self.check_element_on_page(
by.By.XPATH, c.AppPackages.format(pkg_name))
def test_import_bundle_when_dependencies_installed(self):
"""Test bundle import if some dependencies are installed.
@ -2003,8 +2056,12 @@ class TestSuitePackageCategory(base.PackageTestCase):
self.driver.find_element_by_xpath(c.InputSubmit).click()
self.wait_for_alert_message()
self.check_element_on_page(
by.By.XPATH, c.CategoryPackageCount.format(self.category, 0))
if utils.glare_enabled():
# TODO(kzaitsev): see Bug #1618228
# GLARE doesn't expose category package count
self.check_element_on_page(
by.By.XPATH, c.CategoryPackageCount.format(self.category, 0))
# save category id
self.category_id = self.get_element_id(self.category)
@ -2015,6 +2072,9 @@ class TestSuitePackageCategory(base.PackageTestCase):
# delete created category
self.murano_client.categories.delete(self.category_id)
@unittest.skipIf(utils.glare_enabled(),
"GLARE backend doesn't expose category count"
"Bug #1618228")
def test_add_delete_category_for_package(self):
"""Test package importing with new category and changing the category.
@ -2157,6 +2217,9 @@ class TestSuitePackageCategory(base.PackageTestCase):
"with an existing object.")
self.check_alert_message(error_message)
@unittest.skipIf(utils.glare_enabled(),
"GLARE backend doesn't expose category count"
"Bug #1618228")
def test_delete_category_with_package(self):
"""Deletion of category with package in it

5
muranodashboard/tests/functional/utils.py
View File

@ -18,6 +18,7 @@ import zipfile
from oslo_log import log
import config.config as cfg
from muranodashboard.tests.functional import consts
log = log.getLogger(__name__).logger
@ -108,3 +109,7 @@ def compose_bundle(bundle_path, app_names):
bundle['Packages'].append({'Name': app_name})
with open(bundle_path, 'w') as f:
f.write(json.dumps(bundle))
def glare_enabled():
return cfg.common.packages_service == "glare"