From: David Mulder Date: Thu, 18 Feb 2021 15:50:25 +0000 (-0700) Subject: samba-tool: Test gpo manage motd set command X-Git-Tag: tevent-0.11.0~1653 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4715a0ee0d946caca1fab3e1218205ad68f5b20b;p=thirdparty%2Fsamba.git samba-tool: Test gpo manage motd set command Signed-off-by: David Mulder Reviewed-by: Jeremy Allison --- diff --git a/python/samba/netcmd/gpo.py b/python/samba/netcmd/gpo.py index 9f1a0f9e6ec..0d2ecb51423 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -3387,10 +3387,40 @@ samba-tool gpo manage motd list {31B2F340-016D-11D2-945F-00C04FB984F9} text = data.find('text') self.outf.write(text.text) +class cmd_set_motd(Command): + """Sets a VGP MOTD Group Policy to the sysvol + +This command sets the Message of the Day to the sysvol for applying to winbind +clients. Not providing a value will unset the policy. + +Example: +samba-tool gpo manage motd set {31B2F340-016D-11D2-945F-00C04FB984F9} "Message for today" + """ + + synopsis = "%prog [value] [options]" + + takes_optiongroups = { + "sambaopts": options.SambaOptions, + "versionopts": options.VersionOptions, + "credopts": options.CredentialsOptions, + } + + takes_options = [ + Option("-H", "--URL", help="LDB URL for database or target server", type=str, + metavar="URL", dest="H"), + ] + + takes_args = ["gpo", "value?"] + + def run(self, gpo, value=None, H=None, sambaopts=None, credopts=None, + versionopts=None): + pass + class cmd_motd(SuperCommand): """Manage Message of the Day Group Policy Objects""" subcommands = {} subcommands["list"] = cmd_list_motd() + subcommands["set"] = cmd_set_motd() class cmd_manage(SuperCommand): """Manage Group Policy Objects""" diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py index 860254b74f0..50c01cf96a9 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -1223,6 +1223,50 @@ class GpoCmdTestCase(SambaToolCmdTest): # Unstage the manifest.xml file unstage_file(vgp_xml) + def test_vgp_motd_set(self): + text = 'This is the message of the day' + msg = '"%s\n"' % text + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "motd", "set"), + self.gpo_guid, + msg, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'MOTD set failed') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "motd", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertIn(text, out, 'The test entry was not found!') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "motd", "set"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertCmdSuccess(result, out, err, 'MOTD unset failed') + + (result, out, err) = self.runsublevelcmd("gpo", ("manage", + "motd", "list"), + self.gpo_guid, "-H", + "ldap://%s" % + os.environ["SERVER"], + "-U%s%%%s" % + (os.environ["USERNAME"], + os.environ["PASSWORD"])) + self.assertNotIn(text, out, 'The test entry was still found!') + def test_vgp_motd(self): lp = LoadParm() lp.load(os.environ['SERVERCONFFILE']) diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo new file mode 100644 index 00000000000..d34ca470fbc --- /dev/null +++ b/selftest/knownfail.d/gpo @@ -0,0 +1 @@ +^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_vgp_motd_set