openstack/neutron-fwaas
Code Issues Proposed changes

Merge "Use built-in print() instead of print statement"

Browse Source
This commit is contained in:
Jenkins 2013-09-23 08:32:50 +00:00 committed by Gerrit Code Review
commit f7d4f46589
17 changed files with 100 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bin/neutron-rootwrap-xen-dom0
View File

@ -21,6 +21,7 @@ Executes networking commands in dom0. The XenAPI plugin is
responsible determining whether a command is safe to execute.
"""
from __future__ import print_function
import ConfigParser
import json
@ -42,7 +43,7 @@ def parse_args():
exec_name = sys.argv.pop(0)
# argv[0] required; path to conf file
if len(sys.argv) < 2:
print "%s: No command specified" % exec_name
print("%s: No command specified" % exec_name)
sys.exit(RC_NOCOMMAND)
config_file = sys.argv.pop(0)
@ -56,7 +57,7 @@ def _xenapi_section_name(config):
if len(sections) == 1:
return sections[0]
print "Multiple [xenapi] sections or no [xenapi] section found!"
print("Multiple [xenapi] sections or no [xenapi] section found!")
sys.exit(RC_BADCONFIG)
@ -71,13 +72,13 @@ def load_configuration(exec_name, config_file):
username = config.get(section, "xenapi_connection_username")
password = config.get(section, "xenapi_connection_password")
except ConfigParser.Error:
print "%s: Incorrect configuration file: %s" % (exec_name, config_file)
print("%s: Incorrect configuration file: %s" % (exec_name, config_file))
sys.exit(RC_BADCONFIG)
if not url or not password:
msg = ("%s: Must specify xenapi_connection_url, "
"xenapi_connection_username (optionally), and "
"xenapi_connection_password in %s") % (exec_name, config_file)
print msg
print(msg)
sys.exit(RC_BADCONFIG)
return dict(
filters_path=filters_path,
@ -102,7 +103,7 @@ def filter_command(exec_name, filters_path, user_args, exec_dirs):
filter_match = wrapper.match_filter(
filters, user_args, exec_dirs=exec_dirs)
if not filter_match:
print "Unauthorized command: %s" % ' '.join(user_args)
print("Unauthorized command: %s" % ' '.join(user_args))
sys.exit(RC_UNAUTHORIZED)
@ -128,4 +129,4 @@ def main():
if __name__ == '__main__':
print main()
print(main())

13
bin/quantum-rootwrap-xen-dom0
View File

@ -21,6 +21,7 @@ Executes networking commands in dom0. The XenAPI plugin is
responsible determining whether a command is safe to execute.
"""
from __future__ import print_function
import ConfigParser
import json
@ -42,7 +43,7 @@ def parse_args():
exec_name = sys.argv.pop(0)
# argv[0] required; path to conf file
if len(sys.argv) < 2:
print "%s: No command specified" % exec_name
print("%s: No command specified" % exec_name)
sys.exit(RC_NOCOMMAND)
config_file = sys.argv.pop(0)
@ -56,7 +57,7 @@ def _xenapi_section_name(config):
if len(sections) == 1:
return sections[0]
print "Multiple [xenapi] sections or no [xenapi] section found!"
print("Multiple [xenapi] sections or no [xenapi] section found!")
sys.exit(RC_BADCONFIG)
@ -71,13 +72,13 @@ def load_configuration(exec_name, config_file):
username = config.get(section, "xenapi_connection_username")
password = config.get(section, "xenapi_connection_password")
except ConfigParser.Error:
print "%s: Incorrect configuration file: %s" % (exec_name, config_file)
print("%s: Incorrect configuration file: %s" % (exec_name, config_file))
sys.exit(RC_BADCONFIG)
if not url or not password:
msg = ("%s: Must specify xenapi_connection_url, "
"xenapi_connection_username (optionally), and "
"xenapi_connection_password in %s") % (exec_name, config_file)
print msg
print(msg)
sys.exit(RC_BADCONFIG)
return dict(
filters_path=filters_path,
@ -102,7 +103,7 @@ def filter_command(exec_name, filters_path, user_args, exec_dirs):
filter_match = wrapper.match_filter(
filters, user_args, exec_dirs=exec_dirs)
if not filter_match:
print "Unauthorized command: %s" % ' '.join(user_args)
print("Unauthorized command: %s" % ' '.join(user_args))
sys.exit(RC_UNAUTHORIZED)
@ -128,4 +129,4 @@ def main():
if __name__ == '__main__':
print main()
print(main())

17
neutron/plugins/bigswitch/tests/test_server.py
View File

@ -22,6 +22,7 @@
Used for NeutronRestProxy tests
"""
from __future__ import print_function
import json
import re
@ -128,15 +129,15 @@ class TestNetworkCtrl(object):
pass
if self.debug:
print '\n'
print('\n')
if self.debug_env:
print '%s:' % 'environ:'
print('environ:')
for (key, value) in sorted(environ.iteritems()):
print ' %16s : %s' % (key, value)
print(' %16s : %s' % (key, value))
print '%s %s' % (method, uri)
print('%s %s' % (method, uri))
if request_data:
print '%s' % (
print('%s' %
json.dumps(request_data, sort_keys=True, indent=4))
status, body = self.request_handler(method, uri, None)
@ -151,13 +152,13 @@ class TestNetworkCtrl(object):
start_response(status, headers)
if self.debug:
if self.debug_env:
print '%s: %s' % ('Response',
json.dumps(body_data, sort_keys=True, indent=4))
print('%s: %s' % ('Response',
json.dumps(body_data, sort_keys=True, indent=4)))
return body
return make_server(self.host, self.port, app)
def run(self):
print "Serving on port %d ..." % self.port
print("Serving on port %d ..." % self.port)
try:
self.server().serve_forever()
except KeyboardInterrupt:

3
neutron/plugins/bigswitch/version.py
View File

@ -20,6 +20,7 @@
# @author: Mandeep Dhami, Big Switch Networks, Inc.
"""Determine version of NeutronRestProxy plugin"""
from __future__ import print_function
# if vcsversion exists, use it. Else, use LOCALBRANCH:LOCALREVISION
try:
@ -61,4 +62,4 @@ def version_string_with_vcs():
if __name__ == "__main__":
print version_string_with_vcs()
print(version_string_with_vcs())

3
neutron/plugins/brocade/tests/noscli.py
View File

@ -21,6 +21,7 @@
"""Brocade NOS Driver CLI."""
from __future__ import print_function
import argparse
@ -50,7 +51,7 @@ class NOSCli(object):
elif args.cmd == 'dissociate' and numargs == 2:
self._dissociate(args.otherargs[0], args.otherargs[1])
else:
print usage_desc
print(usage_desc)
exit(0)
def _create(self, net_id):

6
neutron/plugins/brocade/tests/nostest.py
View File

@ -19,6 +19,8 @@
"""Brocade NOS Driver Test."""
from __future__ import print_function
import sys
from neutron.plugins.brocade.nos import nosdriver as nos
@ -38,8 +40,8 @@ def nostest(host, username, password):
# AMPP enumeration
with driver.connect(host, username, password) as mgr:
print driver.get_port_profiles(mgr)
print driver.get_port_profile(mgr, 'default')
print(driver.get_port_profiles(mgr))
print(driver.get_port_profile(mgr, 'default'))
if __name__ == '__main__':

42
neutron/plugins/nicira/check_nvp_config.py
View File

@ -18,6 +18,8 @@
#
# @author: Aaron Rosen, VMware
from __future__ import print_function
import sys
from oslo.config import cfg
@ -31,7 +33,7 @@ config.setup_logging(cfg.CONF)
def help(name):
print "Usage: %s path/to/nvp.ini" % name
print("Usage: %s path/to/nvp.ini" % name)
sys.exit(1)
@ -55,33 +57,33 @@ def main(argv):
args = ['--config-file']
args.append(argv[1])
config.parse(args)
print "------------------------ Database Options ------------------------"
print "\tconnection: %s" % cfg.CONF.database.connection
print "\tretry_interval: %d" % cfg.CONF.database.retry_interval
print "\tmax_retries: %d" % cfg.CONF.database.max_retries
print "------------------------ NVP Options ------------------------"
print "\tNVP Generation Timeout %d" % cfg.CONF.NVP.nvp_gen_timeout
print("----------------------- Database Options -----------------------")
print("\tconnection: %s" % cfg.CONF.database.connection)
print("\tretry_interval: %d" % cfg.CONF.database.retry_interval)
print("\tmax_retries: %d" % cfg.CONF.database.max_retries)
print("----------------------- NVP Options -----------------------")
print("\tNVP Generation Timeout %d" % cfg.CONF.NVP.nvp_gen_timeout)
print("\tNumber of concurrent connections to each controller %d" %
cfg.CONF.NVP.concurrent_connections)
print "\tmax_lp_per_bridged_ls: %s" % cfg.CONF.NVP.max_lp_per_bridged_ls
print "\tmax_lp_per_overlay_ls: %s" % cfg.CONF.NVP.max_lp_per_overlay_ls
print "------------------------ Cluster Options ------------------------"
print "\trequested_timeout: %s" % cfg.CONF.req_timeout
print "\tretries: %s" % cfg.CONF.retries
print "\tredirects: %s" % cfg.CONF.redirects
print "\thttp_timeout: %s" % cfg.CONF.http_timeout
print("\tmax_lp_per_bridged_ls: %s" % cfg.CONF.NVP.max_lp_per_bridged_ls)
print("\tmax_lp_per_overlay_ls: %s" % cfg.CONF.NVP.max_lp_per_overlay_ls)
print("----------------------- Cluster Options -----------------------")
print("\trequested_timeout: %s" % cfg.CONF.req_timeout)
print("\tretries: %s" % cfg.CONF.retries)
print("\tredirects: %s" % cfg.CONF.redirects)
print("\thttp_timeout: %s" % cfg.CONF.http_timeout)
cluster = NeutronPlugin.create_nvp_cluster(
cfg.CONF,
cfg.CONF.NVP.concurrent_connections,
cfg.CONF.NVP.nvp_gen_timeout)
num_controllers = len(cluster.nvp_controllers)
print "Number of controllers found: %s" % num_controllers
print("Number of controllers found: %s" % num_controllers)
if num_controllers == 0:
print "You must specify at least one controller!"
print("You must specify at least one controller!")
sys.exit(1)
for controller in cluster.nvp_controllers:
print "\tController endpoint: %s" % controller
print("\tController endpoint: %s" % controller)
nvplib.check_cluster_connectivity(cluster)
gateway_services = get_gateway_services(cluster)
default_gateways = {
@ -90,7 +92,7 @@ def main(argv):
errors = 0
for svc_type in default_gateways.keys():
for uuid in gateway_services[svc_type]:
print "\t\tGateway(%s) uuid: %s" % (svc_type, uuid)
print("\t\tGateway(%s) uuid: %s" % (svc_type, uuid))
if (default_gateways[svc_type] and
default_gateways[svc_type] not in gateway_services):
print("\t\t\tError: specified default %s gateway (%s) is "
@ -98,7 +100,7 @@ def main(argv):
default_gateways[svc_type]))
errors += 1
transport_zones = get_transport_zones(cluster)
print "\tTransport zones: %s" % transport_zones
print("\tTransport zones: %s" % transport_zones)
if cfg.CONF.default_tz_uuid not in transport_zones:
print("\t\tError: specified default transport zone "
"(%s) is missing from NVP transport zones!"
@ -110,4 +112,4 @@ def main(argv):
" Please, revise!" % errors)
sys.exit(1)
else:
print "Done."
print("Done.")

6
neutron/plugins/nicira/vshield/tasks/tasks.py
View File

@ -15,6 +15,8 @@
# License for the specific language governing permissions and limitations
# under the License.
from __future__ import print_function
import collections
import uuid
@ -356,10 +358,10 @@ class TaskManager():
def show_pending_tasks(self):
for task in self._tasks_queue:
print str(task)
print(str(task))
for resource, tasks in self._tasks.iteritems():
for task in tasks:
print str(task)
print(str(task))
def count(self):
count = 0

1
neutron/tests/unit/database_stubs.py
View File

@ -85,7 +85,6 @@ class NeutronDB(object):
def update_network(self, tenant_id, net_id, param_data):
"""Rename a network."""
try:
print param_data
net = db.network_update(net_id, tenant_id, **param_data)
LOG.debug("Updated network: %s", net.uuid)
net_dict = {}

3
neutron/tests/unit/nec/test_nec_agent.py
View File

@ -172,9 +172,6 @@ class TestNecAgent(TestNecAgentBase):
self._check_report_state([dummy_vif] * 5, 5, fail_mode)
self._check_report_state([], 0, fail_mode)
print 'record_state', self.record_calls
print 'num_ports_hist', self.num_ports_hist
# Since loopingcall start is mocked, call_count is same as
# the call count of check_report_state.
self.assertEqual(state_rpc.report_state.call_count, 4)

1
neutron/tests/unit/nec/test_pfc_driver.py
View File

@ -427,7 +427,6 @@ class PFCIdConvertTest(base.BaseTestCase):
def test_convert_tenant_id(self):
ofc_t_id = self.generate_random_ids(1)
print ofc_t_id
ret = self.driver.convert_ofc_tenant_id(self.ctx, ofc_t_id)
self.assertEqual(ret, '/tenants/%s' % ofc_t_id)

4
neutron/tests/unit/nec/test_trema_driver.py
View File

@ -241,7 +241,6 @@ class TremaFilterDriverTest(TremaDriverTestBase):
'status': "ACTIVE"}
if filter_dict:
f.update(filter_dict)
print 'filter=%s' % f
net_path = "/networks/%s" % n
@ -462,8 +461,7 @@ class TremaIdConvertTestBase(base.BaseTestCase):
ret = self.driver.convert_ofc_port_id(self.ctx, ofc_p_id, t_id, n_id)
exp = port_path_template % {'network': ofc_n_id, 'port': ofc_p_id}
print 'exp=', exp
print 'ret=', ret
self.assertEqual(ret, exp)
self.mox.VerifyAll()

8
neutron/tests/unit/nicira/test_vcns_driver.py
View File

@ -125,9 +125,6 @@ class VcnsDriverTaskManagerTestCase(base.BaseTestCase):
task.wait(TaskState.RESULT)
if 'error' in userdata:
print userdata['error']
self.assertTrue(userdata['result'])
def test_task_manager_task_sync_exec_process_state(self):
@ -173,11 +170,6 @@ class VcnsDriverTaskManagerTestCase(base.BaseTestCase):
last_task.wait(TaskState.RESULT)
for task in tasks:
if 'error' in task.userdata:
print "Task %s failed: " % (
tasks.name, tasks.userdata['error'])
for task in tasks:
self.assertTrue(task.userdata['result'])

1
neutron/tests/unit/test_extension_allowedaddresspairs.py
View File

@ -271,7 +271,6 @@ class TestAllowedAddressPairs(AllowedAddressPairDBTestCase):
port_security_enabled=True,
allowed_address_pairs=address_pairs)
port = self.deserialize(self.fmt, res)
print port
update_port = {'port': {psec.PORTSECURITY: False}}
# If plugin implements security groups we also need to remove
# the security group on port.

12
neutron/wsgi.py
View File

@ -18,6 +18,8 @@
"""
Utility methods for working with WSGI servers
"""
from __future__ import print_function
import errno
import os
import socket
@ -894,15 +896,15 @@ class Debug(Middleware):
@webob.dec.wsgify
def __call__(self, req):
print ("*" * 40) + " REQUEST ENVIRON"
print(("*" * 40) + " REQUEST ENVIRON")
for key, value in req.environ.items():
print key, "=", value
print(key, "=", value)
print
resp = req.get_response(self.application)
print ("*" * 40) + " RESPONSE HEADERS"
print(("*" * 40) + " RESPONSE HEADERS")
for (key, value) in resp.headers.iteritems():
print key, "=", value
print(key, "=", value)
print
resp.app_iter = self.print_generator(resp.app_iter)
@ -912,7 +914,7 @@ class Debug(Middleware):
@staticmethod
def print_generator(app_iter):
"""Print contents of a wrapper string iterator when iterated."""
print ("*" * 40) + " BODY"
print(("*" * 40) + " BODY")
for part in app_iter:
sys.stdout.write(part)
sys.stdout.flush()

19
tools/check_i18n.py
View File

@ -13,6 +13,7 @@
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from __future__ import print_function
import compiler
import imp
@ -56,11 +57,10 @@ class Visitor(object):
if is_localized(node):
for (checker, msg) in self.msg_format_checkers:
if checker(node):
print >> sys.stderr, (
'%s:%d %s: %s' %
print('%s:%d %s: %s Error: %s' %
(self.filename, node.lineno,
self.lines[node.lineno - 1][:-1],
"Error: %s" % msg))
self.lines[node.lineno - 1][:-1], msg),
file=sys.stderr)
self.error = 1
return
if debug:
@ -79,11 +79,10 @@ class Visitor(object):
"Pass"))
return
elif action == 'error':
print >> sys.stderr, (
'%s:%d %s: %s' %
print('%s:%d %s: %s Error: %s' %
(self.filename, node.lineno,
self.lines[node.lineno - 1][:-1],
"Error: %s" % msg))
self.lines[node.lineno - 1][:-1], msg),
file=sys.stderr)
self.error = 1
return
elif action == 'warn':
@ -92,7 +91,7 @@ class Visitor(object):
self.lines[node.lineno - 1][:-1],
"Warn: %s" % msg))
return
print >> sys.stderr, 'Predicate with wrong action!'
print('Predicate with wrong action!', file=sys.stderr)
def is_file_in_black_list(black_list, f):
@ -120,7 +119,7 @@ if __name__ == '__main__':
try:
cfg_mod = imp.load_source('', cfg_path)
except Exception:
print >> sys.stderr, "Load cfg module failed"
print("Load cfg module failed", file=sys.stderr)
sys.exit(1)
i18n_msg_predicates = cfg_mod.i18n_msg_predicates

3
tools/install_venv.py
View File

@ -23,6 +23,7 @@
"""
Installation script for Neutron's development virtualenv
"""
from __future__ import print_function
import os
import subprocess
@ -50,7 +51,7 @@ def print_help():
Also, make test will automatically use the virtualenv.
"""
print help
print(help)
def main(argv):