openstack/python-tackerclient
Code Issues Proposed changes

Merge "Remove the mask password logic in vim list and vim show"

Browse Source
This commit is contained in:
Jenkins
2016-07-23 02:31:44 +00:00
committed by Gerrit Code Review
parent 9910cbc746 c9ac53a722
commit 602c06373d
3 changed files with 0 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,7 +25,6 @@ from cliff.formatters import table
from cliff import lister
from cliff import show
from oslo_serialization import jsonutils
from oslo_utils import strutils
import six
from tackerclient.common._i18n import _
@@ -386,8 +385,6 @@ class TackerCommand(command.OpenStackCommand):
def format_output_data(self, data):
# Modify data to make it more readable
if self.resource in data:
data[self.resource] = strutils.mask_dict_password(
data[self.resource])
for k, v in six.iteritems(data[self.resource]):
if isinstance(v, list):
value = '\n'.join(jsonutils.dumps(

5
tackerclient/tacker/v1_0/nfvo/vim.py
View File

@@ -14,7 +14,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from oslo_utils import strutils
import yaml
from tackerclient.common import exceptions
@@ -32,10 +31,6 @@ class ListVIM(tackerV10.ListCommand):
list_columns = ['id', 'tenant_id', 'name', 'type', 'description',
'auth_url', 'placement_attr', 'auth_cred', 'status']
def extend_list(self, data, parsed_args):
for index, value in enumerate(data):
data[index] = strutils.mask_dict_password(value)
class ShowVIM(tackerV10.ShowCommand):
"""Show information of a given VIM."""

35
tackerclient/tests/unit/vm/test_cli10_vim.py
View File

@@ -16,8 +16,6 @@
import sys
import mox
from tackerclient.tacker.v1_0.nfvo import vim
from tackerclient.tests.unit import test_cli10
@@ -78,39 +76,6 @@ class CLITestV10VIMJSON(test_cli10.CLITestV10Base):
cmd = vim.ListVIM(test_cli10.MyApp(sys.stdout), None)
self._test_list_resources(self._RESOURCES, cmd, True)
def _test_list_vims_extend(self, data, expected_data, args=['-f', 'json']):
resp_str = self.client.serialize({self._RESOURCES: data})
resp = (test_cli10.MyResp(200), resp_str)
cmd = vim.ListVIM(
test_cli10.MyApp(sys.stdout), None)
self.mox.StubOutWithMock(cmd, "get_client")
self.mox.StubOutWithMock(self.client.httpclient, "request")
cmd.get_client().MultipleTimes().AndReturn(self.client)
path = getattr(self.client, self._RESOURCES + '_path')
self.client.httpclient.request(test_cli10.MyUrlComparator(
test_cli10.end_url(path, format=self.format), self.client),
'GET', body=None, headers=mox.ContainsKeyValue(
'X-Auth-Token', test_cli10.TOKEN)).AndReturn(resp)
self.mox.ReplayAll()
cmd_parser = cmd.get_parser("list_" + self._RESOURCES)
parsed_args = cmd_parser.parse_args(args)
result = cmd.take_action(parsed_args)
res_data = [res for res in result[1]]
self.mox.VerifyAll()
self.mox.UnsetStubs()
for res, exp in zip(res_data, expected_data):
self.assertEqual(len(exp), len(res))
self.assertEqual(exp, res)
def test_list_vims_extend(self):
vim_data = [{'id': 'my_id1', 'auth_cred': {'password':
'encrypted_pw'}}, {'id': 'my_id2', 'auth_cred': {
'password': 'another_encrypted_pw'}}]
expected_data = [('my_id1', {'password': '***'}),
('my_id2', {'password': '***'})]
self._test_list_vims_extend(vim_data, expected_data)
def test_show_vim_id(self):
cmd = vim.ShowVIM(test_cli10.MyApp(sys.stdout), None)
args = ['--fields', 'id', self.test_id]