wintest Set WIN_LCREALM and WIN_BASEDN automatically

Also this uppper cases WIN_REALM, to avoid this being sensitive based
on the configuration file.

Andrew Bartlett

diff --git a/wintest/wintest.py b/wintest/wintest.py
index dce2ac874aa8b7bc1b5588e77dc1275a6b3cfb53..910297ed4b91dfbce4f2c4f323ca7a6ab5b05492 100644 (file)
--- a/wintest/wintest.py
+++ b/wintest/wintest.py
@@ -26,13 +26,19 @@ class wintest():
 
     def setwinvars(self, vm, prefix='WIN'):
         '''setup WIN_XX vars based on a vm name'''
-        for v in ['VM', 'HOSTNAME', 'USER', 'PASS', 'SNAPSHOT', 'BASEDN', 'REALM', 'DOMAIN', 'IP']:
+        for v in ['VM', 'HOSTNAME', 'USER', 'PASS', 'SNAPSHOT', 'REALM', 'DOMAIN', 'IP']:
             vname = '%s_%s' % (vm, v)
             if vname in self.vars:
                 self.setvar("%s_%s" % (prefix,v), self.substitute("${%s}" % vname))
             else:
                 self.vars.pop("%s_%s" % (prefix,v), None)
 
+        if self.getvar("WIN_REALM"):
+            self.setvar("WIN_REALM", self.getvar("WIN_REALM").upper())
+            self.setvar("WIN_LCREALM", self.getvar("WIN_REALM").lower())
+            dnsdomain = self.getvar("WIN_REALM")
+            self.setvar("WIN_BASEDN", "DC=" + dnsdomain.replace(".", ",DC="))
+
     def info(self, msg):
         '''print some information'''
         if not self.list_mode: