Renamed destroynetwork.py to stopnetwork.py.

The old name was not consistent with the add/delete/start/stop/list
verbs used for commands.

Updated the network menu to use the new name and module.

src/virtManagerTui/netmenu.py

@@ -22,7 +22,7 @@ import traceback
 from menuscreen      import MenuScreen
 from definenet       import DefineNetwork
 from startnetwork    import StartNetwork
-from destroynetwork  import DestroyNetwork
+from stopnetwork     import StopNetwork
 from undefinenetwork import UndefineNetwork
 from listnetworks    import ListNetworks
 
@@ -31,7 +31,7 @@ import logging
 
 DEFINE_NETWORK   = 1
 START_NETWORK    = 2
-DESTROY_NETWORK  = 3
+STOP_NETWORK     = 3
 UNDEFINE_NETWORK = 4
 LIST_NETWORKS    = 5
 
@@ -42,14 +42,14 @@ class NetworkMenuScreen(MenuScreen):
     def get_menu_items(self):
         return (("Define A Network",   DEFINE_NETWORK),
                 ("Start A Network",    START_NETWORK),
-                ("Destroy A Network",  DESTROY_NETWORK),
+                ("Stop A Network",     STOP_NETWORK),
                 ("Undefine A Network", UNDEFINE_NETWORK),
                 ("List Networks",      LIST_NETWORKS))
 
     def handle_selection(self, item):
         if   item is DEFINE_NETWORK:   DefineNetwork()
         elif item is START_NETWORK:    StartNetwork()
-        elif item is DESTROY_NETWORK:  DestroyNetwork()
+        elif item is STOP_NETWORK:     StopNetwork()
         elif item is UNDEFINE_NETWORK: UndefineNetwork()
         elif item is LIST_NETWORKS:    ListNetworks()
 

src/virtManagerTui/stopnetwork.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# destroynetwork.py - Copyright (C) 2009 Red Hat, Inc.
+# stopnetwork.py - Copyright (C) 2009 Red Hat, Inc.
 # Written by Darryl L. Pierce <dpierce@redhat.com>
 #
 # This program is free software; you can redistribute it and/or modify
@@ -21,36 +21,36 @@
 from snack import *
 from configscreen import *
 
-LIST_PAGE    = 1
+LIST_PAGE = 1
-DESTROY_PAGE = 2
+STOP_PAGE = 2
 
-class DestroyNetworkConfigScreen(NetworkListConfigScreen):
+class StopNetworkConfigScreen(NetworkListConfigScreen):
     def __init__(self):
-        NetworkListConfigScreen.__init__(self, "Destroy A Network")
+        NetworkListConfigScreen.__init__(self, "Stop A Network")
 
     def get_elements_for_page(self, screen, page):
-        if   page is LIST_PAGE:    return self.get_network_list_page(screen, defined = False)
+        if   page is LIST_PAGE: return self.get_network_list_page(screen, defined = False)
-        elif page is DESTROY_PAGE: return self.get_destroy_network_page(screen)
+        elif page is STOP_PAGE: return self.get_stop_network_page(screen)
 
     def page_has_next(self, page):
         if page is LIST_PAGE: return self.has_selectable_networks()
         return False
 
     def page_has_back(self, page):
-        if page is DESTROY_PAGE: return True
+        if page is STOP_PAGE: return True
         return False
 
     def validate_input(self, page, errors):
         if page is LIST_PAGE:
             network = self.get_selected_network()
-            self.get_libvirt().destroy_network(network)
+            self.get_libvirt().stop_network(network)
             return True
         return False
 
-    def get_destroy_network_page(self, screen):
+    def get_stop_network_page(self, screen):
-        return [Label("Network Destroyed"),
+        return [Label("Network Stoped"),
-                Label("%s has been destroyed." % self.get_selected_network())]
+                Label("%s has been stoped." % self.get_selected_network())]
 
-def DestroyNetwork():
+def StopNetwork():
-    screen = DestroyNetworkConfigScreen()
+    screen = StopNetworkConfigScreen()
     screen.start()