Skip to content

Commit 8c8d41f

Browse files
committed
undo changes done in other branches
1 parent 149b46d commit 8c8d41f

File tree

4 files changed

+4
-27
lines changed

4 files changed

+4
-27
lines changed

src/ansys/geometry/core/connection/backend.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ class BackendType(Enum):
3333
SPACECLAIM = 1
3434
WINDOWS_SERVICE = 2
3535
LINUX_SERVICE = 3
36-
CORE_WINDOWS = 4
37-
CORE_LINUX = 5
3836

3937

4038
class ApiVersions(Enum):

src/ansys/geometry/core/connection/client.py

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -215,23 +215,11 @@ def __init__(
215215
backend_type = BackendType.WINDOWS_SERVICE
216216
elif grpc_backend_type == GRPCBackendType.LINUX_DMS:
217217
backend_type = BackendType.LINUX_SERVICE
218-
elif grpc_backend_type == GRPCBackendType.CORE_SERVICE_WINDOWS:
219-
backend_type = BackendType.CORE_WINDOWS
220-
elif grpc_backend_type == GRPCBackendType.CORE_SERVICE_LINUX:
221-
backend_type = BackendType.CORE_LINUX
222218

223219
# Store the backend type
224220
self._backend_type = backend_type
225221
self._multiple_designs_allowed = (
226-
False
227-
if backend_type
228-
in (
229-
BackendType.DISCOVERY,
230-
BackendType.LINUX_SERVICE,
231-
BackendType.CORE_LINUX,
232-
BackendType.CORE_WINDOWS,
233-
)
234-
else True
222+
False if backend_type in (BackendType.DISCOVERY, BackendType.LINUX_SERVICE) else True
235223
)
236224

237225
# retrieve the backend version

src/ansys/geometry/core/connection/launcher.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1088,7 +1088,7 @@ def launch_modeler_with_core_service(
10881088
LOG.info(f"Writing server logs to the default folder at {server_logs_folder}.")
10891089

10901090
return prepare_and_start_backend(
1091-
BackendType.CORE_WINDOWS,
1091+
BackendType.LINUX_SERVICE,
10921092
product_version=product_version,
10931093
host=host,
10941094
port=port,

src/ansys/geometry/core/connection/product_instance.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -263,12 +263,7 @@ def prepare_and_start_backend(
263263
"""
264264
from ansys.geometry.core.modeler import Modeler
265265

266-
if (
267-
os.name != "nt"
268-
and backend_type != BackendType.LINUX_SERVICE
269-
and backend_type != BackendType.CORE_WINDOWS
270-
and backend_type != BackendType.CORE_LINUX
271-
): # pragma: no cover
266+
if os.name != "nt" and backend_type != BackendType.LINUX_SERVICE: # pragma: no cover
272267
raise RuntimeError(
273268
"Method 'prepare_and_start_backend' is only available on Windows."
274269
"A Linux version is only available for the Core Geometry Service."
@@ -367,11 +362,7 @@ def prepare_and_start_backend(
367362
)
368363
)
369364
# This should be modified to Windows Core Service in the future
370-
elif backend_type in (
371-
BackendType.LINUX_SERVICE,
372-
BackendType.CORE_WINDOWS,
373-
BackendType.CORE_LINUX,
374-
):
365+
elif backend_type == BackendType.LINUX_SERVICE:
375366
# Define several Ansys Geometry Core Service folders needed
376367
root_service_folder = Path(installations[product_version], CORE_GEOMETRY_SERVICE_FOLDER)
377368
native_folder = root_service_folder / "Native"

0 commit comments

Comments
 (0)