svn commit: samba r16807 - in branches/SOC/mkhl/testprogs-map/ejs: .

[mkhl at samba.org]

Author: mkhl
Date: 2006-07-04 18:50:11 +0000 (Tue, 04 Jul 2006)
New Revision: 16807

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=16807

Log:
Add sketched TODO list and ldifs to samab3sam test script.

Martin


Modified:
   branches/SOC/mkhl/testprogs-map/ejs/samba3sam


Changeset:
Modified: branches/SOC/mkhl/testprogs-map/ejs/samba3sam
===================================================================
--- branches/SOC/mkhl/testprogs-map/ejs/samba3sam	2006-07-04 18:48:16 UTC (rev 16806)
+++ branches/SOC/mkhl/testprogs-map/ejs/samba3sam	2006-07-04 18:50:11 UTC (rev 16807)
@@ -7,11 +7,35 @@
 libinclude("base.js");
 var mypath = substr(ARGV[0], 0, -strlen("samba3sam"));
 
+/* TODO:
+
+   1) register partitions:
+
+dn: @PARTITION
+partition: CN=Samba3Sam,${BASEDN}:tdb://samba3.ldb
+partition: ${BASEDN}:tdb://samba4.ldb
+
+   2) register modules:
+
+dn: @MODULES
+ at LIST: rootdse,kludge_acl,paged_results,server_sort,extended_dn,asq,samldb,objectclass,password_hash,operational,objectguid,rdn_name,samab3sam,partition
+
+   3) register mapping:
+
+dn: @MAP=samba3sam
+ at FROM: ${BASEDN}
+ at TO: CN=Samba3Sam,${BASEDN}
+
+*/
+
 var sys = sys_init();
 var s3url;
 var s3 = ldb_init();
 var ok;
 
+var basedn = new Object();
+basedn.BASEDN = "dc=vernstok,dc=nl";
+
 if (ARGV.length == 2) {
 	s3url = ARGV[1];
 	ok = s3.connect(s3url);
@@ -24,6 +48,7 @@
 	ok = s3.connect(s3url);
 	assert(ok);
 	var ldif = sys.file_load(mypath + "../../testdata/samba3/samba3.ldif");
+	ldif = substitute_var(ldif, basedn);
 	assert(ldif != undefined);
 	ok = s3.add(ldif);
 	assert(ok);
@@ -36,20 +61,17 @@
 assert(ok);
 
 var ldif = sys.file_load(mypath + "../../source/setup/provision_init.ldif");
+ldif = substitute_var(ldif, basedn);
 assert(ldif != undefined);
 ok = s4.add(ldif);
 assert(ok);
 
 var ldif = sys.file_load(mypath + "../../source/setup/provision_templates.ldif");
-var subobj = new Object();
-subobj.BASEDN = "dc=vernstok,dc=nl";
-ldif = substitute_var(ldif, subobj);
+ldif = substitute_var(ldif, basedn);
 assert(ldif != undefined);
 ok = s4.add(ldif);
 assert(ok);
 
-
-
 ok = s4.add(sprintf("dn: @MAP=samba3sam
 @MAP_URL: %s", s3url));
 assert(ok);