X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Fconf%2Flustre2ldif.xsl;h=3713ec873d4dac89db607f72a8d895acda6ac8cd;hb=9570cac99cb852d8c0ba0694e8b4d33e32539775;hp=f5d80989b751624102ee010bb8e492447dc972e8;hpb=ccb42f2458669aaac84a661091b05a59bb781197;p=fs%2Flustre-release.git

diff --git a/lustre/conf/lustre2ldif.xsl b/lustre/conf/lustre2ldif.xsl
index f5d8098..3713ec8 100644
--- a/lustre/conf/lustre2ldif.xsl
+++ b/lustre/conf/lustre2ldif.xsl
@@ -10,6 +10,7 @@ dn: <value-of select="$basedn"/>
 uuid: CONFIG_UUID
 objectClass: LUSTRECONFIG
 config: <value-of select="$config"/>
+version: <value-of select="@version"/>
 <text>
 </text><apply-templates/>
 </template>
@@ -23,8 +24,36 @@ networkRef: <value-of select="network/@uuid"/>
 <for-each select="profile_ref">
 profileRef: <value-of select="@uuidref"/>
 </for-each>
+<if test="timeout">
+timeout: <value-of select="timeout"/>
+</if>
+<if test="lustreUpcall">
+lustreUpcall: <value-of select="lustreUpcall"/>
+</if>
+<if test="portalsUpcall">
+portalsUpcall: <value-of select="portalsUpcall"/>
+</if>
+<if test="ptldebug">
+ptldebug: <value-of select="ptldebug"/>
+</if>
+<if test="subsystem">
+subsystem: <value-of select="subsystem"/>
+</if>
 <text>
-</text><apply-templates/>
+</text>
+<for-each select="network">
+dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
+objectClass: NETWORK
+lustreName: <value-of select="@name"/>
+uuid: <value-of select="@uuid"/>
+nettype: <value-of select="@nettype"/>
+nid: <value-of select="nid"/>
+<if test="port">
+port: <value-of select="port"/>
+</if>
+<text>
+</text>
+</for-each>
 </template>
 
 <template match="profile">
@@ -50,11 +79,25 @@ port: <value-of select="port"/>
 </text>
 </template>
 
+
 <template match="mds">
 dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
 objectClass: MDS
 lustreName: <value-of select="@name"/>
-uuid: <value-of select="@uuid"/><apply-templates/>
+uuid: <value-of select="@uuid"/>
+activeRef: <value-of select="active_ref/@uuidref"/>
+<if test="lovconfig_ref">
+lovconfigRef: <value-of select="lovconfig_ref/@uuidref"/>
+</if>
+<if test="filesystem_ref">
+filesystemRef: <value-of select="filesystem_ref/@uuidref"/>
+</if>
+<if test="@failover">
+failover: <value-of select="@failover"/>
+</if>
+<if test="group">
+group: <value-of select="group"/>
+</if>
 <text>
 </text>
 </template>
@@ -76,8 +119,11 @@ devpath: <value-of select="devpath"/>
 <if test="devsize">
 devsize: <value-of select="devsize"/>
 </if>
-networkRef: <value-of select="network_ref/@uuidref"/>
-mdsRef: <value-of select="mds_ref/@uuidref"/>
+<if test="journalsize">
+journalsize: <value-of select="journalsize"/>
+</if>
+nodeRef: <value-of select="node_ref/@uuidref"/>
+targetRef: <value-of select="target_ref/@uuidref"/>
 <text>
 </text>
 </template>
@@ -104,13 +150,14 @@ uuid: <value-of select="@uuid"/><apply-templates/>
 </text>
 </template>
 
-<template match="obd">
+<template match="osd">
 dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
-objectClass: OBD
+objectClass: OSD
 lustreName: <value-of select="@name"/>
 uuid: <value-of select="@uuid"/>
-activeRef: <value-of select="active_ref/@uuidref"/>
-obdtype: <value-of select="@obdtype"/>
+nodeRef: <value-of select="node_ref/@uuidref"/>
+targetRef: <value-of select="target_ref/@uuidref"/>
+osdtype: <value-of select="@osdtype"/>
 <if test="fstype">
 fstype: <value-of select="fstype"/>
 </if>
@@ -123,6 +170,9 @@ devpath: <value-of select="devpath"/>
 <if test="devsize">
 devsize: <value-of select="devsize"/>
 </if>
+<if test="journalsize">
+journalsize: <value-of select="journalsize"/>
+</if>
 <text>
 </text>
 </template>
@@ -131,6 +181,22 @@ devsize: <value-of select="devsize"/>
 dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
 objectClass: OST
 lustreName: <value-of select="@name"/>
+uuid: <value-of select="@uuid"/>
+activeRef: <value-of select="active_ref/@uuidref"/>
+<if test="@failover">
+failover: <value-of select="@failover"/>
+</if>
+<if test="group">
+group: <value-of select="group"/>
+</if>
+<text>
+</text>
+</template>
+
+<template match="filesystem">
+dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
+objectClass: FILESYSTEM
+lustreName: <value-of select="@name"/>
 uuid: <value-of select="@uuid"/><apply-templates/>
 <text>
 </text>
@@ -163,15 +229,31 @@ uuid: <value-of select="@uuid"/>
 </text>
 </template>
 
+<template match="ptlrpc">
+dn: uuid=<value-of select="@uuid"/>,<value-of select="$basedn"/>
+objectClass: PTLRPC
+lustreName: <value-of select="@name"/>
+uuid: <value-of select="@uuid"/>
+<text>
+</text>
+</template>
 
 <template match="ldlm_ref">
 ldlmRef: <value-of select="@uuidref"/>
 </template>
 
+<template match="ptlrpc_ref">
+ptlrpcRef: <value-of select="@uuidref"/>
+</template>
+
 <template match="obd_ref">
 obdRef: <value-of select="@uuidref"/>
 </template>
 
+<template match="osd_ref">
+osdRef: <value-of select="@uuidref"/>
+</template>
+
 <template match="ost_ref">
 ostRef: <value-of select="@uuidref"/>
 </template>
@@ -184,10 +266,18 @@ networkRef: <value-of select="@uuidref"/>
 mdsRef: <value-of select="@uuidref"/>
 </template>
 
+<template match="mdsdev_ref">
+mdsdevRef: <value-of select="@uuidref"/>
+</template>
+
 <template match="mountpoint_ref">
 mountpointRef: <value-of select="@uuidref"/>
 </template>
 
+<template match="filesystem_ref">
+filesystemRef: <value-of select="@uuidref"/>
+</template>
+
 <template match="echoclient_ref">
 echoclientRef: <value-of select="@uuidref"/>
 </template>
@@ -196,17 +286,8 @@ echoclientRef: <value-of select="@uuidref"/>
 lovRef: <value-of select="@uuidref"/>
 </template>
 
-<template match="lovconfig_ref">
-lovconfigRef: <value-of select="@uuidref"/>
-</template>
-
 <template match="path">
 path: <value-of select="."/>
 </template>
 
-<template match="active_ref">
-activeRef: <value-of select="@uuidref"/>
-</template>
 </stylesheet>
-
-