diff --git a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
index 40285f360..78b771b79 100755
--- a/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
+++ b/xCAT-server/lib/xcat/plugins/DBobjectdefs.pm
@@ -20,6 +20,7 @@ use Getopt::Long;
 use xCAT::MsgUtils;
 use xCAT::Utils;
 use xCAT::SvrUtils;
+use File::Find;
 use strict;
 
 # options can be bundled up like -vV
@@ -456,7 +457,7 @@ sub processArgs
     undef $::opt_osimg;
     undef $::opt_nics;
     undef $::opt_setattr;
-
+    undef $::opt_template;
 
     # parse the options - include any option from all 4 cmds
     Getopt::Long::Configure("no_pass_through");
@@ -485,6 +486,7 @@ sub processArgs
                     'osimage'  => \$::opt_osimg,
                     'nics'  => \$::opt_nics,
                     'u'     => \$::opt_setattr,
+                    'template:s' => \$::opt_template,
         )
       )
     {
@@ -602,6 +604,55 @@ sub processArgs
         return 2;
     }
 
+   
+    if($::opt_template){
+        if($::opt_template =~ /,/ and $::command eq "mkdef"){
+            my $rsp;
+            $rsp->{data}->[0] = "mkdef: multiple templates specified!";
+            xCAT::MsgUtils->message("E", $rsp, $::callback);
+            return 2;
+        }
+    }
+
+
+    if (defined $::opt_template and ($::command eq "mkdef" or $::command eq "lsdef")){
+        my $objtmpldir="$::XCATROOT/share/xcat/templates/objects/";
+         
+        my @tmpldirlist;
+        if($::command eq "lsdef"){
+            if (!$::opt_a){
+                if($::opt_t){
+                    my @tmpltypelist=split(",",$::opt_t);
+                    foreach my $objtype (@tmpltypelist){
+                        push(@tmpldirlist,$objtmpldir.$objtype);
+                    }
+                }
+            }else{
+                push(@tmpldirlist,$objtmpldir);
+            }
+        }elsif($::command eq "mkdef"){
+            if($::opt_t){
+                push(@tmpldirlist,$objtmpldir.$::opt_t);
+            }else{
+                push(@tmpldirlist,$objtmpldir."node");
+            }
+        }
+        my $objfiledata;
+        find(\&wanted,@tmpldirlist);
+        sub wanted{
+            if (-f $_){
+                my $line;
+                open(FH,$_);
+                while($line=<FH>){
+                    $objfiledata.=$line;
+                }
+                close(FH)
+            }
+        }
+
+        $::filedata=$objfiledata;
+    }
+
     # can get object names in many ways - easier to keep track
     $::objectsfrom_args = 0;
     $::objectsfrom_opto = 0;
@@ -768,10 +819,39 @@ sub processArgs
             return 1;
         }
 
-        #   - %::FILEATTRS{fileobjname}{attr}=val
-        # set @::fileobjtypes, @::fileobjnames, %::FILEATTRS
+        if($::opt_template){
+            my %tmpfileattr;
+            my @tmpfileobjtypes;
+            my @tmpfileobjnames;
+            my @tmplobjlist=split(",",$::opt_template);
+            foreach my $key (@tmplobjlist){
+                if(exists $::FILEATTRS{$key}){
+                    $tmpfileattr{$key}=\%{$::FILEATTRS{$key}};
+                    push(@tmpfileobjnames,$key);
+                    push(@tmpfileobjtypes,$tmpfileattr{$key}{objtype});
+                }else{
+                    delete $::FILEATTRS{$key};
+                    my $rsp;
+                    $rsp->{data}->[0] = "Could not find $key in xCAT templates, checking whether it is an existing object definition... ";
+                    xCAT::MsgUtils->message("I", $rsp, $::callback);
+                }
+            }
+            
+            if(@tmpfileobjnames){
+                %::FILEATTRS=%tmpfileattr;
+                @::fileobjtypes=@tmpfileobjtypes;
+                @::fileobjnames=@tmpfileobjnames;
+                $::objectsfrom_file = 1;
+            }else{
+                @::fileobjtypes=();
+                @::fileobjnames=(); 
+            }    
+        }else{
+            #   - %::FILEATTRS{fileobjname}{attr}=val
+            # set @::fileobjtypes, @::fileobjnames, %::FILEATTRS
 
-        $::objectsfrom_file = 1;
+            $::objectsfrom_file = 1;
+        }
     }
 
     #
@@ -830,11 +910,11 @@ sub processArgs
 
 
     # must have object type(s) - default if not provided
-    if (!@::clobjtypes && !@::fileobjtypes && !$::opt_a && !$::opt_t)
+    if (!@::clobjtypes && (!@::fileobjtypes || (@::fileobjtypes && defined $::opt_template)) && !$::opt_a && !$::opt_t)
     {
-
         # make the default type = 'node' if not specified
         push(@::clobjtypes, 'node');
+
         my $rsp;
         if ( !$::opt_z && !$::opt_x) {
             # don't want this msg in stanza or xml output
@@ -1074,7 +1154,7 @@ sub processArgs
 
     # can't have -a with other obj sources
     if ($::opt_a
-        && ($::opt_o || $::filedata || @::noderange))
+        && ($::opt_o || ($::filedata && ! defined $::opt_template ) || @::noderange))
     {
 
         my $rsp;
@@ -1087,31 +1167,38 @@ sub processArgs
     if ($::opt_a)
     {
 
-        my @tmplist;
-
-        # for every type of data object get the list of defined objects
-        foreach my $t (keys %{xCAT::Schema::defspec})
-        {
-            # exclude the auditlog and eventlog,
-            # the auditlog and eventlog tables might be very big
-            # use lsdef -t auditlog or lsdef -t eventlog instead
-            if (($t eq 'auditlog') || ($t eq 'eventlog')) { next; }
-
-            $::objectsfrom_opta = 1;
-
+        if(!defined $::opt_template){
             my @tmplist;
-            @tmplist = xCAT::DBobjUtils->getObjectsOfType($t);
 
-            # add objname and type to hash and global list
-            if (scalar(@tmplist) > 0)
+            # for every type of data object get the list of defined objects
+            foreach my $t (keys %{xCAT::Schema::defspec})
             {
-                foreach my $o (@tmplist)
+                # exclude the auditlog and eventlog,
+                # the auditlog and eventlog tables might be very big
+                # use lsdef -t auditlog or lsdef -t eventlog instead
+                if (($t eq 'auditlog') || ($t eq 'eventlog')) { next; }
+
+                $::objectsfrom_opta = 1;
+
+                my @tmplist;
+                @tmplist = xCAT::DBobjUtils->getObjectsOfType($t);
+
+                # add objname and type to hash and global list
+                if (scalar(@tmplist) > 0)
                 {
-                    push(@::clobjnames, $o);
-                    $::AllObjTypeHash{$o} = $t;
+                    foreach my $o (@tmplist)
+                    {
+                        push(@::clobjnames, $o);
+                        $::AllObjTypeHash{$o} = $t;
+                    }
                 }
             }
         }
+        else{
+            foreach my $fileobj (@::fileobjnames){
+                $::AllObjTypeHash{$fileobj}=$::FILEATTRS{$fileobj}{objtype};
+            } 
+        }
     }
 
     # must have object name(s) -
@@ -1125,7 +1212,7 @@ sub processArgs
 
     # combine object name all object names provided
     @::allobjnames = @::clobjnames;
-    if (scalar(@::fileobjnames) > 0)
+    if (scalar(@::fileobjnames) > 0 && !defined($::opt_template))
     {
         # add list from stanza or xml file
         push @::allobjnames, @::fileobjnames;
@@ -1170,6 +1257,53 @@ sub processArgs
         }
     }
 
+    if ($::opt_template && ($::command eq 'mkdef') )
+    {
+        unless($::objectsfrom_file){
+            my @myobjlist = xCAT::DBobjUtils->getObjectsOfType($::clobjtypes[0]);
+            unless (@myobjlist)
+            {
+                my $rsp;
+                $rsp->{data}->[0] = "Could not get objects of type \'$::clobjtypes[0]\'.";
+                xCAT::MsgUtils->message("E", $rsp, $::callback);
+                return 3;
+            }
+
+            unless(grep(/^$::opt_template$/,@myobjlist)){
+                my $rsp;
+                $rsp->{data}->[0] = "Could not find the template object named \'$::opt_template\' of type \'$::clobjtypes[0]\'.";
+                xCAT::MsgUtils->message("E", $rsp, $::callback);
+                return 3;
+            }
+
+            if(grep(/^$::opt_template$/,@::allobjnames)){
+                my $rsp;
+                $rsp->{data}->[0] = "The template node cannot be the same as the node to create.";
+                xCAT::MsgUtils->message("E", $rsp, $::callback);
+                return 1;
+            }
+     
+            my %objtypehash;
+            $objtypehash{$::opt_template} = $::clobjtypes[0];
+            $::ATTRLIST="all";
+            my %objattrhash = xCAT::DBobjUtils->getobjdefs(\%objtypehash);
+            foreach my $key(keys %{$objattrhash{$::opt_template}}){
+                if($key ne "objtype" and not $::ATTRS{$key}){
+                    $::ATTRS{$key}=$objattrhash{$::opt_template}{$key};
+                }
+            }
+        }else{
+            foreach my $key(keys %{$::FILEATTRS{$::opt_template}}){
+                if($key ne "objtype" and not $::ATTRS{$key}){
+                    $::ATTRS{$key}=$::FILEATTRS{$::opt_template}{$key};
+                }
+            }
+            delete $::FILEATTRS{$::opt_template};
+            @::fileobjtypes=();
+            @::fileobjnames=(); 
+        }
+    }
+
     #  check for the -i option
     if ($::opt_i && ($::command ne 'lsdef'))
     {
@@ -2789,7 +2923,6 @@ sub defls
 
     # process the command line
     my $rc = &processArgs;
-
     if ($rc != 0)
     {
 
@@ -2810,7 +2943,7 @@ sub defls
 
 
     # do we want just the object names or all the attr=val
-    if ($::opt_l || @::noderange || $::opt_o || $::opt_i)
+    if ($::opt_l || @::noderange || $::opt_o || $::opt_i || $::opt_template)
     {
 
         # assume we want the the details - not just the names
@@ -2861,6 +2994,26 @@ sub defls
             @neededattrs = (@neededattrs, @whereattrs);
         }
     }
+  
+    if (defined $::opt_template){
+
+        unless ($::opt_template){
+            %myhash=%::FILEATTRS;    
+        }else{
+            my @templatelist=split(",",$::opt_template);
+            foreach my $mytemplate (@templatelist){
+                if(exists $::FILEATTRS{$mytemplate}){
+                    $myhash{$mytemplate}= \%{$::FILEATTRS{$mytemplate}};            
+                }else{
+                    my $rsp;
+                    $rsp->{data}->[0] = "Could not find the specified $::opt_t template $mytemplate.";
+                    xCAT::MsgUtils->message("I", $rsp, $::callback);
+                    return 1;
+                } 
+            }
+        }
+    }
+
 
     if ($::objectsfrom_opto || $::objectsfrom_nr || $::objectsfrom_args)
     {
@@ -2883,11 +3036,11 @@ sub defls
             return 1;
 
         }
-
     }
 
+
     #  if just provided type list then find all objects of these types
-    if ($::objectsfrom_optt)
+    if ( ! defined $::opt_template && $::objectsfrom_optt)
     {
         %objhash = %::ObjTypeHash;
 
@@ -2901,65 +3054,70 @@ sub defls
         }
     }
 
+
     # if specify all
     if ($::opt_a)
     {
-
-        # could be modified by type
-        if ($::opt_t)
-        {
-
-            # get all objects matching type list
-            # Get all object in this type list
-            foreach my $t (@::clobjtypes)
+        if(! defined $::opt_template){
+            # could be modified by type
+            if ($::opt_t)
             {
-                my @tmplist = xCAT::DBobjUtils->getObjectsOfType($t);
 
-                if (scalar(@tmplist) > 1)
+                # get all objects matching type list
+                # Get all object in this type list
+                foreach my $t (@::clobjtypes)
                 {
-                    foreach my $obj (@tmplist)
-                    {
+                    my @tmplist = xCAT::DBobjUtils->getObjectsOfType($t);
 
-                        $objhash{$obj} = $t;
+                    if (scalar(@tmplist) > 1)
+                    {
+                        foreach my $obj (@tmplist)
+                        {
+
+                            $objhash{$obj} = $t;
+                        }
+                    }
+                    else
+                    {
+                        my $rsp;
+                        $rsp->{data}->[0] = "Could not get objects of type \'$t\'.";
+                        xCAT::MsgUtils->message("I", $rsp, $::callback);
                     }
                 }
-                else
+
+                %myhash = xCAT::DBobjUtils->getobjdefs(\%objhash);
+                if (!(%myhash))
                 {
                     my $rsp;
-                    $rsp->{data}->[0] = "Could not get objects of type \'$t\'.";
-                    xCAT::MsgUtils->message("I", $rsp, $::callback);
+                    $rsp->{data}->[0] = "Could not get xCAT object definitions.";
+                    xCAT::MsgUtils->message("E", $rsp, $::callback);
+                    return 1;
                 }
-            }
 
-            %myhash = xCAT::DBobjUtils->getobjdefs(\%objhash);
-            if (!(%myhash))
+            }
+            else
             {
-                my $rsp;
-                $rsp->{data}->[0] = "Could not get xCAT object definitions.";
-                xCAT::MsgUtils->message("E", $rsp, $::callback);
-                return 1;
+
+                %myhash = xCAT::DBobjUtils->getobjdefs(\%::AllObjTypeHash, $::VERBOSE);
+                if (!(%myhash))
+                {
+                    my $rsp;
+                    $rsp->{data}->[0] = "Could not get xCAT object definitions.";
+                    xCAT::MsgUtils->message("E", $rsp, $::callback);
+                    return 1;
+                }
+
             }
-
-        }
-        else
-        {
-
-            %myhash = xCAT::DBobjUtils->getobjdefs(\%::AllObjTypeHash, $::VERBOSE);
-            if (!(%myhash))
+            foreach my $t (keys %{xCAT::Schema::defspec})
             {
-                my $rsp;
-                $rsp->{data}->[0] = "Could not get xCAT object definitions.";
-                xCAT::MsgUtils->message("E", $rsp, $::callback);
-                return 1;
+                push(@::clobjtypes, $t);
             }
-
-        }
-        foreach my $t (keys %{xCAT::Schema::defspec})
-        {
-            push(@::clobjtypes, $t);
+        }elsif( defined $::opt_template){
+            push @::clobjtypes, keys { map { $_ => 1 } @::fileobjtypes }; 
         }
     } # end - if specify all
 
+
     if (!(%myhash))
     {
         my $rsp;
@@ -2968,7 +3126,6 @@ sub defls
         return 0;
     }
 
-
     # need a special case for the node postscripts attribute,
     # The 'xcatdefaults' postscript should be added to the postscripts and postbootscripts attribute
     my $getnodes = 0;
@@ -2982,6 +3139,8 @@ sub defls
             }
         }
     }
+
+
     my %nodeosimagehash = ();
     if ($getnodes)
     {
@@ -3172,6 +3331,8 @@ sub defls
                 }
             }
 
+
+
             # Get osimage definition info in one invocation
             if(scalar(keys %imglist) > 0)
             {
@@ -3208,6 +3369,7 @@ sub defls
                 }
             }
         }
+
         my $xcatdefaultsps;
         my $xcatdefaultspbs;
         my @TableRowArray = xCAT::DBobjUtils->getDBtable('postscripts');
@@ -3223,6 +3385,7 @@ sub defls
                 }
             }
         }
+
         foreach my $obj (keys %myhash)
         {
             if ($myhash{$obj}{objtype} eq 'node')
@@ -3260,6 +3423,7 @@ sub defls
         }
     }
 
+
     # the list of objects may be limited by the "-w" option
     # see which objects have attr/val that match the where values
     #        - if provided
@@ -3284,9 +3448,11 @@ sub defls
         push (@{$rsp_info->{data}}, "# <xCAT data object stanza file>");
     }
 
+
     # group the objects by type to make the output easier to read
     my $numobjects = 0;    # keep track of how many object we want to display
     # for each type
+
     foreach my $type (@::clobjtypes)
     {
         # Check if -i specifies valid attributes
@@ -3302,6 +3468,7 @@ sub defls
             }
         }
 
+
         my %defhash;
 
         foreach my $obj (keys %myhash)
@@ -3337,12 +3504,6 @@ sub defls
             }
 
             if (!defined($::opt_S) ) {
-                #my $tmp1=$listtab->getAllEntries("all");
-                #if (defined($tmp1) && (@$tmp1 > 0)) {
-                #    foreach(@$tmp1) {
-                #        $newhash{$_->{node}} = 1;
-                #    }
-                #}
                 my @def_nodes = keys %defhash;
                 my $hidden_nodes = $listtab->getNodesAttribs(\@def_nodes, ['hidden']);
                 foreach my $n (keys %{$hidden_nodes}) {
@@ -3645,31 +3806,6 @@ sub defls
         } # end - for each object
     } # end - for each type
 
-    #delete the fsp and bpa node from the hash
-    #my $newrsp;
-    #my $listtab  = xCAT::Table->new( 'nodelist' );
-    #if ($listtab and  (!defined($::opt_S))  ) {
-    #    foreach my $n (@{$rsp_info->{data}}) {
-    #        if ( $n =~ /\(node\)/ ) {
-    #            $_= $n;
-    #            s/ +\(node\)//;
-    #            my ($hidhash) = $listtab->getNodeAttribs($_ ,['hidden']);
-    #            if ( $hidhash->{hidden} ne 1)  {
-    #                push (@{$newrsp->{data}}, $n);
-    #            }
-    #        }else{
-    #        push (@{$newrsp->{data}}, $n);
-    #        }
-    #    }
-    #    if (defined($newrsp->{data}) && scalar(@{$newrsp->{data}}) > 0) {
-    #        xCAT::MsgUtils->message("I", $newrsp, $::callback);
-    #        return 0;
-    #    }
-    #}else {
-    #    my $rsp;
-    #    $rsp->{data}->[0] = "Could not open nodelist table.";
-    #    xCAT::MsgUtils->message("I", $rsp, $::callback);
-    #}
 
     # Display the definition of objects
     if (defined($rsp_info->{data}) && scalar(@{$rsp_info->{data}}) > 0) {