net: normalize data in network_state object

The network_state object's network and route keys would have different
information depending upon how the network_state object was populated.

This change cleans that up. Now:
  * address will always contain an IP address.
  * prefix will always include an integer value that is the
    network_prefix for the address.
  * netmask will be present only if the address is ipv4, and its
    value will always correlate to the 'prefix'.

1 files changed, 6 insertions, 8 deletions

diff --git a/cloudinit/net/netplan.py b/cloudinit/net/netplan.py
index a715f3b0..67543305 100644
--- a/cloudinit/net/netplan.py
+++ b/cloudinit/net/netplan.py
@@ -4,7 +4,7 @@ import copy
 import os
 
 from . import renderer
-from .network_state import mask2cidr, subnet_is_ipv6
+from .network_state import subnet_is_ipv6
 
 from cloudinit import log as logging
 from cloudinit import util
@@ -118,10 +118,9 @@ def _extract_addresses(config, entry):
                 sn_type += '4'
             entry.update({sn_type: True})
         elif sn_type in ['static']:
-            addr = '%s' % subnet.get('address')
-            netmask = subnet.get('netmask')
-            if netmask and '/' not in addr:
-                addr += '/%s' % mask2cidr(netmask)
+            addr = "%s" % subnet.get('address')
+            if 'prefix' in subnet:
+                addr += "/%d" % subnet.get('prefix')
             if 'gateway' in subnet and subnet.get('gateway'):
                 gateway = subnet.get('gateway')
                 if ":" in gateway:
@@ -138,9 +137,8 @@ def _extract_addresses(config, entry):
                     mtukey += '6'
                 entry.update({mtukey: subnet.get('mtu')})
             for route in subnet.get('routes', []):
-                network = route.get('network')
-                netmask = route.get('netmask')
-                to_net = '%s/%s' % (network, mask2cidr(netmask))
+                to_net = "%s/%s" % (route.get('network'),
+                                    route.get('prefix'))
                 route = {
                     'via': route.get('gateway'),
                     'to': to_net,