openstack
/
kolla-cli
Code Issues Proposed changes

Updated inventory version for 4.x release 

Updated inventory version for 4.x release from 3 to 4 so
that we pick up any new services introduced in 4.x on
upgrades from 2.x / 3.x.  Also fixed a pep8 failure in
utils related to line length.

Change-Id: I90105a47dcdc21dc873ccb5a9e90093ed139abd5
Jira-Issue: OPENSTACK-1603
This commit is contained in:
Borne Mace 2017-08-22 09:50:30 -07:00
parent f597625876
commit 99afdbcc1d
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
kollacli/common/inventory.py
View File

@ -70,9 +70,11 @@ def remove_temp_inventory(path):
class Inventory(object):
class_version = 3
class_version = 4
"""class version history
4: (v4.0.1):
- more sub-services added
3: (v3.0.1):
- added aodh, ceph
- fix to ensure all sub-services have service as parent
@ -105,11 +107,11 @@ class Inventory(object):
for group in groups:
ceilometer.add_groupname(group)
if self.version <= 2:
# upgrade from inventory v2
if self.version <= 3:
# upgrade from inventory v2 / v3
# some sub-services may be missing their parent associations.
# they are now needed in v3.
# they are now needed in v3 / v4
for svc in self.get_services():
for sub_svcname in svc.get_sub_servicenames():
sub_svc = self.get_sub_service(sub_svcname)

4
kollacli/common/utils.py
View File

@ -399,8 +399,8 @@ def convert_lists_to_string(tuples, parsed_args):
(\u0414\u0435\u043a\u0430\u0442). By converting
the list to string here, the proper non-ascii chars are displayed.
This will only change the lists when the output is to a user visible medium.
It cannot be changed if the display output is json, yaml, etc.
This will only change the lists when the output is to a user visible
medium. It cannot be changed if the display output is json, yaml, etc.
"""
convert_types = ['table', 'csv', 'html', 'value']
if parsed_args.formatter and parsed_args.formatter not in convert_types: