fix test for record. Better output for record

[netconf.git] / netconf

diff --git a/netconf b/netconf
index 2f0694fd2da43a857e9bb3a37ce6cf8279431335..3dd1d377490630a19ec45e613eb75cf2803a4a0d 100644 (file)
--- a/netconf
+++ b/netconf
@@ -146,7 +146,8 @@ def usage():
     -g, --gateway      Default gateway. Optional.
     -i, --interface    Interface to configure.
     -m, --netmask      Netmask to use for interface. Default /24.
     -g, --gateway      Default gateway. Optional.
     -i, --interface    Interface to configure.
     -m, --netmask      Netmask to use for interface. Default /24.

-    -n, --nameserver   Nameserver to use. Optional."""
+    -n, --nameserver   Nameserver to use. Optional.
+    -r, --record       Output create commands to stdout."""

 
 def parse_input():
     options = ()
 
 def parse_input():
     options = ()


@@ -182,26 +183,37 @@ def parse_input():
                record = True
            else:
                assert False, 'Unhandled option'
                record = True
            else:
                assert False, 'Unhandled option'

-    
-       if not address or not interface:
-           print 'Error: missing options'
-           usage()
-           sys.exit(2)
+
+       if (record):
+           if (bool(address) ^ bool(interface)):
+                print 'Error: missing options'
+               usage()
+               sys.exit(2)
+        else:
+           if not address or not interface or error:
+               print 'Error: missing options'
+               usage()
+               sys.exit(2)
+

        if address == '0':
            address = None
        if not netmask:
            netmask = '24'
     
        if address == '0':
            address = None
        if not netmask:
            netmask = '24'
     

-       options = (interface, address, netmask, gateway, nameserver)
+       options = (interface, address, netmask, gateway, nameserver, record)

     
     return options
 
 def main():
     interactive = True
     
     return options
 
 def main():
     interactive = True

+    record = False
+    output = ''

 
     options = parse_input()
     if options:
 
     options = parse_input()
     if options:

-       interactive = False
+        record = options[5]
+        if (options[0]):
+           interactive = False

 
     p = Parser()
     try:
 
     p = Parser()
     try:


@@ -228,12 +240,12 @@ def main():
                    gw = options[3]
                 cmd = 'ipadm delete-if %s' % nic[0]
                if record:
                    gw = options[3]
                 cmd = 'ipadm delete-if %s' % nic[0]
                if record:

-                   print cmd
+                   output += cmd

                else:
                    runcmd(cmd)
                 cmd = 'ipadm create-if %s' % nic[0]
                if record:
                else:
                    runcmd(cmd)
                 cmd = 'ipadm create-if %s' % nic[0]
                if record:

-                   print cmd
+                   output += "\n" + cmd

                else:
                    (out, err) = runcmd(cmd)
                    if err:
                else:
                    (out, err) = runcmd(cmd)
                    if err:


@@ -242,7 +254,7 @@ def main():
                     # use DHCP
                     cmd = 'ipadm create-addr -T dhcp %s/v4' % nic[0]
                    if record:
                     # use DHCP
                     cmd = 'ipadm create-addr -T dhcp %s/v4' % nic[0]
                    if record:

-                       print cmd
+                       output += "\n" + cmd

                    else:
                        (out, err) = runcmd(cmd)
                        if err:
                    else:
                        (out, err) = runcmd(cmd)
                        if err:


@@ -251,7 +263,7 @@ def main():
                     # use STATIC
                     cmd = 'ipadm create-addr -T static -a %s/%s %s/v4' % (ip, mask, nic[0])
                    if record:
                     # use STATIC
                     cmd = 'ipadm create-addr -T static -a %s/%s %s/v4' % (ip, mask, nic[0])
                    if record:

-                       print cmd
+                       output += "\n" + cmd

                    else:
                        (out, err) = runcmd(cmd)
                        if err:
                    else:
                        (out, err) = runcmd(cmd)
                        if err:


@@ -259,7 +271,7 @@ def main():
                     if gw:
                         cmd = 'route -p add default %s' % gw
                        if record:
                     if gw:
                         cmd = 'route -p add default %s' % gw
                        if record:

-                           print cmd
+                           output += "\n" + cmd

                        else:
                            (out, err) = runcmd(cmd)
                            if err:
                        else:
                            (out, err) = runcmd(cmd)
                            if err:


@@ -288,11 +300,13 @@ def main():
                     cmd += '&& cp /etc/nsswitch.conf{,.bak} '
                     cmd += '&& cp /etc/nsswitch.{dns,conf}'
                    if record:
                     cmd += '&& cp /etc/nsswitch.conf{,.bak} '
                     cmd += '&& cp /etc/nsswitch.{dns,conf}'
                    if record:

-                       print cmd
+                       output += "\n" + cmd

                    else:
                        (out, err) = runcmd(cmd)
                        if err:
                            raise RuntimeError(err)
                    else:
                        (out, err) = runcmd(cmd)
                        if err:
                            raise RuntimeError(err)

+                if record:
+                    print output

         else:
             print "Found no unassigned interfaces"
     except ParserError as e:
         else:
             print "Found no unassigned interfaces"
     except ParserError as e: