Merge branch 'master' into iv-doc-updates

google · Feb 2, 2024 · 37cdf19 · 37cdf19
2 parents e628fae + d66bbdb
commit 37cdf19
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 4 deletions.
diff --git a/ontology/docs/building_config.md b/ontology/docs/building_config.md
@@ -204,8 +204,8 @@ ENTITY-CODE:
     represents this entity.
 *   **Code:** The human readable identifier for the entity. This should
     be unique in document scope.
-*   **cloud_device_id:** the cloud device id from the cloud iot registry.
-    This field is mandatory when a translation exists.
+*   **cloud_device_id:** the numeric device id from cloud iot registry.
+    This field is mandatory when a translation exists. Must be a numeric string.
 *   **Connections:** Used to specify connections from other entities (sources)
     pointing to this entity, with connection types. Entities are keys and cannot
     be repeated. Values are one or more connections, specified as a single

diff --git a/ontology/yaml/resources/HVAC/entity_types/FAN.yaml b/ontology/yaml/resources/HVAC/entity_types/FAN.yaml
@@ -37,6 +37,16 @@ FAN_SS_VSC:
   - SS
   - VSC
 
+FAN_SS_VSC_ZSPC:
+  guid: "b9f968cc-211b-4b25-915d-525216aebc4e"
+  description: "Fan with start/stop status, open-loop speed control & zone static pressure control."
+  is_canonical: true
+  implements:
+  - FAN
+  - SS
+  - VSC
+  - ZSPC
+
 FAN_SS_WDPM:
   guid: "d12cbe88-243a-40a5-b624-3a2f355e7cfc"
   description: "Fan with start/stop and differential pressure monitoring."

diff --git a/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/METERS/entity_types/ABSTRACT.yaml
@@ -62,6 +62,8 @@ PVCM:
   guid: "97b8b9c1-21dd-4201-9424-c776e28de758"
   description: "Phase-level current and voltage monitoring."
   is_abstract: true
+  opt_uses:
+  - neutral_line_current_sensor
   uses:
   - phase1_line_current_sensor
   - phase2_line_current_sensor

diff --git a/tools/validators/instance_validator/tests/fake_instances/GOOD/bc_entity_with_id.yaml b/tools/validators/instance_validator/tests/fake_instances/GOOD/bc_entity_with_id.yaml
@@ -17,7 +17,7 @@
 DMP_EDM-17-GUID:
   type: HVAC/DMP_EDM
   code: DMP_EDM-17
-  cloud_device_id: "1234567890123456"
+  cloud_device_id: "123456"
   translation:
     exhaust_air_damper_command:
       present_value: "points.exhaust_air_damper_command.present_value"

diff --git a/tools/validators/instance_validator/validate/entity_instance.py b/tools/validators/instance_validator/validate/entity_instance.py
@@ -47,7 +47,7 @@
 )
 _UDMI_UNIT_FIELD_PATTERN = re.compile(_UDMI_UNIT_FIELD_REGEX)
 
-_DEVICE_NUMERIC_ID_REGEX = r'[0-9]{16}'
+_DEVICE_NUMERIC_ID_REGEX = r'[0-9]+'
 _DEVICE_NUMERIC_ID_PATTERN = re.compile(_DEVICE_NUMERIC_ID_REGEX)
 
 # Faciltities naming patterns