david/jcl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add delay options for shutdown and restart ad-hoc commands

Browse Source 
darcs-hash:20070913175446-86b55-c0255862967551813cf5bda9db271190a02d4ef2.gz
This commit is contained in:
David Rousselie
2007-09-13 19:54:46 +02:00
parent e678dff219
commit 03bb43a413
4 changed files with 100 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/jcl/jabber/command.py
View File

@@ -1056,10 +1056,24 @@ class JCLCommandManager(CommandManager):
result_form.add_field(field_type="hidden", result_form.add_field(field_type="hidden",
name="FORM_TYPE", name="FORM_TYPE",
value="http://jabber.org/protocol/admin") value="http://jabber.org/protocol/admin")
result_form.add_field(name="delay", delay_field = result_form.add_field(name="delay",
field_type="list-multi", field_type="list-single",
label=lang_class.field_restart_delay, label=lang_class.field_restart_delay,
required=True) required=True)
delay_field.add_option(label=lang_class.field_30_sec,
values=["30"])
delay_field.add_option(label=lang_class.field_60_sec,
values=["60"])
delay_field.add_option(label=lang_class.field_90_sec,
values=["90"])
delay_field.add_option(label=lang_class.field_120_sec,
values=["120"])
delay_field.add_option(label=lang_class.field_180_sec,
values=["180"])
delay_field.add_option(label=lang_class.field_240_sec,
values=["240"])
delay_field.add_option(label=lang_class.field_300_sec,
values=["300"])
result_form.add_field(name="announcement", result_form.add_field(name="announcement",
field_type="text-multi", field_type="text-multi",
label=lang_class.field_announcement) label=lang_class.field_announcement)
@@ -1102,10 +1116,24 @@ class JCLCommandManager(CommandManager):
result_form.add_field(field_type="hidden", result_form.add_field(field_type="hidden",
name="FORM_TYPE", name="FORM_TYPE",
value="http://jabber.org/protocol/admin") value="http://jabber.org/protocol/admin")
result_form.add_field(name="delay", delay_field = result_form.add_field(name="delay",
field_type="list-multi", field_type="list-single",
label=lang_class.field_shutdown_delay, label=lang_class.field_shutdown_delay,
required=True) required=True)
delay_field.add_option(label=lang_class.field_30_sec,
values=["30"])
delay_field.add_option(label=lang_class.field_60_sec,
values=["60"])
delay_field.add_option(label=lang_class.field_90_sec,
values=["90"])
delay_field.add_option(label=lang_class.field_120_sec,
values=["120"])
delay_field.add_option(label=lang_class.field_180_sec,
values=["180"])
delay_field.add_option(label=lang_class.field_240_sec,
values=["240"])
delay_field.add_option(label=lang_class.field_300_sec,
values=["300"])
result_form.add_field(name="announcement", result_form.add_field(name="announcement",
field_type="text-multi", field_type="text-multi",
label=lang_class.field_announcement) label=lang_class.field_announcement)

44
src/jcl/jabber/tests/command.py
View File

@@ -2894,7 +2894,25 @@ class JCLCommandManager_TestCase(JCLTestCase):
"data": "jabber:x:data"}) "data": "jabber:x:data"})
self.assertEquals(len(fields), 3) self.assertEquals(len(fields), 3)
self.assertEquals(fields[1].prop("var"), "delay") self.assertEquals(fields[1].prop("var"), "delay")
self.assertEquals(fields[1].prop("type"), "list-multi") self.assertEquals(fields[1].prop("type"), "list-single")
delay_options = result[0].xpath_eval("c:command/data:x/data:field[2]/data:option",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(delay_options), 7)
self.assertEquals(delay_options[0].children.name, "value")
self.assertEquals(delay_options[0].children.content, "30")
self.assertEquals(delay_options[1].children.name, "value")
self.assertEquals(delay_options[1].children.content, "60")
self.assertEquals(delay_options[2].children.name, "value")
self.assertEquals(delay_options[2].children.content, "90")
self.assertEquals(delay_options[3].children.name, "value")
self.assertEquals(delay_options[3].children.content, "120")
self.assertEquals(delay_options[4].children.name, "value")
self.assertEquals(delay_options[4].children.content, "180")
self.assertEquals(delay_options[5].children.name, "value")
self.assertEquals(delay_options[5].children.content, "240")
self.assertEquals(delay_options[6].children.name, "value")
self.assertEquals(delay_options[6].children.content, "300")
self.assertEquals(fields[2].prop("var"), "announcement") self.assertEquals(fields[2].prop("var"), "announcement")
self.assertEquals(fields[2].prop("type"), "text-multi") self.assertEquals(fields[2].prop("type"), "text-multi")
@@ -2993,7 +3011,25 @@ class JCLCommandManager_TestCase(JCLTestCase):
"data": "jabber:x:data"}) "data": "jabber:x:data"})
self.assertEquals(len(fields), 3) self.assertEquals(len(fields), 3)
self.assertEquals(fields[1].prop("var"), "delay") self.assertEquals(fields[1].prop("var"), "delay")
self.assertEquals(fields[1].prop("type"), "list-multi") self.assertEquals(fields[1].prop("type"), "list-single")
delay_options = result[0].xpath_eval("c:command/data:x/data:field[2]/data:option",
{"c": "http://jabber.org/protocol/commands",
"data": "jabber:x:data"})
self.assertEquals(len(delay_options), 7)
self.assertEquals(delay_options[0].children.name, "value")
self.assertEquals(delay_options[0].children.content, "30")
self.assertEquals(delay_options[1].children.name, "value")
self.assertEquals(delay_options[1].children.content, "60")
self.assertEquals(delay_options[2].children.name, "value")
self.assertEquals(delay_options[2].children.content, "90")
self.assertEquals(delay_options[3].children.name, "value")
self.assertEquals(delay_options[3].children.content, "120")
self.assertEquals(delay_options[4].children.name, "value")
self.assertEquals(delay_options[4].children.content, "180")
self.assertEquals(delay_options[5].children.name, "value")
self.assertEquals(delay_options[5].children.content, "240")
self.assertEquals(delay_options[6].children.name, "value")
self.assertEquals(delay_options[6].children.content, "300")
self.assertEquals(fields[2].prop("var"), "announcement") self.assertEquals(fields[2].prop("var"), "announcement")
self.assertEquals(fields[2].prop("type"), "text-multi") self.assertEquals(fields[2].prop("type"), "text-multi")
@@ -3008,9 +3044,9 @@ class JCLCommandManager_TestCase(JCLTestCase):
command_node.setProp("sessionid", session_id) command_node.setProp("sessionid", session_id)
command_node.setProp("action", "next") command_node.setProp("action", "next")
submit_form = Form(xmlnode_or_type="submit") submit_form = Form(xmlnode_or_type="submit")
submit_form.add_field(field_type="list-multi", submit_form.add_field(field_type="list-single",
name="delay", name="delay",
value=[0]) value=0)
submit_form.add_field(field_type="text-multi", submit_form.add_field(field_type="text-multi",
name="announcement", name="announcement",
value=["service will be shut in 0 second"]) value=["service will be shut in 0 second"])

16
src/jcl/lang.py
View File

@@ -215,6 +215,14 @@ class Lang:
u"Fill out this form to shut down the service." u"Fill out this form to shut down the service."
field_shutdown_delay = u"Delay before shutting down the service" field_shutdown_delay = u"Delay before shutting down the service"
field_30_sec = u"30 seconds"
field_60_sec = u"60 seconds"
field_90_sec = u"90 seconds"
field_120_sec = u"120 seconds"
field_180_sec = u"180 seconds"
field_240_sec = u"240 seconds"
field_300_sec = u"300 seconds"
welcome_message_subject = u"Welcome" welcome_message_subject = u"Welcome"
class fr: class fr:
@@ -374,6 +382,14 @@ class Lang:
u"Remplir ce formulaire pour arrêter le service." u"Remplir ce formulaire pour arrêter le service."
field_shutdown_delay = u"Délai avant d'arrêter le service" field_shutdown_delay = u"Délai avant d'arrêter le service"
field_30_sec = u"30 secondes"
field_60_sec = u"60 secondes"
field_90_sec = u"90 secondes"
field_120_sec = u"120 secondes"
field_180_sec = u"180 secondes"
field_240_sec = u"240 secondes"
field_300_sec = u"300 secondes"
welcome_message_subject = u"Bienvenue" welcome_message_subject = u"Bienvenue"
class nl: class nl:

8
src/jcl/tests/lang.py
View File

@@ -215,6 +215,14 @@ class Language_TestCase(unittest.TestCase):
self.assertNotEquals(self.lang_class.command_shutdown_1_description, None) self.assertNotEquals(self.lang_class.command_shutdown_1_description, None)
self.assertNotEquals(self.lang_class.field_shutdown_delay, None) self.assertNotEquals(self.lang_class.field_shutdown_delay, None)
self.assertNotEquals(self.lang_class.field_30_sec, None)
self.assertNotEquals(self.lang_class.field_60_sec, None)
self.assertNotEquals(self.lang_class.field_90_sec, None)
self.assertNotEquals(self.lang_class.field_120_sec, None)
self.assertNotEquals(self.lang_class.field_180_sec, None)
self.assertNotEquals(self.lang_class.field_240_sec, None)
self.assertNotEquals(self.lang_class.field_300_sec, None)
self.assertNotEquals(self.lang_class.welcome_message_subject, None) self.assertNotEquals(self.lang_class.welcome_message_subject, None)
class Language_fr_TestCase(Language_TestCase): class Language_fr_TestCase(Language_TestCase):