From: David Mulder Date: Wed, 17 Feb 2021 21:58:51 +0000 (-0700) Subject: samba-tool: Test gpo manage motd list command X-Git-Tag: tevent-0.11.0~1655 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f8d68d9f84d9d306297db94810d6e2f9bd4f8efb;p=thirdparty%2Fsamba.git samba-tool: Test gpo manage motd list 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 818c46ddb1a..d2bede247d3 100644 --- a/python/samba/netcmd/gpo.py +++ b/python/samba/netcmd/gpo.py @@ -3323,6 +3323,39 @@ class cmd_scripts(SuperCommand): subcommands = {} subcommands["startup"] = cmd_startup() +class cmd_list_motd(Command): + """List VGP MOTD Group Policy from the sysvol + +This command lists the Message of the Day from the sysvol that will be applied +to winbind clients. + +Example: +samba-tool gpo manage motd list {31B2F340-016D-11D2-945F-00C04FB984F9} + """ + + synopsis = "%prog [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"] + + def run(self, gpo, 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() + class cmd_manage(SuperCommand): """Manage Group Policy Objects""" subcommands = {} @@ -3333,6 +3366,7 @@ class cmd_manage(SuperCommand): subcommands["files"] = cmd_files() subcommands["openssh"] = cmd_openssh() subcommands["scripts"] = cmd_scripts() + subcommands["motd"] = cmd_motd() class cmd_gpo(SuperCommand): """Group Policy Object (GPO) management.""" diff --git a/python/samba/tests/samba_tool/gpo.py b/python/samba/tests/samba_tool/gpo.py index 13734f3b163..860254b74f0 100644 --- a/python/samba/tests/samba_tool/gpo.py +++ b/python/samba/tests/samba_tool/gpo.py @@ -1223,6 +1223,45 @@ class GpoCmdTestCase(SambaToolCmdTest): # Unstage the manifest.xml file unstage_file(vgp_xml) + def test_vgp_motd(self): + lp = LoadParm() + lp.load(os.environ['SERVERCONFFILE']) + local_path = lp.get('path', 'sysvol') + vgp_xml = os.path.join(local_path, lp.get('realm').lower(), 'Policies', + self.gpo_guid, 'Machine/VGP/VTLA/Unix', + 'MOTD/manifest.xml') + + stage = etree.Element('vgppolicy') + policysetting = etree.SubElement(stage, 'policysetting') + pv = etree.SubElement(policysetting, 'version') + pv.text = '1' + name = etree.SubElement(policysetting, 'name') + name.text = 'Text File' + description = etree.SubElement(policysetting, 'description') + description.text = 'Represents a Generic Text File' + apply_mode = etree.SubElement(policysetting, 'apply_mode') + apply_mode.text = 'replace' + data = etree.SubElement(policysetting, 'data') + filename = etree.SubElement(data, 'filename') + filename.text = 'motd' + text = etree.SubElement(data, 'text') + text.text = 'This is a message of the day' + ret = stage_file(vgp_xml, etree.tostring(stage, 'utf-8')) + self.assertTrue(ret, 'Could not create the target %s' % vgp_xml) + + (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.text, out, 'The test entry was not found!') + + # Unstage the manifest.xml file + unstage_file(vgp_xml) + def setUp(self): """set up a temporary GPO to work with""" super(GpoCmdTestCase, self).setUp() diff --git a/selftest/knownfail.d/gpo b/selftest/knownfail.d/gpo new file mode 100644 index 00000000000..41587fc7a31 --- /dev/null +++ b/selftest/knownfail.d/gpo @@ -0,0 +1 @@ +^samba.tests.samba_tool.gpo.samba.tests.samba_tool.gpo.GpoCmdTestCase.test_vgp_motd