Merge branch 'master' into fix/917_ncp_init

Author: bhmanda-silabs

data_model/1.4/clusters/EcosystemInformationCluster.xml

@@ -120,4 +120,18 @@ Davis, CA 95616, USA
       <access fabricScoped="true"/>
     </struct>
   </dataTypes>
+  <attributes>
+    <attribute id="0x0000" name="DeviceDirectory" type="list">
+      <entry type="EcosystemDeviceStruct"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
+    <attribute id="0x0001" name="LocationDirectory" type="list">
+      <entry type="EcosystemLocationStruct"/>
+      <access read="true" readPrivilege="manage" fabricScoped="true"/>
+      <quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
+      <mandatoryConform/>
+    </attribute>
+  </attributes>
 </cluster>

data_model/1.4/spec_sha

@@ -1 +1 @@
-3d8fc9ae05045a53fdaffd7e3593f92a48b10e30
+21812107312887c416632ed6dd2399af1f077548

scripts/dm_xml_ci_change_enforcement.py

@@ -36,15 +36,15 @@ def check_dm_directory(dir):
 
     def check_dir(dir):
         cmd = f'git diff HEAD^..HEAD --name-only -- {dir}'
-        output = subprocess.check_output(cmd, shell=True).decode().splitlines()
+        output = subprocess.check_output(cmd, shell=True).decode()
         if output and 'spec_sha' not in output and 'scraper_version' not in output:
             print(f'Data model directory {dir} had changes to the following files without a corresponding update to the spec SHA')
             print(output)
             print("Note that the data_model directory files are automatically updated by a spec scraper and should not be manually updated.")
             return 1
         return 0
 
-    ret = check_dir(clusters) + check_dir(device_types)
+    ret = check_dir(dir)
     sys.exit(ret)