Merge ~raharper/cloud-init:net-v2-dont-print-udevadm-commands into cloud-init:master

Proposed by Ryan Harper on 2017-03-28
Status: Merged
Merged at revision: 18762d706a2527b8a9ae94e4497b5c3f4a7c845e
Proposed branch: ~raharper/cloud-init:net-v2-dont-print-udevadm-commands
Merge into: cloud-init:master
Diff against target: 48 lines (+4/-4)
1 file modified
cloudinit/net/netplan.py (+4/-4)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve on 2017-03-28
cloud-init commiters 2017-03-28 Pending
Review via email: mp+321222@code.launchpad.net

Description of the Change

netplan: remove debugging prints, use logging instead

Remove debugging print statements. Change a few to use
logging.debug() where useful.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
2index cd93b21..7bf1021 100644
3--- a/cloudinit/net/netplan.py
4+++ b/cloudinit/net/netplan.py
5@@ -1,6 +1,7 @@
6 # This file is part of cloud-init. See LICENSE file ...
7
8 import copy
9+import logging
10 import os
11
12 from . import renderer
13@@ -10,6 +11,7 @@ from cloudinit import util
14 from cloudinit.net import SYS_CLASS_NET, get_devicelist
15
16
17+LOG = logging.getLogger(__name__)
18 NET_CONFIG_TO_V2 = {
19 'bond': {'bond-ad-select': 'ad-select',
20 'bond-arp-interval': 'arp-interval',
21@@ -186,7 +188,7 @@ class Renderer(renderer.Renderer):
22
23 def _netplan_generate(self, run=False):
24 if not run:
25- print("netplan postcmd disabled")
26+ LOG.debug("netplan postcmd disabled")
27 return
28 util.subp(self.NETPLAN_GENERATE, capture=True)
29
30@@ -196,17 +198,15 @@ class Renderer(renderer.Renderer):
31 the setup_link udev builtin command
32 """
33 if not run:
34- print("netsetup postcmd disabled")
35+ LOG.debug("netsetup postcmd disabled")
36 return
37 setup_lnk = ['udevadm', 'test-builtin', 'net_setup_link']
38 for cmd in [setup_lnk + [SYS_CLASS_NET + iface]
39 for iface in get_devicelist() if
40 os.path.islink(SYS_CLASS_NET + iface)]:
41- print(cmd)
42 util.subp(cmd, capture=True)
43
44 def _render_content(self, network_state):
45- print('rendering v2 for victory!')
46 ethernets = {}
47 wifis = {}
48 bridges = {}

Subscribers

People subscribed via source and target branches