diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.node b/xCAT-test/autotest/testcase/xcat-inventory/cases.node
index 9be85e214..2f25cd706 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.node
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.node
@@ -803,15 +803,15 @@ check:rc==0
 #To test if "xcat-inventory export -t node" works correctly
 cmd:xcat-inventory export -t node  |tee /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node
 check:rc==0
-cmd: grep " \"xcatdefaults\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
+cmd: grep "xcatdefaults:" /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
 check:rc==0
-cmd: grep " \"service\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
+cmd: grep "service:" /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
 check:rc==0
-cmd:dn=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/node_in_xcat_db|wc -l);dg=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/group_in_xcat_db |wc -l);((da=$dn+$dg+2));echo "dn=$dn dg=$dg da=$da";ia=$(grep " \"obj_type\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node|wc -l);echo "ia=$ia"; if [[ $da -eq $ia ]];then exit 0; else exit 1;fi
+cmd:dn=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/node_in_xcat_db|wc -l);dg=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/group_in_xcat_db |wc -l);((da=$dn+$dg+2));echo "dn=$dn dg=$dg da=$da";ia=$(grep "obj_type:" /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node|wc -l);echo "ia=$ia"; if [[ $da -eq $ia ]];then exit 0; else exit 1;fi
 check:rc==0
-cmd:a=0;for i in `awk -F':' '{print $1}' /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/group_in_xcat_db`; do  grep -E " \"$i\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node; if [[ $? -eq 0 ]]; then ((a++));fi;done;dg=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/group_in_xcat_db|wc -l);if [[ $a -eq $dg ]]; then exit 0; else exit 1;fi
+cmd:a=0;for i in `awk -F':' '{print $1}' /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/group_in_xcat_db`; do  grep -E " $i:" /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node; if [[ $? -eq 0 ]]; then ((a++));fi;done;dg=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/group_in_xcat_db|wc -l);if [[ $a -eq $dg ]]; then exit 0; else exit 1;fi
 check:rc==0
-cmd:a=0;for i in `awk -F' ' '{print $1}' /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/node_in_xcat_db`;do  grep -E " \"$i\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node; if [[ $? -eq 0 ]]; then ((a++));fi;done;dn=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/node_in_xcat_db |wc -l); if [[ $dn -eq $a ]]; then exit 0; else exit 1;fi
+cmd:a=0;for i in `awk -F' ' '{print $1}' /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/node_in_xcat_db`;do  grep -E ""$i:" /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/export_all_node; if [[ $? -eq 0 ]]; then ((a++));fi;done;dn=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_default_format/node_in_xcat_db |wc -l); if [[ $dn -eq $a ]]; then exit 0; else exit 1;fi
 check:rc==0
 cmd:rmdef bogusnode[1-3]
 check:rc==0
@@ -846,7 +846,7 @@ check:rc==0
 #To test if "xcat-inventory export --format=yaml -t node  |tee /tmp/xcat_inventory_try_to_export_all_type_is_node_yaml_format/export_all_node
 cmd:xcat-inventory export --format=yaml  -t node  |tee /tmp/xcat_inventory_try_to_export_all_type_is_node_yaml_format/export_all_node
 check:rc==0
-cmd: grep " xcatdefaults:" /tmp/xcat_inventory_try_to_export_all_type_is_node_yaml_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
+cmd: grep "xcatdefaults:" /tmp/xcat_inventory_try_to_export_all_type_is_node_yaml_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
 check:rc==0
 cmd: grep " service:" /tmp/xcat_inventory_try_to_export_all_type_is_node_yaml_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
 check:rc==0
@@ -888,9 +888,9 @@ cmd:lsdef -t group -i grouptype  -c|grep "grouptype=static" |tee /tmp/xcat_inven
 check:rc==0
 cmd:xcat-inventory export  --format=json -t node  |tee /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/export_all_node
 check:rc==0
-cmd: grep " \"xcatdefaults\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
+cmd: grep "xcatdefaults:" /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
 check:rc==0
-cmd: grep " \"service\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
+cmd: grep "service:" /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/export_all_node > /dev/null 2>&1; if [[ $? -eq 0 ]]; then exit 0; else exit 1;fi
 check:rc==0
 cmd:dn=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/node_in_xcat_db|wc -l);dg=$(cat /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/group_in_xcat_db |wc -l);((da=$dn+$dg+2));ia=$(grep " \"obj_type\": " /tmp/xcat_inventory_try_to_export_all_type_is_node_json_format/export_all_node|wc -l); if [[ $da -eq $ia ]];then exit 0; else exit 1;fi
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir b/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
index 07969ab3e..2e9e0ca5c 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.osimage.import_from_osimage_dir
@@ -19,7 +19,7 @@ check:rc==0
 #check whether the osimage definition is created
 cmd: lsdef -t osimage -o test_myimage -z |tee /tmp/export_import_an_osimage_directory/test_myimage.stanza
 check:rc==0
-cmd: diff /tmp/export_import_an_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza
+cmd: diff /tmp/export_import_an_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza -I "environvar" 
 check: rc==0
 #check whether the customized osimage files are imported
 cmd: diff -r /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/ /tmp/test_myimage/
@@ -64,9 +64,9 @@ cmd: lsdef -t osimage -o test_myimage -z | tee /tmp/export_import_multiple_osima
 check:rc==0
 cmd: lsdef -t osimage -o test_myimage2 -z | tee /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage2.stanza
 check:rc==0
-cmd: diff /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza
+cmd: diff /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza -I "environvar"
 check: rc==0
-cmd: diff /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage2.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza
+cmd: diff /tmp/export_import_multiple_osimages_from_osimage_directory/test_myimage2.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage2/test_myimage2.stanza -I "environvar"
 check: rc==0
 #check whether the customized osimage files are imported
 cmd: diff -r /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/ /tmp/test_myimage/
@@ -112,7 +112,7 @@ check:rc==0
 #check whether the osimage definition is created
 cmd: lsdef -t osimage -o test_myimage -z |tee /tmp/export_import_specified_from_osimage_directory/test_myimage.stanza
 check:rc==0
-cmd: diff /tmp/export_import_specified_from_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza
+cmd: diff /tmp/export_import_specified_from_osimage_directory/test_myimage.stanza /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/test_myimage.stanza -I "environvar"
 check: rc==0
 #check whether the customized osimage files are imported
 cmd: diff -r /opt/xcat/share/xcat/tools/autotest/testcase/xcat-inventory/templates/cluster_invdir/osimage/test_myimage/tmp/test_myimage/ /tmp/test_myimage/
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/cases.site b/xCAT-test/autotest/testcase/xcat-inventory/cases.site
index fb59a5238..2fe499b1b 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/cases.site
+++ b/xCAT-test/autotest/testcase/xcat-inventory/cases.site
@@ -102,100 +102,98 @@ check:rc==0
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');chdef -t site -o clustersite  useSSHonAIX=0 useNFSv4onAIX=0 FQDNfirst=1 SNsyncfiledir='/var/xcat/syncfiles' auditnosyslog=0 auditskipcmds=ALL blademaxp=64 cleanupxcatpost=no consoleondemand=no databaseloc='/var/lib' db2installloc='/mntdb2' dbtracelevel=0 defserialflow=0 defserialport=0 defserialspeed=9600 dhcpinterfaces=eth0 dhcplease=43200 dhcpsetup=n disjointdhcps=1 dnshandler=ddns dnsinterfaces='xcatmn|eth1,eth2;service|bond0' dnsupdaters=dnsupdaters domain='pok.stglabs.ibm.com' enableASMI=no excludenodes=excludenodes externaldns=externaldns extntpservers=extntpservers forwarders=$mnip fsptimeout=0 genmacprefix='00:11:aa' genpasswords=genpasswords hierarchicalattrs=hierarchicalattrs httpport=80 hwctrldispatch=y installdir='/install/' installloc='hostname:/path' ipmidispatch=y ipmimaxp=64 ipmiretries=3 ipmisdrcache=no ipmitimeout=2 iscsidir='/iscsidir' managedaddressmode=dhcp master=$mnip maxssh=8 mnroutenames=mnroutenames nameservers=$mnip nmapoptions='--min-rtt-timeout' nodestatus=n nodesyncfiledir='/var/xcat/node/syncfiles' ntpservers=$mnip persistkvmguests=y powerinterval=0 ppcmaxp=64 ppcretry=3 ppctimeout=0 precreatemypostscripts=1 pruneservices=1 runbootscripts=yes setinstallnic=1 sharedinstall=no sharedtftp=1 skiptables=nics skipvalidatelog=1 snmpc=snmpc sshbetweennodes=ALLGROUPS svloglocal=1 syspowerinterval=10 syspowermaxnodes=10 tftpdir='/tftprot/' tftpflags='-v' timezone='America/New_York' useNmapfromMN=no useflowcontrol=no usexhrm=no vcenterautojoin=no vmwarereconfigonpower=no vsftp=n xcatconfdir='/etc/xcat' xcatdebugmode=1 xcatdport=3001 xcatiport=3002 xcatlport=3003 xcatmaxbatchconnections=64 xcatmaxconnections=60 xcatsslciphers='3DES' xcatsslversion=TLSv1
 check:rc==0
 cmd:#!/bin/bash
-echo '{
-    "schema_version": "1.0",
-    "site": {
-        "clustersite": {
-            "FQDNfirst": "1",
-            "SNsyncfiledir": "/var/xcat/syncfiles",
-            "auditnosyslog": "0",
-            "auditskipcmds": "ALL",
-            "blademaxp": "64",
-            "cleanupxcatpost": "no",
-            "consoleondemand": "no",
-            "databaseloc": "/var/lib",
-            "db2installloc": "/mntdb2",
-            "dbtracelevel": "0",
-            "defserialflow": "0",
-            "defserialport": "0",
-            "defserialspeed": "9600",
-            "dhcpinterfaces": "eth0",
-            "dhcplease": "43200",
-            "dhcpsetup": "n",
-            "disjointdhcps": "1",
-            "dnshandler": "ddns",
-            "dnsinterfaces": "xcatmn|eth1,eth2;service|bond0",
-            "dnsupdaters": "dnsupdaters",
-            "domain": "pok.stglabs.ibm.com",
-            "enableASMI": "no",
-            "excludenodes": "excludenodes",
-            "externaldns": "externaldns",
-            "extntpservers": "extntpservers",
-            "forwarders": "10.3.5.8",
-            "fsptimeout": "0",
-            "genmacprefix": "00:11:aa",
-            "genpasswords": "genpasswords",
-            "hierarchicalattrs": "hierarchicalattrs",
-            "httpport": "80",
-            "hwctrldispatch": "y",
-            "installdir": "/install/",
-            "installloc": "hostname:/path",
-            "ipmidispatch": "y",
-            "ipmimaxp": "64",
-            "ipmiretries": "3",
-            "ipmisdrcache": "no",
-            "ipmitimeout": "2",
-            "iscsidir": "/iscsidir",
-            "managedaddressmode": "dhcp",
-            "master": "10.3.5.8",
-            "maxssh": "8",
-            "mnroutenames": "mnroutenames",
-            "nameservers": "10.3.5.8",
-            "nmapoptions": "--min-rtt-timeout",
-            "nodestatus": "n",
-            "nodesyncfiledir": "/var/xcat/node/syncfiles",
-            "ntpservers": "10.3.5.8",
-            "persistkvmguests": "y",
-            "powerinterval": "0",
-            "ppcmaxp": "64",
-            "ppcretry": "3",
-            "ppctimeout": "0",
-            "precreatemypostscripts": "1",
-            "pruneservices": "1",
-            "runbootscripts": "yes",
-            "setinstallnic": "1",
-            "sharedinstall": "no",
-            "sharedtftp": "1",
-            "skiptables": "nics",
-            "skipvalidatelog": "1",
-            "snmpc": "snmpc",
-            "sshbetweennodes": "ALLGROUPS",
-            "svloglocal": "1",
-            "syspowerinterval": "10",
-            "syspowermaxnodes": "10",
-            "tftpdir": "/tftprot/",
-            "tftpflags": "-v",
-            "timezone": "America/New_York",
-            "useNFSv4onAIX": "0",
-            "useNmapfromMN": "no",
-            "useSSHonAIX": "0",
-            "useflowcontrol": "no",
-            "usexhrm": "no",
-            "vcenterautojoin": "no",
-            "vmwarereconfigonpower": "no",
-            "vsftp": "n",
-            "xcatconfdir": "/etc/xcat",
-            "xcatdebugmode": "1",
-            "xcatdport": "3001",
-            "xcatiport": "3002",
-            "xcatlport": "3003",
-            "xcatmaxbatchconnections": "64",
-            "xcatmaxconnections": "60",
-            "xcatsslciphers": "3DES",
-            "xcatsslversion": "TLSv1"
-        }
-    }
-}' > /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org
+echo " 
+ schema_version: '2.0'
+ site:
+   clustersite:
+     FQDNfirst: '1'
+     SNsyncfiledir: /var/xcat/syncfiles
+     auditnosyslog: '0'
+     auditskipcmds: ALL
+     blademaxp: '64'
+     cleanupxcatpost: 'no'
+     consoleondemand: 'no'
+     databaseloc: /var/lib
+     db2installloc: /mntdb2
+     dbtracelevel: '0'
+     defserialflow: '0'
+     defserialport: '0'
+     defserialspeed: '9600'
+     dhcpinterfaces: eth0
+     dhcplease: '43200'
+     dhcpsetup: n
+     disjointdhcps: '1'
+     dnshandler: ddns
+     dnsinterfaces: xcatmn|eth1,eth2;service|bond0
+     dnsupdaters: dnsupdaters
+     domain: pok.stglabs.ibm.com
+     enableASMI: 'no'
+     excludenodes: excludenodes
+     externaldns: externaldns
+     extntpservers: extntpservers
+     forwarders: 10.3.1.13
+     fsptimeout: '0'
+     genmacprefix: 00:11:aa
+     genpasswords: genpasswords
+     hierarchicalattrs: hierarchicalattrs
+     httpport: '80'
+     hwctrldispatch: y
+     installdir: /install/
+     installloc: hostname:/path
+     ipmidispatch: y
+     ipmimaxp: '64'
+     ipmiretries: '3'
+     ipmisdrcache: 'no'
+     ipmitimeout: '2'
+     iscsidir: /iscsidir
+     managedaddressmode: dhcp
+     master: 10.3.1.13
+     maxssh: '8'
+     mnroutenames: mnroutenames
+     nameservers: 10.3.1.13
+     nmapoptions: --min-rtt-timeout
+     nodestatus: n
+     nodesyncfiledir: /var/xcat/node/syncfiles
+     ntpservers: 10.3.1.13
+     persistkvmguests: y
+     powerinterval: '0'
+     ppcmaxp: '64'
+     ppcretry: '3'
+     ppctimeout: '0'
+     precreatemypostscripts: '1'
+     pruneservices: '1'
+     runbootscripts: 'yes'
+     setinstallnic: '1'
+     sharedinstall: 'no'
+     sharedtftp: '1'
+     skiptables: nics
+     skipvalidatelog: '1'
+     snmpc: snmpc
+     sshbetweennodes: ALLGROUPS
+     svloglocal: '1'
+     syspowerinterval: '10'
+     syspowermaxnodes: '10'
+     tftpdir: /tftprot/
+     tftpflags: -v
+     timezone: America/New_York
+     useNFSv4onAIX: '0'
+     useNmapfromMN: 'no'
+     useSSHonAIX: '0'
+     useflowcontrol: 'no'
+     usexhrm: 'no'
+     vcenterautojoin: 'no'
+     vmwarereconfigonpower: 'no'
+     vsftp: n
+     xcatconfdir: /etc/xcat
+     xcatdebugmode: '1'
+     xcatdport: '3001'
+     xcatiport: '3002'
+     xcatlport: '3003'
+     xcatmaxbatchconnections: '64'
+     xcatmaxconnections: '60'
+     xcatsslciphers: 3DES
+     xcatsslversion: TLSv1
+ " > /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org
 cmd:mnip=$(lsdef -t site -o clustersite -i master -c|awk -F'=' '{print $2}');sed -i "s/10.3.5.8/$mnip/g" /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.org
 check:rc==0
 cmd:xcat-inventory export -t site |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_default_format/site.export
@@ -318,7 +316,7 @@ check:rc==0
 cmd:xcat-inventory export --format=json -t site |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.export
 check:rc==0
 cmd:#!/bin/bash
-diff -y --ignore-blank-lines  --ignore-matching-lines="^#"  /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.export
+diff -y --ignore-blank-lines  --ignore-matching-lines="^#" --ignore-matching-lines="schema_version"   /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.export
 check:rc==0
 cmd:cat /tmp/xcat_inventory_try_to_export_all_type_is_site_json_format/site.stanza | mkdef -z -f
 check:rc==0
@@ -431,7 +429,7 @@ check:rc==0
 cmd:xcat-inventory export --format=yaml -t site|sed -e '/^\s*$/d' |tee /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.export
 check:rc==0
 cmd:#!/bin/bash
-diff -y --ignore-blank-lines  --ignore-matching-lines="^#"  /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.export
+diff -y --ignore-blank-lines  --ignore-matching-lines="^#" --ignore-matching-lines="schema_version"  /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.org /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.export
 check:rc==0
 cmd:cat /tmp/xcat_inventory_try_to_export_all_type_is_site_yaml_format/site.stanza | mkdef -z -f
 check:rc==0
diff --git a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json
index 2dad18b47..92b5fa341 100644
--- a/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json
+++ b/xCAT-test/autotest/testcase/xcat-inventory/templates/environment/test.environments.osimage.update.json
@@ -4,7 +4,7 @@
             "basic_attributes": {
                 "arch": "OSARCH",
                 "distribution": "OSVERS",
-                "osdistro": "OSARCH-OSVERS",
+                "osdistro": "OSVERS-OSARCH",
                 "osname": "Linux"
             },
             "deprecated": {