openstack
/
python-vitrageclient
Code Issues Proposed changes

Remove unicode from client 

Change-Id: If0ac1d13a7958edb1389c1f76abce47016e50845
This commit is contained in:
Q.hongtao 2021-01-03 10:15:54 +08:00 committed by Eyal
parent 3b976540d9
commit 7dbc1e89e2
7 changed files with 18 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.zuul.yaml
View File

@ -1,7 +1,6 @@
- project:
templates:
- check-requirements
- openstack-lower-constraints-jobs
- openstack-python3-wallaby-jobs
- openstackclient-plugin-jobs
- publish-openstack-docs-pti

8
doc/source/conf.py
View File

@ -40,8 +40,8 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = u'python-vitrageclient'
copyright = u'2016, OpenStack Foundation'
project = 'python-vitrageclient'
copyright = '2016, OpenStack Foundation'
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
@ -70,8 +70,8 @@ htmlhelp_basename = '%sdoc' % project
latex_documents = [
('index',
'%s.tex' % project,
u'%s Documentation' % project,
u'OpenStack Foundation', 'manual'),
'%s Documentation' % project,
'OpenStack Foundation', 'manual'),
]
# Example configuration for intersphinx: refer to the Python standard library.

12
doc/source/contributor/cli.rst
View File

@ -696,12 +696,12 @@ resource list
+--------------------------------------+-------------------+--------------------------------------+------------+-------------------------------------------------------------------------------------------------------------------------------+
| ID | Type | Data Source ID | State | Metadata |
+--------------------------------------+-------------------+--------------------------------------+------------+-------------------------------------------------------------------------------------------------------------------------------+
| 786efe03-55ff-41b2-bdc1-6cd94bc355ad | nova.instance | f3d6819a-5b52-4fae-93d4-ce58c263510b | SUBOPTIMAL | {'project_id': u'4437e14f56904650af9eef83dff35263', 'name': u'vm-0', 'update_timestamp': u'2018-01-03 09:06:06.339099+00:00'} |
| d019ee2b-df2a-4c8f-bc59-f28a2296b0db | neutron.network | dafa8864-a04c-4688-bab2-c6dc3ce5c31b | OK | {'project_id': u'4437e14f56904650af9eef83dff35263', 'name': u'public', 'update_timestamp': u'2017-11-09T09:49:49Z'} |
| 772d627f-90d7-4c5e-8c18-6587fa5b88ee | neutron.port | 75ff8ce5-26d9-4d77-875f-8d297918374c | OK | {'project_id': u'4437e14f56904650af9eef83dff35263', 'update_timestamp': u'2017-11-28T11:50:23Z'} |
| 4ac47cef-419f-4e4b-9590-22c10bbd21fd | nova.host | compute-0-0 | OK | {'name': u'compute-0-0', 'update_timestamp': u'2018-01-03 09:06:06.851229+00:00'} |
| 99920528-2757-4fde-a2a0-3063bf0c4020 | openstack.cluster | OpenStack Cluster | OK | {'name': u'openstack.cluster'} |
| 374203a6-e7bc-4bd6-bc32-1137f4f3d234 | nova.zone | nova | OK | {'name': u'nova', 'update_timestamp': u'2018-01-03 09:06:07.628148+00:00'} |
| 786efe03-55ff-41b2-bdc1-6cd94bc355ad | nova.instance | f3d6819a-5b52-4fae-93d4-ce58c263510b | SUBOPTIMAL | {'project_id': '4437e14f56904650af9eef83dff35263', 'name': 'vm-0', 'update_timestamp': '2018-01-03 09:06:06.339099+00:00'} |
| d019ee2b-df2a-4c8f-bc59-f28a2296b0db | neutron.network | dafa8864-a04c-4688-bab2-c6dc3ce5c31b | OK | {'project_id': '4437e14f56904650af9eef83dff35263', 'name': 'public', 'update_timestamp': '2017-11-09T09:49:49Z'} |
| 772d627f-90d7-4c5e-8c18-6587fa5b88ee | neutron.port | 75ff8ce5-26d9-4d77-875f-8d297918374c | OK | {'project_id': '4437e14f56904650af9eef83dff35263', 'update_timestamp': '2017-11-28T11:50:23Z'} |
| 4ac47cef-419f-4e4b-9590-22c10bbd21fd | nova.host | compute-0-0 | OK | {'name': 'compute-0-0', 'update_timestamp': '2018-01-03 09:06:06.851229+00:00'} |
| 99920528-2757-4fde-a2a0-3063bf0c4020 | openstack.cluster | OpenStack Cluster | OK | {'name': 'openstack.cluster'} |
| 374203a6-e7bc-4bd6-bc32-1137f4f3d234 | nova.zone | nova | OK | {'name': 'nova', 'update_timestamp': '2018-01-03 09:06:07.628148+00:00'} |
+--------------------------------------+-------------------+--------------------------------------+------------+-------------------------------------------------------------------------------------------------------------------------------+
resource show

1
lower-constraints.txt
View File

@ -3,7 +3,6 @@ cliff==2.8.0
cmd2==0.8.0
coverage==4.5.1
debtcollector==1.2.0
decorator==3.4.0
deprecation==1.0
dogpile.cache==0.6.2
extras==1.0.0

8
releasenotes/source/conf.py
View File

@ -41,8 +41,8 @@ source_suffix = '.rst'
master_doc = 'index'
# General information about the project.
project = u'python-vitrageclient releasenotes'
copyright = u'2016, Vitrage developers'
project = 'python-vitrageclient releasenotes'
copyright = '2016, Vitrage developers'
# If true, '()' will be appended to :func: etc. cross-reference text.
add_function_parentheses = True
@ -71,8 +71,8 @@ htmlhelp_basename = '%sdoc' % project
latex_documents = [
('index',
'%s.tex' % project,
u'%s Vitrage Client ReleaseNotes' % project,
u'Vitrage developers', 'manual'),
'%s Vitrage Client ReleaseNotes' % project,
'Vitrage developers', 'manual'),
]
# Example configuration for intersphinx: refer to the Python standard library.

6
vitrageclient/common/formatters.py
View File

@ -52,9 +52,9 @@ class GraphFormatter(base.SingleFormatter, metaclass=abc.ABCMeta):
# if name and type the same
# don't print twice its redundant
# e.g openstack.cluster
node[u'label'] = name + '\n' + v_type
node['label'] = name + '\n' + v_type
else:
node[u'label'] = v_type
node['label'] = v_type
# type list is not supported in some
# formats
@ -63,7 +63,7 @@ class GraphFormatter(base.SingleFormatter, metaclass=abc.ABCMeta):
data['multigraph'] = False
for node in data['links']:
node[u'label'] = node.pop('relationship_type')
node['label'] = node.pop('relationship_type')
# used only in multigraph
node.pop('key')

2
vitrageclient/tests/cli/test_topology_show.py
View File

@ -158,7 +158,7 @@ strict digraph {
}
''' # noqa
GRAPHML_DATA = u'''\
GRAPHML_DATA = '''\
<?xml version='1.0' encoding='utf-8'?>
<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://graphml.graphdrawing.org/xmlns/1.0/graphml.xsd">
<key attr.name="size" attr.type="int" for="node" id="d20" />