openstack/python-tackerclient
Code Issues Proposed changes

Merge "Cleanup deprecated iteritems of dict"

Browse Source
This commit is contained in:
Zuul
2020-05-18 17:38:22 +00:00
committed by Gerrit Code Review
parent 80cc957e0c 741fd38741
commit 0af84c52cd
8 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tackerclient/osc/v1/nfvo/ns.py
View File

@@ -195,7 +195,7 @@ class DeleteNS(command.Command):
'resource': _NS}) 'resource': _NS})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _NS " %s(s):") % _NS
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

2
tackerclient/osc/v1/nfvo/nsd.py
View File

@@ -133,7 +133,7 @@ class DeleteNSD(command.Command):
'resource': _NSD}) 'resource': _NSD})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _NSD " %s(s):") % _NSD
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

2
tackerclient/osc/v1/nfvo/vim.py
View File

@@ -185,7 +185,7 @@ class DeleteVIM(command.Command):
'resource': _VIM}) 'resource': _VIM})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _VIM " %s(s):") % _VIM
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

2
tackerclient/osc/v1/nfvo/vnffg.py
View File

@@ -213,7 +213,7 @@ class DeleteVNFFG(command.Command):
'resource': _VNFFG}) 'resource': _VNFFG})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _VNFFG " %s(s):") % _VNFFG
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

2
tackerclient/osc/v1/nfvo/vnffgd.py
View File

@@ -131,7 +131,7 @@ class DeleteVNFFGD(command.Command):
'resource': _VNFFGD}) 'resource': _VNFFGD})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _VNFFGD " %s(s):") % _VNFFGD
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

2
tackerclient/osc/v1/vnfm/vnf.py
View File

@@ -229,7 +229,7 @@ class DeleteVNF(command.Command):
'resource': _VNF}) 'resource': _VNF})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _VNF " %s(s):") % _VNF
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

2
tackerclient/osc/v1/vnfm/vnfd.py
View File

@@ -134,7 +134,7 @@ class DeleteVNFD(command.Command):
'resource': _VNFD}) 'resource': _VNFD})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % _VNFD " %s(s):") % _VNFD
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})

3
tackerclient/tacker/v1_0/__init__.py
View File

@@ -332,6 +332,7 @@ class TableFormater(table.TableFormatter):
https://bugs.launchpad.net/python-tackerclient/+bug/1165962 https://bugs.launchpad.net/python-tackerclient/+bug/1165962
""" """
def emit_list(self, column_names, data, stdout, parsed_args): def emit_list(self, column_names, data, stdout, parsed_args):
if column_names: if column_names:
super(TableFormater, self).emit_list(column_names, data, stdout, super(TableFormater, self).emit_list(column_names, data, stdout,
@@ -559,7 +560,7 @@ class DeleteCommand(TackerCommand):
'resource': self.resource}) 'resource': self.resource})
err_msg = _("\n\nUnable to delete the below" err_msg = _("\n\nUnable to delete the below"
" %s(s):") % self.resource " %s(s):") % self.resource
for failed_id, error in failed_items.iteritems(): for failed_id, error in failed_items.items():
err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s') err_msg += (_('\n Cannot delete %(failed_id)s: %(error)s')
% {'failed_id': failed_id, % {'failed_id': failed_id,
'error': error}) 'error': error})