simple-network.configure: process pairs of parameters in a function

1 files changed, 27 insertions, 1 deletions

diff --git a/morphlib/exts/simple-network.configure b/morphlib/exts/simple-network.configure
index 1981dcda..a24c5845 100755
--- a/morphlib/exts/simple-network.configure
+++ b/morphlib/exts/simple-network.configure
@@ -69,11 +69,37 @@ class SimpleNetworkConfigurationExtension(cliapp.Application):
 
         return sum([bin(int(x)).count('1') for x in mask.split('.')])
 
+    def process_pairs(self, pairs):
+        """Process rest of parameters"""
+
+        address = None
+        netmask = None
+        gateway = None
+        lines = []
+        for pair in pairs:
+            if pair[0] == 'address':
+                address = pair[1]
+            elif pair[0] == 'netmask':
+                netmask = pair[1]
+            elif pair[0] == 'gateway':
+                gateway = pair[1]
+
+        if address and netmask:
+            network_suffix = self.convert_net_mask_to_cidr_suffix (netmask);
+            address_line = address + '/' + str(network_suffix)
+            lines += ["Address=%s" % address_line]
+
+        if gateway is not None:
+            lines += ["Gateway=%s" % gateway]
+
+        return lines
+
     def generate_iface_file(self, stanza):
         """Generate an interfaces stanza from the provided data."""
 
         name = stanza['name']
         itype = stanza['type']
+        pairs = stanza['args'].items()
 
         if itype == "loopback":
             return
@@ -84,7 +110,7 @@ class SimpleNetworkConfigurationExtension(cliapp.Application):
         if itype == "dhcp":
             lines += ["DHCP=yes"]
         else:
-            lines += ["%s=%s" % elem for elem in stanza['args'].items()]
+            lines += self.process_pairs (pairs)
 
         return "\n".join(lines)