From 382ce3796855d52f2a3541ff4ea49e5d591cdf99 Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 13 Dec 2022 12:48:45 +0530 Subject: [PATCH 1/2] Renamed get_attrb_value to get_attr --- .../fluent/core/services/datamodel_se.py | 26 +++++++++---------- tests/test_datamodel_server/test_client.py | 2 +- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/ansys/fluent/core/services/datamodel_se.py b/src/ansys/fluent/core/services/datamodel_se.py index 0bcfe9c28201..4478b1c66c2f 100644 --- a/src/ansys/fluent/core/services/datamodel_se.py +++ b/src/ansys/fluent/core/services/datamodel_se.py @@ -223,11 +223,11 @@ class PyStateContainer(PyCallableStateObject): Methods ------- - get_attrib_value(attrib) + get_attr(attrib) Get the attribute value of the current object. getAttribValue(attrib) Get the attribute value of the current object. - (This method is the same as the get_attrib_value(attrib) + (This method is the same as the get_attr(attrib) method.) get_state() Get the state of the current object. @@ -272,7 +272,7 @@ def set_state(self, state: Any = None, **kwargs) -> None: setState = set_state - def get_attrib_value(self, attrib: str) -> Any: + def get_attr(self, attrib: str) -> Any: """Get attribute value of the current object. Parameters @@ -292,11 +292,11 @@ def get_attrib_value(self, attrib: str) -> Any: response = self.service.get_attribute_value(request) return _convert_variant_to_value(response.result) - getAttribValue = get_attrib_value + getAttribValue = get_attr def is_active(self): """Returns true if the parameter is active.""" - return true_if_none(self.get_attrib_value(Attribute.IS_ACTIVE.value)) + return true_if_none(self.get_attr(Attribute.IS_ACTIVE.value)) def help(self) -> None: """Print help string.""" @@ -397,10 +397,10 @@ class PyParameter(PyStateContainer): def default_value(self): """Get default value of the parameter.""" - return self.get_attrib_value(Attribute.DEFAULT.value) + return self.get_attr(Attribute.DEFAULT.value) def is_read_only(self): - return true_if_none(self.get_attrib_value(Attribute.IS_READ_ONLY.value)) + return true_if_none(self.get_attr(Attribute.IS_READ_ONLY.value)) def true_if_none(val): @@ -415,17 +415,17 @@ class PyTextual(PyParameter): """Provides interface for textual parameters.""" def allowed_values(self): - return self.get_attrib_value(Attribute.ALLOWED_VALUES.value) + return self.get_attr(Attribute.ALLOWED_VALUES.value) class PyNumerical(PyParameter): """Provides interface for numerical parameters.""" def min(self): - return self.get_attrib_value(Attribute.MIN.value) + return self.get_attr(Attribute.MIN.value) def max(self): - return self.get_attrib_value(Attribute.MAX.value) + return self.get_attr(Attribute.MAX.value) class PyDictionary(PyParameter): @@ -719,11 +719,11 @@ def get_state(self) -> Any: getState = get_state - def get_attrib_value(self, attrib: str) -> Any: + def get_attr(self, attrib: str) -> Any: attrib_path = f"{self.name}/{attrib}" - return self.parent.get_attrib_value(attrib_path) + return self.parent.get_attr(attrib_path) - getAttribValue = get_attrib_value + getAttribValue = get_attr def help(self) -> None: pass diff --git a/tests/test_datamodel_server/test_client.py b/tests/test_datamodel_server/test_client.py index 42be67f09c40..42f930ab9d2f 100644 --- a/tests/test_datamodel_server/test_client.py +++ b/tests/test_datamodel_server/test_client.py @@ -19,7 +19,7 @@ def test_preferences_client(): assert preferences.Appearance.ColorTheme.get_state() == "Dark" assert preferences.Appearance.GraphicsColorTheme.get_state() == "Dark" - assert preferences.Appearance.AnsysLogo.Color.get_attrib_value("allowedValues") == [ + assert preferences.Appearance.AnsysLogo.Color.get_attr("allowedValues") == [ "White", "Black", ] From ad903c4355a2d3c05600524aa58e398505a62eba Mon Sep 17 00:00:00 2001 From: Harshal Pohekar Date: Tue, 13 Dec 2022 13:19:04 +0530 Subject: [PATCH 2/2] Updated allowed values test --- tests/test_datamodel_server/test_client.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tests/test_datamodel_server/test_client.py b/tests/test_datamodel_server/test_client.py index 42f930ab9d2f..28013f0ec3d0 100644 --- a/tests/test_datamodel_server/test_client.py +++ b/tests/test_datamodel_server/test_client.py @@ -23,6 +23,11 @@ def test_preferences_client(): "White", "Black", ] + + assert preferences.Appearance.AnsysLogo.Color.allowed_values() == [ + "White", + "Black", + ] close_server()