Renamed createnetwork.py to startnetwork.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.
This commit is contained in:
Darryl L. Pierce 2011-05-26 14:37:20 -04:00 committed by Cole Robinson
parent bbb3ab3530
commit 19a83eafa8
2 changed files with 15 additions and 15 deletions

View File

@ -21,7 +21,7 @@ import traceback
from menuscreen import MenuScreen from menuscreen import MenuScreen
from definenet import DefineNetwork from definenet import DefineNetwork
from createnetwork import CreateNetwork from startnetwork import StartNetwork
from destroynetwork import DestroyNetwork from destroynetwork import DestroyNetwork
from undefinenetwork import UndefineNetwork from undefinenetwork import UndefineNetwork
from listnetworks import ListNetworks from listnetworks import ListNetworks
@ -30,7 +30,7 @@ import utils
import logging import logging
DEFINE_NETWORK = 1 DEFINE_NETWORK = 1
CREATE_NETWORK = 2 START_NETWORK = 2
DESTROY_NETWORK = 3 DESTROY_NETWORK = 3
UNDEFINE_NETWORK = 4 UNDEFINE_NETWORK = 4
LIST_NETWORKS = 5 LIST_NETWORKS = 5
@ -41,14 +41,14 @@ class NetworkMenuScreen(MenuScreen):
def get_menu_items(self): def get_menu_items(self):
return (("Define A Network", DEFINE_NETWORK), return (("Define A Network", DEFINE_NETWORK),
("Create A Network", CREATE_NETWORK), ("Start A Network", START_NETWORK),
("Destroy A Network", DESTROY_NETWORK), ("Destroy A Network", DESTROY_NETWORK),
("Undefine A Network", UNDEFINE_NETWORK), ("Undefine A Network", UNDEFINE_NETWORK),
("List Networks", LIST_NETWORKS)) ("List Networks", LIST_NETWORKS))
def handle_selection(self, item): def handle_selection(self, item):
if item is DEFINE_NETWORK: DefineNetwork() if item is DEFINE_NETWORK: DefineNetwork()
elif item is CREATE_NETWORK: CreateNetwork() elif item is START_NETWORK: StartNetwork()
elif item is DESTROY_NETWORK: DestroyNetwork() elif item is DESTROY_NETWORK: DestroyNetwork()
elif item is UNDEFINE_NETWORK: UndefineNetwork() elif item is UNDEFINE_NETWORK: UndefineNetwork()
elif item is LIST_NETWORKS: ListNetworks() elif item is LIST_NETWORKS: ListNetworks()

View File

@ -1,6 +1,6 @@
#!/usr/bin/env python #!/usr/bin/env python
# #
# createnetwork.py - Copyright (C) 2009 Red Hat, Inc. # startnetwork.py - Copyright (C) 2009 Red Hat, Inc.
# Written by Darryl L. Pierce <dpierce@redhat.com> # Written by Darryl L. Pierce <dpierce@redhat.com>
# #
# This program is free software; you can redistribute it and/or modify # This program is free software; you can redistribute it and/or modify
@ -22,31 +22,31 @@ from snack import *
from configscreen import * from configscreen import *
LIST_PAGE = 1 LIST_PAGE = 1
CREATE_PAGE = 2 START_PAGE = 2
class CreateNetworkConfigScreen(NetworkListConfigScreen): class StartNetworkConfigScreen(NetworkListConfigScreen):
def __init__(self): def __init__(self):
NetworkListConfigScreen.__init__(self, "Create A Network") NetworkListConfigScreen.__init__(self, "Start A Network")
def get_elements_for_page(self, screen, page): def get_elements_for_page(self, screen, page):
if page is LIST_PAGE: return self.get_network_list_page(screen, created = False) if page is LIST_PAGE: return self.get_network_list_page(screen, created = False)
elif page is CREATE_PAGE: return self.get_create_network_page(screen) elif page is START_PAGE: return self.get_start_network_page(screen)
def page_has_next(self, page): def page_has_next(self, page):
if page is LIST_PAGE: return self.has_selectable_networks() if page is LIST_PAGE: return self.has_selectable_networks()
def page_has_back(self, page): def page_has_back(self, page):
return (page is CREATE_PAGE) return (page is START_PAGE)
def validate_input(self, page, errors): def validate_input(self, page, errors):
if page is LIST_PAGE: if page is LIST_PAGE:
self.get_libvirt().create_network(self.get_selected_network()) self.get_libvirt().start_network(self.get_selected_network())
return True return True
def get_create_network_page(self, screen): def get_start_network_page(self, screen):
return [Label("Network Started"), return [Label("Network Started"),
Label("%s was successfully started." % self.get_selected_network())] Label("%s was successfully started." % self.get_selected_network())]
def CreateNetwork(): def StartNetwork():
screen = CreateNetworkConfigScreen() screen = StartNetworkConfigScreen()
screen.start() screen.start()