1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183 | diff --git a/cloudinit/net/network_state.py b/cloudinit/net/network_state.py
index 9e9c05a0..c22d4312 100644
--- a/cloudinit/net/network_state.py
+++ b/cloudinit/net/network_state.py
@@ -289,19 +289,15 @@ class NetworkStateInterpreter(object):
iface.update({param: val})
# convert subnet ipv6 netmask to cidr as needed
- subnets = command.get('subnets')
- if subnets:
+ subnets = _normalize_subnets(command.get('subnets'))
+
+ # automatically set 'use_ipv6' if any addresses are ipv6
+ if not self.use_ipv6:
for subnet in subnets:
- if subnet['type'] == 'static':
- if ':' in subnet['address']:
- self.use_ipv6 = True
- if 'netmask' in subnet and ':' in subnet['address']:
- subnet['netmask'] = mask2cidr(subnet['netmask'])
- for route in subnet.get('routes', []):
- if 'netmask' in route:
- route['netmask'] = mask2cidr(route['netmask'])
- elif subnet['type'].endswith('6'):
- self.use_ipv6 = True
+ if (subnet.get('type').endswith('6') or
+ is_ipv6_addr(subnet.get('address'))):
+ self.use_ipv6 = True
+ break
iface.update({
'name': command.get('name'),
@@ -692,6 +688,70 @@ class NetworkStateInterpreter(object):
return subnets
+def _normalize_subnet(subnet):
+ subnet = copy.deepcopy(subnet)
+ for k in ('address', 'gateway', 'netmask'):
+ if k in subnet and not subnet[k]:
+ del subnet[k]
+
+ if 'address' in subnet:
+ addr = subnet['address']
+ if "/" in addr:
+ toks = subnet['address'].split("/", 2)
+ subnet['address'] = toks[0]
+ subnet['prefix'] = int(toks[1])
+ elif subnet.get('prefix'):
+ subnet['prefix'] = int(subnet['prefix'])
+ elif subnet.get('netmask'):
+ subnet['prefix'] = mask_to_net_prefix(subnet.get('netmask'))
+ else:
+ if is_ipv6_addr(subnet['address'])
+ subnet['prefix'] = 64
+ else:
+ subnet['prefix'] = 24
+
+ if 'netmask' in subnet:
+ del subnet['netmask']
+
+ if 'addr' in subnet and not subnet['addr']:
+ del subnet['addr']
+
+ if subnet['type'] == 'static':
+ # automatically set 'use_ipv6' if any addresses are ipv6
+ if is_ipv6_addr(subnet['address']):
+ self.use_ipv6 = True
+
+ subnet['prefix'] =
+ if 'netmask' in subnet and is_ipv6_addr(subnet['address']):
+ subnet['netmask'] = mask2cidr(subnet['netmask'])
+ for route in subnet.get('routes', []):
+ if 'netmask' in route:
+ route['netmask'] = mask2cidr(route['netmask'])
+
+def _normalize_subnets(subnets):
+ norm = []
+ if not subnets:
+ return []
+ for subnet in subnets:
+ if subnet['type'] == 'static':
+ # automatically set 'use_ipv6' if any addresses are ipv6
+ if is_ipv6_addr(subnet['address']):
+ self.use_ipv6 = True
+
+ subnet['prefix'] =
+ if 'netmask' in subnet and is_ipv6_addr(subnet['address']):
+ subnet['netmask'] = mask2cidr(subnet['netmask'])
+ for route in subnet.get('routes', []):
+ if 'netmask' in route:
+ route['netmask'] = mask2cidr(route['netmask'])
+ elif subnet['type'].endswith('6'):
+ self.use_ipv6 = True
+
+
+def is_ipv6_addr(address):
+ return ":" in address
+
+
def subnet_is_ipv6(subnet):
"""Common helper for checking network_state subnets for ipv6."""
# 'static6' or 'dhcp6'
@@ -703,22 +763,45 @@ def subnet_is_ipv6(subnet):
return False
-def cidr2mask(cidr):
+def net_prefix_to_ipv4_mask(prefix):
+ """Convert a network prefix to an ipv4 netmask.
+
+ This is the inverse of ipv4_mask_to_net_prefix.
+ 24 -> "255.255.255.0"
+ Also supports input as a string."""
+
mask = [0, 0, 0, 0]
- for i in list(range(0, cidr)):
+ for i in list(range(0, int(prefix))):
idx = int(i / 8)
mask[idx] = mask[idx] + (1 << (7 - i % 8))
return ".".join([str(x) for x in mask])
-def ipv4mask2cidr(mask):
+def ipv4_mask_to_net_prefix(mask, strict=True):
+ """Convert an ipv4 netmask into a network prefix length.
+ "255.255.255.0" => 24
+ """
+ if not isinstance(mask, six.string_types):
+ raise TypeError("netmask '%s' is not a string")
+
if '.' not in mask:
+ if strict:
+ raise ValueError("netmask '%s' does not contain a '.'" % mask)
return mask
- return sum([bin(int(x)).count('1') for x in mask.split('.')])
+ toks = mask.split(".")
+ if len(toks) != 4:
+ raise ValueError("netmask '%s' had only %d parts" % (mask, len(toks)))
+ return sum([bin(int(x)).count('1') for x in toks])
-def ipv6mask2cidr(mask):
+
+def ipv6_mask_to_net_prefix(mask, strict=True):
+ """Convert an ipv6 netmask (very uncommon) into a network prefix length."""
+ if not isinstance(mask, six.string_types):
+ raise TypeError("mask '%s' is not a string")
if ':' not in mask:
+ if strict:
+ raise ValueError("mask '%s' does not have a ':'")
return mask
bitCount = [0, 0x8000, 0xc000, 0xe000, 0xf000, 0xf800, 0xfc00, 0xfe00,
@@ -733,6 +816,28 @@ def ipv6mask2cidr(mask):
return cidr
+def mask_to_net_prefix(mask):
+ """Return the network prefix for the netmask provided.
+
+ Supports ipv4 or ipv6 netmasks."""
+ if ':' in str(mask):
+ return ipv6_mask_to_net_prefix(mask)
+ elif '.' in str(mask):
+ return ipv4_mask_to_net_prefix(mask)
+
+
+def ipv4mask2cidr(mask):
+ return ipv4_mask_to_net_prefix(mask, strict=False)
+
+
+def cidr2mask(cidr):
+ return net_prefix_to_ipv4_mask(cidr)
+
+
+def ipv6mask2cidr(mask):
+ return ipv6mask2netprefix(mask, strict=False)
+
+
def mask2cidr(mask):
if ':' in str(mask):
return ipv6mask2cidr(mask)
|