Compare commits

...

4 Commits
2.3.2 ... 2.3.3

Author SHA1 Message Date
Mark McClain
df68d75f66 Make compatible with Cliff (1.5.2)
The most recent version of cliff changes the way formatters work.  This
temporarily disables the custom formatter to get the gate working
again.

Partial-Bug: #1265926
Change-Id: Id0fe9ca3ddf0326a88055f8767de4cbe4cadb950
2014-01-03 16:58:01 -05:00
Jenkins
2026ffdc6c Merge "Remove start index 0 in range()" 2013-12-25 01:49:29 +00:00
Cyril Roelandt
60800b13cf Remove a debugging print statement
This seems useless, and it's a syntax error in Python3.

Change-Id: I699186b73b2208cccb958335d55912066172f4ff
2013-12-17 12:54:59 +01:00
Wu Wenxiang
c989bad9e8 Remove start index 0 in range()
Remove the useless arg ("start index" = 0) in files, since its default
value is 0, to make code cleaner.

Fixes bug #1261580

Change-Id: Ieeace91e8cbd540ddccd8288002331a6e5a70c58
2013-12-17 07:53:52 +08:00
3 changed files with 6 additions and 4 deletions

View File

@@ -341,8 +341,11 @@ class NeutronCommand(command.OpenStackCommand):
def __init__(self, app, app_args):
super(NeutronCommand, self).__init__(app, app_args)
if hasattr(self, 'formatters'):
self.formatters['table'] = TableFormater()
# NOTE(markmcclain): This is no longer supported in cliff version 1.5.2
# see https://bugs.launchpad.net/python-neutronclient/+bug/1265926
#if hasattr(self, 'formatters'):
#self.formatters['table'] = TableFormater()
def get_client(self):
return self.app.client_manager.neutron

View File

@@ -466,7 +466,7 @@ class CLITestV20NetworkJSON(test_cli20.CLITestV20Base):
def _test_extend_list(self, mox_calls):
data = [{'id': 'netid%d' % i, 'name': 'net%d' % i,
'subnets': ['mysubid%d' % i]}
for i in range(0, 10)]
for i in range(10)]
self.mox.StubOutWithMock(self.client.httpclient, "request")
path = getattr(self.client, 'subnets_path')
cmd = network.ListNetwork(test_cli20.MyApp(sys.stdout), None)

View File

@@ -60,7 +60,6 @@ class CLITestV20PortJSON(test_cli20.CLITestV20Base):
args += ['--extra-dhcp-opt',
('opt_name=%(opt_name)s,opt_value=%(opt_value)s' %
dhcp_opt)]
print args
position_names = ['network_id', 'extra_dhcp_opts']
position_values = [netid, extra_dhcp_opts]
position_values.extend([netid])