Add a network system check command input.

[karesansui/karesansui.git] / bin / stop_network.py

diff --git a/bin/stop_network.py b/bin/stop_network.py
index ce21faf..03f46f8 100755 (executable)
--- a/bin/stop_network.py
+++ b/bin/stop_network.py
@@ -53,17 +53,18 @@ class StopNetwork(KssCommand):
         try:
             active_networks = conn.list_active_network()
             inactive_networks = conn.list_inactive_network()
-            if opts.name in active_networks or opts.name in inactive_networks:
-                self.up_progress(10)
-                conn.stop_network(opts.name)
-                self.up_progress(50)
+            if not (opts.name in active_networks or opts.name in inactive_networks):
+                raise KssCommandException('Network not found. - net=%s' % (opts.name))
 
-                if not opts.name in conn.list_active_network():
-                    self.logger.info('Stopped network. - net=%s' % (opts.name))
-                    print >>sys.stderr, _('Stopped network. - net=%s') % (opts.name)
+            self.up_progress(10)
+            conn.stop_network(opts.name)
+            self.up_progress(40)
 
-            else:
-                raise KssCommandException('Network not found. - net=%s' % (opts.name))
+            if opts.name in conn.list_active_network():
+                raise KssCommandException('Failed to stop network. - net=%s' % (opts.name))
+
+            self.logger.info('Stopped network. - net=%s' % (opts.name))
+            print >>sys.stderr, _('Stopped network. - net=%s') % (opts.name)
 
             return True
         finally: