openstack
/
pymod2pkg
Code Issues Proposed changes

Tighten the horizon plugin rule a bit more 

There was another corner case not found by unit tests. Add
testcase and skip re-expanding the -ui/-dashboard renaming
for the python- subpackage.

Change-Id: Ifa08bc8da8524e15e90bafbb40d6a3ca1acbb615
This commit is contained in:
Dirk Mueller 2019-01-02 18:18:12 +01:00
parent adefeddaa5
commit d8c52f2621
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pymod2pkg/__init__.py
View File

@ -243,11 +243,11 @@ RDO_PKG_MAP = [
'Tempest', 'tripleo-common', 'trove', 'tuskar',
'vitrage', 'watcher', 'zaqar', 'zun'],
pkgfun=openstack_prefix_tr),
# Horizon plugins (normalized to openstack-<project>-ui)
RegexRule(pattern=r'^[\w-]+-(dashboard|ui)',
pkgfun=rdo_horizon_plugins_tr),
# XStatic projects (name is python-pypi_name, no lowercase conversion)
RegexRule(pattern=r'^XStatic.*', pkgfun=rdo_xstatic_tr),
# Horizon plugins (normalized to openstack-<project>-ui)
RegexRule(pattern=r'^(neutron-)?\w+-(dashboard|ui)',
pkgfun=rdo_horizon_plugins_tr),
# Tempest plugins (normalized to python-<project>-tests-tempest)
RegexRule(pattern=r'\w+-tempest-plugin', pkgfun=rdo_tempest_plugins_tr)
]
@ -295,7 +295,7 @@ SUSE_PKG_MAP = [
SingleRule('monasca-ui', 'openstack-horizon-plugin-monasca-ui'),
SingleRule('murano-dashboard', 'openstack-horizon-plugin-murano-ui'),
SingleRule('networking-vsphere', 'openstack-neutron-vsphere'),
RegexRule(pattern=r'^[\w-]+-(dashboard|ui)',
RegexRule(pattern=r'^(neutron-)?\w+-(dashboard|ui)',
pkgfun=suse_horizon_plugins_tr),
]

5
tests.py
View File

@ -102,8 +102,13 @@ class Pymod2PkgTests(unittest.TestCase):
self.assertEqual(pymod2pkg.module2package(
'neutron-fwaas-dashboard', 'suse'),
'openstack-horizon-plugin-neutron-fwaas-ui')
self.assertEqual(pymod2pkg.module2package(
'horizon-plugin-neutron-fwaas-ui', 'suse'),
'python-horizon-plugin-neutron-fwaas-ui')
self.assertEqual(pymod2pkg.module2package('zomg-dashboard', 'suse'),
'openstack-horizon-plugin-zomg-ui')
self.assertEqual(pymod2pkg.module2package('XStatic-jquery-ui', 'suse'),
'python-XStatic-jquery-ui')
def test_translation_tempest_plugins(self):
self.assertEqual(pymod2pkg.module2package('keystone-tempest-plugin',