Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

units of measure bug changes #56

Merged
merged 2 commits into from
Dec 9, 2024
Merged

units of measure bug changes #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c8d87ce
units of measure bug changes
Dec 9, 2024
ecb5216
changes for integration test
Dec 9, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions plugins/modules/site_workflow_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1312,8 +1312,8 @@ def validate_site_input_data(self, config, state):
units_of_measure))
self.log("Invalid 'units_of_measure': {0}. Expected 'feet' or 'meters'.".format(units_of_measure), "ERROR")
else:
errormsg.append("units_of_measure should not be None or empty")
self.log("Missing 'units_of_measure' in floor entry.", "ERROR")
site[site_type]["units_of_measure"] = "feet"
self.log("Default value assigned for units_of_measure: feet.", "INFO")

upload_floor_image_path = site.get(site_type, {}).get("upload_floor_image_path")
if upload_floor_image_path:
Expand Down
30 changes: 15 additions & 15 deletions tests/integration/ccc_site_workflow_manager/vars/vars_site_workflow_manager.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,29 +138,29 @@
floorNumber: 1

- delete_a_site:
- type: 'floor'
- type: 'area'
site:
floor:
name: cherry
parentName: Global/japan3/blossom
rfModel: Cubes And Walled Offices
width: 177
length: 171
height: 10
floorNumber: 1
area:
name: japan3
parentName: Global

- type: 'building'
site:
building:
name: blossom
address: 1234 Elm Street
parentName: Global/japan3
latitude: 37.358
longitude: -121.846
latitude: 37.385
longitude: -121.845
country: India

- type: 'area'
- type: 'floor'
site:
area:
name: japan3
parentName: Global
floor:
name: cherry
parentName: Global/japan3/blossom
rfModel: Cubes And Walled Offices
width: 105
length: 105
height: 10
floorNumber: 1
Loading